NOISSUE rebrand vim to MNV's not Vim

Signed-off-by: Mehmet Samet Duman <yongdohyun@projecttick.org>

396 files changed, 11830 insertions, 11819 deletions

diff --git a/uvim/src/testdir/Make_all.mak b/uvim/src/testdir/Make_all.mak
index 28a5ec663a..97388d20a1 100644
--- a/uvim/src/testdir/Make_all.mak
+++ b/uvim/src/testdir/Make_all.mak
@@ -37,40 +37,40 @@ SCRIPTS_TINY_OUT = \
 	test28.out \
 	test29.out
 
-# Tests for Vim9 script.
-TEST_VIM9 = \
-	test_vim9_assign \
-	test_vim9_builtin \
-	test_vim9_class \
-	test_vim9_cmd \
-	test_vim9_disassemble \
-	test_vim9_enum \
-	test_vim9_expr \
-	test_vim9_fails \
-	test_vim9_func \
-	test_vim9_generics \
-	test_vim9_import \
-	test_vim9_interface \
-	test_vim9_python3 \
-	test_vim9_script \
-	test_vim9_typealias
+# Tests for MNV9 script.
+TEST_MNV9 = \
+	test_mnv9_assign \
+	test_mnv9_builtin \
+	test_mnv9_class \
+	test_mnv9_cmd \
+	test_mnv9_disassemble \
+	test_mnv9_enum \
+	test_mnv9_expr \
+	test_mnv9_fails \
+	test_mnv9_func \
+	test_mnv9_generics \
+	test_mnv9_import \
+	test_mnv9_interface \
+	test_mnv9_python3 \
+	test_mnv9_script \
+	test_mnv9_typealias
 
-TEST_VIM9_RES = \
-	test_vim9_assign.res \
-	test_vim9_builtin.res \
-	test_vim9_class.res \
-	test_vim9_cmd.res \
-	test_vim9_disassemble.res \
-	test_vim9_enum.res \
-	test_vim9_expr.res \
-	test_vim9_fails.res \
-	test_vim9_func.res \
-	test_vim9_generics.res \
-	test_vim9_import.res \
-	test_vim9_interface.res \
-	test_vim9_python3.res \
-	test_vim9_script.res \
-	test_vim9_typealias.res
+TEST_MNV9_RES = \
+	test_mnv9_assign.res \
+	test_mnv9_builtin.res \
+	test_mnv9_class.res \
+	test_mnv9_cmd.res \
+	test_mnv9_disassemble.res \
+	test_mnv9_enum.res \
+	test_mnv9_expr.res \
+	test_mnv9_fails.res \
+	test_mnv9_func.res \
+	test_mnv9_generics.res \
+	test_mnv9_import.res \
+	test_mnv9_interface.res \
+	test_mnv9_python3.res \
+	test_mnv9_script.res \
+	test_mnv9_typealias.res
 
 # Benchmark scripts.
 SCRIPTS_BENCH = test_bench_regexp.res
@@ -349,9 +349,9 @@ NEW_TESTS = \
 	test_utf8_comparisons \
 	test_vartabs \
 	test_version \
-	$(TEST_VIM9) \
-	test_viminfo \
-	test_vimscript \
+	$(TEST_MNV9) \
+	test_mnvinfo \
+	test_mnvscript \
 	test_virtualedit \
 	test_visual \
 	test_wayland \
@@ -370,7 +370,7 @@ NEW_TESTS = \
 	test_alot_utf8 \
 	test_alot
 
-# Test targets that use runtest.vim.
+# Test targets that use runtest.mnv.
 # Keep test_alot*.res as the last one, sort the others.
 # test_largefile.res is omitted, it uses too much resources to run on CI.
 NEW_TESTS_RES = \
@@ -608,9 +608,9 @@ NEW_TESTS_RES = \
 	test_user_func.res \
 	test_usercommands.res \
 	test_vartabs.res \
-	$(TEST_VIM9_RES) \
-	test_viminfo.res \
-	test_vimscript.res \
+	$(TEST_MNV9_RES) \
+	test_mnvinfo.res \
+	test_mnvscript.res \
 	test_virtualedit.res \
 	test_visual.res \
 	test_wayland.res \
diff --git a/uvim/src/testdir/Make_amiga.mak b/uvim/src/testdir/Make_amiga.mak
index 6ffc12dfce..a5cc13fd95 100644
--- a/uvim/src/testdir/Make_amiga.mak
+++ b/uvim/src/testdir/Make_amiga.mak
@@ -1,9 +1,9 @@
 #
-# Makefile to run all tests for Vim, on Amiga
+# Makefile to run all tests for MNV, on Amiga
 #
 # Requires "rm", "csh" and "diff"!
 
-VIMPROG = /vim
+MNVPROG = /mnv
 
 default: nongui
 
@@ -11,17 +11,17 @@ include Make_all.mak
 
 SCRIPTS = $(SCRIPTS_TINY_OUT)
 
-.SUFFIXES: .in .out .res .vim
+.SUFFIXES: .in .out .res .mnv
 
 nongui:	/tmp $(SCRIPTS)
 	csh -c echo ALL DONE
 
 clean:
-	csh -c \rm -rf *.out Xdir1 Xfind XfakeHOME Xdotest test.ok viminfo
+	csh -c \rm -rf *.out Xdir1 Xfind XfakeHOME Xdotest test.ok mnvinfo
 
 .in.out:
 	copy $*.ok test.ok
-	$(VIMPROG) -u util/amiga.vim -U NONE --noplugin --not-a-term -s dotest.in $*.in
+	$(MNVPROG) -u util/amiga.mnv -U NONE --noplugin --not-a-term -s dotest.in $*.in
 	diff test.out $*.ok
 	rename test.out $*.out
 	-delete X#? ALL QUIET
diff --git a/uvim/src/testdir/Make_ming.mak b/uvim/src/testdir/Make_ming.mak
index 8d54500dec..1f0fed3598 100644
--- a/uvim/src/testdir/Make_ming.mak
+++ b/uvim/src/testdir/Make_ming.mak
@@ -1,5 +1,5 @@
 #
-# Makefile to run all tests for Vim, on Dos-like machines
+# Makefile to run all tests for MNV, on Dos-like machines
 # with sh.exe or zsh.exe in the path or not.
 #
 # Author: Bill McCarthy
@@ -15,21 +15,21 @@ MV = move /y
 CP = copy /y
 CAT = type
 
-VIMPROG = ..\\vim
+MNVPROG = ..\\mnv
 
 default: nongui
 
 include Make_all.mak
 
 # Explicit dependencies.
-test_options_all.res: opt_test.vim
+test_options_all.res: opt_test.mnv
 
 TEST_OUTFILES = $(SCRIPTS_TINY_OUT)
 DOSTMP = dostmp
 # Keep $(DOSTMP)/*.in
 .PRECIOUS: $(patsubst %.out, $(DOSTMP)/%.in, $(TEST_OUTFILES))
 
-.SUFFIXES: .in .out .res .vim
+.SUFFIXES: .in .out .res .mnv
 
 # Add --gui-dialog-file to avoid getting stuck in a dialog.
 COMMON_ARGS = $(NO_INITS) --gui-dialog-file guidialog
@@ -46,7 +46,7 @@ report:
 	@rem without the +eval feature test_result.log is a copy of test.log
 	@if exist test.log ( copy /y test.log test_result.log > nul ) \
 		else ( echo No failures reported > test_result.log )
-	$(VIMPROG) -u NONE $(COMMON_ARGS) -S util\summarize.vim messages
+	$(MNVPROG) -u NONE $(COMMON_ARGS) -S util\summarize.mnv messages
 	-if exist starttime del starttime
 	@echo.
 	@echo Test results:
@@ -62,7 +62,7 @@ $(NEW_TESTS):
 	-if exist test.log del test.log
 	-if exist messages del messages
 	-if exist starttime del starttime
-	@$(MAKE) -f Make_ming.mak $@.res VIMPROG=$(VIMPROG) --no-print-directory
+	@$(MAKE) -f Make_ming.mak $@.res MNVPROG=$(MNVPROG) --no-print-directory
 	@type messages
 	@if exist test.log exit 1
 
@@ -81,13 +81,13 @@ clean:
 	-@if exist XfakeHOME $(DELDIR) XfakeHOME
 	-@if exist X* $(DEL) X*
 	-@for /d %%i in (X*) do @rd /s/q %%i
-	-@if exist viminfo $(DEL) viminfo
+	-@if exist mnvinfo $(DEL) mnvinfo
 	-@if exist test.log $(DEL) test.log
 	-@if exist test_result.log del test_result.log
 	-@if exist messages $(DEL) messages
 	-@if exist starttime $(DEL) starttime
 	-@if exist benchmark.out del benchmark.out
-	-@if exist opt_test.vim $(DEL) opt_test.vim
+	-@if exist opt_test.mnv $(DEL) opt_test.mnv
 	-@if exist gen_opt_test.log $(DEL) gen_opt_test.log
 	-@if exist guidialog $(DEL) guidialog
 	-@if exist guidialogfile $(DEL) guidialogfile
@@ -106,7 +106,7 @@ tinytests: $(SCRIPTS_TINY_OUT)
 $(DOSTMP)/%.in : %.in
 	if not exist $(DOSTMP)\nul mkdir $(DOSTMP)
 	if exist $(DOSTMP)\$< $(DEL) $(DOSTMP)\$<
-	$(VIMPROG) -u util\dos.vim $(COMMON_ARGS) "+set ff=dos|f $@|wq" $<
+	$(MNVPROG) -u util\dos.mnv $(COMMON_ARGS) "+set ff=dos|f $@|wq" $<
 
 # For each input file dostmp/test99.in run the tests.
 # This moves test99.in to test99.in.bak temporarily.
@@ -116,7 +116,7 @@ $(DOSTMP)/%.in : %.in
 	$(MV) $(notdir $<) $(notdir $<).bak > NUL
 	$(CP) $(DOSTMP)\$(notdir $<) $(notdir $<) > NUL
 	$(CP) $(basename $@).ok test.ok > NUL
-	$(VIMPROG) -u util\dos.vim $(COMMON_ARGS) -s dotest.in $(notdir $<)
+	$(MNVPROG) -u util\dos.mnv $(COMMON_ARGS) -s dotest.in $(notdir $<)
 	-@if exist test.out $(MV) test.out $(DOSTMP)\$@ > NUL
 	-@if exist $(notdir $<).bak $(MV) $(notdir $<).bak $(notdir $<) > NUL
 	-@if exist test.ok $(DEL) test.ok
@@ -124,8 +124,8 @@ $(DOSTMP)/%.in : %.in
 	-@if exist Xfind $(DELDIR) Xfind
 	-@if exist XfakeHOME $(DELDIR) XfakeHOME
 	-@del X*
-	-@if exist viminfo del viminfo
-	$(VIMPROG) -u util\dos.vim $(COMMON_ARGS) "+set ff=unix|f test.out|wq" \
+	-@if exist mnvinfo del mnvinfo
+	$(MNVPROG) -u util\dos.mnv $(COMMON_ARGS) "+set ff=unix|f test.out|wq" \
 		$(DOSTMP)\$@
 	@diff test.out $(basename $@).ok & if errorlevel 1 \
 		( $(MV) test.out $(basename $@).failed > NUL \
@@ -134,7 +134,7 @@ $(DOSTMP)/%.in : %.in
 		else ( $(MV) test.out $(basename $@).out > NUL )
 
 
-# New style of tests uses Vim script with assert calls.  These are easier
+# New style of tests uses MNV script with assert calls.  These are easier
 # to write and a lot easier to read and debug.
 # Limitation: Only works with the +eval feature.
 
@@ -143,28 +143,28 @@ newtests: newtestssilent
 
 newtestssilent: $(NEW_TESTS_RES)
 
-.vim.res:
-	@echo $(VIMPROG) > vimcmd
-	$(VIMPROG) -u NONE $(COMMON_ARGS) -S runtest.vim $*.vim
-	@$(DEL) vimcmd
+.mnv.res:
+	@echo $(MNVPROG) > mnvcmd
+	$(MNVPROG) -u NONE $(COMMON_ARGS) -S runtest.mnv $*.mnv
+	@$(DEL) mnvcmd
 
-test_gui.res: test_gui.vim
-	@echo $(VIMPROG) > vimcmd
-	$(VIMPROG) -u NONE $(COMMON_ARGS) -S runtest.vim $<
-	@$(DEL) vimcmd
+test_gui.res: test_gui.mnv
+	@echo $(MNVPROG) > mnvcmd
+	$(MNVPROG) -u NONE $(COMMON_ARGS) -S runtest.mnv $<
+	@$(DEL) mnvcmd
 
-test_gui_init.res: test_gui_init.vim
-	@echo $(VIMPROG) > vimcmd
-	$(VIMPROG) -u util\gui_preinit.vim -U util\gui_init.vim $(NO_PLUGINS) -S runtest.vim $<
-	@$(DEL) vimcmd
+test_gui_init.res: test_gui_init.mnv
+	@echo $(MNVPROG) > mnvcmd
+	$(MNVPROG) -u util\gui_preinit.mnv -U util\gui_init.mnv $(NO_PLUGINS) -S runtest.mnv $<
+	@$(DEL) mnvcmd
 
-opt_test.vim: util/gen_opt_test.vim ../optiondefs.h ../../runtime/doc/options.txt
-	$(VIMPROG) -e -s -u NONE $(COMMON_ARGS) --nofork -S $^
+opt_test.mnv: util/gen_opt_test.mnv ../optiondefs.h ../../runtime/doc/options.txt
+	$(MNVPROG) -e -s -u NONE $(COMMON_ARGS) --nofork -S $^
 	@if exist gen_opt_test.log ( type gen_opt_test.log & exit /b 1 )
 
-test_bench_regexp.res: test_bench_regexp.vim
+test_bench_regexp.res: test_bench_regexp.mnv
 	-$(DEL) benchmark.out
-	@echo $(VIMPROG) > vimcmd
-	$(VIMPROG) -u NONE $(COMMON_ARGS) -S runtest.vim $*.vim
-	@$(DEL) vimcmd
+	@echo $(MNVPROG) > mnvcmd
+	$(MNVPROG) -u NONE $(COMMON_ARGS) -S runtest.mnv $*.mnv
+	@$(DEL) mnvcmd
 	$(CAT) benchmark.out
diff --git a/uvim/src/testdir/Make_mvc.mak b/uvim/src/testdir/Make_mvc.mak
index 5b492d7dc3..1a8376d646 100644
--- a/uvim/src/testdir/Make_mvc.mak
+++ b/uvim/src/testdir/Make_mvc.mak
@@ -1,5 +1,5 @@
 #
-# Makefile to run all tests for Vim, on Dos-like machines.
+# Makefile to run all tests for MNV, on Dos-like machines.
 #
 # Requires a set of Unix tools: echo, diff, etc.
 #
@@ -8,10 +8,10 @@
 !INCLUDE ..\auto\nmake\tools.mak
 
 # Testing may be done with a debug build 
-!IF EXIST(..\\vimd.exe) && !EXIST(..\\vim.exe)
-VIMPROG = ..\\vimd.exe
+!IF EXIST(..\\mnvd.exe) && !EXIST(..\\mnv.exe)
+MNVPROG = ..\\mnvd.exe
 !ELSE
-VIMPROG = ..\\vim.exe
+MNVPROG = ..\\mnv.exe
 !ENDIF
 
 DIFF = diff.exe
@@ -21,14 +21,14 @@ default: nongui
 !INCLUDE .\Make_all.mak
 
 # Explicit dependencies.
-test_options_all.res: opt_test.vim
+test_options_all.res: opt_test.mnv
 
 TEST_OUTFILES = $(SCRIPTS_TINY_OUT)
 DOSTMP = dostmp
 DOSTMP_OUTFILES = $(TEST_OUTFILES:test=dostmp\test)
 DOSTMP_INFILES = $(DOSTMP_OUTFILES:.out=.in)
 
-.SUFFIXES: .in .out .res .vim
+.SUFFIXES: .in .out .res .mnv
 
 # Add --gui-dialog-file to avoid getting stuck in a dialog.
 COMMON_ARGS = $(NO_INITS) --gui-dialog-file guidialog
@@ -46,7 +46,7 @@ codestyle:
 	-@ if exist test.log $(RM) test.log
 	-@ if exist messages $(RM) messages
 	-@ if exist starttime $(RM) starttime
-	@ $(MAKE) -lf Make_mvc.mak VIMPROG=$(VIMPROG) test_codestyle.res
+	@ $(MAKE) -lf Make_mvc.mak MNVPROG=$(MNVPROG) test_codestyle.res
 	@ type messages
 	@ if exist test.log exit 1
 
@@ -54,7 +54,7 @@ report:
 	@ rem without the +eval feature test_result.log is a copy of test.log
 	@ if exist test.log ( $(CP) test.log test_result.log > nul ) \
 		else ( echo No failures reported > test_result.log )
-	$(VIMPROG) -u NONE $(COMMON_ARGS) -S util\summarize.vim messages
+	$(MNVPROG) -u NONE $(COMMON_ARGS) -S util\summarize.mnv messages
 	- if exist starttime $(RM) starttime
 	@ echo:
 	@ echo Test results:
@@ -70,7 +70,7 @@ $(NEW_TESTS):
 	- if exist test.log $(RM) test.log
 	- if exist messages $(RM) messages
 	- if exist starttime $(RM) starttime
-	@ $(MAKE) -lf Make_mvc.mak VIMPROG=$(VIMPROG) $@.res
+	@ $(MAKE) -lf Make_mvc.mak MNVPROG=$(MNVPROG) $@.res
 	@ type messages
 	@ if exist test.log exit 1
 
@@ -89,13 +89,13 @@ clean:
 	- if exist XfakeHOME $(RD) XfakeHOME
 	- if exist X* $(RM) X*
 	- for /d %i in (X*) do @$(RD) %i
-	- if exist viminfo $(RM) viminfo
+	- if exist mnvinfo $(RM) mnvinfo
 	- if exist test.log $(RM) test.log
 	- if exist test_result.log $(RM) test_result.log
 	- if exist messages $(RM) messages
 	- if exist starttime $(RM) starttime
 	- if exist benchmark.out $(RM) benchmark.out
-	- if exist opt_test.vim $(RM) opt_test.vim
+	- if exist opt_test.mnv $(RM) opt_test.mnv
 	- if exist gen_opt_test.log $(RM) gen_opt_test.log
 	- if exist guidialog $(RM) guidialog
 	- if exist guidialogfile $(RM) guidialogfile
@@ -114,7 +114,7 @@ tinytests: $(SCRIPTS_TINY_OUT)
 $(DOSTMP_INFILES): $(*B).in
 	if not exist $(DOSTMP)\NUL $(MKD) $(DOSTMP)
 	if exist $@ $(RM) $@
-	$(VIMPROG) -u util\dos.vim $(COMMON_ARGS) "+set ff=dos|f $@|wq" $(*B).in
+	$(MNVPROG) -u util\dos.mnv $(COMMON_ARGS) "+set ff=dos|f $@|wq" $(*B).in
 
 # For each input file dostmp/test99.in run the tests.
 # This moves test99.in to test99.in.bak temporarily.
@@ -124,7 +124,7 @@ $(TEST_OUTFILES): $(DOSTMP)\$(*B).in
 	$(MV) $(*B).in $(*B).in.bak > nul
 	$(CP) $(DOSTMP)\$(*B).in $(*B).in > nul
 	$(CP) $(*B).ok test.ok > nul
-	$(VIMPROG) -u util\dos.vim $(COMMON_ARGS) -s dotest.in $(*B).in
+	$(MNVPROG) -u util\dos.mnv $(COMMON_ARGS) -s dotest.in $(*B).in
 	-@ if exist test.out $(MV) test.out $(DOSTMP)\$(*B).out > nul
 	-@ if exist $(*B).in.bak $(MV) $(*B).in.bak $(*B).in > nul
 	-@ if exist test.ok $(RM) test.ok
@@ -132,8 +132,8 @@ $(TEST_OUTFILES): $(DOSTMP)\$(*B).in
 	-@ if exist Xfind $(RD) Xfind
 	-@ if exist XfakeHOME $(RD) XfakeHOME
 	-@ $(RM) X*
-	-@ if exist viminfo $(RM) viminfo
-	$(VIMPROG) -u util\dos.vim $(COMMON_ARGS) "+set ff=unix|f test.out|wq" \
+	-@ if exist mnvinfo $(RM) mnvinfo
+	$(MNVPROG) -u util\dos.mnv $(COMMON_ARGS) "+set ff=unix|f test.out|wq" \
 		$(DOSTMP)\$(*B).out
 	@ $(DIFF) test.out $*.ok & if errorlevel 1 \
 		( $(MV) test.out $*.failed > nul \
@@ -142,7 +142,7 @@ $(TEST_OUTFILES): $(DOSTMP)\$(*B).in
 		else ( $(MV) test.out $*.out > nul )
 
 
-# New style of tests uses Vim script with assert calls.  These are easier
+# New style of tests uses MNV script with assert calls.  These are easier
 # to write and a lot easier to read and debug.
 # Limitation: Only works with the +eval feature.
 
@@ -151,32 +151,32 @@ newtests: newtestssilent
 
 newtestssilent: $(NEW_TESTS_RES)
 
-.vim.res:
-	@ echo $(VIMPROG) > vimcmd
-	$(VIMPROG) -u NONE $(COMMON_ARGS) -S runtest.vim $*.vim
-	@ $(RM) vimcmd
+.mnv.res:
+	@ echo $(MNVPROG) > mnvcmd
+	$(MNVPROG) -u NONE $(COMMON_ARGS) -S runtest.mnv $*.mnv
+	@ $(RM) mnvcmd
 
-test_gui.res: test_gui.vim
-	@ echo $(VIMPROG) > vimcmd
-	$(VIMPROG) -u NONE $(COMMON_ARGS) -S runtest.vim $*.vim
-	@ $(RM) vimcmd
+test_gui.res: test_gui.mnv
+	@ echo $(MNVPROG) > mnvcmd
+	$(MNVPROG) -u NONE $(COMMON_ARGS) -S runtest.mnv $*.mnv
+	@ $(RM) mnvcmd
 
-test_gui_init.res: test_gui_init.vim
-	@ echo $(VIMPROG) > vimcmd
-	$(VIMPROG) -u util\gui_preinit.vim -U util\gui_init.vim $(NO_PLUGINS) \
-		-S runtest.vim $*.vim
-	@ $(RM) vimcmd
+test_gui_init.res: test_gui_init.mnv
+	@ echo $(MNVPROG) > mnvcmd
+	$(MNVPROG) -u util\gui_preinit.mnv -U util\gui_init.mnv $(NO_PLUGINS) \
+		-S runtest.mnv $*.mnv
+	@ $(RM) mnvcmd
 
-opt_test.vim: util/gen_opt_test.vim ../optiondefs.h \
+opt_test.mnv: util/gen_opt_test.mnv ../optiondefs.h \
 		../../runtime/doc/options.txt
-	$(VIMPROG) -e -s -u NONE $(COMMON_ARGS) --nofork -S $**
+	$(MNVPROG) -e -s -u NONE $(COMMON_ARGS) --nofork -S $**
 	@ if exist gen_opt_test.log ( type gen_opt_test.log & exit /b 1 )
 
-test_bench_regexp.res: test_bench_regexp.vim
+test_bench_regexp.res: test_bench_regexp.mnv
 	- if exist benchmark.out $(RM) benchmark.out
-	@ echo $(VIMPROG) > vimcmd
-	$(VIMPROG) -u NONE $(COMMON_ARGS) -S runtest.vim $*.vim
-	@ $(RM) vimcmd
+	@ echo $(MNVPROG) > mnvcmd
+	$(MNVPROG) -u NONE $(COMMON_ARGS) -S runtest.mnv $*.mnv
+	@ $(RM) mnvcmd
 	@ if exist benchmark.out ( type benchmark.out )
 
-# vim: set noet sw=8 ts=8 sts=0 wm=0 tw=79 ft=make:
+# mnv: set noet sw=8 ts=8 sts=0 wm=0 tw=79 ft=make:
diff --git a/uvim/src/testdir/Make_vms.mms b/uvim/src/testdir/Make_vms.mms
index ad21395008..8e5d7b11da 100644
--- a/uvim/src/testdir/Make_vms.mms
+++ b/uvim/src/testdir/Make_vms.mms
@@ -1,5 +1,5 @@
 #
-# Makefile to run all tests for Vim on VMS
+# Makefile to run all tests for MNV on VMS
 #
 # Authors:	Zoltan Arpadffy, <arpadffy@polarhome.com>
 #		Sandor Kopanyi,  <sandor.kopanyi@mailbox.hu>
@@ -33,7 +33,7 @@
 # Please, do not change anything below without programming experience.
 #######################################################################
 
-VIMPROG = <->vim.exe
+MNVPROG = <->mnv.exe
 
 .SUFFIXES : .out .in
 
@@ -56,7 +56,7 @@ GUI_OPTION = -g
 	-@ write sys$output "                "$*" "
 	-@ write sys$output "-----------------------------------------------"
 	-@ !run the test
-	-@ create/term/wait/nodetach mcr $(VIMPROG) $(GUI_OPTION) -u util/vms.vim --noplugin -s dotest.in $*.in
+	-@ create/term/wait/nodetach mcr $(MNVPROG) $(GUI_OPTION) -u util/vms.mnv --noplugin -s dotest.in $*.in
 	-@ !analyse the result
 	-@ directory /size/date test.out
 	-@ if "''F$SEARCH("test.out.*")'" .NES. "" then rename/nolog test.out $*.out 
@@ -77,11 +77,11 @@ all : clean nolog $(START_WITH) $(SCRIPT) nolog
 nolog :
 	-@ define sys$output test.log
 	-@ write sys$output "-----------------------------------------------"
-	-@ write sys$output "           Standard VIM test cases"
+	-@ write sys$output "           Standard MNV test cases"
 	-@ write sys$output "-----------------------------------------------"
 	-@ write sys$output " OpenVMS version: ''F$GETSYI("VERSION")'"
-	-@ write sys$output " Vim version:"
-	-@ mcr $(VIMPROG) --version
+	-@ write sys$output " MNV version:"
+	-@ mcr $(MNVPROG) --version
 	-@ write sys$output " Test date:"
 	-@ show time
 	-@ write sys$output "-----------------------------------------------"
@@ -89,9 +89,9 @@ nolog :
 	-@ write sys$output "-----------------------------------------------"
 	-@ write sys$output "MAKE_VMS.MMS options:"
 	-@ write sys$output "   WANT_GUI   = ""$(WANT_GUI)"" "
-	-@ write sys$output "Default vimrc file is util/VMS.VIM:"
+	-@ write sys$output "Default mnvrc file is util/VMS.MNV:"
 	-@ write sys$output "-----------------------------------------------"
-	-@ type util/VMS.VIM
+	-@ type util/VMS.MNV
 
 clean :
 	-@ if "''F$SEARCH("*.out")'"        .NES. "" then delete/noconfirm/nolog *.out.*
@@ -104,5 +104,5 @@ clean :
 	-@ if "''F$SEARCH("*.*_sw*")'"      .NES. "" then delete/noconfirm/nolog *.*_sw*.*
 	-@ if "''F$SEARCH("*.failed")'"     .NES. "" then delete/noconfirm/nolog *.failed.*
 	-@ if "''F$SEARCH("*.rej")'"        .NES. "" then delete/noconfirm/nolog *.rej.*
-	-@ if "''F$SEARCH("viminfo.*")'"    .NES. "" then delete/noconfirm/nolog viminfo.*.*
+	-@ if "''F$SEARCH("mnvinfo.*")'"    .NES. "" then delete/noconfirm/nolog mnvinfo.*.*
 
diff --git a/uvim/src/testdir/Makefile b/uvim/src/testdir/Makefile
index 2e1d900b88..b3f0818302 100644
--- a/uvim/src/testdir/Makefile
+++ b/uvim/src/testdir/Makefile
@@ -1,11 +1,11 @@
 #
-# Makefile to run all tests for Vim
+# Makefile to run all tests for MNV
 #
 
 # Use console or GUI.
-VIMPROG = ../vim
+MNVPROG = ../mnv
 XXDPROG = ../xxd/xxd
-# VIMPROG = ../gvim
+# MNVPROG = ../gmnv
 
 SCRIPTSOURCE = ../../runtime
 
@@ -16,12 +16,12 @@ REDIR_TEST_TO_NULL = --cmd 'au SwapExists * let v:swapchoice = "e"' | LC_ALL=C a
 
 # Uncomment this line to use valgrind for memory leaks and extra warnings.
 #   The output goes into a file "valgrind.testN"
-#   Vim should be compiled with EXITFREE to avoid false warnings.
+#   MNV should be compiled with EXITFREE to avoid false warnings.
 #   This will make testing about 10 times as slow.
 # VALGRIND = valgrind --tool=memcheck --leak-check=yes --num-callers=45 --log-file=valgrind.$*
 
 # To execute one test, e.g. in gdb, use something like this:
-# run -f -u util/unix.vim --gui-dialog-file guidialog -U NONE --noplugin --not-a-term -S runtest.vim test_name.vim
+# run -f -u util/unix.mnv --gui-dialog-file guidialog -U NONE --noplugin --not-a-term -S runtest.mnv test_name.mnv
 
 default: nongui
 
@@ -30,9 +30,9 @@ default: nongui
 include Make_all.mak
 
 # Explicit dependencies.
-test_options_all.res: opt_test.vim
+test_options_all.res: opt_test.mnv
 
-.SUFFIXES: .in .out .res .vim
+.SUFFIXES: .in .out .res .mnv
 
 nongui:	nolog tinytests newtests report
 
@@ -48,7 +48,7 @@ report:
 		then cp test.log test_result.log; \
 		else echo No failures reported > test_result.log; \
 		fi"
-	$(VIMPROG) -u NONE $(NO_INITS) -S util/summarize.vim messages $(REDIR_TEST_TO_NULL)
+	$(MNVPROG) -u NONE $(NO_INITS) -S util/summarize.mnv messages $(REDIR_TEST_TO_NULL)
 	@rm -f starttime
 	@echo
 	@echo 'Test results:'
@@ -58,7 +58,7 @@ report:
 		else echo ALL DONE; \
 		fi"
 
-$(SCRIPTS_TINY_OUT) $(NEW_TESTS_RES): $(VIMPROG)
+$(SCRIPTS_TINY_OUT) $(NEW_TESTS_RES): $(MNVPROG)
 
 # For $ASAN_OPTIONS and $UBSAN_OPTIONS append the testname to it.
 # This assumes $ASAN_OPTIONS contains log_path as last part of the environment variable
@@ -68,7 +68,7 @@ $(SCRIPTS_TINY_OUT) $(NEW_TESTS_RES): $(VIMPROG)
 # 	make test_largefile
 $(NEW_TESTS):
 	rm -f $@.res $(CLEANUP_FILES)
-	@MAKEFLAGS=--no-print-directory $(MAKE) -f Makefile $@.res VIMPROG=$(VIMPROG) XXDPROG=$(XXDPROG) SCRIPTSOURCE=$(SCRIPTSOURCE)
+	@MAKEFLAGS=--no-print-directory $(MAKE) -f Makefile $@.res MNVPROG=$(MNVPROG) XXDPROG=$(XXDPROG) SCRIPTSOURCE=$(SCRIPTSOURCE)
 	@cat messages
 	@if test -f test.log; then \
 		exit 1; \
@@ -76,32 +76,32 @@ $(NEW_TESTS):
 
 codestyle:
 	rm -f test_codestyle.res $(CLEANUP_FILES)
-	@MAKEFLAGS=--no-print-directory $(MAKE) -f Makefile test_codestyle.res VIMPROG=$(VIMPROG) XXDPROG=$(XXDPROG) SCRIPTSOURCE=$(SCRIPTSOURCE)
+	@MAKEFLAGS=--no-print-directory $(MAKE) -f Makefile test_codestyle.res MNVPROG=$(MNVPROG) XXDPROG=$(XXDPROG) SCRIPTSOURCE=$(SCRIPTSOURCE)
 	@cat messages
 	@if test -f test.log; then \
 		exit 1; \
 	fi
 
-# Run only tests specific for Vim9 script
-test_vim9:
-	rm -f test_vim9_*.res $(CLEANUP_FILES)
-	@MAKEFLAGS=--no-print-directory $(MAKE) -f Makefile $(TEST_VIM9_RES) VIMPROG=$(VIMPROG) XXDPROG=$(XXDPROG) SCRIPTSOURCE=$(SCRIPTSOURCE)
+# Run only tests specific for MNV9 script
+test_mnv9:
+	rm -f test_mnv9_*.res $(CLEANUP_FILES)
+	@MAKEFLAGS=--no-print-directory $(MAKE) -f Makefile $(TEST_MNV9_RES) MNVPROG=$(MNVPROG) XXDPROG=$(XXDPROG) SCRIPTSOURCE=$(SCRIPTSOURCE)
 	@cat messages
 	@rm -f starttime
-	@MAKEFLAGS=--no-print-directory $(MAKE) -f Makefile report VIMPROG=$(VIMPROG) XXDPROG=$(XXDPROG) SCRIPTSOURCE=$(SCRIPTSOURCE)
+	@MAKEFLAGS=--no-print-directory $(MAKE) -f Makefile report MNVPROG=$(MNVPROG) XXDPROG=$(XXDPROG) SCRIPTSOURCE=$(SCRIPTSOURCE)
 	@if test -f test.log; then \
 		exit 1; \
 	fi
 
-RM_ON_RUN = test.out X* viminfo
+RM_ON_RUN = test.out X* mnvinfo
 RM_ON_START = test.ok benchmark.out
-RUN_VIMPROG = VIMRUNTIME=$(SCRIPTSOURCE) $(VALGRIND) $(VIMPROG) -f $(GUI_FLAG) -u util/unix.vim $(NO_INITS) -s dotest.in
+RUN_MNVPROG = MNVRUNTIME=$(SCRIPTSOURCE) $(VALGRIND) $(MNVPROG) -f $(GUI_FLAG) -u util/unix.mnv $(NO_INITS) -s dotest.in
 
 # Delete files that may interfere with running tests.  This includes some files
 # that may result from working on the tests, not only from running them.
 clean:
 	-rm -rf *.out *.failed *.res *.rej *.orig XfakeHOME Xdir1 Xfind failed
-	-rm -f opt_test.vim test_result.log $(CLEANUP_FILES)
+	-rm -f opt_test.mnv test_result.log $(CLEANUP_FILES)
 	-rm -f gen_opt_test.log
 	-rm -rf $(RM_ON_RUN) $(RM_ON_START)
 	-rm -f valgrind.*
@@ -127,9 +127,9 @@ tinytests: $(SCRIPTS_TINY_OUT)
 	@# a second, fall back to a second if it fails.
 	@-/bin/sh -c "sleep .2 > /dev/null 2>&1 || sleep 1"
 	if test -n "$${ASAN_OPTIONS}"; then \
-		ASAN_OPTIONS="$${ASAN_OPTIONS}_$*" UBSAN_OPTIONS="$${UBSAN_OPTIONS}_$*" $(RUN_VIMPROG) $*.in $(REDIR_TEST_TO_NULL) ; \
+		ASAN_OPTIONS="$${ASAN_OPTIONS}_$*" UBSAN_OPTIONS="$${UBSAN_OPTIONS}_$*" $(RUN_MNVPROG) $*.in $(REDIR_TEST_TO_NULL) ; \
 	else \
-		$(RUN_VIMPROG) $*.in $(REDIR_TEST_TO_NULL) ; \
+		$(RUN_MNVPROG) $*.in $(REDIR_TEST_TO_NULL) ; \
 	fi
 
 	@# Check if the test.out file matches test.ok.
@@ -143,14 +143,14 @@ tinytests: $(SCRIPTS_TINY_OUT)
 	@/bin/sh -c "if test -f valgrind; then\
 		  mv -f valgrind valgrind.$*; \
 		fi"
-	-rm -rf X* test.ok viminfo
+	-rm -rf X* test.ok mnvinfo
 
 
-# New style of tests uses Vim script with assert calls.  These are easier
+# New style of tests uses MNV script with assert calls.  These are easier
 # to write and a lot easier to read and debug.
 # Limitation: Only works with the +eval feature.
 # Add --gui-dialog-file to avoid getting stuck in a dialog.
-RUN_VIMTEST = VIMRUNTIME=$(SCRIPTSOURCE) $(VALGRIND) $(VIMPROG) -f $(GUI_FLAG) -u util/unix.vim --gui-dialog-file guidialog
+RUN_MNVTEST = MNVRUNTIME=$(SCRIPTSOURCE) $(VALGRIND) $(MNVPROG) -f $(GUI_FLAG) -u util/unix.mnv --gui-dialog-file guidialog
 
 newtests: newtestssilent
 	@/bin/sh -c "if test -f messages; then cat messages; fi"
@@ -158,44 +158,44 @@ newtests: newtestssilent
 newtestssilent: $(NEW_TESTS_RES)
 
 
-.vim.res:
-	@echo "$(VIMPROG)" > vimcmd
-	@echo "$(RUN_VIMTEST)" >> vimcmd
+.mnv.res:
+	@echo "$(MNVPROG)" > mnvcmd
+	@echo "$(RUN_MNVTEST)" >> mnvcmd
 	if test -n "$${ASAN_OPTIONS}"; then \
-		ASAN_OPTIONS="$${ASAN_OPTIONS}_$*" UBSAN_OPTIONS="$${UBSAN_OPTIONS}_$*" $(RUN_VIMTEST) $(NO_INITS) -S runtest.vim $*.vim $(REDIR_TEST_TO_NULL) ; \
+		ASAN_OPTIONS="$${ASAN_OPTIONS}_$*" UBSAN_OPTIONS="$${UBSAN_OPTIONS}_$*" $(RUN_MNVTEST) $(NO_INITS) -S runtest.mnv $*.mnv $(REDIR_TEST_TO_NULL) ; \
 	else \
-		$(RUN_VIMTEST) $(NO_INITS) -S runtest.vim $*.vim $(REDIR_TEST_TO_NULL) ; \
+		$(RUN_MNVTEST) $(NO_INITS) -S runtest.mnv $*.mnv $(REDIR_TEST_TO_NULL) ; \
 	fi
-	@rm vimcmd
+	@rm mnvcmd
 
-test_gui.res: test_gui.vim
-	@echo "$(VIMPROG)" > vimcmd
-	@echo "$(RUN_GVIMTEST)" >> vimcmd
+test_gui.res: test_gui.mnv
+	@echo "$(MNVPROG)" > mnvcmd
+	@echo "$(RUN_GMNVTEST)" >> mnvcmd
 	if test -n "$${ASAN_OPTIONS}"; then \
-		ASAN_OPTIONS="$${ASAN_OPTIONS}_$*" UBSAN_OPTIONS="$${UBSAN_OPTIONS}_$*" $(RUN_VIMTEST) -u NONE $(NO_INITS) -S runtest.vim $< ; \
+		ASAN_OPTIONS="$${ASAN_OPTIONS}_$*" UBSAN_OPTIONS="$${UBSAN_OPTIONS}_$*" $(RUN_MNVTEST) -u NONE $(NO_INITS) -S runtest.mnv $< ; \
 	else \
-		$(RUN_VIMTEST) -u NONE $(NO_INITS) -S runtest.vim $< ; \
+		$(RUN_MNVTEST) -u NONE $(NO_INITS) -S runtest.mnv $< ; \
 	fi
 
-	@rm vimcmd
+	@rm mnvcmd
 
-test_gui_init.res: test_gui_init.vim
-	@echo "$(VIMPROG)" > vimcmd
-	@echo "$(RUN_GVIMTEST_WITH_GVIMRC)" >> vimcmd
+test_gui_init.res: test_gui_init.mnv
+	@echo "$(MNVPROG)" > mnvcmd
+	@echo "$(RUN_GMNVTEST_WITH_GMNVRC)" >> mnvcmd
 	if test -n "$${ASAN_OPTIONS}"; then \
-		ASAN_OPTIONS="$${ASAN_OPTIONS}_$*" UBSAN_OPTIONS="$${UBSAN_OPTIONS}_$*" $(RUN_VIMTEST) -u util/gui_preinit.vim -U util/gui_init.vim $(NO_PLUGINS) -S runtest.vim $< ; \
+		ASAN_OPTIONS="$${ASAN_OPTIONS}_$*" UBSAN_OPTIONS="$${UBSAN_OPTIONS}_$*" $(RUN_MNVTEST) -u util/gui_preinit.mnv -U util/gui_init.mnv $(NO_PLUGINS) -S runtest.mnv $< ; \
 	else \
-		$(RUN_VIMTEST) -u util/gui_preinit.vim -U util/gui_init.vim $(NO_PLUGINS) -S runtest.vim $< ; \
+		$(RUN_MNVTEST) -u util/gui_preinit.mnv -U util/gui_init.mnv $(NO_PLUGINS) -S runtest.mnv $< ; \
 	fi
-	@rm vimcmd
+	@rm mnvcmd
 
-GEN_OPT_DEPS = util/gen_opt_test.vim ../optiondefs.h ../../runtime/doc/options.txt
+GEN_OPT_DEPS = util/gen_opt_test.mnv ../optiondefs.h ../../runtime/doc/options.txt
 
-opt_test.vim: $(GEN_OPT_DEPS)
+opt_test.mnv: $(GEN_OPT_DEPS)
 	if test -n "$${ASAN_OPTIONS}"; then \
-		ASAN_OPTIONS="$${ASAN_OPTIONS}_$*" UBSAN_OPTIONS="$${UBSAN_OPTIONS}_$*" $(VIMPROG) -e -s -u NONE $(NO_INITS) --nofork --gui-dialog-file guidialog -S $(GEN_OPT_DEPS) ; \
+		ASAN_OPTIONS="$${ASAN_OPTIONS}_$*" UBSAN_OPTIONS="$${UBSAN_OPTIONS}_$*" $(MNVPROG) -e -s -u NONE $(NO_INITS) --nofork --gui-dialog-file guidialog -S $(GEN_OPT_DEPS) ; \
 	else \
-		$(VIMPROG) -e -s -u NONE $(NO_INITS) --nofork --gui-dialog-file guidialog -S $(GEN_OPT_DEPS) ; \
+		$(MNVPROG) -e -s -u NONE $(NO_INITS) --nofork --gui-dialog-file guidialog -S $(GEN_OPT_DEPS) ; \
 	fi
 	@if test -f gen_opt_test.log; then \
 		cat gen_opt_test.log; \
@@ -204,20 +204,20 @@ opt_test.vim: $(GEN_OPT_DEPS)
 
 test_xxd.res:
 	if test -n "$${ASAN_OPTIONS}"; then \
-		XXD=$(XXDPROG); export XXD; ASAN_OPTIONS="$${ASAN_OPTIONS}_$*" UBSAN_OPTIONS="$${UBSAN_OPTIONS}_$*" $(RUN_VIMTEST) $(NO_INITS) -S runtest.vim test_xxd.vim ; \
+		XXD=$(XXDPROG); export XXD; ASAN_OPTIONS="$${ASAN_OPTIONS}_$*" UBSAN_OPTIONS="$${UBSAN_OPTIONS}_$*" $(RUN_MNVTEST) $(NO_INITS) -S runtest.mnv test_xxd.mnv ; \
 	else \
-		XXD=$(XXDPROG); export XXD; $(RUN_VIMTEST) $(NO_INITS) -S runtest.vim test_xxd.vim ; \
+		XXD=$(XXDPROG); export XXD; $(RUN_MNVTEST) $(NO_INITS) -S runtest.mnv test_xxd.mnv ; \
 	fi
 
-test_bench_regexp.res: test_bench_regexp.vim
+test_bench_regexp.res: test_bench_regexp.mnv
 	-rm -rf benchmark.out $(RM_ON_RUN)
 	@# Sleep a moment to avoid that the xterm title is messed up.
 	@# 200 msec is sufficient, but only modern sleep supports a fraction of
 	@# a second, fall back to a second if it fails.
 	@-/bin/sh -c "sleep .2 > /dev/null 2>&1 || sleep 1"
 	if test -n "$${ASAN_OPTIONS}"; then \
-		ASAN_OPTIONS="$${ASAN_OPTIONS}_$*" UBSAN_OPTIONS="$${UBSAN_OPTIONS}_$*" $(RUN_VIMTEST) $(NO_INITS) -S runtest.vim $*.vim $(REDIR_TEST_TO_NULL) ; \
+		ASAN_OPTIONS="$${ASAN_OPTIONS}_$*" UBSAN_OPTIONS="$${UBSAN_OPTIONS}_$*" $(RUN_MNVTEST) $(NO_INITS) -S runtest.mnv $*.mnv $(REDIR_TEST_TO_NULL) ; \
 	else \
-		$(RUN_VIMTEST) $(NO_INITS) -S runtest.vim $*.vim $(REDIR_TEST_TO_NULL) ; \
+		$(RUN_MNVTEST) $(NO_INITS) -S runtest.mnv $*.mnv $(REDIR_TEST_TO_NULL) ; \
 	fi
 	@/bin/sh -c "if test -f benchmark.out; then cat benchmark.out; fi"
diff --git a/uvim/src/testdir/README.txt b/uvim/src/testdir/README.txt
index 1ae0d28ae8..e0284524a2 100644
--- a/uvim/src/testdir/README.txt
+++ b/uvim/src/testdir/README.txt
@@ -1,4 +1,4 @@
-This directory contains test cases for various Vim features.
+This directory contains test cases for various MNV features.
 The auxiliary functions to perform the tests are in the util/ folder.
 
 For testing an indent script see runtime/indent/testdir/README.txt.
@@ -9,7 +9,7 @@ want to separate it from other tests with comment lines.
 
 TO ADD A NEW STYLE TEST:
 
-1) Create a test_<subject>.vim file.
+1) Create a test_<subject>.mnv file.
 2) Add test_<subject>.res to NEW_TESTS_RES in Make_all.mak in alphabetical
    order.
 3) Also add an entry "test_<subject>" to NEW_TESTS in Make_all.mak.
@@ -17,13 +17,13 @@ TO ADD A NEW STYLE TEST:
 
 At 2), instead of running the test separately, it can be included in
 "test_alot".  Do this for quick tests without side effects.  The test runs a
-bit faster, because Vim doesn't have to be started, one Vim instance runs many
+bit faster, because MNV doesn't have to be started, one MNV instance runs many
 tests.
 
 At 4), to run a test in GUI, add "GUI_FLAG=-g" to the make command.
 
 
-What you can use (see test_assert.vim for an example):
+What you can use (see test_assert.mnv for an example):
 
 - Call assert_equal(), assert_true(), assert_false(), etc.
 
@@ -36,22 +36,22 @@ What you can use (see test_assert.vim for an example):
   change the source code to add an ID to the allocation.  Add a new one to
   alloc_id_T, before aid_last.
 
-- Use test_override() to make Vim behave differently, e.g.  if char_avail()
+- Use test_override() to make MNV behave differently, e.g.  if char_avail()
   must return FALSE for a while.  E.g. to trigger the CursorMovedI autocommand
-  event. See test_cursor_func.vim for an example.
+  event. See test_cursor_func.mnv for an example.
 
 - If the bug that is being tested isn't fixed yet, you can throw an exception
   with "Skipped" so that it's clear this still needs work.  E.g.: throw
   "Skipped: Bug with <c-e> and popupmenu not fixed yet"
 
 - The following environment variables are recognized and can be set to
-  influence the behavior of the test suite (see runtest.vim for details)
+  influence the behavior of the test suite (see runtest.mnv for details)
 
   - $TEST_MAY_FAIL=Test_channel_one    - ignore those failing tests
   - $TEST_FILTER=Test_channel    - only run test that match this pattern
   - $TEST_SKIP_PAT=Test_channel  - skip tests that match this pattern
   - $TEST_NO_RETRY=yes           - do not try to re-run failing tests
-  You can also set them in Vim:
+  You can also set them in MNV:
     :let $TEST_MAY_FAIL = 'Test_channel_one'
     :let $TEST_FILTER = '_set_mode'
     :let $TEST_SKIP_PAT = 'Test_loop_forever'
@@ -59,7 +59,7 @@ What you can use (see test_assert.vim for an example):
   Use an empty string to revert, e.g.:
     :let $TEST_FILTER = ''
 
-- See the start of runtest.vim for more help.
+- See the start of runtest.mnv for more help.
 
 
 TO ADD A SCREEN DUMP TEST:
@@ -70,7 +70,7 @@ Mostly the same as writing a new style test.  Additionally, see help on
 
 OLD STYLE TESTS:
 
-There are a few tests that are used when Vim was built without the +eval
+There are a few tests that are used when MNV was built without the +eval
 feature.  These cannot use the "assert" functions, therefore they consist of a
 .in file that contains Normal mode commands between STARTTEST and ENDTEST.
 They modify the file and the result gets written in the test.out file.  This
@@ -96,11 +96,11 @@ tests are successful, then this file will be an empty file.
 
 - To run a single test function from a test script:
 
-    $ ../vim -u NONE -S runtest.vim <test_file>.vim <function_name>
+    $ ../mnv -u NONE -S runtest.mnv <test_file>.mnv <function_name>
 
 - To execute only specific test functions, add a second argument:
 
-    $ ../vim -u NONE -S runtest.vim test_channel.vim open_delay
+    $ ../mnv -u NONE -S runtest.mnv test_channel.mnv open_delay
 
 - To run all the tests:
 
@@ -110,13 +110,13 @@ tests are successful, then this file will be an empty file.
 
     > nmake -f Make_mvc.mak
 
-- To run the tests with GUI Vim:
+- To run the tests with GUI MNV:
 
     $ make GUI_FLAG=-g
 
     or
 
-    $ make VIMPROG=../gvim
+    $ make MNVPROG=../gmnv
 
 - To cleanup the temporary files after running the tests:
 
@@ -126,9 +126,9 @@ tests are successful, then this file will be an empty file.
 VIEWING GENERATED SCREENDUMPS (local):
 
 You may also wish to look at the whole batch of failed screendumps after
-running "make".  Source the "viewdumps.vim" script for this task:
+running "make".  Source the "viewdumps.mnv" script for this task:
 
-    $ ../vim -u NONE -S viewdumps.vim \
+    $ ../mnv -u NONE -S viewdumps.mnv \
 				[dumps/Test_xxd_*.dump ...]
 
 By default, all screendumps found in the "failed" directory will be added to
@@ -159,13 +159,13 @@ directory by creating a symlink:
 
 You can now examine the extracted screendumps:
 
-    $ ./src/vim -u NONE -S src/testdir/viewdumps.vim \
+    $ ./src/mnv -u NONE -S src/testdir/viewdumps.mnv \
 				/tmp/src/testdir/failed/*.dump
 
 
 VIEWING GENERATED SCREENDUMPS (submitted for a pull request):
 
-Note: There is also a "git difftool" extension described in ./commondumps.vim.
+Note: There is also a "git difftool" extension described in ./commondumps.mnv.
 
 First, you need to check out the topic branch with the proposed changes and
 write down a difference list between the HEAD commit (index) and its parent
@@ -201,5 +201,5 @@ you can now examine the screendumps from the "failed" directory (note that new
 screendumps will be shown with no difference between their versions):
 
     $ cd ..
-    $ ../vim -u NONE -S viewdumps.vim
+    $ ../mnv -u NONE -S viewdumps.mnv
 
diff --git a/uvim/src/testdir/commondumps.vim b/uvim/src/testdir/commondumps.mnv
index 27d59bcdd1..8a6bd7fd74 100644
--- a/uvim/src/testdir/commondumps.vim
+++ b/uvim/src/testdir/commondumps.mnv
@@ -1,4 +1,4 @@
-vim9script
+mnv9script
 
 # Generate the small ASCII letters (for marking).
 def SmallAlphaLetters(): list<string>
@@ -78,8 +78,8 @@ enddef
 # See below on how to configure the git difftool extension
 
 # Extend "git difftool" with the capability for loading screendump files.
-if v:progname =~? '\<g\=vimdiff$'
-  # Let "(g)vimdiff" render other files.
+if v:progname =~? '\<g\=mnvdiff$'
+  # Let "(g)mnvdiff" render other files.
   if [argv(0), argv(1)]
       ->filter((_: number, fname: string) =>
 	  fname =~? '^\%(/dev/null\|.\+\.dump\)$')
@@ -97,13 +97,13 @@ if v:progname =~? '\<g\=vimdiff$'
       silent bwipeout 1 2
     endtry
   endif
-  # Always stop from further sourcing this script for "(g)vimdiff".
+  # Always stop from further sourcing this script for "(g)mnvdiff".
   finish
 endif
 
 # CONSIDER ALTERNATIVES FOR ENABLING THE ABOVE EXTENSION.
 #
-# For convenience, it is assumed that there is a defined "$VIM_FORK_PATHNAME"
+# For convenience, it is assumed that there is a defined "$MNV_FORK_PATHNAME"
 # environment variable holding an absolute pathname for the root directory of
 # this repository.
 #
@@ -111,13 +111,13 @@ endif
 # A. USE Git FOR CONFIGURATION.
 #
 # Define the following Git variables with "git config --edit --local" (where
-# the "vimdumps" name is arbitrary):
+# the "mnvdumps" name is arbitrary):
 #
 # ------------------------------------------------------------------------------
 # [diff]
-#	tool = vimdumps
-# [difftool.vimdumps]
-#	cmd = vimdiff -S "${VIM_FORK_PATHNAME:?}"/src/testdir/commondumps.vim -o -- "$LOCAL" "$REMOTE"
+#	tool = mnvdumps
+# [difftool.mnvdumps]
+#	cmd = mnvdiff -S "${MNV_FORK_PATHNAME:?}"/src/testdir/commondumps.mnv -o -- "$LOCAL" "$REMOTE"
 # ------------------------------------------------------------------------------
 #
 # Rendered screendump files (among other files) between revisions can now be
@@ -132,10 +132,10 @@ endif
 # B. USE Bash FOR CONFIGURATION (on Debian GNU/Linux).
 #
 # 1. Make an alias that sources this file, e.g.:
-#	alias git_vimdiff="git difftool -x 'vimdiff -S "${VIM_FORK_PATHNAME:?}"/vim/src/testdir/commondumps.vim -o --'"
+#	alias git_mnvdiff="git difftool -x 'mnvdiff -S "${MNV_FORK_PATHNAME:?}"/mnv/src/testdir/commondumps.mnv -o --'"
 #
 # 2. Enable programmable completion for the alias, e.g.:
-#	cat ~/.local/share/bash-completion/completions/git_vimdiff
+#	cat ~/.local/share/bash-completion/completions/git_mnvdiff
 #
 # ------------------------------------------------------------------------------
 # ## Consider (un)setting "$BASH_COMPLETION_USER_DIR" and/or "$XDG_DATA_HOME" so
@@ -146,13 +146,13 @@ endif
 # ## "/usr/share/bash-completion/completions/git" script.
 # [ -r /usr/share/bash-completion/completions/git ] &&
 # . /usr/share/bash-completion/completions/git &&
-# __git_complete git_vimdiff _git_difftool
+# __git_complete git_mnvdiff _git_difftool
 # ------------------------------------------------------------------------------
 #
 # Rendered screendump files (among other files) between revisions can now be
 # compared, two at a time, by using the alias, e.g.:
-#	git_vimdiff 50423ab8~1 50423ab8
-#	git_vimdiff 50423ab8~1 50423ab8 -- '**/*.dump'
+#	git_mnvdiff 50423ab8~1 50423ab8
+#	git_mnvdiff 50423ab8~1 50423ab8 -- '**/*.dump'
 #
 # The raw files can also be examined:
 #	:all
@@ -226,4 +226,4 @@ def g:Init(subtreedirname: string, count: number)
   endif
 enddef
 
-# vim:fdm=syntax:sw=2:ts=8:noet:nosta:
+# mnv:fdm=syntax:sw=2:ts=8:noet:nosta:
diff --git a/uvim/src/testdir/crash/crash_scrollbar b/uvim/src/testdir/crash/crash_scrollbar
index 1de5905228..abc91486aa 100644
--- a/uvim/src/testdir/crash/crash_scrollbar
+++ b/uvim/src/testdir/crash/crash_scrollbar
@@ -1,2 +1,2 @@
-" this goes to insert mode and presses key k_VerScrollbar which may cause a redraw in exmode, which used ot crash Vim
-norm o€ùX
+" this goes to insert mode and presses key k_VerScrollbar which may cause a redraw in exmode, which used ot crash MNV
+norm o��X
diff --git a/uvim/src/testdir/crash/vim_msg_trunc_poc b/uvim/src/testdir/crash/mnv_msg_trunc_poc
index 73b04bec35..73b04bec35 100644
--- a/uvim/src/testdir/crash/vim_msg_trunc_poc
+++ b/uvim/src/testdir/crash/mnv_msg_trunc_poc
diff --git a/uvim/src/testdir/crash/vim_regsub_both b/uvim/src/testdir/crash/mnv_regsub_both
index a82b205c8f..a82b205c8f 100644
--- a/uvim/src/testdir/crash/vim_regsub_both
+++ b/uvim/src/testdir/crash/mnv_regsub_both
diff --git a/uvim/src/testdir/crash/vim_regsub_both_poc b/uvim/src/testdir/crash/mnv_regsub_both_poc
index 19a57114be..19a57114be 100644
--- a/uvim/src/testdir/crash/vim_regsub_both_poc
+++ b/uvim/src/testdir/crash/mnv_regsub_both_poc
diff --git a/uvim/src/testdir/crash/poc_tagfunc.vim b/uvim/src/testdir/crash/poc_tagfunc.mnv
index 49d9b6f719..49d9b6f719 100644
--- a/uvim/src/testdir/crash/poc_tagfunc.vim
+++ b/uvim/src/testdir/crash/poc_tagfunc.mnv
diff --git a/uvim/src/testdir/dumps/Test_incsearch_vimgrep_01.dump b/uvim/src/testdir/dumps/Test_incsearch_mnvgrep_01.dump
index 955d030583..955d030583 100644
--- a/uvim/src/testdir/dumps/Test_incsearch_vimgrep_01.dump
+++ b/uvim/src/testdir/dumps/Test_incsearch_mnvgrep_01.dump
diff --git a/uvim/src/testdir/dumps/Test_incsearch_vimgrep_02.dump b/uvim/src/testdir/dumps/Test_incsearch_mnvgrep_02.dump
index a5d94eac55..a5d94eac55 100644
--- a/uvim/src/testdir/dumps/Test_incsearch_vimgrep_02.dump
+++ b/uvim/src/testdir/dumps/Test_incsearch_mnvgrep_02.dump
diff --git a/uvim/src/testdir/dumps/Test_incsearch_vimgrep_03.dump b/uvim/src/testdir/dumps/Test_incsearch_mnvgrep_03.dump
index 038ceb9d95..038ceb9d95 100644
--- a/uvim/src/testdir/dumps/Test_incsearch_vimgrep_03.dump
+++ b/uvim/src/testdir/dumps/Test_incsearch_mnvgrep_03.dump
diff --git a/uvim/src/testdir/dumps/Test_incsearch_vimgrep_04.dump b/uvim/src/testdir/dumps/Test_incsearch_mnvgrep_04.dump
index 92dd78dd87..92dd78dd87 100644
--- a/uvim/src/testdir/dumps/Test_incsearch_vimgrep_04.dump
+++ b/uvim/src/testdir/dumps/Test_incsearch_mnvgrep_04.dump
diff --git a/uvim/src/testdir/dumps/Test_incsearch_vimgrep_05.dump b/uvim/src/testdir/dumps/Test_incsearch_mnvgrep_05.dump
index e11ff574c1..e11ff574c1 100644
--- a/uvim/src/testdir/dumps/Test_incsearch_vimgrep_05.dump
+++ b/uvim/src/testdir/dumps/Test_incsearch_mnvgrep_05.dump
diff --git a/uvim/src/testdir/dumps/Test_vim9_closure_fails.dump b/uvim/src/testdir/dumps/Test_mnv9_closure_fails.dump
index dd0103cada..dd0103cada 100644
--- a/uvim/src/testdir/dumps/Test_vim9_closure_fails.dump
+++ b/uvim/src/testdir/dumps/Test_mnv9_closure_fails.dump
diff --git a/uvim/src/testdir/dumps/Test_vim9_no_redraw.dump b/uvim/src/testdir/dumps/Test_mnv9_no_redraw.dump
index 2f02082b30..2f02082b30 100644
--- a/uvim/src/testdir/dumps/Test_vim9_no_redraw.dump
+++ b/uvim/src/testdir/dumps/Test_mnv9_no_redraw.dump
diff --git a/uvim/src/testdir/dumps/Test_vim9_reject_declaration_1.dump b/uvim/src/testdir/dumps/Test_mnv9_reject_declaration_1.dump
index e4f56239a8..e4f56239a8 100644
--- a/uvim/src/testdir/dumps/Test_vim9_reject_declaration_1.dump
+++ b/uvim/src/testdir/dumps/Test_mnv9_reject_declaration_1.dump
diff --git a/uvim/src/testdir/dumps/Test_vim9_reject_declaration_2.dump b/uvim/src/testdir/dumps/Test_mnv9_reject_declaration_2.dump
index a6d516c61a..a6d516c61a 100644
--- a/uvim/src/testdir/dumps/Test_vim9_reject_declaration_2.dump
+++ b/uvim/src/testdir/dumps/Test_mnv9_reject_declaration_2.dump
diff --git a/uvim/src/testdir/dumps/Test_vim9_silent_echo.dump b/uvim/src/testdir/dumps/Test_mnv9_silent_echo.dump
index f5f7927859..f5f7927859 100644
--- a/uvim/src/testdir/dumps/Test_vim9_silent_echo.dump
+++ b/uvim/src/testdir/dumps/Test_mnv9_silent_echo.dump
diff --git a/uvim/src/testdir/dumps/Test_popup_setbuf_04.vim b/uvim/src/testdir/dumps/Test_popup_setbuf_04.mnv
index c9ce1d4c5d..c9ce1d4c5d 100644
--- a/uvim/src/testdir/dumps/Test_popup_setbuf_04.vim
+++ b/uvim/src/testdir/dumps/Test_popup_setbuf_04.mnv
diff --git a/uvim/src/testdir/dumps/Test_popup_setbuf_05.vim b/uvim/src/testdir/dumps/Test_popup_setbuf_05.mnv
index c9ce1d4c5d..c9ce1d4c5d 100644
--- a/uvim/src/testdir/dumps/Test_popup_setbuf_05.vim
+++ b/uvim/src/testdir/dumps/Test_popup_setbuf_05.mnv
diff --git a/uvim/src/testdir/dumps/Test_popup_setbuf_06.vim b/uvim/src/testdir/dumps/Test_popup_setbuf_06.mnv
index c9ce1d4c5d..c9ce1d4c5d 100644
--- a/uvim/src/testdir/dumps/Test_popup_setbuf_06.vim
+++ b/uvim/src/testdir/dumps/Test_popup_setbuf_06.mnv
diff --git a/uvim/src/testdir/dumps/Test_termdebug_evaluate_in_popup_01.vim b/uvim/src/testdir/dumps/Test_termdebug_evaluate_in_popup_01.mnv
index 959798ac41..959798ac41 100644
--- a/uvim/src/testdir/dumps/Test_termdebug_evaluate_in_popup_01.vim
+++ b/uvim/src/testdir/dumps/Test_termdebug_evaluate_in_popup_01.mnv
diff --git a/uvim/src/testdir/dumps/Test_termdebug_evaluate_in_popup_02.vim b/uvim/src/testdir/dumps/Test_termdebug_evaluate_in_popup_02.mnv
index 9b38dc4dea..9b38dc4dea 100644
--- a/uvim/src/testdir/dumps/Test_termdebug_evaluate_in_popup_02.vim
+++ b/uvim/src/testdir/dumps/Test_termdebug_evaluate_in_popup_02.mnv
diff --git a/uvim/src/testdir/dumps/Test_undo_after_write_1.vim b/uvim/src/testdir/dumps/Test_undo_after_write_1.mnv
index 62e02b338f..62e02b338f 100644
--- a/uvim/src/testdir/dumps/Test_undo_after_write_1.vim
+++ b/uvim/src/testdir/dumps/Test_undo_after_write_1.mnv
diff --git a/uvim/src/testdir/dumps/Test_undo_after_write_2.vim b/uvim/src/testdir/dumps/Test_undo_after_write_2.mnv
index b99f232048..b99f232048 100644
--- a/uvim/src/testdir/dumps/Test_undo_after_write_2.vim
+++ b/uvim/src/testdir/dumps/Test_undo_after_write_2.mnv
diff --git a/uvim/src/testdir/dumps/Test_verbose_system_1.vim b/uvim/src/testdir/dumps/Test_verbose_system_1.mnv
index c0cbe1a73a..c0cbe1a73a 100644
--- a/uvim/src/testdir/dumps/Test_verbose_system_1.vim
+++ b/uvim/src/testdir/dumps/Test_verbose_system_1.mnv
diff --git a/uvim/src/testdir/dumps/Test_verbose_system_2.vim b/uvim/src/testdir/dumps/Test_verbose_system_2.mnv
index c0cbe1a73a..c0cbe1a73a 100644
--- a/uvim/src/testdir/dumps/Test_verbose_system_2.vim
+++ b/uvim/src/testdir/dumps/Test_verbose_system_2.mnv
diff --git a/uvim/src/testdir/dumps/Test_xxd_color_0.vim b/uvim/src/testdir/dumps/Test_xxd_color_0.mnv
index 7ac1f2647d..7ac1f2647d 100644
--- a/uvim/src/testdir/dumps/Test_xxd_color_0.vim
+++ b/uvim/src/testdir/dumps/Test_xxd_color_0.mnv
diff --git a/uvim/src/testdir/dumps/Test_xxd_color_1.vim b/uvim/src/testdir/dumps/Test_xxd_color_1.mnv
index 7ac1f2647d..7ac1f2647d 100644
--- a/uvim/src/testdir/dumps/Test_xxd_color_1.vim
+++ b/uvim/src/testdir/dumps/Test_xxd_color_1.mnv
diff --git a/uvim/src/testdir/keycode_check.vim b/uvim/src/testdir/keycode_check.mnv
index 33eb6ceeb7..24e6a19486 100644
--- a/uvim/src/testdir/keycode_check.vim
+++ b/uvim/src/testdir/keycode_check.mnv
@@ -1,8 +1,8 @@
-vim9script
+mnv9script
 
 # Script to get various codes that keys send, depending on the protocol used.
 #
-# Usage:  vim -u NONE -S keycode_check.vim
+# Usage:  mnv -u NONE -S keycode_check.mnv
 #
 # Author:	Bram Moolenaar
 # Last Update:	2022 Nov 15
@@ -311,7 +311,7 @@ def DoTerm(name: string)
   endfor
 
   echo "For Alt to work you may need to press the Windows/Super key as well"
-  echo "When a key press doesn't get to Vim (e.g. when using Alt) press x"
+  echo "When a key press doesn't get to MNV (e.g. when using Alt) press x"
 
   # The log of ignored typeahead is left around for debugging, start with an
   # empty file here.
diff --git a/uvim/src/testdir/runtest.vim b/uvim/src/testdir/runtest.mnv
index 7822da9150..545043ba47 100644
--- a/uvim/src/testdir/runtest.vim
+++ b/uvim/src/testdir/runtest.mnv
@@ -1,10 +1,10 @@
-" This script is sourced while editing the .vim file with the tests.
+" This script is sourced while editing the .mnv file with the tests.
 " When the script is successful the .res file will be created.
 " Errors are appended to the test.log file.
 "
 " To execute only specific test functions, add a second argument.  It will be
 " matched against the names of the Test_ function.  E.g.:
-"	../vim -u NONE -S runtest.vim test_channel.vim open_delay
+"	../mnv -u NONE -S runtest.mnv test_channel.mnv open_delay
 " The output can be found in the "messages" file.
 "
 " If the environment variable $TEST_FILTER is set then only test functions
@@ -28,10 +28,10 @@
 "
 " The test script may contain anything, only functions that start with
 " "Test_" are special.  These will be invoked and should contain assert
-" functions.  See test_assert.vim for an example.
+" functions.  See test_assert.mnv for an example.
 "
 " It is possible to source other files that contain "Test_" functions.  This
-" can speed up testing, since Vim does not need to restart.  But be careful
+" can speed up testing, since MNV does not need to restart.  But be careful
 " that the tests do not interfere with each other.
 "
 " If an error cannot be detected properly with an assert function add the
@@ -101,17 +101,17 @@ endif
 set shellslash
 
 " Common with all tests on all systems.
-source util/setup.vim
+source util/setup.mnv
 
 " Needed for RunningWithValgrind().
-source util/shared.vim
+source util/shared.mnv
 
 " Needed for the various Check commands
-source util/check.vim
+source util/check.mnv
 
 " For consistency run all tests with 'nocompatible' set.
 " This also enables use of line continuation.
-set nocp viminfo+=nviminfo
+set nocp mnvinfo+=nmnvinfo
 
 " Use utf-8 by default, instead of whatever the system default happens to be.
 " Individual tests can overrule this at the top of the file and use
@@ -120,7 +120,7 @@ let g:orig_encoding = &encoding
 set encoding=utf-8
 
 " REDIR_TEST_TO_NULL has a very permissive SwapExists autocommand which is for
-" the test_name.vim file itself. Replace it here with a more restrictive one,
+" the test_name.mnv file itself. Replace it here with a more restrictive one,
 " so we still catch mistakes.
 if has("win32")
   " replace any '/' directory separators by '\\'
@@ -156,9 +156,9 @@ lang mess C
 
 " suppress menu translation
 if has('gui_running') && exists('did_install_default_menus')
-  source $VIMRUNTIME/delmenu.vim
+  source $MNVRUNTIME/delmenu.mnv
   set langmenu=none
-  source $VIMRUNTIME/menu.vim
+  source $MNVRUNTIME/menu.mnv
 endif
 
 let s:srcdir = expand('%:p:h:h')
@@ -166,7 +166,7 @@ let s:srcdir = expand('%:p:h:h')
 if has('win32')
   " avoid prompt that is long or contains a line break
   let $PROMPT = '$P$G'
-  " On MS-Windows t_md and t_me are Vim specific escape sequences.
+  " On MS-Windows t_md and t_me are MNV specific escape sequences.
   let s:t_bold = "\x1b[1m"
   let s:t_normal = "\x1b[m"
 else
@@ -212,8 +212,8 @@ func s:GetSwapFileList()
   let files = swapfilelist()
   let &directory = save_dir
 
-  " remove a match with runtest.vim
-  let idx = indexof(files, 'v:val =~ "runtest.vim."')
+  " remove a match with runtest.mnv
+  let idx = indexof(files, 'v:val =~ "runtest.mnv."')
   if idx >= 0
     call remove(files, idx)
   endif
@@ -296,7 +296,7 @@ func RunTheTest(test)
 
   let skipped = v:false
 
-  au VimLeavePre * call EarlyExit(g:testfunc)
+  au MNVLeavePre * call EarlyExit(g:testfunc)
   if a:test =~ 'Test_nocatch_'
     " Function handles errors itself.  This avoids skipping commands after the
     " error.
@@ -318,7 +318,7 @@ func RunTheTest(test)
       call add(v:errors, 'Caught exception in ' . a:test . ': ' . v:exception . ' @ ' . v:throwpoint)
     endtry
   endif
-  au! VimLeavePre
+  au! MNVLeavePre
 
   if a:test =~ '_terminal_'
     " Terminal tests sometimes hang, give extra information
@@ -437,7 +437,7 @@ endfunc
 function Delete_Xtest_Files()
   for file in glob('X*', v:false, v:true)
     if file ==? 'XfakeHOME'
-      " Clean up files created by setup.vim
+      " Clean up files created by setup.mnv
       call delete('XfakeHOME', 'rf')
       continue
     endif
@@ -471,7 +471,7 @@ func EarlyExit(test)
   " It's OK for the test we use to test the quit detection.
   if a:test != 'Test_zz_quit_detected()'
     call add(v:errors, v:errmsg)
-    call add(v:errors, 'Test caused Vim to exit: ' . a:test)
+    call add(v:errors, 'Test caused MNV to exit: ' . a:test)
   endif
 
   call FinishTesting()
@@ -482,8 +482,8 @@ func FinishTesting()
   call AfterTheTest('')
   call Delete_Xtest_Files()
 
-  " Don't write viminfo on exit.
-  set viminfo=
+  " Don't write mnvinfo on exit.
+  set mnvinfo=
 
   if s:fail == 0 && s:fail_expected == 0
     " Success, create the .res file so that make knows it's done.
@@ -559,7 +559,7 @@ let s:errors = []
 let s:errors_expected = []
 let s:messages = []
 let s:skipped = []
-if expand('%') =~ 'test_vimscript.vim'
+if expand('%') =~ 'test_mnvscript.mnv'
   " this test has intentional errors, don't use try/catch.
   source %
 else
@@ -688,4 +688,4 @@ endfor
 
 call FinishTesting()
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/samples/Test_tohtml_basic.c.html b/uvim/src/testdir/samples/Test_tohtml_basic.c.html
index 9046d847c7..c33df84bcc 100644
--- a/uvim/src/testdir/samples/Test_tohtml_basic.c.html
+++ b/uvim/src/testdir/samples/Test_tohtml_basic.c.html
@@ -2,9 +2,9 @@
 <html>
 <head>
 <meta charset="UTF-8">
-<title>/home/jiangyinzuo/vim/src/testdir/Test_tohtml_basic.c.html</title>
-<meta name="Generator" content="Vim/9.2">
-<meta name="plugin-version" content="vim9.0_v2">
+<title>/home/jiangyinzuo/mnv/src/testdir/Test_tohtml_basic.c.html</title>
+<meta name="Generator" content="MNV/9.2">
+<meta name="plugin-version" content="mnv9.0_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="use_css,no_foldcolumn,pre_wrap,prevent_copy=,use_input_for_pc=none">
 <meta name="colorscheme" content="none">
@@ -18,7 +18,7 @@ a { color: inherit; }
 </style>
 </head>
 <body>
-<pre id='vimCodeElement'>
+<pre id='mnvCodeElement'>
 #include &lt;stdio.h&gt;
 #include &lt;stdlib.h&gt;
 
@@ -45,4 +45,4 @@ int main(int argc, char *argv[])
 </pre>
 </body>
 </html>
-<!-- vim: set foldmethod=manual : -->
+<!-- mnv: set foldmethod=manual : -->
diff --git a/uvim/src/testdir/samples/Test_tohtml_basic_no_css.c.html b/uvim/src/testdir/samples/Test_tohtml_basic_no_css.c.html
index 272b71248a..acbd337c10 100644
--- a/uvim/src/testdir/samples/Test_tohtml_basic_no_css.c.html
+++ b/uvim/src/testdir/samples/Test_tohtml_basic_no_css.c.html
@@ -2,9 +2,9 @@
 <html>
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
-<title>/home/jiangyinzuo/vim/src/testdir/Test_tohtml_basic_no_css.c.html</title>
-<meta name="Generator" content="Vim/9.2">
-<meta name="plugin-version" content="vim9.0_v2">
+<title>/home/jiangyinzuo/mnv/src/testdir/Test_tohtml_basic_no_css.c.html</title>
+<meta name="Generator" content="MNV/9.2">
+<meta name="plugin-version" content="mnv9.0_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="no_pre,no_foldcolumn,expand_tabs,prevent_copy=,use_input_for_pc=none">
 <meta name="colorscheme" content="none">
@@ -37,4 +37,4 @@ int main(int argc, char *argv[])<br>
 </font>
 </body>
 </html>
-<!-- vim: set foldmethod=manual : -->
+<!-- mnv: set foldmethod=manual : -->
diff --git a/uvim/src/testdir/samples/matchparen.vim b/uvim/src/testdir/samples/matchparen.mnv
index 4235a0d39b..73e2da096a 100644
--- a/uvim/src/testdir/samples/matchparen.vim
+++ b/uvim/src/testdir/samples/matchparen.mnv
@@ -1,7 +1,7 @@
-" Vim plugin for showing matching parens
-" Maintainer:	The Vim Project <https://github.com/vim/vim>
+" MNV plugin for showing matching parens
+" Maintainer:	The MNV Project <https://github.com/Project-Tick/Project-Tick>
 " Last Change:	2023 Oct 20
-" Former Maintainer:	Bram Moolenaar <Bram@vim.org>
+" Former Maintainer:	Bram Moolenaar <Bram@mnv.org>
 
 " Exit quickly when:
 " - this plugin was already loaded (or disabled)
@@ -126,8 +126,8 @@ func s:Highlight_Matching_Pair()
     " Catch if this throws E363: pattern uses more memory than 'maxmempattern'.
     try
       execute 'if ' . s_skip . ' | let s_skip = "0" | endif'
-    catch /^Vim\%((\a\+)\)\=:E363/
-      " We won't find anything, so skip searching, should keep Vim responsive.
+    catch /^MNV\%((\a\+)\)\=:E363/
+      " We won't find anything, so skip searching, should keep MNV responsive.
       return
     endtry
   endif
@@ -224,7 +224,7 @@ func s:NoMatchParen()
 endfunc
 
 func s:DoMatchParen()
-  runtime plugin/matchparen.vim
+  runtime plugin/matchparen.mnv
   let w = winnr()
   silent windo doau CursorMoved
   exe "noau ". w . "wincmd w"
diff --git a/uvim/src/testdir/samples/re.freeze.txt b/uvim/src/testdir/samples/re.freeze.txt
index d768c23c5e..d7395e2b41 100644
--- a/uvim/src/testdir/samples/re.freeze.txt
+++ b/uvim/src/testdir/samples/re.freeze.txt
@@ -1,6 +1,6 @@
 :set re=0 or 2
 Search for the pattern: /\s\+\%#\@<!$/
-vim should not freeze.
+mnv should not freeze.
 
 <td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td><td style="border-bottom windowtext 0.5pt solid; border-left windowtext;" class=abc align=right><font face=arial><font color=#ff0000><b>5</b></font></font></td> 
 
diff --git a/uvim/src/testdir/sautest/autoload/Test104.vim b/uvim/src/testdir/sautest/autoload/Test104.mnv
index d1e0e17a3b..d1e0e17a3b 100644
--- a/uvim/src/testdir/sautest/autoload/Test104.vim
+++ b/uvim/src/testdir/sautest/autoload/Test104.mnv
diff --git a/uvim/src/testdir/sautest/autoload/auto9.vim b/uvim/src/testdir/sautest/autoload/auto9.mnv
index fad1fa781d..9aac92755e 100644
--- a/uvim/src/testdir/sautest/autoload/auto9.vim
+++ b/uvim/src/testdir/sautest/autoload/auto9.mnv
@@ -1,4 +1,4 @@
-vim9script
+mnv9script
 
 export func Getsome()
   return 'some'
diff --git a/uvim/src/testdir/sautest/autoload/foo.vim b/uvim/src/testdir/sautest/autoload/foo.mnv
index 21d33a0f4d..6c7195bffe 100644
--- a/uvim/src/testdir/sautest/autoload/foo.vim
+++ b/uvim/src/testdir/sautest/autoload/foo.mnv
@@ -1,4 +1,4 @@
-let g:loaded_foo_vim += 1
+let g:loaded_foo_mnv += 1
 
 let foo#bar = {}
 
diff --git a/uvim/src/testdir/sautest/autoload/footest.mnv b/uvim/src/testdir/sautest/autoload/footest.mnv
new file mode 100644
index 0000000000..fc22fb0835
--- /dev/null
+++ b/uvim/src/testdir/sautest/autoload/footest.mnv
@@ -0,0 +1,5 @@
+" Autoload script used by test_listdict.mnv, test_exists.mnv and test_let.mnv
+let footest#x = 1
+func footest#F()
+  return 0
+endfunc
diff --git a/uvim/src/testdir/sautest/autoload/footest.vim b/uvim/src/testdir/sautest/autoload/footest.vim
deleted file mode 100644
index 1e78963a10..0000000000
--- a/uvim/src/testdir/sautest/autoload/footest.vim
+++ /dev/null
@@ -1,5 +0,0 @@
-" Autoload script used by test_listdict.vim, test_exists.vim and test_let.vim
-let footest#x = 1
-func footest#F()
-  return 0
-endfunc
diff --git a/uvim/src/testdir/sautest/autoload/globone.vim b/uvim/src/testdir/sautest/autoload/globone.mnv
index 98c9a10582..98c9a10582 100644
--- a/uvim/src/testdir/sautest/autoload/globone.vim
+++ b/uvim/src/testdir/sautest/autoload/globone.mnv
diff --git a/uvim/src/testdir/sautest/autoload/globtwo.vim b/uvim/src/testdir/sautest/autoload/globtwo.mnv
index 98c9a10582..98c9a10582 100644
--- a/uvim/src/testdir/sautest/autoload/globtwo.vim
+++ b/uvim/src/testdir/sautest/autoload/globtwo.mnv
diff --git a/uvim/src/testdir/sautest/autoload/sourced.vim b/uvim/src/testdir/sautest/autoload/sourced.mnv
index aac96b11ce..c76561cab7 100644
--- a/uvim/src/testdir/sautest/autoload/sourced.vim
+++ b/uvim/src/testdir/sautest/autoload/sourced.mnv
@@ -1,4 +1,4 @@
-let g:loaded_sourced_vim += 1
+let g:loaded_sourced_mnv += 1
 func sourced#something()
 endfunc
 call sourced#something()
diff --git a/uvim/src/testdir/test10.in b/uvim/src/testdir/test10.in
index 40f8e08075..0e298676b7 100644
--- a/uvim/src/testdir/test10.in
+++ b/uvim/src/testdir/test10.in
@@ -1,12 +1,12 @@
-Test that vim9script also works without the +eval feature.
+Test that mnv9script also works without the +eval feature.
 
 STARTTEST
-:/^START/+1,/^END/-1:w! Xvim9
-:so Xvim9
+:/^START/+1,/^END/-1:w! Xmnv9
+:so Xmnv9
 ENDTEST
 
 START
-vim9script
+mnv9script
 
 if 1
   echo 'this is skipped without +eval'
diff --git a/uvim/src/testdir/test29.in b/uvim/src/testdir/test29.in
index 047803c60f..59b89d377d 100644
--- a/uvim/src/testdir/test29.in
+++ b/uvim/src/testdir/test29.in
@@ -1,5 +1,5 @@
 Test for buffer name completion when 'wildoptions' contains "fuzzy"
-(Confirm that Vim does not crash)
+(Confirm that MNV does not crash)
 
 STARTTEST
 :set wildoptions=fuzzy
diff --git a/uvim/src/testdir/test_alot.mnv b/uvim/src/testdir/test_alot.mnv
new file mode 100644
index 0000000000..72ce104725
--- /dev/null
+++ b/uvim/src/testdir/test_alot.mnv
@@ -0,0 +1,31 @@
+" A series of tests that can run in one MNV invocation.
+" This makes testing go faster, since MNV doesn't need to restart.
+
+source test_backup.mnv
+source test_behave.mnv
+source test_compiler.mnv
+source test_ex_equal.mnv
+source test_ex_undo.mnv
+source test_ex_z.mnv
+source test_ex_mode.mnv
+source test_expand.mnv
+source test_expand_dllpath.mnv
+source test_expand_func.mnv
+source test_file_perm.mnv
+source test_fnamemodify.mnv
+source test_ga.mnv
+source test_glob2regpat.mnv
+source test_global.mnv
+source test_move.mnv
+source test_put.mnv
+source test_reltime.mnv
+source test_searchpos.mnv
+source test_set.mnv
+source test_shift.mnv
+source test_sha256.mnv
+source test_tabline.mnv
+source test_tagcase.mnv
+source test_tagfunc.mnv
+source test_unlet.mnv
+source test_version.mnv
+source test_wnext.mnv
diff --git a/uvim/src/testdir/test_alot.vim b/uvim/src/testdir/test_alot.vim
deleted file mode 100644
index 592ca65672..0000000000
--- a/uvim/src/testdir/test_alot.vim
+++ /dev/null
@@ -1,31 +0,0 @@
-" A series of tests that can run in one Vim invocation.
-" This makes testing go faster, since Vim doesn't need to restart.
-
-source test_backup.vim
-source test_behave.vim
-source test_compiler.vim
-source test_ex_equal.vim
-source test_ex_undo.vim
-source test_ex_z.vim
-source test_ex_mode.vim
-source test_expand.vim
-source test_expand_dllpath.vim
-source test_expand_func.vim
-source test_file_perm.vim
-source test_fnamemodify.vim
-source test_ga.vim
-source test_glob2regpat.vim
-source test_global.vim
-source test_move.vim
-source test_put.vim
-source test_reltime.vim
-source test_searchpos.vim
-source test_set.vim
-source test_shift.vim
-source test_sha256.vim
-source test_tabline.vim
-source test_tagcase.vim
-source test_tagfunc.vim
-source test_unlet.vim
-source test_version.vim
-source test_wnext.vim
diff --git a/uvim/src/testdir/test_alot_latin.mnv b/uvim/src/testdir/test_alot_latin.mnv
new file mode 100644
index 0000000000..7cde69f759
--- /dev/null
+++ b/uvim/src/testdir/test_alot_latin.mnv
@@ -0,0 +1,7 @@
+" A series of tests that can run in one MNV invocation.
+" This makes testing go faster, since MNV doesn't need to restart.
+
+" These tests use latin1 'encoding'.  Setting 'encoding' is in the individual
+" files, so that they can be run by themselves.
+
+source test_regexp_latin.mnv
diff --git a/uvim/src/testdir/test_alot_latin.vim b/uvim/src/testdir/test_alot_latin.vim
deleted file mode 100644
index 23a404cac1..0000000000
--- a/uvim/src/testdir/test_alot_latin.vim
+++ /dev/null
@@ -1,7 +0,0 @@
-" A series of tests that can run in one Vim invocation.
-" This makes testing go faster, since Vim doesn't need to restart.
-
-" These tests use latin1 'encoding'.  Setting 'encoding' is in the individual
-" files, so that they can be run by themselves.
-
-source test_regexp_latin.vim
diff --git a/uvim/src/testdir/test_alot_utf8.mnv b/uvim/src/testdir/test_alot_utf8.mnv
new file mode 100644
index 0000000000..018171b619
--- /dev/null
+++ b/uvim/src/testdir/test_alot_utf8.mnv
@@ -0,0 +1,14 @@
+" A series of tests that can run in one MNV invocation.
+" This makes testing go faster, since MNV doesn't need to restart.
+
+" These tests use utf8 'encoding'.  Setting 'encoding' is already done in
+" runtest.mnv.
+
+source test_charsearch_utf8.mnv
+source test_expr_utf8.mnv
+source test_mksession_utf8.mnv
+source test_regexp_utf8.mnv
+source test_source_utf8.mnv
+source test_startup_utf8.mnv
+source test_utf8.mnv
+source test_utf8_comparisons.mnv
diff --git a/uvim/src/testdir/test_alot_utf8.vim b/uvim/src/testdir/test_alot_utf8.vim
deleted file mode 100644
index 77f5ede4c8..0000000000
--- a/uvim/src/testdir/test_alot_utf8.vim
+++ /dev/null
@@ -1,14 +0,0 @@
-" A series of tests that can run in one Vim invocation.
-" This makes testing go faster, since Vim doesn't need to restart.
-
-" These tests use utf8 'encoding'.  Setting 'encoding' is already done in
-" runtest.vim.
-
-source test_charsearch_utf8.vim
-source test_expr_utf8.vim
-source test_mksession_utf8.vim
-source test_regexp_utf8.vim
-source test_source_utf8.vim
-source test_startup_utf8.vim
-source test_utf8.vim
-source test_utf8_comparisons.vim
diff --git a/uvim/src/testdir/test_arabic.vim b/uvim/src/testdir/test_arabic.mnv
index 8758e98886..8a3f1c033c 100644
--- a/uvim/src/testdir/test_arabic.vim
+++ b/uvim/src/testdir/test_arabic.mnv
@@ -564,15 +564,15 @@ endfunc
 func Test_arabic_chars_in_search_cmd()
   new
   set arabic
-  call feedkeys("i\nsghl!\<C-^>vim\<C-^>", 'tx')
+  call feedkeys("i\nsghl!\<C-^>mnv\<C-^>", 'tx')
   call cursor(1, 1)
-  call feedkeys("/^sghl!\<C-^>vim$\<C-^>\<CR>", 'tx')
+  call feedkeys("/^sghl!\<C-^>mnv$\<C-^>\<CR>", 'tx')
   call assert_equal([2, 1], [line('.'), col('.')])
 
   " Try searching in left-to-right mode
   set rightleftcmd=
   call cursor(1, 1)
-  call feedkeys("/^sghl!\<C-^>vim$\<CR>", 'tx')
+  call feedkeys("/^sghl!\<C-^>mnv$\<CR>", 'tx')
   call assert_equal([2, 1], [line('.'), col('.')])
 
   set rightleftcmd&
@@ -589,4 +589,4 @@ func Test_W17_arabic_requires_utf8()
   let &encoding = save_enc
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_arglist.vim b/uvim/src/testdir/test_arglist.mnv
index f62d2cfabf..fad3db45db 100644
--- a/uvim/src/testdir/test_arglist.vim
+++ b/uvim/src/testdir/test_arglist.mnv
@@ -536,8 +536,8 @@ endfunc
 
 func Test_arg_all_expand()
   call writefile(['test file Xxx1'], 'Xx x', 'D')
-  next notexist Xx\ x runtest.vim
-  call assert_equal('notexist Xx\ x runtest.vim', expand('##'))
+  next notexist Xx\ x runtest.mnv
+  call assert_equal('notexist Xx\ x runtest.mnv', expand('##'))
 endfunc
 
 func Test_large_arg()
@@ -581,20 +581,20 @@ func Test_argdo()
   bwipe Xa.c Xb.c Xc.c
 endfunc
 
-" Test for quitting Vim with unedited files in the argument list
+" Test for quitting MNV with unedited files in the argument list
 func Test_quit_with_arglist()
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
-  let buf = RunVimInTerminal('', {'rows': 6})
+  let buf = RunMNVInTerminal('', {'rows': 6})
   call term_sendkeys(buf, ":set nomore\n")
   call term_sendkeys(buf, ":args a b c\n")
   call term_sendkeys(buf, ":quit\n")
   call TermWait(buf)
   call WaitForAssert({-> assert_match('^E173:', term_getline(buf, 6))})
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 
   " Try :confirm quit with unedited files in arglist
-  let buf = RunVimInTerminal('', {'rows': 6})
+  let buf = RunMNVInTerminal('', {'rows': 6})
   call term_sendkeys(buf, ":set nomore\n")
   call term_sendkeys(buf, ":args a b c\n")
   call term_sendkeys(buf, ":confirm quit\n")
@@ -818,4 +818,4 @@ func Test_arglist_w_locked_unlock()
   au! BufAdd
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_assert.vim b/uvim/src/testdir/test_assert.mnv
index b3e640c11f..6587fee4ec 100644
--- a/uvim/src/testdir/test_assert.vim
+++ b/uvim/src/testdir/test_assert.mnv
@@ -167,7 +167,7 @@ func Test_assert_exception()
   catch
     call assert_equal(1, assert_exception('E12345:'))
   endtry
-  call assert_match("Expected 'E12345:' but got 'Vim:E492: ", v:errors[0])
+  call assert_match("Expected 'E12345:' but got 'MNV:E492: ", v:errors[0])
   call remove(v:errors, 0)
 
   try
@@ -332,12 +332,12 @@ func Test_assert_fail_fails()
   call remove(v:errors, 0)
 
   " Test for matching the line number and the script name in an error message
-  call writefile(['', 'call Xnonexisting()'], 'Xassertfails.vim', 'D')
-  call assert_fails('source Xassertfails.vim', 'E117:', '', 10)
+  call writefile(['', 'call Xnonexisting()'], 'Xassertfails.mnv', 'D')
+  call assert_fails('source Xassertfails.mnv', 'E117:', '', 10)
   call assert_match("Expected 10 but got 2", v:errors[0])
   call remove(v:errors, 0)
-  call assert_fails('source Xassertfails.vim', 'E117:', '', 2, 'Xabc')
-  call assert_match("Expected 'Xabc' but got .*Xassertfails.vim", v:errors[0])
+  call assert_fails('source Xassertfails.mnv', 'E117:', '', 2, 'Xabc')
+  call assert_match("Expected 'Xabc' but got .*Xassertfails.mnv", v:errors[0])
   call remove(v:errors, 0)
 endfunc
 
@@ -348,7 +348,7 @@ func Test_assert_wrong_arg_emsg_off()
   call setline(1, ['foo', 'bar'])
   1,2fold
 
-  " This used to crash Vim
+  " This used to crash MNV
   let &l:foldtext = 'assert_match({}, {})'
   redraw!
 
@@ -368,9 +368,9 @@ endfunc
 " Requires using a terminal, in regular tests the hit-enter prompt won't be
 " triggered.
 func Test_assert_fails_in_timer()
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
-  let buf = RunVimInTerminal('', {'rows': 6})
+  let buf = RunMNVInTerminal('', {'rows': 6})
   let cmd = ":call timer_start(0, {-> assert_fails('call', 'E471:')})"
   call term_sendkeys(buf, cmd)
   call WaitForAssert({-> assert_equal(cmd, term_getline(buf, 6))})
@@ -378,7 +378,7 @@ func Test_assert_fails_in_timer()
   call TermWait(buf, 100)
   call assert_match('E471: Argument required', term_getline(buf, 6))
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 " Check that a typed assert_equal() doesn't prepend an unnecessary ':'.
@@ -388,7 +388,7 @@ func Test_assert_equal_typed()
     call feedkeys(":call writefile(v:errors, 'Xerrors')\<CR>", 't')
     call feedkeys(":qa!\<CR>", 't')
   END
-  call assert_equal(1, RunVim([], after, ''))
+  call assert_equal(1, RunMNV([], after, ''))
   call assert_equal(['Expected 0 but got 1'], readfile('Xerrors'))
 
   call delete('Xerrors')
@@ -520,8 +520,8 @@ endfunc
 
 " Must be last.
 func Test_zz_quit_detected()
-  " Verify that if a test function ends Vim the test script detects this.
+  " Verify that if a test function ends MNV the test script detects this.
   quit
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_autochdir.vim b/uvim/src/testdir/test_autochdir.mnv
index a9cb66b2ce..eddd29679f 100644
--- a/uvim/src/testdir/test_autochdir.vim
+++ b/uvim/src/testdir/test_autochdir.mnv
@@ -112,9 +112,9 @@ endfunc
 func Test_multibyte()
   " using an invalid character should not cause a crash
   set wic
-  call assert_fails('tc û���¦*', has('win32') ? 'E480:' : 'E344:')
+  call assert_fails('tc �����*', has('win32') ? 'E480:' : 'E344:')
   set nowic
 endfunc
 
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_autocmd.vim b/uvim/src/testdir/test_autocmd.mnv
index 592dd47150..680f1300a4 100644
--- a/uvim/src/testdir/test_autocmd.vim
+++ b/uvim/src/testdir/test_autocmd.mnv
@@ -1,7 +1,7 @@
 " Tests for autocommands
 
-source util/screendump.vim
-import './util/vim9.vim' as v9
+source util/screendump.mnv
+import './util/mnv9.mnv' as v9
 
 func s:cleanup_buffers() abort
   for bnr in range(1, bufnr('$'))
@@ -18,23 +18,23 @@ func CleanUpTestAuGroup()
   augroup! testing
 endfunc
 
-func Test_vim_did_enter()
-  call assert_false(v:vim_did_enter)
+func Test_mnv_did_enter()
+  call assert_false(v:mnv_did_enter)
 
-  " This script will never reach the main loop, can't check if v:vim_did_enter
+  " This script will never reach the main loop, can't check if v:mnv_did_enter
   " becomes one.
 endfunc
 
 " Test for the CursorHold autocmd
 func Test_CursorHold_autocmd()
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
   call writefile(['one', 'two', 'three'], 'XoneTwoThree', 'D')
   let before =<< trim END
     set updatetime=10
     au CursorHold * call writefile([line('.')], 'XCHoutput', 'a')
   END
   call writefile(before, 'XCHinit', 'D')
-  let buf = RunVimInTerminal('-S XCHinit XoneTwoThree', {})
+  let buf = RunMNVInTerminal('-S XCHinit XoneTwoThree', {})
   call term_sendkeys(buf, "G")
   call term_wait(buf, 50)
   call term_sendkeys(buf, "gg")
@@ -46,7 +46,7 @@ func Test_CursorHold_autocmd()
   call term_sendkeys(buf, "j")
   call term_wait(buf)
   call WaitForAssert({-> assert_equal(['1', '2', '3'], readfile('XCHoutput')[-3:-1])})
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 
   call delete('XCHoutput')
 endfunc
@@ -130,7 +130,7 @@ if has('timers')
     augroup set_tabstop
       au OptionSet tabstop call timer_start(1, {-> execute("echo 'Handler called'", "")})
     augroup END
-    call writefile(['vim: set ts=7 sw=5 :', 'something'], 'XoptionsetModeline', 'D')
+    call writefile(['mnv: set ts=7 sw=5 :', 'something'], 'XoptionsetModeline', 'D')
     set modeline
     let v:errmsg = ''
     call assert_fails('split XoptionsetModeline', 'E12:')
@@ -262,7 +262,7 @@ func Test_autocmd_dummy_wipeout()
 
   let s:li = []
   split Xdummywipetest1.txt
-  silent! vimgrep /notmatched/ Xdummywipetest*
+  silent! mnvgrep /notmatched/ Xdummywipetest*
   call assert_equal(["bufunload", "bufwipeout"], s:li)
 
   bwipeout
@@ -387,7 +387,7 @@ func Test_WinNewPre()
 endfunc
 
 func Test_WinResized()
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   let lines =<< trim END
     set scrolloff=0
@@ -406,7 +406,7 @@ func Test_WinResized()
     au WinResized * call WriteResizedEvent()
   END
   call writefile(lines, 'Xtest_winresized', 'D')
-  let buf = RunVimInTerminal('-S Xtest_winresized', {'rows': 10})
+  let buf = RunMNVInTerminal('-S Xtest_winresized', {'rows': 10})
 
   " redraw now to avoid a redraw after the :echo command
   call term_sendkeys(buf, ":redraw!\<CR>")
@@ -438,11 +438,11 @@ func Test_WinResized()
         \ }, event)
 
   call delete('XresizeEvent')
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_WinScrolled()
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   let lines =<< trim END
     set nowrap scrolloff=0
@@ -462,7 +462,7 @@ func Test_WinScrolled()
     au WinScrolled * call WriteScrollEvent()
   END
   call writefile(lines, 'Xtest_winscrolled', 'D')
-  let buf = RunVimInTerminal('-S Xtest_winscrolled', {'rows': 6})
+  let buf = RunMNVInTerminal('-S Xtest_winscrolled', {'rows': 6})
 
   call term_sendkeys(buf, ":echo g:scrolled\<CR>")
   call WaitForAssert({-> assert_match('^0 ', term_getline(buf, 6))}, 1000)
@@ -500,7 +500,7 @@ func Test_WinScrolled()
 
   " Scroll the window horizontally to focus the last letter of the third line
   " containing only six characters. Moving to the previous and shorter lines
-  " should trigger another autocommand as Vim has to make them visible.
+  " should trigger another autocommand as MNV has to make them visible.
   call term_sendkeys(buf, "5zl2k")
   call term_sendkeys(buf, ":echo g:scrolled\<CR>")
   call WaitForAssert({-> assert_match('^8 ', term_getline(buf, 6))}, 1000)
@@ -520,11 +520,11 @@ func Test_WinScrolled()
   call WaitForAssert({-> assert_match('^v:true ', term_getline(buf, 6))}, 1000)
 
   call delete('XscrollEvent')
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_WinScrolled_mouse()
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   let lines =<< trim END
     set nowrap scrolloff=0
@@ -535,7 +535,7 @@ func Test_WinScrolled_mouse()
     au WinScrolled * let g:scrolled += 1
   END
   call writefile(lines, 'Xtest_winscrolled_mouse', 'D')
-  let buf = RunVimInTerminal('-S Xtest_winscrolled_mouse', {'rows': 10})
+  let buf = RunMNVInTerminal('-S Xtest_winscrolled_mouse', {'rows': 10})
 
   " With the upper split focused, send a scroll-down event to the unfocused one.
   call test_setmouse(7, 1)
@@ -550,26 +550,26 @@ func Test_WinScrolled_mouse()
   call term_sendkeys(buf, ":echo g:scrolled\<CR>")
   call WaitForAssert({-> assert_match('^2', term_getline(buf, 10))}, 1000)
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_WinScrolled_close_curwin()
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   let lines =<< trim END
     set nowrap scrolloff=0
     call setline(1, ['aaa', 'bbb'])
     vsplit
     au WinScrolled * close
-    au VimLeave * call writefile(['123456'], 'Xtestout')
+    au MNVLeave * call writefile(['123456'], 'Xtestout')
   END
   call writefile(lines, 'Xtest_winscrolled_close_curwin', 'D')
-  let buf = RunVimInTerminal('-S Xtest_winscrolled_close_curwin', {'rows': 6})
+  let buf = RunMNVInTerminal('-S Xtest_winscrolled_close_curwin', {'rows': 6})
 
   " This was using freed memory
   call term_sendkeys(buf, "\<C-E>")
   call TermWait(buf)
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 
   " check the startup script finished to the end
   call assert_equal(['123456'], readfile('Xtestout'))
@@ -578,7 +578,7 @@ endfunc
 
 func Test_WinScrolled_once_only()
   CheckScreendump
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   let lines =<< trim END
       set cmdheight=2
@@ -596,19 +596,19 @@ func Test_WinScrolled_once_only()
       wincmd l
   END
   call writefile(lines, 'Xtest_winscrolled_once', 'D')
-  let buf = RunVimInTerminal('-S Xtest_winscrolled_once', #{rows: 10, cols: 60, statusoff: 2})
+  let buf = RunMNVInTerminal('-S Xtest_winscrolled_once', #{rows: 10, cols: 60, statusoff: 2})
 
   call term_sendkeys(buf, "\<C-E>")
   call VerifyScreenDump(buf, 'Test_winscrolled_once_only_1', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 " Check that WinScrolled is not triggered immediately when defined and there
 " are split windows.
 func Test_WinScrolled_not_when_defined()
   CheckScreendump
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   let lines =<< trim END
       call setline(1, ['aaa', 'bbb'])
@@ -618,7 +618,7 @@ func Test_WinScrolled_not_when_defined()
       endfunc
   END
   call writefile(lines, 'Xtest_winscrolled_not', 'D')
-  let buf = RunVimInTerminal('-S Xtest_winscrolled_not', #{rows: 10, cols: 60, statusoff: 2})
+  let buf = RunMNVInTerminal('-S Xtest_winscrolled_not', #{rows: 10, cols: 60, statusoff: 2})
   call term_sendkeys(buf, ":split\<CR>")
   call TermWait(buf)
   " use a timer to show the message after redrawing
@@ -628,11 +628,11 @@ func Test_WinScrolled_not_when_defined()
   call term_sendkeys(buf, "\<C-E>")
   call VerifyScreenDump(buf, 'Test_winscrolled_not_when_defined_2', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_WinScrolled_long_wrapped()
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   let lines =<< trim END
     set scrolloff=0
@@ -644,7 +644,7 @@ func Test_WinScrolled_long_wrapped()
     call cursor(1, height * width)
   END
   call writefile(lines, 'Xtest_winscrolled_long_wrapped', 'D')
-  let buf = RunVimInTerminal('-S Xtest_winscrolled_long_wrapped', {'rows': 6})
+  let buf = RunMNVInTerminal('-S Xtest_winscrolled_long_wrapped', {'rows': 6})
 
   call term_sendkeys(buf, ":echo g:scrolled\<CR>")
   call WaitForAssert({-> assert_match('^0 ', term_getline(buf, 6))}, 1000)
@@ -661,11 +661,11 @@ func Test_WinScrolled_long_wrapped()
   call term_sendkeys(buf, ":echo g:scrolled\<CR>")
   call WaitForAssert({-> assert_match('^3 ', term_getline(buf, 6))}, 1000)
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_WinScrolled_diff()
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   let lines =<< trim END
     set diffopt+=foldcolumn:0
@@ -679,7 +679,7 @@ func Test_WinScrolled_diff()
     au WinScrolled * call WriteScrollEvent()
   END
   call writefile(lines, 'Xtest_winscrolled_diff', 'D')
-  let buf = RunVimInTerminal('-S Xtest_winscrolled_diff', {'rows': 8})
+  let buf = RunMNVInTerminal('-S Xtest_winscrolled_diff', {'rows': 8})
 
   call term_sendkeys(buf, "\<C-E>")
   call WaitForAssert({-> assert_match('^d', term_getline(buf, 3))}, 1000)
@@ -721,7 +721,7 @@ func Test_WinScrolled_diff()
         \ '1001': {'leftcol': 0, 'topline': -1, 'topfill': 1, 'width': 0, 'height': 0, 'skipcol': 0}
         \ }, event)
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
   call delete('XscrollEvent')
 endfunc
 
@@ -902,34 +902,34 @@ func Test_BufUnload_tabonly_nested()
 endfunc
 
 func s:AddAnAutocmd()
-  augroup vimBarTest
+  augroup mnvBarTest
     au BufReadCmd * echo 'hello'
   augroup END
-  call assert_equal(3, len(split(execute('au vimBarTest'), "\n")))
+  call assert_equal(3, len(split(execute('au mnvBarTest'), "\n")))
 endfunc
 
 func Test_early_bar()
   " test that a bar is recognized before the {event}
   call s:AddAnAutocmd()
-  augroup vimBarTest | au! | let done = 77 | augroup END
-  call assert_equal(1, len(split(execute('au vimBarTest'), "\n")))
+  augroup mnvBarTest | au! | let done = 77 | augroup END
+  call assert_equal(1, len(split(execute('au mnvBarTest'), "\n")))
   call assert_equal(77, done)
 
   call s:AddAnAutocmd()
-  augroup vimBarTest| au!| let done = 88 | augroup END
-  call assert_equal(1, len(split(execute('au vimBarTest'), "\n")))
+  augroup mnvBarTest| au!| let done = 88 | augroup END
+  call assert_equal(1, len(split(execute('au mnvBarTest'), "\n")))
   call assert_equal(88, done)
 
   " test that a bar is recognized after the {event}
   call s:AddAnAutocmd()
-  augroup vimBarTest| au!BufReadCmd| let done = 99 | augroup END
-  call assert_equal(1, len(split(execute('au vimBarTest'), "\n")))
+  augroup mnvBarTest| au!BufReadCmd| let done = 99 | augroup END
+  call assert_equal(1, len(split(execute('au mnvBarTest'), "\n")))
   call assert_equal(99, done)
 
   " test that a bar is recognized after the {group}
   call s:AddAnAutocmd()
-  au! vimBarTest|echo 'hello'
-  call assert_equal(1, len(split(execute('au vimBarTest'), "\n")))
+  au! mnvBarTest|echo 'hello'
+  call assert_equal(1, len(split(execute('au mnvBarTest'), "\n")))
 endfunc
 
 func RemoveGroup()
@@ -939,31 +939,31 @@ endfunc
 
 func Test_augroup_warning()
   augroup TheWarning
-    au VimEnter * echo 'entering'
+    au MNVEnter * echo 'entering'
   augroup END
-  call assert_match("TheWarning.*VimEnter", execute('au VimEnter'))
+  call assert_match("TheWarning.*MNVEnter", execute('au MNVEnter'))
   redir => res
   augroup! TheWarning
   redir END
   call assert_match("W19:", res)
-  call assert_match("-Deleted-.*VimEnter", execute('au VimEnter'))
+  call assert_match("-Deleted-.*MNVEnter", execute('au MNVEnter'))
 
   " check "Another" does not take the pace of the deleted entry
   augroup Another
   augroup END
-  call assert_match("-Deleted-.*VimEnter", execute('au VimEnter'))
+  call assert_match("-Deleted-.*MNVEnter", execute('au MNVEnter'))
   augroup! Another
 
   " no warning for postpone aucmd delete
   augroup StartOK
-    au VimEnter * call RemoveGroup()
+    au MNVEnter * call RemoveGroup()
   augroup END
-  call assert_match("StartOK.*VimEnter", execute('au VimEnter'))
+  call assert_match("StartOK.*MNVEnter", execute('au MNVEnter'))
   redir => res
-  doautocmd VimEnter
+  doautocmd MNVEnter
   redir END
   call assert_notmatch("W19:", res)
-  au! VimEnter
+  au! MNVEnter
 
   call assert_fails('augroup!', 'E471:')
 endfunc
@@ -1011,11 +1011,11 @@ func Test_augroup_deleted()
   " This caused a crash before E936 was introduced
   augroup x
     call assert_fails('augroup! x', 'E936:')
-    au VimEnter * echo
+    au MNVEnter * echo
   augroup end
   augroup! x
-  call assert_match("-Deleted-.*VimEnter", execute('au VimEnter'))
-  au! VimEnter
+  call assert_match("-Deleted-.*MNVEnter", execute('au MNVEnter'))
+  au! MNVEnter
 endfunc
 
 " Tests for autocommands on :close command.
@@ -1134,7 +1134,7 @@ endfunc
 func Test_autocmd_SessLoadPre()
   tabnew
   set noswapfile
-  mksession! Session.vim
+  mksession! Session.mnv
 
   call assert_false(exists('g:session_loaded_var'))
 
@@ -1165,21 +1165,21 @@ func Test_autocmd_SessLoadPre()
     func! WriteErrors()
       call writefile([execute("messages")], "XerrorsPost")
     endfunc
-    au VimLeave * call WriteErrors()
+    au MNVLeave * call WriteErrors()
   [CODE]
 
-  call writefile(content, 'Xvimrc', 'D')
+  call writefile(content, 'Xmnvrc', 'D')
 
   call writefile(
         \ ['let g:session_loaded_var = 1'],
-        \ 'Sessionx.vim',
+        \ 'Sessionx.mnv',
         \ 'b'
         \ )
 
-  " --- Run child Vim ---
+  " --- Run child MNV ---
   call system(
-        \ GetVimCommand('Xvimrc')
-        \ .. ' --not-a-term --noplugins -S Session.vim -c cq'
+        \ GetMNVCommand('Xmnvrc')
+        \ .. ' --not-a-term --noplugins -S Session.mnv -c cq'
         \ )
 
   call WaitForAssert({-> assert_true(filereadable('XerrorsPost'))})
@@ -1191,13 +1191,13 @@ func Test_autocmd_SessLoadPre()
   call assert_match('SessionLoadPost DONE', errors)
 
   set swapfile
-  for file in ['Session.vim', 'Sessionx.vim', 'XerrorsPost']
+  for file in ['Session.mnv', 'Sessionx.mnv', 'XerrorsPost']
     call delete(file)
   endfor
 endfunc
 
 " Closing a window might cause an endless loop
-" E814 for older Vims
+" E814 for older MNVs
 func Test_autocmd_bufwipe_in_SessLoadPost()
   edit Xtest
   tabnew
@@ -1217,17 +1217,17 @@ func Test_autocmd_bufwipe_in_SessLoadPost()
     func WriteErrors()
       call writefile([execute("messages")], "XerrorsBwipe")
     endfunc
-    au VimLeave * call WriteErrors()
+    au MNVLeave * call WriteErrors()
   [CODE]
 
-  call writefile(content, 'Xvimrc', 'D')
-  call system(GetVimCommand('Xvimrc') .. ' --not-a-term --noplugins -S Session.vim -c cq')
+  call writefile(content, 'Xmnvrc', 'D')
+  call system(GetMNVCommand('Xmnvrc') .. ' --not-a-term --noplugins -S Session.mnv -c cq')
   sleep 100m
   let errors = join(readfile('XerrorsBwipe'))
   call assert_match('E814:', errors)
 
   set swapfile
-  for file in ['Session.vim', 'XerrorsBwipe']
+  for file in ['Session.mnv', 'XerrorsBwipe']
     call delete(file)
   endfor
 endfunc
@@ -1236,16 +1236,16 @@ endfunc
 " not incremented correctly.
 func Test_autocmd_blast_badd()
   let content =<< trim [CODE]
-      au BufNew,BufAdd,BufWinEnter,BufEnter,BufLeave,BufWinLeave,BufUnload,VimEnter foo* blast
+      au BufNew,BufAdd,BufWinEnter,BufEnter,BufLeave,BufWinLeave,BufUnload,MNVEnter foo* blast
       edit foo1
-      au BufNew,BufAdd,BufWinEnter,BufEnter,BufLeave,BufWinLeave,BufUnload,VimEnter foo* ball
+      au BufNew,BufAdd,BufWinEnter,BufEnter,BufLeave,BufWinLeave,BufUnload,MNVEnter foo* ball
       edit foo2
       call writefile(['OK'], 'XerrorsBlast')
       qall
   [CODE]
 
   call writefile(content, 'XblastBall', 'D')
-  call system(GetVimCommand() .. ' --clean -S XblastBall')
+  call system(GetMNVCommand() .. ' --clean -S XblastBall')
   sleep 100m
   call assert_match('OK', readfile('XerrorsBlast')->join())
 
@@ -1278,11 +1278,11 @@ func Test_autocmd_bufwipe_in_SessLoadPost2()
     func WriteErrors()
       call writefile([execute("messages")], "XerrorsPost")
     endfunc
-    au VimLeave * call WriteErrors()
+    au MNVLeave * call WriteErrors()
   [CODE]
 
-  call writefile(content, 'Xvimrc', 'D')
-  call system(GetVimCommand('Xvimrc') .. ' --not-a-term --noplugins -S Session.vim -c cq')
+  call writefile(content, 'Xmnvrc', 'D')
+  call system(GetMNVCommand('Xmnvrc') .. ' --not-a-term --noplugins -S Session.mnv -c cq')
   sleep 100m
   let errors = join(readfile('XerrorsPost'))
   " This probably only ever matches on unix.
@@ -1290,7 +1290,7 @@ func Test_autocmd_bufwipe_in_SessLoadPost2()
   call assert_match('SessionLoadPost DONE', errors)
 
   set swapfile
-  for file in ['Session.vim', 'XerrorsPost']
+  for file in ['Session.mnv', 'XerrorsPost']
     call delete(file)
   endfor
 endfunc
@@ -1311,7 +1311,7 @@ endfunc
 func Test_OptionSet()
   CheckOption autochdir
 
-  badd test_autocmd.vim
+  badd test_autocmd.mnv
 
   call test_override('starting', 1)
   set nocp
@@ -1905,7 +1905,7 @@ func Test_OptionSet()
   au! OptionSet
   " set tags&
   for opt in ['nu', 'ai', 'acd', 'ar', 'bs', 'backup', 'cul', 'cp', 'backupext', 'tags', 'spelllang', 'statusline', 'foldignore', 'cmdheight', 'undolevels', 'wrapmargin', 'foldcolumn', 'wrapscan', 'autoread', 'cindent', 'cursorcolumn']
-    exe printf(":set %s&vim", opt)
+    exe printf(":set %s&mnv", opt)
   endfor
   call test_override('starting', 0)
   delfunc! AutoCommandOptionSet
@@ -2027,7 +2027,7 @@ func Test_Acmd_BufEnter()
 	      \ "\<Tab>this is a test",
 	      \ 'end of test file Xxx1'], 'Xxx1', 'D')
   call writefile(['start of test file Xxx2',
-	      \ 'vim: set noai :',
+	      \ 'mnv: set noai :',
 	      \ "\<Tab>this is a test",
 	      \ 'end of test file Xxx2'], 'Xxx2', 'D')
 
@@ -2051,7 +2051,7 @@ func Test_Acmd_BufEnter()
   call assert_equal(4, line('.'))
 
   %bwipe!
-  set ai&vim modeline&vim modelines&vim
+  set ai&mnv modeline&mnv modelines&mnv
 endfunc
 
 " Test for issue #57
@@ -2065,7 +2065,7 @@ func Test_ai_CTRL_O()
   exe "normal o# abcdef\<Esc>2hi\<C-O>d0\<Esc>"
   call assert_equal(['# abc', 'def', 'def'], getline(2, 4))
 
-  set ai&vim
+  set ai&mnv
   let &fo = save_fo
   enew!
 endfunc
@@ -2224,7 +2224,7 @@ func Test_CmdlineLeavePre_cabbr()
   " For unknown reason this fails intermittently on MS-Windows
   CheckNotMSWindows
   CheckFeature terminal
-  let buf = term_start([GetVimProg(), '--clean', '-c', 'set noswapfile'], {'term_rows': 3})
+  let buf = term_start([GetMNVProg(), '--clean', '-c', 'set noswapfile'], {'term_rows': 3})
   call assert_equal('running', term_getstatus(buf))
   call term_sendkeys(buf, ":let g:a=0\<cr>")
   call term_wait(buf, 50)
@@ -2449,7 +2449,7 @@ func Test_bufunload_all()
       endwhile
     endfunc
     au BufUnload * call UnloadAllBufs()
-    au VimLeave * call writefile(['Test Finished'], 'Xout')
+    au MNVLeave * call writefile(['Test Finished'], 'Xout')
     edit Xxx1
     split Xxx2
     q
@@ -2458,7 +2458,7 @@ func Test_bufunload_all()
   call writefile(content, 'Xbunloadtest', 'D')
 
   call delete('Xout')
-  call system(GetVimCommandClean() .. ' -N --not-a-term -S Xbunloadtest')
+  call system(GetMNVCommandClean() .. ' -N --not-a-term -S Xbunloadtest')
   call assert_true(filereadable('Xout'))
 
   call delete('Xout')
@@ -2820,7 +2820,7 @@ func Test_TextYankPost()
           \   regtype: 'v', visual: v:true, inclusive: v:false},
           \ g:event)
 
-    set clipboard&vim
+    set clipboard&mnv
   endif
 
   au! TextYankPost
@@ -2843,7 +2843,7 @@ func Test_autocmd_user()
 endfunc
 
 func Test_autocmd_user_clear_group()
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   let lines =<< trim END
     autocmd! User
@@ -2853,18 +2853,18 @@ func Test_autocmd_user_clear_group()
     au CmdlineLeave : call timer_start(0, {-> execute('autocmd! User')})
   END
   call writefile(lines, 'XautoUser', 'D')
-  let buf = RunVimInTerminal('-S XautoUser', {'rows': 10})
+  let buf = RunMNVInTerminal('-S XautoUser', {'rows': 10})
 
   " this was using freed memory
   call term_sendkeys(buf, ":autocmd User\<CR>")
   call TermWait(buf, 50)
   call term_sendkeys(buf, "G")
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_autocmd_CmdlineLeave_unlet()
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   let lines =<< trim END
       for i in range(1, 999)
@@ -2873,7 +2873,7 @@ func Test_autocmd_CmdlineLeave_unlet()
       au CmdlineLeave : call timer_start(0, {-> execute('unlet g:var990')})
   END
   call writefile(lines, 'XleaveUnlet', 'D')
-  let buf = RunVimInTerminal('-S XleaveUnlet', {'rows': 10})
+  let buf = RunMNVInTerminal('-S XleaveUnlet', {'rows': 10})
 
   " this was using freed memory
   call term_sendkeys(buf, ":let g:\<CR>")
@@ -2882,7 +2882,7 @@ func Test_autocmd_CmdlineLeave_unlet()
   call TermWait(buf, 50)
   call term_sendkeys(buf, "\<CR>")  " for the hit-enter prompt
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 function s:Before_test_dirchanged()
@@ -3011,7 +3011,7 @@ func Test_ChangedP()
   au! TextChangedP
   delfu TextChangedAutocmd
   unlet! g:autocmd
-  set complete&vim completeopt&vim
+  set complete&mnv completeopt&mnv
 
   bw!
 endfunc
@@ -3043,7 +3043,7 @@ func Test_TextChanged_with_norm()
   " For unknown reason this fails on MS-Windows
   CheckNotMSWindows
   CheckFeature terminal
-  let buf = term_start([GetVimProg(), '--clean', '-c', 'set noswapfile'], {'term_rows': 3})
+  let buf = term_start([GetMNVProg(), '--clean', '-c', 'set noswapfile'], {'term_rows': 3})
   call assert_equal('running', term_getstatus(buf))
   call term_sendkeys(buf, ":let g:a=0\<cr>")
   call term_wait(buf, 50)
@@ -3060,12 +3060,12 @@ endfunc
 func Test_Changed_FirstTime()
   CheckFeature terminal
   CheckNotGui
-  " Starting a terminal to run Vim is always considered flaky.
+  " Starting a terminal to run MNV is always considered flaky.
   let g:test_is_flaky = 1
 
   " Prepare file for TextChanged event.
   call writefile([''], 'Xchanged.txt', 'D')
-  let buf = term_start([GetVimProg(), '--clean', '-c', 'set noswapfile'], {'term_rows': 3})
+  let buf = term_start([GetMNVProg(), '--clean', '-c', 'set noswapfile'], {'term_rows': 3})
   call assert_equal('running', term_getstatus(buf))
   " Wait for the ruler (in the status line) to be shown.
   " In ConPTY, there is additional character which is drawn up to the width of
@@ -3119,8 +3119,8 @@ func Test_autocmd_nested()
   close
   bwipe! somefile
 
-  " nested without ++ does not work in Vim9 script
-  call assert_fails('vim9cmd au WinNew * nested echo fails', 'E1078:')
+  " nested without ++ does not work in MNV9 script
+  call assert_fails('mnv9cmd au WinNew * nested echo fails', 'E1078:')
 
   augroup Testing
     au!
@@ -3162,22 +3162,22 @@ func Test_autocmd_nested_keeps_cursor_pos()
 endfunc
 
 func Test_autocmd_nested_switch_window()
-  " run this in a separate Vim so that SafeState works
-  CheckRunVimInTerminal
+  " run this in a separate MNV so that SafeState works
+  CheckRunMNVInTerminal
   CheckScreendump
 
   let lines =<< trim END
-      vim9script
+      mnv9script
       ['()']->writefile('Xautofile')
-      autocmd VimEnter * ++nested edit Xautofile | split
+      autocmd MNVEnter * ++nested edit Xautofile | split
       autocmd BufReadPost * autocmd SafeState * ++once foldclosed('.')
       autocmd WinEnter * matchadd('ErrorMsg', 'pat')
   END
   call writefile(lines, 'Xautoscript', 'D')
-  let buf = RunVimInTerminal('-S Xautoscript', {'rows': 10})
+  let buf = RunMNVInTerminal('-S Xautoscript', {'rows': 10})
   call VerifyScreenDump(buf, 'Test_autocmd_nested_switch', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
   call delete('Xautofile')
 endfunc
 
@@ -3234,7 +3234,7 @@ func Test_autocmd_bufreadpre()
   call assert_equal(g:wsv1.lnum, winsaveview().lnum)
   call assert_equal(2, b:bufreadpre)
   " Now set the cursor position in an BufReadPre autocommand
-  " (even though the position will be invalid, this should make Vim reset the
+  " (even though the position will be invalid, this should make MNV reset the
   " cursor position in the other window.
   wincmd p
   set cpo+=g
@@ -3255,7 +3255,7 @@ func Test_autocmd_bufreadpre()
   set cpo-=g
 endfunc
 
-" FileChangedShell tested in test_filechanged.vim
+" FileChangedShell tested in test_filechanged.mnv
 
 " Tests for the following autocommands:
 " - FileWritePre	writing a compressed file
@@ -3275,7 +3275,7 @@ func Test_ReadWrite_Autocmds()
   let $GZIP = ""
 
   " Use a FileChangedShell autocommand to avoid a prompt for 'Xtestfile.gz'
-  " being modified outside of Vim (noticed on Solaris).
+  " being modified outside of MNV (noticed on Solaris).
   au FileChangedShell * echo 'caught FileChangedShell'
 
   " Test for the FileReadPost, FileWritePre and FileWritePost autocmds
@@ -3413,7 +3413,7 @@ func Test_ReadWrite_Autocmds()
   augroup Test4
     au!
   augroup END
-  set shelltemp&vim
+  set shelltemp&mnv
 
   " Test for the FileReadPre and FileReadPost autocmds.
   augroup Test5
@@ -3489,7 +3489,7 @@ func Test_autocmd_in_try_block()
 endfunc
 
 func Test_autocmd_SafeState()
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   let lines =<< trim END
 	let g:safe = 0
@@ -3501,7 +3501,7 @@ func Test_autocmd_SafeState()
 	endfunc
   END
   call writefile(lines, 'XSafeState', 'D')
-  let buf = RunVimInTerminal('-S XSafeState', #{rows: 6})
+  let buf = RunMNVInTerminal('-S XSafeState', #{rows: 6})
 
   " Sometimes we loop to handle a K_IGNORE, SafeState may be triggered once or
   " more often.
@@ -3519,21 +3519,21 @@ func Test_autocmd_SafeState()
   call term_sendkeys(buf, ":echo g:again\<CR>")
   call WaitForAssert({-> assert_match('xtx', term_getline(buf, 6))}, 1000)
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_autocmd_CmdWinEnter()
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   let lines =<< trim END
-    augroup vimHints | au! | augroup END
+    augroup mnvHints | au! | augroup END
     let b:dummy_var = 'This is a dummy'
     autocmd CmdWinEnter * quit
     let winnr = winnr('$')
   END
   let filename = 'XCmdWinEnter'
   call writefile(lines, filename)
-  let buf = RunVimInTerminal('-S '.filename, #{rows: 6})
+  let buf = RunMNVInTerminal('-S '.filename, #{rows: 6})
 
   call term_sendkeys(buf, "q:")
   call TermWait(buf)
@@ -3545,7 +3545,7 @@ func Test_autocmd_CmdWinEnter()
   call WaitForAssert({-> assert_match('^1', term_getline(buf, 6))}, 1000)
 
   " clean up
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
   call delete(filename)
 endfunc
 
@@ -3733,9 +3733,9 @@ func Test_autocmd_invalid_args()
   augroup Test
   augroup END
   " Invalid autocmd event
-  call assert_fails('autocmd Bufabc Xinvfile set ft=vim', 'E216:')
+  call assert_fails('autocmd Bufabc Xinvfile set ft=mnv', 'E216:')
   " Invalid autocmd event in a autocmd group
-  call assert_fails('autocmd Test Bufabc Xinvfile set ft=vim', 'E216:')
+  call assert_fails('autocmd Test Bufabc Xinvfile set ft=mnv', 'E216:')
   augroup! Test
   " Execute all autocmds
   call assert_fails('doautocmd * BufEnter', 'E217:')
@@ -3985,14 +3985,14 @@ func Test_autocmd_closing_cmdwin()
   only
 endfunc
 
-func Test_autocmd_vimgrep()
-  augroup aucmd_vimgrep
+func Test_autocmd_mnvgrep()
+  augroup aucmd_mnvgrep
     au QuickfixCmdPre,BufNew,BufReadCmd * sb
     au QuickfixCmdPre,BufNew,BufReadCmd * q9
   augroup END
   call assert_fails('lv ?a? foo', 'E926:')
 
-  augroup aucmd_vimgrep
+  augroup aucmd_mnvgrep
     au!
   augroup END
 endfunc
@@ -4303,13 +4303,13 @@ endfunc
 func Test_autocmd_get()
   augroup TestAutoCmdFns
     au!
-    autocmd BufAdd *.vim echo "bufadd-vim"
+    autocmd BufAdd *.mnv echo "bufadd-mnv"
     autocmd BufAdd *.py echo "bufadd-py"
-    autocmd BufHidden *.vim echo "bufhidden"
+    autocmd BufHidden *.mnv echo "bufhidden"
   augroup END
   augroup TestAutoCmdFns2
-    autocmd BufAdd *.vim echo "bufadd-vim-2"
-    autocmd BufRead *.a1b2c3 echo "bufadd-vim-2"
+    autocmd BufAdd *.mnv echo "bufadd-mnv-2"
+    autocmd BufRead *.a1b2c3 echo "bufadd-mnv-2"
   augroup END
 
   let l = autocmd_get()
@@ -4317,14 +4317,14 @@ func Test_autocmd_get()
 
   " Test for getting all the autocmds in a group
   let expected = [
-        \ #{cmd: 'echo "bufadd-vim"', group: 'TestAutoCmdFns',
-        \  pattern: '*.vim', nested: v:false, once: v:false,
+        \ #{cmd: 'echo "bufadd-mnv"', group: 'TestAutoCmdFns',
+        \  pattern: '*.mnv', nested: v:false, once: v:false,
         \  event: 'BufAdd'},
         \ #{cmd: 'echo "bufadd-py"', group: 'TestAutoCmdFns',
         \  pattern: '*.py', nested: v:false, once: v:false,
         \  event: 'BufAdd'},
         \ #{cmd: 'echo "bufhidden"', group: 'TestAutoCmdFns',
-        \  pattern: '*.vim', nested: v:false,
+        \  pattern: '*.mnv', nested: v:false,
         \  once: v:false, event: 'BufHidden'}]
   call assert_equal(expected, autocmd_get(#{group: 'TestAutoCmdFns'}))
 
@@ -4334,8 +4334,8 @@ func Test_autocmd_get()
 
   " Test for getting autocmds for an event in a group
   let expected = [
-        \ #{cmd: 'echo "bufadd-vim"', group: 'TestAutoCmdFns',
-        \  pattern: '*.vim', nested: v:false, once: v:false,
+        \ #{cmd: 'echo "bufadd-mnv"', group: 'TestAutoCmdFns',
+        \  pattern: '*.mnv', nested: v:false, once: v:false,
         \  event: 'BufAdd'},
         \ #{cmd: 'echo "bufadd-py"', group: 'TestAutoCmdFns',
         \  pattern: '*.py', nested: v:false, once: v:false,
@@ -4353,25 +4353,25 @@ func Test_autocmd_get()
   " Test for getting the autocmds for an events in a group for particular
   " pattern
   let l = autocmd_get(#{group: 'TestAutoCmdFns', event: 'BufAdd',
-        \ pattern: '*.vim'})
+        \ pattern: '*.mnv'})
   call assert_equal([
-        \ #{cmd: 'echo "bufadd-vim"', group: 'TestAutoCmdFns',
-        \  pattern: '*.vim', nested: v:false, once: v:false,
+        \ #{cmd: 'echo "bufadd-mnv"', group: 'TestAutoCmdFns',
+        \  pattern: '*.mnv', nested: v:false, once: v:false,
         \  event: 'BufAdd'}], l)
 
   " Test for getting the autocmds for a pattern in a group
-  let l = autocmd_get(#{group: 'TestAutoCmdFns', pattern: '*.vim'})
+  let l = autocmd_get(#{group: 'TestAutoCmdFns', pattern: '*.mnv'})
   call assert_equal([
-        \ #{cmd: 'echo "bufadd-vim"', group: 'TestAutoCmdFns',
-        \  pattern: '*.vim', nested: v:false, once: v:false,
+        \ #{cmd: 'echo "bufadd-mnv"', group: 'TestAutoCmdFns',
+        \  pattern: '*.mnv', nested: v:false, once: v:false,
         \  event: 'BufAdd'},
         \ #{cmd: 'echo "bufhidden"', group: 'TestAutoCmdFns',
-        \  pattern: '*.vim', nested: v:false,
+        \  pattern: '*.mnv', nested: v:false,
         \  once: v:false, event: 'BufHidden'}], l)
 
   " Test for getting the autocmds for a pattern in all the groups
   let l = autocmd_get(#{pattern: '*.a1b2c3'})
-  call assert_equal([{'cmd': 'echo "bufadd-vim-2"', 'group': 'TestAutoCmdFns2',
+  call assert_equal([{'cmd': 'echo "bufadd-mnv-2"', 'group': 'TestAutoCmdFns2',
         \ 'pattern': '*.a1b2c3', 'nested': v:false, 'once': v:false,
         \ 'event': 'BufRead'}], l)
 
@@ -4386,7 +4386,7 @@ func Test_autocmd_get()
   " Test for getting autocmds after removing one inside an autocmd
   func CheckAutocmdGet()
     augroup TestAutoCmdFns
-      autocmd! BufAdd *.vim
+      autocmd! BufAdd *.mnv
     augroup END
 
     let expected = [
@@ -4394,14 +4394,14 @@ func Test_autocmd_get()
           \  pattern: '*.py', nested: v:false, once: v:false,
           \  event: 'BufAdd'},
           \ #{cmd: 'echo "bufhidden"', group: 'TestAutoCmdFns',
-          \  pattern: '*.vim', nested: v:false,
+          \  pattern: '*.mnv', nested: v:false,
           \  once: v:false, event: 'BufHidden'}]
 
     call assert_equal(expected, autocmd_get(#{group: 'TestAutoCmdFns'}))
     call assert_equal([expected[0]],
           \ autocmd_get(#{group: 'TestAutoCmdFns', pattern: '*.py'}))
     call assert_equal([expected[1]],
-          \ autocmd_get(#{group: 'TestAutoCmdFns', pattern: '*.vim'}))
+          \ autocmd_get(#{group: 'TestAutoCmdFns', pattern: '*.mnv'}))
   endfunc
 
   autocmd User Xauget call CheckAutocmdGet()
@@ -4423,15 +4423,15 @@ func Test_autocmd_get()
   " Test for nested and once autocmds
   augroup TestAutoCmdFns
     au!
-    autocmd VimSuspend * ++nested echo "suspend"
-    autocmd VimResume * ++once echo "resume"
+    autocmd MNVSuspend * ++nested echo "suspend"
+    autocmd MNVResume * ++once echo "resume"
   augroup END
 
   let expected = [
         \ {'cmd': 'echo "resume"', 'group': 'TestAutoCmdFns', 'pattern': '*',
-        \  'nested': v:false, 'once': v:true, 'event': 'VimResume'},
+        \  'nested': v:false, 'once': v:true, 'event': 'MNVResume'},
         \ {'cmd': 'echo "suspend"', 'group': 'TestAutoCmdFns', 'pattern': '*',
-        \ 'nested': v:true, 'once': v:false, 'event': 'VimSuspend'}]
+        \ 'nested': v:true, 'once': v:false, 'event': 'MNVSuspend'}]
   call assert_equal(expected, autocmd_get(#{group: 'TestAutoCmdFns'}))
 
   " Test for buffer-local autocmd
@@ -4726,7 +4726,7 @@ func Test_autocmd_nested_setbufvar()
   call setline(1, 'bar')
   enew
   au BufWriteCmd Xbbb ++nested call setbufvar('Xaaa', '&ft', 'foo') | bw! Xaaa
-  au FileType foo call py3eval('vim.current.buffer.options["cindent"]')
+  au FileType foo call py3eval('mnv.current.buffer.options["cindent"]')
   wall
 
   au! BufWriteCmd
@@ -4737,13 +4737,13 @@ func Test_autocmd_nested_setbufvar()
   %bwipe!
 endfunc
 
-func SetupVimTest_shm()
+func SetupMNVTest_shm()
   let g:bwe = []
   let g:brp = []
   set shortmess+=F
   messages clear
 
-  let dirname='XVimTestSHM'
+  let dirname='XMNVTestSHM'
   call mkdir(dirname, 'R')
   call writefile(['test'], dirname .. '/1')
   call writefile(['test'], dirname .. '/2')
@@ -4764,7 +4764,7 @@ func SetupVimTest_shm()
 
   " clean up
   noa enew!
-  set shortmess&vim
+  set shortmess&mnv
   augroup test
       autocmd!
   augroup END
@@ -4774,7 +4774,7 @@ endfunc
 func Test_autocmd_shortmess()
   CheckNotMSWindows
 
-  call SetupVimTest_shm()
+  call SetupMNVTest_shm()
   let output = execute(':mess')->split('\n')
 
   let info = copy(output)->filter({idx, val -> val =~# '\d of 3'} )
@@ -4791,15 +4791,15 @@ func Test_autocmd_shortmess()
   call assert_equal(3, info->len())
   call assert_equal(3, bytes->len())
 
-  delfunc SetupVimTest_shm
+  delfunc SetupMNVTest_shm
 endfunc
 
 func Test_autocmd_invalidates_undo_on_textchanged()
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
   let script =<< trim END
     set hidden
     " create quickfix list (at least 2 lines to move line)
-    vimgrep /u/j %
+    mnvgrep /u/j %
 
     " enter quickfix window
     cwindow
@@ -4814,12 +4814,12 @@ func Test_autocmd_invalidates_undo_on_textchanged()
     move+1
   END
   call writefile(script, 'XTest_autocmd_invalidates_undo_on_textchanged', 'D')
-  let buf = RunVimInTerminal('XTest_autocmd_invalidates_undo_on_textchanged', {'rows': 20})
+  let buf = RunMNVInTerminal('XTest_autocmd_invalidates_undo_on_textchanged', {'rows': 20})
   call term_sendkeys(buf, ":so %\<cr>")
   call term_sendkeys(buf, "G")
   call WaitForAssert({-> assert_match('^XTest_autocmd_invalidates_undo_on_textchanged\s*$', term_getline(buf, 20))}, 1000)
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_autocmd_creates_new_window_on_bufleave()
@@ -4835,7 +4835,7 @@ func Test_autocmd_creates_new_window_on_bufleave()
   %bw!
 endfunc
 
-" Ensure `expected` was just recently written as a Vim session
+" Ensure `expected` was just recently written as a MNV session
 func s:assert_session_path(expected)
   call assert_equal(a:expected, v:this_session)
 endfunc
@@ -4854,7 +4854,7 @@ func Test_explicit_session_absolute_path()
   let directory = getcwd()
 
   let v:this_session = ""
-  let name = "some_file.vim"
+  let name = "some_file.mnv"
   let expected = fnamemodify(name, ":p")
   call s:watch_for_session_path(expected)
   execute "mksession! " .. expected
@@ -4869,7 +4869,7 @@ func Test_explicit_session_relative_path()
   let directory = getcwd()
 
   let v:this_session = ""
-  let name = "some_file.vim"
+  let name = "some_file.mnv"
   let expected = fnamemodify(name, ":p")
   call s:watch_for_session_path(expected)
   execute "mksession! " .. name
@@ -4884,7 +4884,7 @@ func Test_implicit_session()
   let directory = getcwd()
 
   let v:this_session = ""
-  let expected = fnamemodify("Session.vim", ":p")
+  let expected = fnamemodify("Session.mnv", ":p")
   call s:watch_for_session_path(expected)
   mksession!
 
@@ -4894,10 +4894,10 @@ endfunc
 " Test TextChangedI and TextChanged
 func Test_Changed_ChangedI()
   " Run this test in a terminal because it requires running the main loop.
-  " Don't use CheckRunVimInTerminal as that will skip the test on Windows.
+  " Don't use CheckRunMNVInTerminal as that will skip the test on Windows.
   CheckFeature terminal
   CheckNotGui
-  " Starting a terminal to run Vim is always considered flaky.
+  " Starting a terminal to run MNV is always considered flaky.
   let g:test_is_flaky = 1
 
   call writefile(['one', 'two', 'three'], 'XTextChangedI2', 'D')
@@ -4919,7 +4919,7 @@ func Test_Changed_ChangedI()
 
   call writefile(before, 'Xinit', 'D')
   let buf = term_start(
-        \ GetVimCommandCleanTerm() .. '-n -S Xinit XTextChangedI2',
+        \ GetMNVCommandCleanTerm() .. '-n -S Xinit XTextChangedI2',
         \ {'term_rows': 10})
   call assert_equal('running', term_getstatus(buf))
   call WaitForAssert({-> assert_true(filereadable('XTextChangedI3'))})
@@ -5013,12 +5013,12 @@ func Test_SwapExists_set_other_buf_filetype()
     autocmd SwapExists * ++nested call SwapExists()
     autocmd SafeState * ++nested ++once call SafeState()
   END
-  call writefile(lines, 'XftSwapExists.vim', 'D')
+  call writefile(lines, 'XftSwapExists.mnv', 'D')
 
-  new XftSwapExists.vim
-  if RunVim('', '', ' -S XftSwapExists.vim')
+  new XftSwapExists.mnv
+  if RunMNV('', '', ' -S XftSwapExists.mnv')
     call assert_equal(
-          \ ['', '  readonly', '  filetype=vim'],
+          \ ['', '  readonly', '  filetype=mnv'],
           \ readfile('XftSwapExists.out'))
     call delete('XftSwapExists.out')
   endif
@@ -5051,10 +5051,10 @@ func Test_SwapExists_set_other_buf_modified()
     autocmd SwapExists * ++nested call SwapExists()
     autocmd SafeState * ++nested ++once call SafeState()
   END
-  call writefile(lines, 'XmodSwapExists.vim', 'D')
+  call writefile(lines, 'XmodSwapExists.mnv', 'D')
 
-  new XmodSwapExists.vim
-  if RunVim('', '', ' -S XmodSwapExists.vim')
+  new XmodSwapExists.mnv
+  if RunMNV('', '', ' -S XmodSwapExists.mnv')
     call assert_equal(
           \ ['', '  readonly', 'nomodified'],
           \ readfile('XmodSwapExists.out'))
@@ -5076,7 +5076,7 @@ func Test_BufEnter_botline()
   bwipe! Xxx1
   bwipe! Xxx2
   au! BufEnter Xxx1
-  set hidden&vim
+  set hidden&mnv
 endfunc
 
 func Test_KeyInputPre()
@@ -5190,7 +5190,7 @@ func Test_WinNewPre_crash()
 endfunc
 
 " The specifics of the turkish locale may
-" cause that Vim will not treat the GuiEnter autocommand
+" cause that MNV will not treat the GuiEnter autocommand
 " as case insensitive and instead issues an error
 func Test_GuiEnter_Turkish_locale()
   try
@@ -5306,7 +5306,7 @@ func Test_eventignorewin()
 endfunc
 
 func Test_WinScrolled_Resized_eiw()
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   let lines =<< trim END
     call setline(1, ['foo']->repeat(32))
@@ -5317,7 +5317,7 @@ func Test_WinScrolled_Resized_eiw()
     au WinResized * let [g:afile,g:resized] = [expand('<afile>'),g:resized+1]
   END
   call writefile(lines, 'Xtest_winscrolled_eiw', 'D')
-  let buf = RunVimInTerminal('-S Xtest_winscrolled_eiw', {'rows': 10})
+  let buf = RunMNVInTerminal('-S Xtest_winscrolled_eiw', {'rows': 10})
 
   " Both windows are ignoring resize events
   call term_sendkeys(buf, "\<C-W>-")
@@ -5337,7 +5337,7 @@ func Test_WinScrolled_Resized_eiw()
   call term_sendkeys(buf, ":echo win_getid() g:afile g:resized g:scrolled\<CR>")
   call WaitForAssert({-> assert_equal('1000 1001 1 1', term_getline(buf, 10))}, 1000)
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 " Test that TabClosedPre and TabClosed are triggered when closing a tab.
@@ -5558,7 +5558,7 @@ func Test_autocmd_TabClosedPre()
   tabnew A
   sp
   tabclose
-  source Session.vim
+  source Session.mnv
   call assert_equal('1Z2>AA', GetTabs())
 
   " Test directly closing the tab page with ':tabonly'
@@ -5571,11 +5571,11 @@ func Test_autocmd_TabClosedPre()
   tabnew A
   tabnew B
   tabonly
-  source Session.vim
+  source Session.mnv
   call assert_equal('1>A2B', GetTabs())
 
   " Clean up
-  call delete('Session.vim')
+  call delete('Session.mnv')
   au!
   only
   tabonly
@@ -5814,29 +5814,29 @@ func Test_eventignore_subtract()
   %bw!
 endfunc
 
-func Test_VimResized_and_window_width_not_equalized()
-  CheckRunVimInTerminal
+func Test_MNVResized_and_window_width_not_equalized()
+  CheckRunMNVInTerminal
 
   let lines =<< trim END
-    let g:vim_resized = 0
-    autocmd VimResized * let g:vim_resized = 1
+    let g:mnv_resized = 0
+    autocmd MNVResized * let g:mnv_resized = 1
     10vsplit
   END
-  call writefile(lines, 'XTest_VimResize', 'D')
-  let buf = RunVimInTerminal('-S XTest_VimResize', {'rows': 10, 'cols': 30})
+  call writefile(lines, 'XTest_MNVResize', 'D')
+  let buf = RunMNVInTerminal('-S XTest_MNVResize', {'rows': 10, 'cols': 30})
 
   " redraw now to avoid a redraw after the :echo command
   call term_sendkeys(buf, ":redraw!\<CR>")
   call TermWait(buf)
 
   call term_sendkeys(buf, ":set columns=40\<CR>")
-  call term_sendkeys(buf, ":echo 'VimResized:' g:vim_resized\<CR>")
-  call WaitForAssert({-> assert_match('^VimResized: 1$', term_getline(buf, 10))}, 1000)
+  call term_sendkeys(buf, ":echo 'MNVResized:' g:mnv_resized\<CR>")
+  call WaitForAssert({-> assert_match('^MNVResized: 1$', term_getline(buf, 10))}, 1000)
   call term_sendkeys(buf, ":let window_width = getwininfo(win_getid())[0].width\<CR>")
   call term_sendkeys(buf, ":echo 'window_width:' window_width\<CR>")
   call WaitForAssert({-> assert_match('^window_width: 10$', term_getline(buf, 10))}, 1000)
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_win_tabclose_autocmd()
@@ -5951,10 +5951,10 @@ func Test_SwapExists_b_nwindows()
     autocmd SwapExists * ++nested ++once call SwapExists()
     autocmd SafeState * ++nested ++once call SafeState()
   END
-  call writefile(lines, 'XnwindowsSwapExists.vim', 'D')
+  call writefile(lines, 'XnwindowsSwapExists.mnv', 'D')
 
-  new XnwindowsSwapExists.vim
-  if RunVim('', '', ' -S XnwindowsSwapExists.vim')
+  new XnwindowsSwapExists.mnv
+  if RunMNV('', '', ' -S XnwindowsSwapExists.mnv')
     call assert_equal(['0'], readfile('XnwindowsSwapExists.out'))
     call delete('XnwindowsSwapExists.out')
   endif
@@ -5967,4 +5967,4 @@ func Test_autocmd_add_secure()
   call assert_fails('sandbox call autocmd_delete([{"event": "BufRead"}])', 'E48:')
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_autoload.vim b/uvim/src/testdir/test_autoload.mnv
index d0f913660e..718b9f54fc 100644
--- a/uvim/src/testdir/test_autoload.vim
+++ b/uvim/src/testdir/test_autoload.mnv
@@ -3,10 +3,10 @@
 set runtimepath=./sautest
 
 func Test_autoload_dict_func()
-  let g:loaded_foo_vim = 0
+  let g:loaded_foo_mnv = 0
   let g:called_foo_bar_echo = 0
   call g:foo#bar.echo()
-  call assert_equal(1, g:loaded_foo_vim)
+  call assert_equal(1, g:loaded_foo_mnv)
   call assert_equal(1, g:called_foo_bar_echo)
 
   eval 'bar'->g:foo#addFoo()->assert_equal('barfoo')
@@ -16,14 +16,14 @@ func Test_autoload_dict_func()
 endfunc
 
 func Test_source_autoload()
-  let g:loaded_sourced_vim = 0
-  source sautest/autoload/sourced.vim
-  call assert_equal(1, g:loaded_sourced_vim)
+  let g:loaded_sourced_mnv = 0
+  source sautest/autoload/sourced.mnv
+  call assert_equal(1, g:loaded_sourced_mnv)
 endfunc
 
-func Test_autoload_vim9script()
+func Test_autoload_mnv9script()
   call assert_equal('some', auto9#Getsome())
   call assert_equal(49, auto9#Add42(7))
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_backspace_opt.vim b/uvim/src/testdir/test_backspace_opt.mnv
index ea28803e74..ee63ad5240 100644
--- a/uvim/src/testdir/test_backspace_opt.vim
+++ b/uvim/src/testdir/test_backspace_opt.mnv
@@ -33,7 +33,7 @@ func Test_backspace_option()
   " Check the error
   call assert_fails('set backspace=ABC', 'E474:')
   call assert_fails('set backspace+=def', 'E474:')
-  " NOTE: Vim doesn't check following error...
+  " NOTE: MNV doesn't check following error...
   "call assert_fails('set backspace-=ghi', 'E474:')
 
   " Check backwards compatibility with version 5.4 and earlier
@@ -51,7 +51,7 @@ func Test_backspace_option()
   " Cleared when 'compatible' is set
   set compatible
   call assert_equal('', &backspace)
-  set nocompatible viminfo+=nviminfo
+  set nocompatible mnvinfo+=nmnvinfo
 endfunc
 
 " Test with backspace set to the non-compatible setting
@@ -71,22 +71,22 @@ func Test_backspace_ctrl_u()
   set compatible
   set backspace=2
 
-  exe "normal Avim1\<C-U>\<Esc>\<CR>"
-  exe "normal Avim2\<C-G>u\<C-U>\<Esc>\<CR>"
+  exe "normal Amnv1\<C-U>\<Esc>\<CR>"
+  exe "normal Amnv2\<C-G>u\<C-U>\<Esc>\<CR>"
 
   set cpo-=<
   inoremap <c-u> <left><c-u>
-  exe "normal Avim3\<*C-U>\<Esc>\<CR>"
+  exe "normal Amnv3\<*C-U>\<Esc>\<CR>"
   iunmap <c-u>
-  exe "normal Avim4\<C-U>\<C-U>\<Esc>\<CR>"
+  exe "normal Amnv4\<C-U>\<C-U>\<Esc>\<CR>"
 
   " Test with backspace set to the compatible setting
   set backspace= visualbell
-  exe "normal A vim5\<Esc>A\<C-U>\<C-U>\<Esc>\<CR>"
-  exe "normal A vim6\<Esc>Azwei\<C-G>u\<C-U>\<Esc>\<CR>"
+  exe "normal A mnv5\<Esc>A\<C-U>\<C-U>\<Esc>\<CR>"
+  exe "normal A mnv6\<Esc>Azwei\<C-G>u\<C-U>\<Esc>\<CR>"
 
   inoremap <c-u> <left><c-u>
-  exe "normal A vim7\<*C-U>\<*C-U>\<Esc>\<CR>"
+  exe "normal A mnv7\<*C-U>\<*C-U>\<Esc>\<CR>"
 
   call assert_equal([
         \ "1 this shouldn't be deleted",
@@ -94,15 +94,15 @@ func Test_backspace_ctrl_u()
         \ "3 this shouldn't be deleted",
         \ "4 this should be deleted3",
         \ "",
-        \ "6 this shouldn't be deleted vim5",
-        \ "7 this shouldn't be deleted vim6",
-        \ "8 this shouldn't be deleted (not touched yet) vim7",
+        \ "6 this shouldn't be deleted mnv5",
+        \ "7 this shouldn't be deleted mnv6",
+        \ "8 this shouldn't be deleted (not touched yet) mnv7",
         \ ""], getline(1, '$'))
 
   " Reset values
-  set compatible&vim
-  set visualbell&vim
-  set backspace&vim
+  set compatible&mnv
+  set visualbell&mnv
+  set backspace&mnv
 
   " Test new nostop option
   %d_
@@ -132,9 +132,9 @@ func Test_backspace_ctrl_u()
   endfor
 
   " Reset options
-  set compatible&vim
-  set visualbell&vim
-  set backspace&vim
+  set compatible&mnv
+  set visualbell&mnv
+  set backspace&mnv
   close!
 endfunc
 
@@ -166,4 +166,4 @@ func Test_backspace_number_value()
   set backspace&
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_backup.vim b/uvim/src/testdir/test_backup.mnv
index 3c24a69bff..61a831e5a2 100644
--- a/uvim/src/testdir/test_backup.vim
+++ b/uvim/src/testdir/test_backup.mnv
@@ -12,7 +12,7 @@ func Test_backup()
   let l = readfile('Xbackup.txt~')
   call assert_equal(['line1', 'line2'], l)
   bw!
-  set backup&vim backupdir&vim backupskip&vim
+  set backup&mnv backupdir&mnv backupskip&mnv
   call delete('Xbackup.txt')
   call delete('Xbackup.txt~')
 endfunc
@@ -28,7 +28,7 @@ func Test_backup_backupskip()
   :w! Xbackup.txt
   call assert_false(filereadable('Xbackup.txt~'))
   bw!
-  set backup&vim backupdir&vim backupskip&vim
+  set backup&mnv backupdir&mnv backupskip&mnv
   call delete('Xbackup.txt')
   call delete('Xbackup.txt~')
 endfunc
@@ -50,7 +50,7 @@ func Test_backup2()
   bw!
   call delete('Xbackup.txt')
   call delete(f)
-  set backup&vim backupdir&vim backupskip&vim
+  set backup&mnv backupdir&mnv backupskip&mnv
 endfunc
 
 func Test_backup2_backupcopy()
@@ -70,7 +70,7 @@ func Test_backup2_backupcopy()
   bw!
   call delete('Xbackup.txt')
   call delete(f)
-  set backup&vim backupdir&vim backupcopy&vim backupskip&vim
+  set backup&mnv backupdir&mnv backupcopy&mnv backupskip&mnv
 endfunc
 
 " Test for using a non-existing directory as a backup directory
@@ -80,7 +80,7 @@ func Test_non_existing_backupdir()
   new Xbackupdir
   call assert_fails('write', 'E510:')
 
-  set backupdir&vim backupskip&vim
+  set backupdir&mnv backupskip&mnv
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_balloon.vim b/uvim/src/testdir/test_balloon.mnv
index 8ff2f263ae..756564d6d2 100644
--- a/uvim/src/testdir/test_balloon.vim
+++ b/uvim/src/testdir/test_balloon.mnv
@@ -4,7 +4,7 @@
 CheckNotGui
 CheckFeature balloon_eval_term
 
-source util/screendump.vim
+source util/screendump.mnv
 
 let s:common_script =<< trim [CODE]
   call setline(1, ["one one one", "two tXo two", "three three three"])
@@ -31,7 +31,7 @@ func Test_balloon_eval_term()
   call writefile(s:common_script + xtra_lines, 'XTest_beval', 'D')
 
   " Check that the balloon shows up after a mouse move
-  let buf = RunVimInTerminal('-S XTest_beval', {'rows': 10, 'cols': 50})
+  let buf = RunMNVInTerminal('-S XTest_beval', {'rows': 10, 'cols': 50})
   call TermWait(buf, 50)
   call term_sendkeys(buf, 'll')
   call term_sendkeys(buf, ":call Trigger()\<CR>")
@@ -44,7 +44,7 @@ func Test_balloon_eval_term()
   call VerifyScreenDump(buf, 'Test_balloon_eval_term_01a', {})
 
   " clean up
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_balloon_eval_term_visual()
@@ -59,13 +59,13 @@ func Test_balloon_eval_term_visual()
 	\ ], 'XTest_beval_visual', 'D')
 
   " Check that the balloon shows up after a mouse move
-  let buf = RunVimInTerminal('-S XTest_beval_visual', {'rows': 10, 'cols': 50})
+  let buf = RunMNVInTerminal('-S XTest_beval_visual', {'rows': 10, 'cols': 50})
   call TermWait(buf, 50)
   call WaitForAssert({-> assert_match('-- VISUAL --', term_getline(buf, 10))})
   call VerifyScreenDump(buf, 'Test_balloon_eval_term_02', {})
 
   " clean up
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_balloon_eval_term_rightleft()
@@ -84,14 +84,14 @@ func Test_balloon_eval_term_rightleft()
   call writefile(s:common_script + xtra_lines, 'XTest_beval_rl', 'D')
 
   " Check that the balloon shows up after a mouse move
-  let buf = RunVimInTerminal('-S XTest_beval_rl', {'rows': 10, 'cols': 50})
+  let buf = RunMNVInTerminal('-S XTest_beval_rl', {'rows': 10, 'cols': 50})
   call TermWait(buf, 50)
   call term_sendkeys(buf, 'll')
   call term_sendkeys(buf, ":call Trigger()\<CR>")
   call VerifyScreenDump(buf, 'Test_balloon_eval_term_03', {})
 
   " clean up
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_balloon_gui.vim b/uvim/src/testdir/test_balloon_gui.mnv
index 9043877520..085d5bfbad 100644
--- a/uvim/src/testdir/test_balloon_gui.vim
+++ b/uvim/src/testdir/test_balloon_gui.mnv
@@ -17,4 +17,4 @@ func Test_balloon_show_gui()
   call balloon_show('')
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_behave.vim b/uvim/src/testdir/test_behave.mnv
index 72411b4870..13b658026a 100644
--- a/uvim/src/testdir/test_behave.vim
+++ b/uvim/src/testdir/test_behave.mnv
@@ -28,4 +28,4 @@ func Test_behave_error()
   call assert_fails('behave x', 'E475:')
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_bench_regexp.vim b/uvim/src/testdir/test_bench_regexp.mnv
index 636d832a27..089489a510 100644
--- a/uvim/src/testdir/test_bench_regexp.vim
+++ b/uvim/src/testdir/test_bench_regexp.mnv
@@ -9,7 +9,7 @@ func Measure(file, pattern, arg)
     let after = ['call search("' .. escape(a:pattern, '\\') .. '", "", "", 10000)']
     let after += ['quit!']
     let args = empty(a:arg) ? '' : a:arg .. ' ' .. a:file
-    call RunVim(before, after, args)
+    call RunMNV(before, after, args)
     let s = 'file: ' .. a:file .. ', re: ' .. re ..
           \ ', time: ' .. reltimestr(reltime(sstart))
     call writefile([s], 'benchmark.out', "a")
@@ -20,4 +20,4 @@ func Test_Regex_Benchmark()
   call Measure('samples/re.freeze.txt', '\s\+\%#\@<!$', '+5')
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_blob.vim b/uvim/src/testdir/test_blob.mnv
index 34a5cb7509..1a0db2d6d1 100644
--- a/uvim/src/testdir/test_blob.vim
+++ b/uvim/src/testdir/test_blob.mnv
@@ -1,6 +1,6 @@
 " Tests for the Blob types
 
-import './util/vim9.vim' as v9
+import './util/mnv9.mnv' as v9
 
 func TearDown()
   " Run garbage collection after every test
@@ -39,7 +39,7 @@ func Test_blob_create()
       call assert_equal(0, len(test_null_blob()))
       call assert_equal(0z, copy(test_null_blob()))
   END
-  call v9.CheckLegacyAndVim9Success(lines)
+  call v9.CheckLegacyAndMNV9Success(lines)
 endfunc
 
 " assignment to a blob
@@ -82,61 +82,61 @@ func Test_blob_assign()
       LET blob1 += 0z20
       call assert_equal(0z20, blob1)
   END
-  call v9.CheckLegacyAndVim9Success(lines)
+  call v9.CheckLegacyAndMNV9Success(lines)
 
   let lines =<< trim END
       VAR b = 0zDEADBEEF
       LET b[2 : 3] = 0z112233
   END
-  call v9.CheckLegacyAndVim9Failure(lines, 'E972:')
+  call v9.CheckLegacyAndMNV9Failure(lines, 'E972:')
 
   let lines =<< trim END
       VAR b = 0zDEADBEEF
       LET b[2 : 3] = 0z11
   END
-  call v9.CheckLegacyAndVim9Failure(lines, 'E972:')
+  call v9.CheckLegacyAndMNV9Failure(lines, 'E972:')
 
   let lines =<< trim END
       VAR b = 0zDEADBEEF
       LET b[3 : 2] = 0z
   END
-  call v9.CheckLegacyAndVim9Failure(lines, 'E979:')
+  call v9.CheckLegacyAndMNV9Failure(lines, 'E979:')
 
   let lines =<< trim END
       VAR b = 0zDEADBEEF
       LET b[0 : 1] = 0x1122
   END
-  call v9.CheckLegacyAndVim9Failure(lines, ['E709:', 'E1012:', 'E709:'])
+  call v9.CheckLegacyAndMNV9Failure(lines, ['E709:', 'E1012:', 'E709:'])
 
   let lines =<< trim END
       VAR b = 0zDEADBEEF
       LET b[0] = 0z11
   END
-  call v9.CheckLegacyAndVim9Failure(lines, ['E974:', 'E974:', 'E1012:'])
+  call v9.CheckLegacyAndMNV9Failure(lines, ['E974:', 'E974:', 'E1012:'])
 
   let lines =<< trim END
       VAR b = 0zDEADBEEF
       LET b ..= 0z33
   END
-  call v9.CheckLegacyAndVim9Failure(lines, ['E734:', 'E1019:', 'E734:'])
+  call v9.CheckLegacyAndMNV9Failure(lines, ['E734:', 'E1019:', 'E734:'])
 
   let lines =<< trim END
       VAR b = 0zDEADBEEF
       LET b ..= "xx"
   END
-  call v9.CheckLegacyAndVim9Failure(lines, ['E734:', 'E1019:', 'E734:'])
+  call v9.CheckLegacyAndMNV9Failure(lines, ['E734:', 'E1019:', 'E734:'])
 
   let lines =<< trim END
       VAR b = 0zDEADBEEF
       LET b += "xx"
   END
-  call v9.CheckLegacyAndVim9Failure(lines, ['E734:', 'E1012:', 'E734:'])
+  call v9.CheckLegacyAndMNV9Failure(lines, ['E734:', 'E1012:', 'E734:'])
 
   let lines =<< trim END
       VAR b = 0zDEADBEEF
       LET b[1 : 1] ..= 0z55
   END
-  call v9.CheckLegacyAndVim9Failure(lines, ['E734:', 'E1183:', 'E734:'])
+  call v9.CheckLegacyAndMNV9Failure(lines, ['E734:', 'E1183:', 'E734:'])
 
   call assert_fails('let b = readblob("a1b2c3")', 'E484:')
 endfunc
@@ -154,7 +154,7 @@ func Test_blob_get_range()
       call assert_equal(0z, b[5 : 6])
       call assert_equal(0z0011, b[-10 : 1])
   END
-  call v9.CheckLegacyAndVim9Success(lines)
+  call v9.CheckLegacyAndMNV9Success(lines)
 
   " legacy script white space
   let b = 0z0011223344
@@ -179,19 +179,19 @@ func Test_blob_get()
       call assert_equal(0x44, b[4])
       call assert_equal(0x44, b[-1])
   END
-  call v9.CheckLegacyAndVim9Success(lines)
+  call v9.CheckLegacyAndMNV9Success(lines)
 
   let lines =<< trim END
       VAR b = 0z0011223344
       echo b[5]
   END
-  call v9.CheckLegacyAndVim9Failure(lines, 'E979:')
+  call v9.CheckLegacyAndMNV9Failure(lines, 'E979:')
 
   let lines =<< trim END
       VAR b = 0z0011223344
       echo b[-8]
   END
-  call v9.CheckLegacyAndVim9Failure(lines, 'E979:')
+  call v9.CheckLegacyAndMNV9Failure(lines, 'E979:')
 endfunc
 
 func Test_blob_to_string()
@@ -205,7 +205,7 @@ func Test_blob_to_string()
       call assert_equal('0z', string(b))
       call assert_equal('0z', string(test_null_blob()))
   END
-  call v9.CheckLegacyAndVim9Success(lines)
+  call v9.CheckLegacyAndMNV9Success(lines)
 endfunc
 
 func Test_blob_compare()
@@ -234,54 +234,54 @@ func Test_blob_compare()
       call assert_true(0z != 0z10)
       call assert_true(0z10 != 0z)
   END
-  call v9.CheckLegacyAndVim9Success(lines)
+  call v9.CheckLegacyAndMNV9Success(lines)
 
   let lines =<< trim END
       VAR b1 = 0z0011
       echo b1 == 9
   END
-  call v9.CheckLegacyAndVim9Failure(lines, ['E977:', 'E1072:', 'E1072:'])
+  call v9.CheckLegacyAndMNV9Failure(lines, ['E977:', 'E1072:', 'E1072:'])
 
   let lines =<< trim END
       VAR b1 = 0z0011
       echo b1 != 9
   END
-  call v9.CheckLegacyAndVim9Failure(lines, ['E977:', 'E1072:', 'E1072:'])
+  call v9.CheckLegacyAndMNV9Failure(lines, ['E977:', 'E1072:', 'E1072:'])
 
   let lines =<< trim END
       VAR b1 = 0z0011
       VAR b2 = 0z1100
       VAR x = b1 > b2
   END
-  call v9.CheckLegacyAndVim9Failure(lines, ['E978:', 'E1072:', 'E1072:'])
+  call v9.CheckLegacyAndMNV9Failure(lines, ['E978:', 'E1072:', 'E1072:'])
 
   let lines =<< trim END
       VAR b1 = 0z0011
       VAR b2 = 0z1100
       VAR x = b1 < b2
   END
-  call v9.CheckLegacyAndVim9Failure(lines, ['E978:', 'E1072:', 'E1072:'])
+  call v9.CheckLegacyAndMNV9Failure(lines, ['E978:', 'E1072:', 'E1072:'])
 
   let lines =<< trim END
       VAR b1 = 0z0011
       VAR b2 = 0z1100
       VAR x = b1 - b2
   END
-  call v9.CheckLegacyAndVim9Failure(lines, ['E974:', 'E1036:', 'E974:'])
+  call v9.CheckLegacyAndMNV9Failure(lines, ['E974:', 'E1036:', 'E974:'])
 
   let lines =<< trim END
       VAR b1 = 0z0011
       VAR b2 = 0z1100
       VAR x = b1 / b2
   END
-  call v9.CheckLegacyAndVim9Failure(lines, ['E974:', 'E1036:', 'E974:'])
+  call v9.CheckLegacyAndMNV9Failure(lines, ['E974:', 'E1036:', 'E974:'])
 
   let lines =<< trim END
       VAR b1 = 0z0011
       VAR b2 = 0z1100
       VAR x = b1 * b2
   END
-  call v9.CheckLegacyAndVim9Failure(lines, ['E974:', 'E1036:', 'E974:'])
+  call v9.CheckLegacyAndMNV9Failure(lines, ['E974:', 'E1036:', 'E974:'])
 endfunc
 
 func Test_blob_index_assign()
@@ -292,31 +292,31 @@ func Test_blob_index_assign()
       LET b[0] = 0x33
       call assert_equal(0z331122, b)
   END
-  call v9.CheckLegacyAndVim9Success(lines)
+  call v9.CheckLegacyAndMNV9Success(lines)
 
   let lines =<< trim END
       VAR b = 0z00
       LET b[2] = 0x33
   END
-  call v9.CheckLegacyAndVim9Failure(lines, 'E979:')
+  call v9.CheckLegacyAndMNV9Failure(lines, 'E979:')
 
   let lines =<< trim END
       VAR b = 0z00
       LET b[-2] = 0x33
   END
-  call v9.CheckLegacyAndVim9Failure(lines, 'E979:')
+  call v9.CheckLegacyAndMNV9Failure(lines, 'E979:')
 
   let lines =<< trim END
       VAR b = 0z00010203
       LET b[0 : -1] = 0z33
   END
-  call v9.CheckLegacyAndVim9Failure(lines, 'E979:')
+  call v9.CheckLegacyAndMNV9Failure(lines, 'E979:')
 
   let lines =<< trim END
       VAR b = 0z00010203
       LET b[3 : 4] = 0z3344
   END
-  call v9.CheckLegacyAndVim9Failure(lines, 'E979:')
+  call v9.CheckLegacyAndMNV9Failure(lines, 'E979:')
 endfunc
 
 func Test_blob_for_loop()
@@ -349,7 +349,7 @@ func Test_blob_for_loop()
       endfor
       call assert_equal(5, i)
   END
-  call v9.CheckLegacyAndVim9Success(lines)
+  call v9.CheckLegacyAndMNV9Success(lines)
 
   " Test for skipping the loop var assignment in a for loop
   let lines =<< trim END
@@ -360,7 +360,7 @@ func Test_blob_for_loop()
     endfor
     call assert_equal(3, c)
   END
-  call v9.CheckLegacyAndVim9Success(lines)
+  call v9.CheckLegacyAndMNV9Success(lines)
 endfunc
 
 func Test_blob_concatenate()
@@ -372,19 +372,19 @@ func Test_blob_concatenate()
       LET b = 0zDEAD + 0zBEEF
       call assert_equal(0zDEADBEEF, b)
   END
-  call v9.CheckLegacyAndVim9Success(lines)
+  call v9.CheckLegacyAndMNV9Success(lines)
 
   let lines =<< trim END
       VAR b = 0z0011
       LET b += "a"
   END
-  call v9.CheckLegacyAndVim9Failure(lines, ['E734:', 'E1012:', 'E734:'])
+  call v9.CheckLegacyAndMNV9Failure(lines, ['E734:', 'E1012:', 'E734:'])
 
   let lines =<< trim END
       VAR b = 0z0011
       LET b += 88
   END
-  call v9.CheckLegacyAndVim9Failure(lines, ['E734:', 'E1012:', 'E734:'])
+  call v9.CheckLegacyAndMNV9Failure(lines, ['E734:', 'E1012:', 'E734:'])
 endfunc
 
 func Test_blob_add()
@@ -393,7 +393,7 @@ func Test_blob_add()
       call add(b, 0x22)
       call assert_equal(0z001122, b)
   END
-  call v9.CheckLegacyAndVim9Success(lines)
+  call v9.CheckLegacyAndMNV9Success(lines)
 
   " Only works in legacy script
   let b = 0z0011
@@ -405,13 +405,13 @@ func Test_blob_add()
       VAR b = 0z0011
       call add(b, [9])
   END
-  call v9.CheckLegacyAndVim9Failure(lines, ['E745:', 'E1012:', 'E1210:'])
+  call v9.CheckLegacyAndMNV9Failure(lines, ['E745:', 'E1012:', 'E1210:'])
 
   let lines =<< trim END
       VAR b = 0z0011
       call add("", 0x01)
   END
-  call v9.CheckLegacyAndVim9Failure(lines, ['E897:', 'E1013:', 'E1226:'])
+  call v9.CheckLegacyAndMNV9Failure(lines, ['E897:', 'E1013:', 'E1226:'])
 
   let lines =<< trim END
       add(test_null_blob(), 0x22)
@@ -458,38 +458,38 @@ func Test_blob_func_remove()
       call assert_equal(0zADBE, remove(b, 1, 2))
       call assert_equal(0zDEEF, b)
   END
-  call v9.CheckLegacyAndVim9Success(lines)
+  call v9.CheckLegacyAndMNV9Success(lines)
 
   " Test invalid cases
   let lines =<< trim END
       VAR b = 0zDEADBEEF
       call remove(b, 5)
   END
-  call v9.CheckLegacyAndVim9Failure(lines, 'E979:')
+  call v9.CheckLegacyAndMNV9Failure(lines, 'E979:')
 
   let lines =<< trim END
       VAR b = 0zDEADBEEF
       call remove(b, 1, 5)
   END
-  call v9.CheckLegacyAndVim9Failure(lines, 'E979:')
+  call v9.CheckLegacyAndMNV9Failure(lines, 'E979:')
 
   let lines =<< trim END
       VAR b = 0zDEADBEEF
       call remove(b, -10)
   END
-  call v9.CheckLegacyAndVim9Failure(lines, 'E979:')
+  call v9.CheckLegacyAndMNV9Failure(lines, 'E979:')
 
   let lines =<< trim END
       VAR b = 0zDEADBEEF
       call remove(b, 3, 2)
   END
-  call v9.CheckLegacyAndVim9Failure(lines, 'E979:')
+  call v9.CheckLegacyAndMNV9Failure(lines, 'E979:')
 
   let lines =<< trim END
       VAR b = 0zDEADBEEF
       call remove(test_null_blob(), 1, 2)
   END
-  call v9.CheckLegacyAndVim9Failure(lines, 'E979:')
+  call v9.CheckLegacyAndMNV9Failure(lines, 'E979:')
 
   let lines =<< trim END
       let b = 0zDEADBEEF
@@ -501,7 +501,7 @@ func Test_blob_func_remove()
 
   " can only check at script level, not in a :def function
   let lines =<< trim END
-      vim9script
+      mnv9script
       var b = 0zDEADBEEF
       lockvar b
       remove(b, 0)
@@ -543,7 +543,7 @@ func Test_blob_read_write()
 
       call delete('Xblob')
   END
-  call v9.CheckLegacyAndVim9Success(lines)
+  call v9.CheckLegacyAndMNV9Success(lines)
 
   if filereadable('/dev/random')
     let b = readblob('/dev/random', 0, 10)
@@ -569,7 +569,7 @@ func Test_blob_filter()
       call assert_equal(0z01030103, filter(0z010203010203, 'v:val != 0x02'))
       call assert_equal(0zADEF, filter(0zDEADBEEF, 'v:key % 2'))
   END
-  call v9.CheckLegacyAndVim9Success(lines)
+  call v9.CheckLegacyAndMNV9Success(lines)
   call assert_fails('echo filter(0z10, "a10")', 'E121:')
 endfunc
 
@@ -580,12 +580,12 @@ func Test_blob_map()
       call assert_equal(0z00010203, map(0zDEADBEEF, 'v:key'))
       call assert_equal(0zDEAEC0F2, map(0zDEADBEEF, 'v:key + v:val'))
   END
-  call v9.CheckLegacyAndVim9Success(lines)
+  call v9.CheckLegacyAndMNV9Success(lines)
 
   let lines =<< trim END
       call map(0z00, '[9]')
   END
-  call v9.CheckLegacyAndVim9Failure(lines, 'E978:')
+  call v9.CheckLegacyAndMNV9Failure(lines, 'E978:')
   call assert_fails('echo map(0z10, "a10")', 'E121:')
 endfunc
 
@@ -600,7 +600,7 @@ func Test_blob_index()
       call assert_equal(0, index(0z11110111, 0x11, -10))
       call assert_equal(-1, index(test_null_blob(), 1))
   END
-  call v9.CheckLegacyAndVim9Success(lines)
+  call v9.CheckLegacyAndMNV9Success(lines)
 endfunc
 
 func Test_blob_insert()
@@ -613,7 +613,7 @@ func Test_blob_insert()
       call insert(b, 0x33, 2)
       call assert_equal(0zDEAD33BEEF, b)
   END
-  call v9.CheckLegacyAndVim9Success(lines)
+  call v9.CheckLegacyAndMNV9Success(lines)
 
   " only works in legacy script
   call assert_equal(0, insert(test_null_blob(), 0x33))
@@ -622,37 +622,37 @@ func Test_blob_insert()
       VAR b = 0zDEADBEEF
       call insert(b, -1)
   END
-  call v9.CheckLegacyAndVim9Failure(lines, 'E475:')
+  call v9.CheckLegacyAndMNV9Failure(lines, 'E475:')
 
   let lines =<< trim END
       VAR b = 0zDEADBEEF
       call insert(b, 257)
   END
-  call v9.CheckLegacyAndVim9Failure(lines, 'E475:')
+  call v9.CheckLegacyAndMNV9Failure(lines, 'E475:')
 
   let lines =<< trim END
       VAR b = 0zDEADBEEF
       call insert(b, 0, [9])
   END
-  call v9.CheckLegacyAndVim9Failure(lines, ['E745:', 'E1013:', 'E1210:'])
+  call v9.CheckLegacyAndMNV9Failure(lines, ['E745:', 'E1013:', 'E1210:'])
 
   let lines =<< trim END
       VAR b = 0zDEADBEEF
       call insert(b, 0, -20)
   END
-  call v9.CheckLegacyAndVim9Failure(lines, 'E475:')
+  call v9.CheckLegacyAndMNV9Failure(lines, 'E475:')
 
   let lines =<< trim END
       VAR b = 0zDEADBEEF
       call insert(b, 0, 20)
   END
-  call v9.CheckLegacyAndVim9Failure(lines, 'E475:')
+  call v9.CheckLegacyAndMNV9Failure(lines, 'E475:')
 
   let lines =<< trim END
       VAR b = 0zDEADBEEF
       call insert(b, [])
   END
-  call v9.CheckLegacyAndVim9Failure(lines, ['E745:', 'E1013:', 'E1210:'])
+  call v9.CheckLegacyAndMNV9Failure(lines, ['E745:', 'E1013:', 'E1210:'])
 
   let lines =<< trim END
       insert(test_null_blob(), 0x33)
@@ -668,7 +668,7 @@ func Test_blob_insert()
   call v9.CheckScriptFailure(lines, 'E741:')
 
   let lines =<< trim END
-      vim9script
+      mnv9script
       var b = 0zDEADBEEF
       lockvar b
       insert(b, 3)
@@ -684,7 +684,7 @@ func Test_blob_reverse()
       call assert_equal(0zDE, reverse(0zDE))
       call assert_equal(0z, reverse(test_null_blob()))
   END
-  call v9.CheckLegacyAndVim9Success(lines)
+  call v9.CheckLegacyAndMNV9Success(lines)
 endfunc
 
 func Test_blob_json_encode()
@@ -692,7 +692,7 @@ func Test_blob_json_encode()
       call assert_equal('[222,173,190,239]', json_encode(0zDEADBEEF))
       call assert_equal('[]', json_encode(0z))
   END
-  call v9.CheckLegacyAndVim9Success(lines)
+  call v9.CheckLegacyAndMNV9Success(lines)
 endfunc
 
 func Test_blob_lock()
@@ -705,7 +705,7 @@ func Test_blob_lock()
   call v9.CheckScriptSuccess(lines)
 
   let lines =<< trim END
-      vim9script
+      mnv9script
       var b = 0z112233
       lockvar b
       unlockvar b
@@ -721,7 +721,7 @@ func Test_blob_lock()
   call v9.CheckScriptFailure(lines, 'E741:')
 
   let lines =<< trim END
-      vim9script
+      mnv9script
       var b = 0z112233
       lockvar b
       b = 0z44
@@ -730,8 +730,8 @@ func Test_blob_lock()
 endfunc
 
 func Test_blob_sort()
-  call v9.CheckLegacyAndVim9Failure(['call sort([1.0, 0z11], "f")'], 'E975:')
-  call v9.CheckLegacyAndVim9Failure(['call sort([11, 0z11], "N")'], 'E974:')
+  call v9.CheckLegacyAndMNV9Failure(['call sort([1.0, 0z11], "f")'], 'E975:')
+  call v9.CheckLegacyAndMNV9Failure(['call sort([11, 0z11], "N")'], 'E974:')
 endfunc
 
 " Tests for the blob2list() function
@@ -832,7 +832,7 @@ func Test_blob_alloc_failure()
 
   " readblob()
   call test_alloc_fail(GetAllocId('blob_alloc'), 0, 0)
-  call assert_fails('let x = readblob("test_blob.vim")', 'E342:')
+  call assert_fails('let x = readblob("test_blob.mnv")', 'E342:')
   call assert_equal(0, x)
 endfunc
 
@@ -873,7 +873,7 @@ func Test_blob_items()
     call assert_equal([], 0z->items())
     call assert_equal([], test_null_blob()->items())
   END
-  call v9.CheckSourceLegacyAndVim9Success(lines)
+  call v9.CheckSourceLegacyAndMNV9Success(lines)
 endfunc
 
 " Test for setting a byte in a blob with invalid value
@@ -882,7 +882,7 @@ func Test_blob_byte_set_invalid_value()
     VAR b = 0zD0C3E4E18E1B
     LET b[0] = 229539777187355
   END
-  call v9.CheckSourceLegacyAndVim9Failure(lines, 'E1239: Invalid value for blob:')
+  call v9.CheckSourceLegacyAndMNV9Failure(lines, 'E1239: Invalid value for blob:')
 endfunc
 
 " Test when converting a blob to a string, and there is an empty line (newline
@@ -938,4 +938,4 @@ func Test_blob2str_multi_byte_encodings()
   call assert_equal(['A', 'B'], blob2str(0z41000000.0A000000.42000000, {'encoding': 'utf-32le'}))
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_blockedit.vim b/uvim/src/testdir/test_blockedit.mnv
index 71f687b7c2..2f132354da 100644
--- a/uvim/src/testdir/test_blockedit.vim
+++ b/uvim/src/testdir/test_blockedit.mnv
@@ -3,7 +3,7 @@
 func Test_blockinsert_indent()
   new
   filetype plugin indent on
-  setlocal sw=2 et ft=vim
+  setlocal sw=2 et ft=mnv
   call setline(1, ['let a=[', '  ''eins'',', '  ''zwei'',', '  ''drei'']'])
   call cursor(2, 3)
   exe "norm! \<c-v>2jI\\ \<esc>"
@@ -17,7 +17,7 @@ endfunc
 func Test_blockinsert_autoindent()
   new
   let lines =<< trim END
-      vim9script
+      mnv9script
       var d = {
       a: () => 0,
       b: () => 0,
@@ -26,11 +26,11 @@ func Test_blockinsert_autoindent()
   END
   call setline(1, lines)
   filetype plugin indent on
-  setlocal sw=2 et ft=vim
+  setlocal sw=2 et ft=mnv
   setlocal indentkeys+=:
   exe "norm! 3Gf)\<c-v>2jA: asdf\<esc>"
   let expected =<< trim END
-      vim9script
+      mnv9script
       var d = {
         a: (): asdf => 0,
       b: (): asdf => 0,
@@ -50,7 +50,7 @@ func Test_blockinsert_autoindent()
   setlocal sw=8 noet
   exe "norm! 3Gf)\<c-v>2jA: asdf\<esc>"
   let expected =<< trim END
-      vim9script
+      mnv9script
       var d = {
 	a: (): asdf => 0,
       b: (): asdf => 0,
@@ -131,4 +131,4 @@ func Test_blockappend_eol_cursor2()
   bw!
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_breakindent.vim b/uvim/src/testdir/test_breakindent.mnv
index bb164f70ea..0209f43b42 100644
--- a/uvim/src/testdir/test_breakindent.vim
+++ b/uvim/src/testdir/test_breakindent.mnv
@@ -6,7 +6,7 @@
 " Test_breakindent08())
 CheckOption breakindent
 
-source util/screendump.vim
+source util/screendump.mnv
 
 func SetUp()
   let s:input ="\tabcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOP"
@@ -764,7 +764,7 @@ func Test_breakindent20_list()
   " reset linebreak option
   " Note: it indents by one additional
   " space, because of the leading space.
-  setl linebreak&vim list listchars=eol:$,space:_
+  setl linebreak&mnv list listchars=eol:$,space:_
   redraw!
   let expect = [
 	\ "__1.__Congress_shall",
@@ -779,7 +779,7 @@ func Test_breakindent20_list()
 
   " check formatlistpat indent
   setl briopt=min:5,list:-1
-  setl linebreak list&vim listchars&vim
+  setl linebreak list&mnv listchars&mnv
   let &l:flp = '^\s*\d\+\.\?[\]:)}\t ]\s*'
   redraw!
   let expect = [
@@ -851,7 +851,7 @@ func Test_breakindent20_list()
 
   " check formatlistpat indent with different list levels
   let &l:flp = '^\s*\(\*\|•\)\+\s\+'
-  setl list&vim listchars&vim
+  setl list&mnv listchars&mnv
   %delete _
   call setline(1, ['* Congress shall make no law',
         \ '••• Congress shall make no law',
@@ -925,7 +925,7 @@ func Test_breakindent20_list()
   call s:close_windows('set breakindent& briopt& linebreak& list& listchars& showbreak&')
 endfunc
 
-" The following used to crash Vim. This is fixed by 8.2.3391.
+" The following used to crash MNV. This is fixed by 8.2.3391.
 " This is a regression introduced by 8.2.2903.
 func Test_window_resize_with_linebreak()
   new
@@ -948,7 +948,7 @@ func Test_cursor_position_with_showbreak()
   CheckScreendump
 
   let lines =<< trim END
-      vim9script
+      mnv9script
       &signcolumn = 'yes'
       &showbreak = '++'
       &breakindentopt = 'shift:2'
@@ -957,7 +957,7 @@ func Test_cursor_position_with_showbreak()
       'second line'->setline(2)
   END
   call writefile(lines, 'XscriptShowbreak', 'D')
-  let buf = RunVimInTerminal('-S XscriptShowbreak', #{rows: 6})
+  let buf = RunMNVInTerminal('-S XscriptShowbreak', #{rows: 6})
 
   call term_sendkeys(buf, "AX")
   call VerifyScreenDump(buf, 'Test_cursor_position_with_showbreak_1', {})
@@ -973,7 +973,7 @@ func Test_cursor_position_with_showbreak()
   call term_sendkeys(buf, "\<C-\>\<C-O>:setlocal nobreakindent\<CR>")
   call VerifyScreenDump(buf, 'Test_cursor_position_with_showbreak_3', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_visual_starts_before_skipcol()
@@ -985,7 +985,7 @@ func Test_visual_starts_before_skipcol()
     call setline(1, "\t" .. join(range(100)))
   END
   call writefile(lines, 'XvisualStartsBeforeSkipcol', 'D')
-  let buf = RunVimInTerminal('-S XvisualStartsBeforeSkipcol', #{rows: 6})
+  let buf = RunMNVInTerminal('-S XvisualStartsBeforeSkipcol', #{rows: 6})
 
   call term_sendkeys(buf, "v$")
   call VerifyScreenDump(buf, 'Test_visual_starts_before_skipcol_1', {})
@@ -996,7 +996,7 @@ func Test_visual_starts_before_skipcol()
   call term_sendkeys(buf, "\<Esc>:setlocal nobreakindent\<CR>gv")
   call VerifyScreenDump(buf, 'Test_visual_starts_before_skipcol_4', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_no_spurious_match()
@@ -1007,7 +1007,7 @@ func Test_no_spurious_match()
   call searchcount().total->assert_equal(1)
 
   " cleanup
-  set hls&vim
+  set hls&mnv
   bwipeout!
 endfunc
 
@@ -1126,7 +1126,7 @@ func Test_linebreak_list()
   " This was setting wlv.c_extra to NUL while wlv.p_extra is NULL
   filetype plugin on
   syntax enable
-  edit! $VIMRUNTIME/doc/index.txt
+  edit! $MNVRUNTIME/doc/index.txt
   /v_P
 
   setlocal list
@@ -1229,4 +1229,4 @@ func Test_breakindent_with_double_width_wrap()
   bwipe!
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_buffer.vim b/uvim/src/testdir/test_buffer.mnv
index 934bc6fe1e..fd270f0016 100644
--- a/uvim/src/testdir/test_buffer.vim
+++ b/uvim/src/testdir/test_buffer.mnv
@@ -1,4 +1,4 @@
-" Tests for Vim buffer
+" Tests for MNV buffer
 
 " Test for the :bunload command with an offset
 func Test_bunload_with_offset()
@@ -263,7 +263,7 @@ func Test_buffer_sbuf_cleanup()
   close
   " create the swap file
   call writefile([], '.XsplitCleanup.swp', 'D')
-  " Remove the catch-all that runtest.vim adds
+  " Remove the catch-all that runtest.mnv adds
   au! SwapExists
   augroup BufTest
     au!
@@ -315,7 +315,7 @@ func Test_goto_buf_with_confirm()
   CheckUnix
   CheckNotGui
   CheckFeature dialog_con
-  " When dialog_con_gui is defined, Vim is compiled with GUI support
+  " When dialog_con_gui is defined, MNV is compiled with GUI support
   " and FEAT_BROWSE will be defined, which causes :confirm :b to
   " call do_browse(), which will try to use a GUI file browser,
   " which aborts if a GUI is not available.
@@ -504,14 +504,14 @@ func Test_buffer_maxmem()
   new
   let v:errmsg = ''
   " try opening some files
-  edit test_arglist.vim
-  call assert_equal('test_arglist.vim', bufname())
-  edit test_eval_stuff.vim
-  call assert_equal('test_eval_stuff.vim', bufname())
-  b test_arglist.vim
-  call assert_equal('test_arglist.vim', bufname())
-  b test_eval_stuff.vim
-  call assert_equal('test_eval_stuff.vim', bufname())
+  edit test_arglist.mnv
+  call assert_equal('test_arglist.mnv', bufname())
+  edit test_eval_stuff.mnv
+  call assert_equal('test_eval_stuff.mnv', bufname())
+  b test_arglist.mnv
+  call assert_equal('test_arglist.mnv', bufname())
+  b test_eval_stuff.mnv
+  call assert_equal('test_eval_stuff.mnv', bufname())
   close
   call assert_equal('', v:errmsg)
   set maxmem& maxmemtot&
@@ -577,9 +577,9 @@ func Test_buflist_alloc_failure()
     bw!
   endif
 
-  " test for :vimgrep loading a dummy buffer
+  " test for :mnvgrep loading a dummy buffer
   call test_alloc_fail(GetAllocId('newbuf_bvars'), 0, 0)
-  call assert_fails('vimgrep two XallocFail5', 'E342:')
+  call assert_fails('mnvgrep two XallocFail5', 'E342:')
 
   " test for quickfix command loading a buffer
   call test_alloc_fail(GetAllocId('newbuf_bvars'), 0, 0)
@@ -913,4 +913,4 @@ func Test_split_window_in_BufLeave_from_switching_buffer()
   bwipe! Xb
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_bufline.vim b/uvim/src/testdir/test_bufline.mnv
index 9f0a0a6b34..7feb0486e9 100644
--- a/uvim/src/testdir/test_bufline.vim
+++ b/uvim/src/testdir/test_bufline.mnv
@@ -1,6 +1,6 @@
 " Tests for setbufline(), getbufline(), appendbufline(), deletebufline()
 
-source util/screendump.vim
+source util/screendump.mnv
 
 func Test_setbufline_getbufline()
   " similar to Test_set_get_bufline()
@@ -80,7 +80,7 @@ func Test_setbufline_getbufline_fold_tab()
 endfunc
 
 func Test_setline_startup()
-  let cmd = GetVimCommand('Xscript')
+  let cmd = GetMNVCommand('Xscript')
   if cmd == ''
     return
   endif
@@ -170,12 +170,12 @@ func Test_appendbufline_no_E315()
     while getbufline(buf, 1)[0] =~ "^\\s*$"
       sleep 10m
     endwhile
-    au VimLeavePre * call writefile([v:errmsg], "Xerror")
-    au VimLeavePre * call writefile(["done"], "Xdone")
+    au MNVLeavePre * call writefile([v:errmsg], "Xerror")
+    au MNVLeavePre * call writefile(["done"], "Xdone")
     qall!
   [CODE]
 
-  if !RunVim([], after, '--clean')
+  if !RunMNV([], after, '--clean')
     return
   endif
   call assert_notmatch("^E315:", readfile("Xerror")[0])
@@ -244,13 +244,13 @@ func Test_appendbufline_redraw()
     norm! G
     wincmd p
     call deletebufline(buf, 1, '$')
-    call appendbufline(buf, '$', 'Hello Vim world...')
+    call appendbufline(buf, '$', 'Hello MNV world...')
   END
   call writefile(lines, 'XscriptMatchCommon', 'D')
-  let buf = RunVimInTerminal('-S XscriptMatchCommon', #{rows: 10})
+  let buf = RunMNVInTerminal('-S XscriptMatchCommon', #{rows: 10})
   call VerifyScreenDump(buf, 'Test_appendbufline_1', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_setbufline_select_mode()
@@ -313,7 +313,7 @@ func Test_setbufline_startup_nofile()
     quit
   [CODE]
 
-  if !RunVim(before, after, '--clean')
+  if !RunMNV(before, after, '--clean')
     return
   endif
   call assert_equal(['success'], readfile('Xresult'))
@@ -336,4 +336,4 @@ func Test_change_bufline_with_textlock()
   bwipe!
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_bufwintabinfo.vim b/uvim/src/testdir/test_bufwintabinfo.mnv
index 1d2418c8c4..6ec896c437 100644
--- a/uvim/src/testdir/test_bufwintabinfo.vim
+++ b/uvim/src/testdir/test_bufwintabinfo.mnv
@@ -15,11 +15,11 @@ func Test_getbufwintabinfo()
   hide enew
   call assert_equal(3, len(getbufinfo({'bufloaded':1})))
 
-  set tabstop&vim
-  let b:editor = 'vim'
+  set tabstop&mnv
+  let b:editor = 'mnv'
   let l = getbufinfo('%')
   call assert_equal(bufnr('%'), l[0].bufnr)
-  call assert_equal('vim', l[0].variables.editor)
+  call assert_equal('mnv', l[0].variables.editor)
   call assert_notequal(-1, index(l[0].windows, '%'->bufwinid()))
 
   let l = '%'->getbufinfo()
@@ -223,8 +223,8 @@ func Test_getwininfo_status_height()
   let info = getwininfo(win_getid())[0]
   call assert_equal(1, info.status_height)
 
-  set laststatus&vim
+  set laststatus&mnv
   bwipe!
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_cd.vim b/uvim/src/testdir/test_cd.mnv
index e95c7c2e0e..384290b90d 100644
--- a/uvim/src/testdir/test_cd.vim
+++ b/uvim/src/testdir/test_cd.mnv
@@ -56,7 +56,7 @@ func Test_cd_minus()
     qall!
   [SCRIPT]
   call writefile(lines, 'Xscript', 'D')
-  if RunVim([], [], '--clean -S Xscript')
+  if RunMNV([], [], '--clean -S Xscript')
     call assert_equal([], readfile('Xresult'))
   endif
   call delete('Xresult')
@@ -420,4 +420,4 @@ func Test_cd_shorten_bufname_with_duplicate_slashes()
   bwipe!
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_cdo.vim b/uvim/src/testdir/test_cdo.mnv
index 9cf435a975..7291b31673 100644
--- a/uvim/src/testdir/test_cdo.vim
+++ b/uvim/src/testdir/test_cdo.mnv
@@ -212,4 +212,4 @@ func Test_cdo_print()
   call assert_equal('Line1', Screenline(&lines - 6))
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_changedtick.vim b/uvim/src/testdir/test_changedtick.mnv
index b7e7cd681e..b9cf00c9fe 100644
--- a/uvim/src/testdir/test_changedtick.vim
+++ b/uvim/src/testdir/test_changedtick.mnv
@@ -94,4 +94,4 @@ func Test_changedtick_not_incremented_with_write()
   call delete(fname)
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_changelist.vim b/uvim/src/testdir/test_changelist.mnv
index c9d8ea4ea1..c4cc618847 100644
--- a/uvim/src/testdir/test_changelist.vim
+++ b/uvim/src/testdir/test_changelist.mnv
@@ -102,4 +102,4 @@ func Test_getchangelist()
   bwipe!
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_channel.vim b/uvim/src/testdir/test_channel.mnv
index 203ae0428e..2865313fcf 100644
--- a/uvim/src/testdir/test_channel.vim
+++ b/uvim/src/testdir/test_channel.mnv
@@ -3,7 +3,7 @@
 " When +channel is supported then +job is too, so we don't check for that.
 CheckFeature channel
 
-source util/screendump.vim
+source util/screendump.mnv
 
 let s:python = PythonProg()
 if s:python == ''
@@ -1158,12 +1158,12 @@ func Test_write_to_buffer_and_scroll()
       call job_start(cmd, #{out_io: 'buffer', out_name: 'Xscrollbuffer'})
   END
   call writefile(lines, 'XtestBufferScroll', 'D')
-  let buf = RunVimInTerminal('-S XtestBufferScroll', #{rows: 10})
+  let buf = RunMNVInTerminal('-S XtestBufferScroll', #{rows: 10})
   call TermWait(buf, 50)
   call VerifyScreenDump(buf, 'Test_job_buffer_scroll_1', {})
 
   " clean up
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_pipe_null()
@@ -1446,7 +1446,7 @@ func s:UnletHandler(handle, msg)
   unlet s:channelfd
 endfunc
 
-" Test that "unlet handle" in a handler doesn't crash Vim.
+" Test that "unlet handle" in a handler doesn't crash MNV.
 func Ch_unlet_handle(port)
   let s:channelfd = ch_open(s:address(a:port), s:chopt)
   eval s:channelfd->ch_sendexpr("test", {'callback': function('s:UnletHandler')})
@@ -1470,7 +1470,7 @@ func Ch_CloseHandler(handle, msg)
   eval s:channelfd->ch_close()
 endfunc
 
-" Test that "unlet handle" in a handler doesn't crash Vim.
+" Test that "unlet handle" in a handler doesn't crash MNV.
 func Ch_close_handle(port)
   let s:channelfd = ch_open(s:address(a:port), s:chopt)
   call ch_sendexpr(s:channelfd, "test", {'callback': function('Ch_CloseHandler')})
@@ -1839,12 +1839,12 @@ func Test_collapse_buffers()
   let g:test_is_flaky = 1
   CheckExecutable cat
 
-  sp test_channel.vim
+  sp test_channel.mnv
   let g:linecount = line('$')
   close
   split testout
   1,$delete
-  call job_start('cat test_channel.vim', {'out_io': 'buffer', 'out_name': 'testout'})
+  call job_start('cat test_channel.mnv', {'out_io': 'buffer', 'out_name': 'testout'})
   call WaitForAssert({-> assert_inrange(g:linecount, g:linecount + 1, line('$'))})
   bwipe!
 endfunc
@@ -2438,9 +2438,9 @@ func Test_cb_with_input()
   let g:wait_exit_cb = 1
 
   if has('win32')
-    let cmd = 'cmd /D /c echo "Vim''s test"'
+    let cmd = 'cmd /D /c echo "MNV''s test"'
   else
-    let cmd = 'echo "Vim''s test"'
+    let cmd = 'echo "MNV''s test"'
   endif
 
   let job = job_start(cmd, {'out_cb': 'ExitCb_cb_with_input'})
@@ -2943,4 +2943,4 @@ func Test_term_start_cb_per_line()
   unlet g:Ch_msgs
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_channel.py b/uvim/src/testdir/test_channel.py
index e02f7dbcb4..7657ec2cb1 100644
--- a/uvim/src/testdir/test_channel.py
+++ b/uvim/src/testdir/test_channel.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 #
-# Server that will accept connections from a Vim channel.
-# Used by test_channel.vim.
+# Server that will accept connections from a MNV channel.
+# Used by test_channel.mnv.
 #
 # This requires Python 2.6 or later.
 
@@ -66,7 +66,7 @@ class TestingRequestHandler(socketserver.BaseRequestHandler):
                         print("sending: {0}".format(cmd))
                         self.request.sendall(cmd.encode('utf-8'))
                         response = "ok"
-                        # Need to wait for Vim to give up, otherwise it
+                        # Need to wait for MNV to give up, otherwise it
                         # sometimes fails on OS X.
                         time.sleep(0.2)
                     elif decoded[1] == 'malformed2':
@@ -74,7 +74,7 @@ class TestingRequestHandler(socketserver.BaseRequestHandler):
                         print("sending: {0}".format(cmd))
                         self.request.sendall(cmd.encode('utf-8'))
                         response = "ok"
-                        # Need to wait for Vim to give up, otherwise the double
+                        # Need to wait for MNV to give up, otherwise the double
                         # quote in the "ok" response terminates the string.
                         time.sleep(0.2)
                     elif decoded[1] == 'malformed3':
@@ -82,7 +82,7 @@ class TestingRequestHandler(socketserver.BaseRequestHandler):
                         print("sending: {0}".format(cmd))
                         self.request.sendall(cmd.encode('utf-8'))
                         response = "ok"
-                        # Need to wait for Vim to give up, otherwise the ]
+                        # Need to wait for MNV to give up, otherwise the ]
                         # in the "ok" response terminates the list.
                         time.sleep(0.2)
                     elif decoded[1] == 'split':
diff --git a/uvim/src/testdir/test_channel_6.py b/uvim/src/testdir/test_channel_6.py
index 5bd17a34b5..35a5ef0bf2 100644
--- a/uvim/src/testdir/test_channel_6.py
+++ b/uvim/src/testdir/test_channel_6.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 #
-# Server that will accept connections from a Vim channel.
-# Used by test_channel.vim.
+# Server that will accept connections from a MNV channel.
+# Used by test_channel.mnv.
 #
 # This requires Python 2.6 or later.
 
diff --git a/uvim/src/testdir/test_channel_dap.py b/uvim/src/testdir/test_channel_dap.py
index 23e13912fe..16aecac8f3 100644
--- a/uvim/src/testdir/test_channel_dap.py
+++ b/uvim/src/testdir/test_channel_dap.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-# Used by Test_channel_dap_mode in test_channel.vim to test DAP functionality.
+# Used by Test_channel_dap_mode in test_channel.mnv to test DAP functionality.
 
 import json
 import socket
diff --git a/uvim/src/testdir/test_channel_lsp.py b/uvim/src/testdir/test_channel_lsp.py
index 887f6974e1..9a4c7d85e3 100644
--- a/uvim/src/testdir/test_channel_lsp.py
+++ b/uvim/src/testdir/test_channel_lsp.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 #
-# Server that will accept connections from a Vim channel.
-# Used by test_channel.vim to test LSP functionality.
+# Server that will accept connections from a MNV channel.
+# Used by test_channel.mnv to test LSP functionality.
 #
 # This requires Python 2.6 or later.
 
@@ -81,7 +81,7 @@ class ThreadedTCPRequestHandler(socketserver.BaseRequestHandler):
         # test for sending extra fields in the http header
         v = {'jsonrpc': '2.0', 'id': msgid, 'result': resp_dict}
         s = json.dumps(v)
-        resp = "Host: abc.vim.org\r\n"
+        resp = "Host: abc.mnv.org\r\n"
         resp += "User-Agent: Python\r\n"
         resp += "Accept-Language: en-US,en\r\n"
         resp += "Content-Type: application/vscode-jsonrpc; charset=utf-8\r\n"
diff --git a/uvim/src/testdir/test_channel_unix.py b/uvim/src/testdir/test_channel_unix.py
index 85e780a388..39608e049a 100644
--- a/uvim/src/testdir/test_channel_unix.py
+++ b/uvim/src/testdir/test_channel_unix.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 #
-# Server that will accept connections from a Vim channel.
-# Used by test_channel.vim.
+# Server that will accept connections from a MNV channel.
+# Used by test_channel.mnv.
 #
 # This requires Python 2.6 or later.
 
diff --git a/uvim/src/testdir/test_charsearch.vim b/uvim/src/testdir/test_charsearch.mnv
index 9b7c9a0a09..f034e10367 100644
--- a/uvim/src/testdir/test_charsearch.vim
+++ b/uvim/src/testdir/test_charsearch.mnv
@@ -97,4 +97,4 @@ func Test_charsearch_hkmap()
   bw!
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_charsearch_utf8.vim b/uvim/src/testdir/test_charsearch_utf8.mnv
index 843edbb514..96eb853bc5 100644
--- a/uvim/src/testdir/test_charsearch_utf8.vim
+++ b/uvim/src/testdir/test_charsearch_utf8.mnv
@@ -3,7 +3,7 @@
 " Test for t,f,F,T movement commands
 func Test_search_cmds()
   new!
-  call setline(1, "・最��ら最後��最強�Vim�最高")
+  call setline(1, "・最��ら最後��最強�MNV�最高")
   1
   normal! f最
   call assert_equal([0, 1, 4, 0], getpos('.'))
@@ -23,4 +23,4 @@ func Test_search_cmds()
   bw!
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_checkpath.vim b/uvim/src/testdir/test_checkpath.mnv
index 97da8c24bb..fd00f27f67 100644
--- a/uvim/src/testdir/test_checkpath.vim
+++ b/uvim/src/testdir/test_checkpath.mnv
@@ -113,4 +113,4 @@ func Test_checkpath_errors()
   call assert_fails('psearch \%(', 'E53:')
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_cindent.vim b/uvim/src/testdir/test_cindent.mnv
index 4884dbb304..8d3cb4cb5a 100644
--- a/uvim/src/testdir/test_cindent.vim
+++ b/uvim/src/testdir/test_cindent.mnv
@@ -138,7 +138,7 @@ def Test_cindent_01()
   setl cino& sts&
 
   var code =<< trim [CODE]
-  /* start of AUTO matically checked vim: set ts=4 : */
+  /* start of AUTO matically checked mnv: set ts=4 : */
   {
   	if (test)
   		cmd1;
@@ -404,9 +404,9 @@ def Test_cindent_01()
   }
 
   {
-  	if (!(vim_strchr(p_cpo, CPO_BUFOPTGLOB) != NULL && entering) &&
+  	if (!(mnv_strchr(p_cpo, CPO_BUFOPTGLOB) != NULL && entering) &&
   			(bp_to->b_p_initialized ||
-  			 (!entering && vim_strchr(p_cpo, CPO_BUFOPT) != NULL)))
+  			 (!entering && mnv_strchr(p_cpo, CPO_BUFOPT) != NULL)))
   		return;
   label :
   	asdf = asdf ?
@@ -1147,7 +1147,7 @@ def Test_cindent_01()
   exe "normal =/end of AUTO\<CR>"
 
   var expected =<< trim [CODE]
-  /* start of AUTO matically checked vim: set ts=4 : */
+  /* start of AUTO matically checked mnv: set ts=4 : */
   {
   	if (test)
   		cmd1;
@@ -1413,9 +1413,9 @@ def Test_cindent_01()
   }
 
   {
-  	if (!(vim_strchr(p_cpo, CPO_BUFOPTGLOB) != NULL && entering) &&
+  	if (!(mnv_strchr(p_cpo, CPO_BUFOPTGLOB) != NULL && entering) &&
   			(bp_to->b_p_initialized ||
-  			 (!entering && vim_strchr(p_cpo, CPO_BUFOPT) != NULL)))
+  			 (!entering && mnv_strchr(p_cpo, CPO_BUFOPT) != NULL)))
   		return;
   label :
   	asdf = asdf ?
@@ -5527,4 +5527,4 @@ def Test_find_brace_backwards()
 enddef
 
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_cjk_linebreak.vim b/uvim/src/testdir/test_cjk_linebreak.mnv
index 17c59164a1..fc70d28c45 100644
--- a/uvim/src/testdir/test_cjk_linebreak.vim
+++ b/uvim/src/testdir/test_cjk_linebreak.mnv
@@ -98,4 +98,4 @@ func Test_cjk_linebreak_join_punct()
   endfor
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_clientserver.vim b/uvim/src/testdir/test_clientserver.mnv
index 8aa9428f2a..a8c8961351 100644
--- a/uvim/src/testdir/test_clientserver.vim
+++ b/uvim/src/testdir/test_clientserver.mnv
@@ -8,7 +8,7 @@ endif
 
 CheckFeature clientserver
 
-source util/shared.vim
+source util/shared.mnv
 
 " Unlike X11, we need the socket server running if we want to send commands to
 " a server via sockets.
@@ -30,13 +30,13 @@ endfunc
 
 func Test_client_server()
   let g:test_is_flaky = 1
-  let cmd = GetVimCommand()
+  let cmd = GetMNVCommand()
   if cmd == ''
-    throw 'GetVimCommand() failed'
+    throw 'GetMNVCommand() failed'
   endif
   call Check_X11_Connection()
 
-  let name = 'XVIMTEST'
+  let name = 'XMNVTEST'
   let cmd .= ' --servername ' . name
   let job = job_start(cmd, {'stoponexit': 'kill', 'out_io': 'null'})
   call WaitForAssert({-> assert_equal("run", job_status(job))})
@@ -46,9 +46,9 @@ func Test_client_server()
   call WaitForAssert({-> assert_match(name, serverlist())})
 
   if !has('win32')
-    if RunVim([], [], '--serverlist >Xtest_serverlist')
+    if RunMNV([], [], '--serverlist >Xtest_serverlist')
       let lines = readfile('Xtest_serverlist')
-      call assert_true(index(lines, 'XVIMTEST') >= 0)
+      call assert_true(index(lines, 'XMNVTEST') >= 0)
     endif
     call delete('Xtest_serverlist')
   endif
@@ -84,7 +84,7 @@ func Test_client_server()
   call assert_fails('call remote_send("XXX", ":let testvar = ''yes''\<CR>")', 'E241:')
 
   call writefile(['one'], 'Xclientfile')
-  let cmd = GetVimProg() .. ' --servername ' .. name .. ' --remote Xclientfile'
+  let cmd = GetMNVProg() .. ' --servername ' .. name .. ' --remote Xclientfile'
   call system(cmd)
   call WaitForAssert({-> assert_equal('Xclientfile', remote_expr(name, "bufname()", "", 2))})
   call WaitForAssert({-> assert_equal('one', remote_expr(name, "getline(1)", "", 2))})
@@ -127,9 +127,9 @@ func Test_client_server()
   call assert_equal('another', remote_read(g:myserverid, 2))
 
   if !has('gui_running')
-    " In GUI vim, the following tests display a dialog box
+    " In GUI mnv, the following tests display a dialog box
 
-    let cmd = GetVimProg() .. ' --servername ' .. name
+    let cmd = GetMNVProg() .. ' --servername ' .. name
 
     " Run a separate instance to send a command to the server
     call remote_expr(name, 'execute("only")')
@@ -155,7 +155,7 @@ func Test_client_server()
     eval name->remote_send(":%bw!\<CR>")
 
     " Edit a file using --remote-wait
-    eval name->remote_send(":source $VIMRUNTIME/plugin/rrhelper.vim\<CR>")
+    eval name->remote_send(":source $MNVRUNTIME/plugin/rrhelper.mnv\<CR>")
     call system(cmd .. ' --remote-wait +enew Xclientfile1')
     call assert_match('.*\<Xclientfile1', remote_expr(name, 'bufname("#")'))
     eval name->remote_send(":%bw!\<CR>")
@@ -192,11 +192,11 @@ func Test_client_server()
   " When using socket server, server id is not a number, but the path to the
   " socket.
   if has('socketserver') && !has('X11')
-    call assert_fails("let x = remote_read('vim/10')", ['E573:.*vim/10'])
+    call assert_fails("let x = remote_read('mnv/10')", ['E573:.*mnv/10'])
     call assert_fails("call server2client('a/b/c', 'xyz')", ['E573:.*a/b/c'])
   else
-    call assert_fails("let x = remote_read('vim10')",
-          \ has('unix') ? ['E573:.*vim10'] : 'E277:')
+    call assert_fails("let x = remote_read('mnv10')",
+          \ has('unix') ? ['E573:.*mnv10'] : 'E277:')
     call assert_fails("call server2client('abc', 'xyz')",
           \ has('unix') ? ['E573:.*abc'] : 'E258:')
   endif
@@ -207,13 +207,13 @@ func Test_client_server_stopinsert()
   CheckNotMSWindows
   CheckNotMac
   let g:test_is_flaky = 1
-  let cmd = GetVimCommand()
+  let cmd = GetMNVCommand()
   if cmd == ''
-    throw 'GetVimCommand() failed'
+    throw 'GetMNVCommand() failed'
   endif
   call Check_X11_Connection()
   let fname = 'Xclientserver_stop.txt'
-  let name = 'XVIMTEST2'
+  let name = 'XMNVTEST2'
   call writefile(['one two three'], fname, 'D')
 
   let cmd .= ' -c "set virtualedit=onemore"'
@@ -252,17 +252,17 @@ func Test_client_server_x11_and_socket_server()
   CheckFeature x11
 
   let g:test_is_flaky = 1
-  let cmd = GetVimCommand()
+  let cmd = GetMNVCommand()
 
   if cmd == ''
-    throw 'GetVimCommand() failed'
+    throw 'GetMNVCommand() failed'
   endif
   call Check_X11_Connection()
 
   let types = ['socket', 'x11']
 
   for type in types
-    let name = 'VIMTEST_' .. toupper(type)
+    let name = 'MNVTEST_' .. toupper(type)
     let actual_cmd = cmd .. ' --clientserver ' .. type
     let actual_cmd .= ' --servername ' .. name
     let job = job_start(actual_cmd, {'stoponexit': 'kill', 'out_io': 'null'})
@@ -291,14 +291,14 @@ func Test_client_server_socket_server_gui()
   CheckFeature gui_gtk
 
   let g:test_is_flaky = 1
-  let cmd = GetVimCommand()
+  let cmd = GetMNVCommand()
 
   if cmd == ''
-    throw 'GetVimCommand() failed'
+    throw 'GetMNVCommand() failed'
   endif
   call Check_X11_Connection()
 
-  let name = 'VIMTESTSOCKET'
+  let name = 'MNVTESTSOCKET'
   let cmd .= ' --clientserver socket'
   let cmd .= ' --servername ' .. name
 
@@ -330,13 +330,13 @@ func Test_client_socket_server_custom_path()
   CheckNotFeature x11
 
   let g:test_is_flaky = 1
-  let cmd = GetVimCommand()
+  let cmd = GetMNVCommand()
 
   if cmd == ''
-    throw 'GetVimCommand() failed'
+    throw 'GetMNVCommand() failed'
   endif
 
-  let name = 'VIMTESTSOCKET2'
+  let name = 'MNVTESTSOCKET2'
 
   let paths = ['./' .. name, '../testdir/' .. name, getcwd(-1) .. '/' .. name]
 
@@ -363,4 +363,4 @@ endfunc
 " Uncomment this line to get a debugging log
 " call ch_logfile('channellog', 'w')
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_clipmethod.vim b/uvim/src/testdir/test_clipmethod.mnv
index ddf415726b..6fdab83a0a 100644
--- a/uvim/src/testdir/test_clipmethod.vim
+++ b/uvim/src/testdir/test_clipmethod.mnv
@@ -1,6 +1,6 @@
 " Tests for clipmethod
 
-source util/window_manager.vim
+source util/window_manager.mnv
 
 CheckFeature clipboard_working
 
@@ -84,7 +84,7 @@ func Test_clipmethod_is_none_when_gui()
   END
 
   call writefile(lines, 'Cbdscript', 'D')
-  call system($'{GetVimCommand()} -S Cbdscript')
+  call system($'{GetMNVCommand()} -S Cbdscript')
   call assert_equal(['1', 'none', 'none'], readfile('Cbdscript'))
 endfunc
 
@@ -124,16 +124,16 @@ func Test_clipreset_switches()
   " hang.
 
   " This will only happen for commands given from the command line, which
-  " is why we cannot just directly call Vim or use the actual Vim instance
+  " is why we cannot just directly call MNV or use the actual MNV instance
   " that's doing all the testing, since main_loop() is never executed.
 
-  " Therefore we should start a separate Vim instance and communicate with it
+  " Therefore we should start a separate MNV instance and communicate with it
   " remotely, so we can execute the actual testing stuff with main_loop()
   " running.
 
   let l:lines =<< trim END
     set cpm=x11
-    source util/shared.vim
+    source util/shared.mnv
 
     func Test()
       clipreset
@@ -159,8 +159,8 @@ func Test_clipreset_switches()
 
   let l:xdisplay = StartXServer()
 
-  let l:name = 'XVIMTEST'
-  let l:cmd = GetVimCommand() .. ' -S Xtester --servername ' .. l:name
+  let l:name = 'XMNVTEST'
+  let l:cmd = GetMNVCommand() .. ' -S Xtester --servername ' .. l:name
   let l:job = job_start(l:cmd, { 'stoponexit': 'kill', 'out_io': 'null'})
 
   call WaitForAssert({-> assert_equal("run", job_status(l:job))})
@@ -225,4 +225,4 @@ func Test_clipmethod_provider()
   set clipmethod&
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_close_count.vim b/uvim/src/testdir/test_close_count.mnv
index c0c37304ef..bc6229cb91 100644
--- a/uvim/src/testdir/test_close_count.vim
+++ b/uvim/src/testdir/test_close_count.mnv
@@ -173,4 +173,4 @@ func Test_winclose_command()
   only!
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_cmd_lists.vim b/uvim/src/testdir/test_cmd_lists.mnv
index 77ae85ea2c..4e32f0e9ec 100644
--- a/uvim/src/testdir/test_cmd_lists.vim
+++ b/uvim/src/testdir/test_cmd_lists.mnv
@@ -38,9 +38,9 @@ func Test_cmd_lists()
   norm gg
   let l:missing_cmds = []
   for cmd in l:command_list
-    " Reserved Vim 9 commands or other script-only syntax aren't useful to
+    " Reserved MNV 9 commands or other script-only syntax aren't useful to
     " document as Ex commands.
-    let l:vim9cmds = [
+    let l:mnv9cmds = [
           \ 'abstract',
           \ 'class',
           \ 'endclass',
@@ -56,7 +56,7 @@ func Test_cmd_lists()
           \ '--',
           \ '{',
           \ '}']
-    if index(l:vim9cmds, cmd) != -1
+    if index(l:mnv9cmds, cmd) != -1
       continue
     endif
 
@@ -67,4 +67,4 @@ func Test_cmd_lists()
   call assert_equal(0, len(l:missing_cmds), "Missing commands from `:help ex-cmd-index`: " .. string(l:missing_cmds))
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_cmdline.vim b/uvim/src/testdir/test_cmdline.mnv
index 2810e0b7e8..685bbb4420 100644
--- a/uvim/src/testdir/test_cmdline.vim
+++ b/uvim/src/testdir/test_cmdline.mnv
@@ -1,7 +1,7 @@
 " Tests for editing the command line.
 
-source util/screendump.vim
-import './util/vim9.vim' as v9
+source util/screendump.mnv
+import './util/mnv9.mnv' as v9
 
 func SetUp()
   func SaveLastScreenLine()
@@ -187,33 +187,33 @@ func Test_wildmenu_screendump()
 
   " Test simple wildmenu
   let rows = 8
-  let buf = RunVimInTerminal('-S XTest_wildmenu', {'rows': rows})
-  call term_sendkeys(buf, ":vim\<Tab>")
-  call WaitForTermCurPosAndLinesToMatch(buf, [rows, (strlen(':vim9cmd') + 1)], g:test_timeout, ((rows - 1), '\<vimgrepadd\s\+$'))
+  let buf = RunMNVInTerminal('-S XTest_wildmenu', {'rows': rows})
+  call term_sendkeys(buf, ":mnv\<Tab>")
+  call WaitForTermCurPosAndLinesToMatch(buf, [rows, (strlen(':mnv9cmd') + 1)], g:test_timeout, ((rows - 1), '\<mnvgrepadd\s\+$'))
   call VerifyScreenDump(buf, 'Test_wildmenu_1', {})
 
   call term_sendkeys(buf, "\<Tab>")
-  call WaitForTermCurPosAndLinesToMatch(buf, [rows, (strlen(':vim9script') + 1)], g:test_timeout, ((rows - 1), '\<vimgrepadd\s\+$'))
+  call WaitForTermCurPosAndLinesToMatch(buf, [rows, (strlen(':mnv9script') + 1)], g:test_timeout, ((rows - 1), '\<mnvgrepadd\s\+$'))
   call VerifyScreenDump(buf, 'Test_wildmenu_2', {})
 
   call term_sendkeys(buf, "\<Tab>")
-  call WaitForTermCurPosAndLinesToMatch(buf, [rows, (strlen(':vimgrep') + 1)], g:test_timeout, ((rows - 1), '\<vimgrepadd\s\+$'))
+  call WaitForTermCurPosAndLinesToMatch(buf, [rows, (strlen(':mnvgrep') + 1)], g:test_timeout, ((rows - 1), '\<mnvgrepadd\s\+$'))
   call VerifyScreenDump(buf, 'Test_wildmenu_3', {})
 
   " Looped back to the original value
   call term_sendkeys(buf, "\<Tab>\<Tab>")
-  call WaitForTermCurPosAndLinesToMatch(buf, [rows, (strlen(':vim') + 1)], g:test_timeout, ((rows - 1), '\<vimgrepadd\s\+$'))
+  call WaitForTermCurPosAndLinesToMatch(buf, [rows, (strlen(':mnv') + 1)], g:test_timeout, ((rows - 1), '\<mnvgrepadd\s\+$'))
   call VerifyScreenDump(buf, 'Test_wildmenu_4', {})
 
   " Test that the wild menu is cleared properly
   call term_sendkeys(buf, " ")
-  call WaitForTermCurPosAndLinesToMatch(buf, [rows, (strlen(':vim ') + 1)])
+  call WaitForTermCurPosAndLinesToMatch(buf, [rows, (strlen(':mnv ') + 1)])
   call VerifyScreenDump(buf, 'Test_wildmenu_5', {})
 
   " Test that a different wildchar still works
   call term_sendkeys(buf, "\<Esc>:set wildchar=<Esc>\<CR>")
-  call term_sendkeys(buf, ":vim\<Esc>")
-  call WaitForTermCurPosAndLinesToMatch(buf, [rows, (strlen(':vim9cmd') + 1)], g:test_timeout, ((rows - 1), '\<vimgrepadd\s\+$'))
+  call term_sendkeys(buf, ":mnv\<Esc>")
+  call WaitForTermCurPosAndLinesToMatch(buf, [rows, (strlen(':mnv9cmd') + 1)], g:test_timeout, ((rows - 1), '\<mnvgrepadd\s\+$'))
   call VerifyScreenDump(buf, 'Test_wildmenu_1', {})
 
   " Double-<Esc> is a hard-coded method to escape while wildchar=<Esc>. Make
@@ -223,14 +223,14 @@ func Test_wildmenu_screendump()
   call VerifyScreenDump(buf, 'Test_wildmenu_6', {})
 
   " clean up
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_wildmenu_with_input_func()
   CheckScreendump
 
   let rows = 8
-  let buf = RunVimInTerminal('-c "set wildmenu"', {'rows': rows})
+  let buf = RunMNVInTerminal('-c "set wildmenu"', {'rows': rows})
 
   call term_sendkeys(buf, ":call input('Command? ', '', 'command')\<CR>")
   call WaitForTermCurPosAndLinesToMatch(buf, [rows, (strlen('Command? ') + 1)])
@@ -263,7 +263,7 @@ func Test_wildmenu_with_input_func()
   call term_sendkeys(buf, "\<CR>")
 
   " clean up
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_redraw_in_autocmd()
@@ -276,7 +276,7 @@ func Test_redraw_in_autocmd()
   call writefile(lines, 'XTest_redraw', 'D')
 
   let rows = 8
-  let buf = RunVimInTerminal('-S XTest_redraw', {'rows': rows})
+  let buf = RunMNVInTerminal('-S XTest_redraw', {'rows': rows})
   call term_sendkeys(buf, ":for i in range(3)\<CR>")
   call WaitForTermCurPosAndLinesToMatch(buf, [rows, (strlen(':  ') + 1)])
   call VerifyScreenDump(buf, 'Test_redraw_in_autocmd_1', {})
@@ -287,7 +287,7 @@ func Test_redraw_in_autocmd()
 
   " clean up
   call term_sendkeys(buf, "\<CR>")
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_redrawstatus_in_autocmd()
@@ -301,7 +301,7 @@ func Test_redrawstatus_in_autocmd()
   call writefile(lines, 'XTest_redrawstatus', 'D')
 
   let rows = 8
-  let buf = RunVimInTerminal('-S XTest_redrawstatus', {'rows': rows})
+  let buf = RunMNVInTerminal('-S XTest_redrawstatus', {'rows': rows})
   " :redrawstatus is postponed if messages have scrolled
   call term_sendkeys(buf, ":echo \"one\\ntwo\\nthree\\nfour\"\<CR>")
   call term_sendkeys(buf, ":foobar")
@@ -326,7 +326,7 @@ func Test_redrawstatus_in_autocmd()
 
   " clean up
   call term_sendkeys(buf, "\<CR>")
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_changing_cmdheight()
@@ -351,7 +351,7 @@ func Test_changing_cmdheight()
   call writefile(lines, 'XTest_cmdheight', 'D')
 
   let rows = 8
-  let buf = RunVimInTerminal('-S XTest_cmdheight', {'rows': rows})
+  let buf = RunMNVInTerminal('-S XTest_cmdheight', {'rows': rows})
   call term_sendkeys(buf, ":resize -3\<CR>")
   call WaitForTermCurPosAndLinesToMatch(buf, [1, 1], g:test_timeout, (4, '\<All$'))
   call VerifyScreenDump(buf, 'Test_changing_cmdheight_1', {})
@@ -397,19 +397,19 @@ func Test_changing_cmdheight()
   call VerifyScreenDump(buf, 'Test_changing_cmdheight_8', {})
 
   " clean up
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_cmdheight_tabline()
   CheckScreendump
 
   let rows = 6
-  let buf = RunVimInTerminal('-c "set ls=2" -c "set stal=2" -c "set cmdheight=1"', {'rows': rows})
+  let buf = RunMNVInTerminal('-c "set ls=2" -c "set stal=2" -c "set cmdheight=1"', {'rows': rows})
   call WaitForTermCurPosAndLinesToMatch(buf, [2, 1], g:test_timeout, ((rows - 1), '\<All$'), (rows, '^$'))
   call VerifyScreenDump(buf, 'Test_cmdheight_tabline_1', {})
 
   " clean up
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_map_completion()
@@ -490,7 +490,7 @@ func Test_map_completion()
   call assert_fails('call feedkeys(":map \\\\%(\<Tab>\<Home>\"\<CR>", "xt")', 'E53:')
 
   unmap <Middle>x
-  set cpo&vim
+  set cpo&mnv
 endfunc
 
 func Test_match_completion()
@@ -648,7 +648,7 @@ func Test_highlight_group_completion()
     call assert_equal('limegreen', getcompletion('hi DoesNotExist guisp=limgrn', 'cmdline')[0])
     set wildoptions-=fuzzy
 
-    " Test pruning bad color names with space. Vim doesn't support them.
+    " Test pruning bad color names with space. MNV doesn't support them.
     let v:colornames['foobar with space'] = '#123456'
     let v:colornames['foobarwithoutspace'] = '#234567'
     call assert_equal(['foobarwithoutspace'], getcompletion('hi FooBar guibg=foobarw', 'cmdline'))
@@ -676,14 +676,14 @@ func Test_getcompletion()
   call assert_true(groupcount > matchcount)
 
   if has('menu')
-    source $VIMRUNTIME/menu.vim
+    source $MNVRUNTIME/menu.mnv
     let matchcount = len(getcompletion('', 'menu'))
     call assert_true(matchcount > 0)
     call assert_equal(['File.'], getcompletion('File', 'menu'))
     call assert_true(matchcount > 0)
     let matchcount = len(getcompletion('File.', 'menu'))
     call assert_true(matchcount > 0)
-    source $VIMRUNTIME/delmenu.vim
+    source $MNVRUNTIME/delmenu.mnv
   endif
 
   let l = getcompletion('v:n', 'var')
@@ -757,12 +757,12 @@ func Test_getcompletion()
   call assert_equal([], l)
 
   let l = getcompletion('run', 'file')
-  call assert_true(index(l, 'runtest.vim') >= 0)
+  call assert_true(index(l, 'runtest.mnv') >= 0)
   let l = getcompletion('walk', 'file')
   call assert_equal([], l)
-  set wildignore=*.vim
+  set wildignore=*.mnv
   let l = getcompletion('run', 'file', 1)
-  call assert_true(index(l, 'runtest.vim') < 0)
+  call assert_true(index(l, 'runtest.mnv') < 0)
   set wildignore&
   " Directory name with space character
   call mkdir('Xdir with space', 'D')
@@ -956,7 +956,7 @@ func Test_multibyte_expression()
       qall!
   END
   call writefile(lines, 'XmultiScript', 'D')
-  call RunVim('', '', '-u NONE -n -e -s -S XmultiScript')
+  call RunMNV('', '', '-u NONE -n -e -s -S XmultiScript')
 endfunc
 
 " Test for getcompletion() with "fuzzy" in 'wildoptions'
@@ -978,19 +978,19 @@ endfunc
 func Test_complete_autoload_error()
   let save_rtp = &rtp
   let lines =<< trim END
-      vim9script
+      mnv9script
       export def Complete(..._): string
         return 'match'
       enddef
       echo this will cause an error
   END
   call mkdir('Xdir/autoload', 'pR')
-  call writefile(lines, 'Xdir/autoload/script.vim')
+  call writefile(lines, 'Xdir/autoload/script.mnv')
   exe 'set rtp+=' .. getcwd() .. '/Xdir'
 
   let lines =<< trim END
-      vim9script
-      import autoload 'script.vim'
+      mnv9script
+      import autoload 'script.mnv'
       command -nargs=* -complete=custom,script.Complete Cmd eval 0 + 0
       &wildcharm = char2nr("\<Tab>")
       feedkeys(":Cmd \<Tab>", 'xt')
@@ -1111,7 +1111,7 @@ func Test_cmdline_paste()
   new
   try
     call feedkeys(":file \<C-R>%Xtestfile\<CR>", 'tx')
-  catch /^Vim\%((\a\+)\)\=:E32/
+  catch /^MNV\%((\a\+)\)\=:E32/
     " ignore error E32
   endtry
   call assert_equal("Xtestfile", bufname("%"))
@@ -1203,11 +1203,11 @@ func Test_illegal_address1()
 endfunc
 
 func Test_illegal_address2()
-  call writefile(['c', 'x', '  x', '.', '1;y'], 'Xtest.vim', 'D')
+  call writefile(['c', 'x', '  x', '.', '1;y'], 'Xtest.mnv', 'D')
   new
-  source Xtest.vim
+  source Xtest.mnv
   " Trigger calling validate_cursor()
-  diffsp Xtest.vim
+  diffsp Xtest.mnv
   quit!
   bwipe!
 endfunc
@@ -1376,10 +1376,10 @@ func Test_cmdline_complete_languages()
 endfunc
 
 func Test_cmdline_complete_env_variable()
-  let $X_VIM_TEST_COMPLETE_ENV = 'foo'
-  call feedkeys(":edit $X_VIM_TEST_COMPLETE_E\<C-A>\<C-B>\"\<CR>", 'tx')
-  call assert_match('"edit $X_VIM_TEST_COMPLETE_ENV', @:)
-  unlet $X_VIM_TEST_COMPLETE_ENV
+  let $X_MNV_TEST_COMPLETE_ENV = 'foo'
+  call feedkeys(":edit $X_MNV_TEST_COMPLETE_E\<C-A>\<C-B>\"\<CR>", 'tx')
+  call assert_match('"edit $X_MNV_TEST_COMPLETE_ENV', @:)
+  unlet $X_MNV_TEST_COMPLETE_ENV
 endfunc
 
 func Test_cmdline_complete_expression()
@@ -1515,9 +1515,9 @@ func Test_cmdline_complete_various()
   call feedkeys(":topleft new\<C-A>\<C-B>\"\<CR>", 'xt')
   call assert_equal("\"topleft new", @:)
 
-  " completion for vim9 and legacy commands
-  call feedkeys(":vim9 call strle\<C-A>\<C-B>\"\<CR>", 'xt')
-  call assert_equal("\"vim9 call strlen(", @:)
+  " completion for mnv9 and legacy commands
+  call feedkeys(":mnv9 call strle\<C-A>\<C-B>\"\<CR>", 'xt')
+  call assert_equal("\"mnv9 call strlen(", @:)
   call feedkeys(":legac call strle\<C-A>\<C-B>\"\<CR>", 'xt')
   call assert_equal("\"legac call strlen(", @:)
 
@@ -1685,9 +1685,9 @@ func Test_cmdline_complete_various()
   call feedkeys(":py3\<C-A>\<C-B>\"\<CR>", 'xt')
   call assert_equal('"py3 py3do py3file', @:)
 
-  " completion for the :vim9 commands
-  call feedkeys(":vim9\<C-A>\<C-B>\"\<CR>", 'xt')
-  call assert_equal('"vim9cmd vim9script', @:)
+  " completion for the :mnv9 commands
+  call feedkeys(":mnv9\<C-A>\<C-B>\"\<CR>", 'xt')
+  call assert_equal('"mnv9cmd mnv9script', @:)
 
   " redir @" is not the start of a comment. So complete after that
   call feedkeys(":redir @\" | cwin\t\<C-B>\"\<CR>", 'xt')
@@ -1952,8 +1952,8 @@ func Test_verbose_option()
   CheckScreendump
 
   let lines =<< trim [SCRIPT]
-    " clear the TermResponse autocommand from defaults.vim
-    au! vimStartup TermResponse
+    " clear the TermResponse autocommand from defaults.mnv
+    au! mnvStartup TermResponse
     command DoSomething echo 'hello' |set ts=4 |let v = '123' |echo v
     call feedkeys("\r", 't') " for the hit-enter prompt
     set verbose=20
@@ -1961,13 +1961,13 @@ func Test_verbose_option()
   call writefile(lines, 'XTest_verbose', 'D')
 
   let rows = 12
-  let buf = RunVimInTerminal('-S XTest_verbose', {'rows': rows})
+  let buf = RunMNVInTerminal('-S XTest_verbose', {'rows': rows})
   call term_sendkeys(buf, ":DoSomething\<CR>")
   call WaitForTermCurPosAndLinesToMatch(buf, [rows, (strlen('Press ENTER or type command to continue') + 1)])
   call VerifyScreenDump(buf, 'Test_verbose_option_1', {})
 
   " clean up
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_setcmdpos()
@@ -2072,13 +2072,13 @@ func Test_cmdlineclear_tabenter()
 
   call writefile(lines, 'XtestCmdlineClearTabenter', 'D')
   let rows = 10
-  let buf = RunVimInTerminal('-S XtestCmdlineClearTabenter', #{rows: rows})
+  let buf = RunMNVInTerminal('-S XtestCmdlineClearTabenter', #{rows: rows})
   " in one tab make the command line higher with CTRL-W -
   call term_sendkeys(buf, ":tabnew\<cr>\<C-w>-\<C-w>-gtgt")
   call WaitForTermCurPosAndLinesToMatch(buf, [2, 1], g:test_timeout, (rows, '\<All$'))
   call VerifyScreenDump(buf, 'Test_cmdlineclear_tabenter', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 " Test for expanding special keywords in cmdline
@@ -2129,7 +2129,7 @@ func Test_cmd_bang()
     qall!
   [SCRIPT]
   call writefile(lines, 'Xscript', 'D')
-  if RunVim([], [], '--clean -S Xscript')
+  if RunMNV([], [], '--clean -S Xscript')
     call assert_equal([], readfile('Xresult'))
   endif
   call delete('Xresult')
@@ -2158,7 +2158,7 @@ func Test_cmd_bang_args()
   call assert_equal(0, v:shell_error)
 
   " Note that below there is one space char after the '!'.  This caused a
-  " shell error in the past, see https://github.com/vim/vim/issues/11495.
+  " shell error in the past, see https://github.com/Project-Tick/Project-Tick/issues/11495.
   :.! 
   call assert_equal(0, v:shell_error)
   bwipe!
@@ -2387,13 +2387,13 @@ func Test_custom_complete_autoload()
   let save_rtp = &rtp
   exe 'set rtp=' .. getcwd() .. '/Xcustdir'
   let lines =<< trim END
-      func vim8#Complete(a, c, p)
+      func mnv8#Complete(a, c, p)
         return "oneA\noneB\noneC"
       endfunc
   END
-  call writefile(lines, 'Xcustdir/autoload/vim8.vim')
+  call writefile(lines, 'Xcustdir/autoload/mnv8.mnv')
 
-  command -nargs=1 -complete=custom,vim8#Complete MyCmd
+  command -nargs=1 -complete=custom,mnv8#Complete MyCmd
   set nowildmenu
   set wildmode=full,list
   call feedkeys(":MyCmd \<C-A>\<C-B>\"\<CR>", 'xt')
@@ -2420,7 +2420,7 @@ func Test_interrupt_compl()
   let interrupted = 0
   try
     call feedkeys(":Tcmd tw\<Tab>\<C-B>\"\<CR>", 'xt')
-  catch /^Vim:Interrupt$/
+  catch /^MNV:Interrupt$/
     let interrupted = 1
   endtry
   call assert_equal(1, interrupted)
@@ -2428,7 +2428,7 @@ func Test_interrupt_compl()
   let interrupted = 0
   try
     call feedkeys(":Tcmd tw\<C-d>\<C-B>\"\<CR>", 'xt')
-  catch /^Vim:Interrupt$/
+  catch /^MNV:Interrupt$/
     let interrupted = 1
   endtry
   call assert_equal(1, interrupted)
@@ -2565,11 +2565,11 @@ func Test_read_shellcmd()
 
   if executable('rm')
     call feedkeys(":r! ++enc=utf-8 r\<c-a>\<c-b>\"\<cr>", 'tx')
-    call assert_notmatch('^"r!.*\<runtest.vim\>', @:)
+    call assert_notmatch('^"r!.*\<runtest.mnv\>', @:)
     call assert_match('^"r!.*\<rm\>', @:)
 
     call feedkeys(":r ++enc=utf-8 !rm\<c-a>\<c-b>\"\<cr>", 'tx')
-    call assert_notmatch('^"r.*\<runtest.vim\>', @:)
+    call assert_notmatch('^"r.*\<runtest.mnv\>', @:)
     call assert_match('^"r ++enc\S\+ !.*\<rm\>', @:)
   endif
 endfunc
@@ -2634,7 +2634,7 @@ func Test_recalling_cmdline()
   \]
   let prefix = 'vi'
   for h in histories
-    call histadd(h.name, 'vim')
+    call histadd(h.name, 'mnv')
     call histadd(h.name, 'virtue')
     call histadd(h.name, 'Virgo')
     call histadd(h.name, 'vogue')
@@ -2649,7 +2649,7 @@ func Test_recalling_cmdline()
       call feedkeys(keyseqs, 'xt')
       call histdel(h.name, -1) " delete the history added by feedkeys above
       let expect = k.prefixmatch
-      \          ? ['virtue', 'vim',   'virtue', prefix]
+      \          ? ['virtue', 'mnv',   'virtue', prefix]
       \          : ['emacs',  'vogue', 'emacs',  prefix]
       call assert_equal(expect, g:cmdlines)
     endfor
@@ -2792,7 +2792,7 @@ endfunc
 " (wildoptions=pum)
 func Test_wildmenu_pum()
   CheckScreendump
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   let commands =<< trim [CODE]
     set wildmenu
@@ -2825,13 +2825,13 @@ func Test_wildmenu_pum()
 
     func DoFeedKeys()
       let &wildcharm = char2nr("\t")
-      call feedkeys(":edit $VIMRUNTIME/\<Tab>\<Left>\<C-U>ab\<Tab>")
+      call feedkeys(":edit $MNVRUNTIME/\<Tab>\<Left>\<C-U>ab\<Tab>")
     endfunc
   [CODE]
   call writefile(commands, 'Xtest', 'D')
 
   let rows = 10
-  let buf = RunVimInTerminal('-S Xtest', #{rows: rows})
+  let buf = RunMNVInTerminal('-S Xtest', #{rows: rows})
 
   call term_sendkeys(buf, ":sign \<Tab>")
   call WaitForTermCurPosAndLinesToMatch(buf, [rows, (strlen(':sign define') + 1)], g:test_timeout, ((rows - 1), '\<unplace\s\+$'))
@@ -3040,7 +3040,7 @@ func Test_wildmenu_pum()
   call term_sendkeys(buf, "\<C-E>\<C-U>:cd -\<CR>")
 
   " After using <C-A> to expand all the matches, pressing <S-Tab> used to
-  " crash Vim
+  " crash MNV
   call term_sendkeys(buf, ":sign \<Tab>\<C-A>\<S-Tab>")
   call WaitForTermCurPosAndLinesToMatch(buf, [rows, (strlen(':sign define jump list place undefine unplace') + 1)])
   call VerifyScreenDump(buf, 'Test_wildmenu_pum_37', {})
@@ -3187,7 +3187,7 @@ func Test_wildmenu_pum()
   call VerifyScreenDump(buf, 'Test_wildmenu_pum_10', {})
 
   call term_sendkeys(buf, "\<C-U>\<Esc>")
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 " Test for wildmenumode() with the cmdline popup menu
@@ -3209,7 +3209,7 @@ endfunc
 
 func Test_wildmenu_with_pum_foldexpr()
   CheckScreendump
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   let lines =<< trim END
       call setline(1, ['folded one', 'folded two', 'some more text'])
@@ -3221,7 +3221,7 @@ func Test_wildmenu_with_pum_foldexpr()
   END
   call writefile(lines, 'Xpumfold', 'D')
   let rows = 10
-  let buf = RunVimInTerminal('-S Xpumfold', #{rows: rows})
+  let buf = RunMNVInTerminal('-S Xpumfold', #{rows: rows})
   call term_sendkeys(buf, ":set\<Tab>")
   call WaitForTermCurPosAndLinesToMatch(buf, [rows, (strlen(':set') + 1)], g:test_timeout, ((rows - 1), '\<setlocal\s\+$'))
   call VerifyScreenDump(buf, 'Test_wildmenu_with_pum_foldexpr_1', {})
@@ -3230,7 +3230,7 @@ func Test_wildmenu_with_pum_foldexpr()
   call WaitForTermCurPosAndLinesToMatch(buf, [1, 1], g:test_timeout, (rows, '\<All$'))
   call VerifyScreenDump(buf, 'Test_wildmenu_with_pum_foldexpr_2', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 " Test for opening the cmdline completion popup menu from the terminal window.
@@ -3238,7 +3238,7 @@ endfunc
 " bottom-most window.
 func Test_wildmenu_pum_from_terminal()
   CheckScreendump
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
   let python = PythonProg()
   call CheckPython(python)
 
@@ -3248,17 +3248,17 @@ func Test_wildmenu_pum_from_terminal()
   call add(cmds, "call term_start('" .. pcmd .. "')")
   call writefile(cmds, 'Xtest', 'D')
   let rows = 10
-  let buf = RunVimInTerminal('-S Xtest', #{rows: rows})
+  let buf = RunMNVInTerminal('-S Xtest', #{rows: rows})
   call term_sendkeys(buf, "\r\r\r")
   call term_sendkeys(buf, "\<C-W>:sign \<Tab>")
   call WaitForTermCurPosAndLinesToMatch(buf, [rows, (strlen(':sign define') + 1)], g:test_timeout, ((rows - 1), '\<unplace\s\+0,0-1\s\+All$'))
   call VerifyScreenDump(buf, 'Test_wildmenu_pum_term_01', {})
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_wildmenu_pum_odd_wildchar()
   CheckScreendump
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   " Test odd wildchar interactions with pum. Make sure they behave properly
   " and don't lead to memory corruption due to improperly cleaned up memory.
@@ -3268,7 +3268,7 @@ func Test_wildmenu_pum_odd_wildchar()
   END
   call writefile(lines, 'XwildmenuTest', 'D')
   let rows = 10
-  let buf = RunVimInTerminal('-S XwildmenuTest', #{rows: rows})
+  let buf = RunMNVInTerminal('-S XwildmenuTest', #{rows: rows})
 
   call term_sendkeys(buf, ":\<C-E>")
   call WaitForTermCurPosAndLinesToMatch(buf, [rows, (strlen(':!') + 1)], g:test_timeout, ((rows - 1), '^\s>\s\+$'))
@@ -3306,7 +3306,7 @@ func Test_wildmenu_pum_odd_wildchar()
   call WaitForTermCurPosAndLinesToMatch(buf, [1, 1], g:test_timeout, (rows, '\<All$'), ((rows - 1), '^\~\s\+$'))
   call VerifyScreenDump(buf, 'Test_wildmenu_pum_odd_wildchar_3', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 " Test that 'rightleft' should not affect cmdline completion popup menu.
@@ -3320,7 +3320,7 @@ func Test_wildmenu_pum_rightleft()
   END
   call writefile(lines, 'Xwildmenu_pum_rl', 'D')
   let rows = 10
-  let buf = RunVimInTerminal('-S Xwildmenu_pum_rl', #{rows: rows, cols: 50})
+  let buf = RunMNVInTerminal('-S Xwildmenu_pum_rl', #{rows: rows, cols: 50})
 
   call term_sendkeys(buf, ":sign \<Tab>")
   call WaitForTermCurPosAndLinesToMatch(buf, [rows, (strlen(':sign define') + 1)], g:test_timeout, ((rows - 1), '\<unplace\s\+\~$'))
@@ -3334,7 +3334,7 @@ func Test_wildmenu_pum_rightleft()
   call VerifyScreenDump(buf, 'Test_wildmenu_pum_rl', {})
   call term_sendkeys(buf, "\<Esc>")
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 " Test highlighting when pattern matches non-first character of item
@@ -3352,13 +3352,13 @@ func Test_wildmenu_pum_hl_nonfirst()
 
   call writefile(lines, 'Xwildmenu_pum_hl_nonf', 'D')
   let rows = 10
-  let buf = RunVimInTerminal('-S Xwildmenu_pum_hl_nonf', #{rows: rows, cols: 50})
+  let buf = RunMNVInTerminal('-S Xwildmenu_pum_hl_nonf', #{rows: rows, cols: 50})
 
   call term_sendkeys(buf, ":MyCmd ne\<tab>")
   call WaitForTermCurPosAndLinesToMatch(buf, [rows, (strlen(':MyCmd ne') + 1)], g:test_timeout, ((rows - 1), '\<aoneC\s\+$'))
   call VerifyScreenDump(buf, 'Test_wildmenu_pum_hl_match_nonf', {})
   call term_sendkeys(buf, "\<Esc>")
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 " Test highlighting matched text in cmdline completion popup menu.
@@ -3372,7 +3372,7 @@ func Test_wildmenu_pum_hl_match()
   END
   call writefile(lines, 'Xwildmenu_pum_hl', 'D')
   let rows = 10
-  let buf = RunVimInTerminal('-S Xwildmenu_pum_hl', #{rows: rows, cols: 50})
+  let buf = RunMNVInTerminal('-S Xwildmenu_pum_hl', #{rows: rows, cols: 50})
 
   call term_sendkeys(buf, ":sign plc\<Tab>")
   call WaitForTermCurPosAndLinesToMatch(buf, [rows, (strlen(':sign place') + 1)], g:test_timeout, ((rows - 1), '\<unplace\s\+$'))
@@ -3395,7 +3395,7 @@ func Test_wildmenu_pum_hl_match()
   call VerifyScreenDump(buf, 'Test_wildmenu_pum_hl_match_6', {})
   call term_sendkeys(buf, "\<Esc>")
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 " Test highlighting of matched text in cmdline completion popup menu provided
@@ -3414,7 +3414,7 @@ func Test_wildmenu_pum_hl_match_list()
   END
   call writefile(lines, 'Xwildmenu_pum_hl', 'D')
   let rows = 10
-  let buf = RunVimInTerminal('-S Xwildmenu_pum_hl', #{rows: rows, cols: 50})
+  let buf = RunMNVInTerminal('-S Xwildmenu_pum_hl', #{rows: rows, cols: 50})
 
   call term_sendkeys(buf, ":ListT hewo\<Tab>")
   call WaitForTermCurPosAndLinesToMatch(buf, [rows, (strlen(':ListT hello/world') + 1)], g:test_timeout, ((rows - 1), '\<hello/wonderful\s\+$'))
@@ -3425,7 +3425,7 @@ func Test_wildmenu_pum_hl_match_list()
   call VerifyScreenDump(buf, 'Test_wildmenu_pum_hl_match_list_2', {})
   call term_sendkeys(buf, "\<Esc>")
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 " Test highlighting of matched text in cmdline completion popup menu provided
@@ -3444,7 +3444,7 @@ func Test_wildmenu_pum_hl_match_findfunc()
   END
   call writefile(lines, 'Xwildmenu_pum_hl', 'D')
   let rows = 10
-  let buf = RunVimInTerminal('-S Xwildmenu_pum_hl', #{rows: rows, cols: 50})
+  let buf = RunMNVInTerminal('-S Xwildmenu_pum_hl', #{rows: rows, cols: 50})
 
   call term_sendkeys(buf, ":find hewo\<Tab>")
   call WaitForTermCurPosAndLinesToMatch(buf, [rows, (strlen(':find hello/world') + 1)], g:test_timeout, ((rows - 1), '\<hello/wonderful\s\+$'))
@@ -3455,7 +3455,7 @@ func Test_wildmenu_pum_hl_match_findfunc()
   call VerifyScreenDump(buf, 'Test_wildmenu_pum_hl_match_find_2', {})
   call term_sendkeys(buf, "\<Esc>")
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 " Test for completion after a :substitute command followed by a pipe (|)
@@ -3679,7 +3679,7 @@ func Test_fuzzy_completion_env()
   call assert_equal('"echo $VUT', @:)
   set wildoptions=fuzzy
   call feedkeys(":echo $VUT\<Tab>\<C-B>\"\<CR>", 'tx')
-  call assert_equal('"echo $VIMRUNTIME', @:)
+  call assert_equal('"echo $MNVRUNTIME', @:)
   set wildoptions&
 endfunc
 
@@ -3694,7 +3694,7 @@ func Test_fuzzy_completion_autocmd_event()
   set wildoptions&
 endfunc
 
-" vim expression fuzzy completion
+" mnv expression fuzzy completion
 func Test_fuzzy_completion_expr()
   let g:PerPlaceCount = 10
   set wildoptions&
@@ -3872,7 +3872,7 @@ endfunc
 func Test_fuzzy_completion_menu()
   CheckFeature menu
 
-  source $VIMRUNTIME/menu.vim
+  source $MNVRUNTIME/menu.mnv
   set wildoptions&
   call feedkeys(":menu pup\<Tab>\<C-B>\"\<CR>", 'tx')
   call assert_equal('"menu pup', @:)
@@ -3881,7 +3881,7 @@ func Test_fuzzy_completion_menu()
   call assert_equal('"menu PopUp.', @:)
 
   set wildoptions&
-  source $VIMRUNTIME/delmenu.vim
+  source $MNVRUNTIME/delmenu.mnv
 endfunc
 
 " :messages suboptions fuzzy completion
@@ -4244,25 +4244,25 @@ endfunc
 " Test for :scriptnames argument completion
 func Test_cmdline_complete_scriptnames()
   set wildmenu
-  call writefile(['let a = 1'], 'Xa1b2c3.vim', 'D')
-  source Xa1b2c3.vim
+  call writefile(['let a = 1'], 'Xa1b2c3.mnv', 'D')
+  source Xa1b2c3.mnv
   call feedkeys(":script \<Tab>\<Left>\<Left>\<C-B>\"\<CR>", 'tx')
-  call assert_match("\"script .*Xa1b2c3.vim$", @:)
+  call assert_match("\"script .*Xa1b2c3.mnv$", @:)
   call feedkeys(":script    \<Tab>\<Left>\<Left>\<C-B>\"\<CR>", 'tx')
-  call assert_match("\"script .*Xa1b2c3.vim$", @:)
+  call assert_match("\"script .*Xa1b2c3.mnv$", @:)
   call feedkeys(":script b2c3\<Tab>\<C-B>\"\<CR>", 'tx')
   call assert_equal("\"script b2c3", @:)
   call feedkeys(":script 2\<Tab>\<C-B>\"\<CR>", 'tx')
   call assert_match("\"script 2\<Tab>$", @:)
   call feedkeys(":script \<Tab>\<Left>\<Left> \<Tab>\<C-B>\"\<CR>", 'tx')
-  call assert_match("\"script .*Xa1b2c3.vim $", @:)
+  call assert_match("\"script .*Xa1b2c3.mnv $", @:)
   call feedkeys(":script \<Tab>\<Left>\<C-B>\"\<CR>", 'tx')
   call assert_equal("\"script ", @:)
-  call assert_match('Xa1b2c3.vim$', getcompletion('.*Xa1b2.*', 'scriptnames')[0])
+  call assert_match('Xa1b2c3.mnv$', getcompletion('.*Xa1b2.*', 'scriptnames')[0])
   call assert_equal([], getcompletion('Xa1b2', 'scriptnames'))
   new
   call feedkeys(":script \<Tab>\<Left>\<Left>\<CR>", 'tx')
-  call assert_equal('Xa1b2c3.vim', fnamemodify(@%, ':t'))
+  call assert_equal('Xa1b2c3.mnv', fnamemodify(@%, ':t'))
   bw!
   set wildmenu&
 endfunc
@@ -4297,50 +4297,50 @@ func Test_cmdline_complete_shellcmdline_argument()
 
   set wildoptions=fuzzy
 
-  call feedkeys(":MyCmd vim test_cmdline.\<Tab>\<C-B>\"\<CR>", 'xt')
-  call assert_equal('"MyCmd vim test_cmdline.vim', @:)
-  call assert_equal(['test_cmdline.vim'],
-        \ getcompletion('vim test_cmdline.', 'shellcmdline'))
+  call feedkeys(":MyCmd mnv test_cmdline.\<Tab>\<C-B>\"\<CR>", 'xt')
+  call assert_equal('"MyCmd mnv test_cmdline.mnv', @:)
+  call assert_equal(['test_cmdline.mnv'],
+        \ getcompletion('mnv test_cmdline.', 'shellcmdline'))
 
-  call feedkeys(":MyCmd vim nonexistentfile\<Tab>\<C-B>\"\<CR>", 'xt')
-  call assert_equal('"MyCmd vim nonexistentfile', @:)
+  call feedkeys(":MyCmd mnv nonexistentfile\<Tab>\<C-B>\"\<CR>", 'xt')
+  call assert_equal('"MyCmd mnv nonexistentfile', @:)
   call assert_equal([],
-        \ getcompletion('vim nonexistentfile', 'shellcmdline'))
+        \ getcompletion('mnv nonexistentfile', 'shellcmdline'))
 
   let compl1 = getcompletion('', 'file')[0]
   let compl2 = getcompletion('', 'file')[1]
-  call feedkeys(":MyCmd vim \<Tab>\<C-B>\"\<CR>", 'xt')
-  call assert_equal('"MyCmd vim ' .. compl1, @:)
+  call feedkeys(":MyCmd mnv \<Tab>\<C-B>\"\<CR>", 'xt')
+  call assert_equal('"MyCmd mnv ' .. compl1, @:)
 
-  call feedkeys(":MyCmd vim \<Tab> \<Tab>\<C-B>\"\<CR>", 'xt')
-  call assert_equal('"MyCmd vim ' .. compl1 .. ' ' .. compl1, @:)
+  call feedkeys(":MyCmd mnv \<Tab> \<Tab>\<C-B>\"\<CR>", 'xt')
+  call assert_equal('"MyCmd mnv ' .. compl1 .. ' ' .. compl1, @:)
 
   let compl = getcompletion('', 'file')[1]
-  call feedkeys(":MyCmd vim \<Tab> \<Tab>\<Tab>\<C-B>\"\<CR>", 'xt')
-  call assert_equal('"MyCmd vim ' .. compl1 .. ' ' .. compl2, @:)
+  call feedkeys(":MyCmd mnv \<Tab> \<Tab>\<Tab>\<C-B>\"\<CR>", 'xt')
+  call assert_equal('"MyCmd mnv ' .. compl1 .. ' ' .. compl2, @:)
 
   set wildoptions&
-  call feedkeys(":MyCmd vim test_cmdline.\<Tab>\<C-B>\"\<CR>", 'xt')
-  call assert_equal('"MyCmd vim test_cmdline.vim', @:)
-  call assert_equal(['test_cmdline.vim'],
-        \ getcompletion('vim test_cmdline.', 'shellcmdline'))
+  call feedkeys(":MyCmd mnv test_cmdline.\<Tab>\<C-B>\"\<CR>", 'xt')
+  call assert_equal('"MyCmd mnv test_cmdline.mnv', @:)
+  call assert_equal(['test_cmdline.mnv'],
+        \ getcompletion('mnv test_cmdline.', 'shellcmdline'))
 
-  call feedkeys(":MyCmd vim nonexistentfile\<Tab>\<C-B>\"\<CR>", 'xt')
-  call assert_equal('"MyCmd vim nonexistentfile', @:)
+  call feedkeys(":MyCmd mnv nonexistentfile\<Tab>\<C-B>\"\<CR>", 'xt')
+  call assert_equal('"MyCmd mnv nonexistentfile', @:)
   call assert_equal([],
-        \ getcompletion('vim nonexistentfile', 'shellcmdline'))
+        \ getcompletion('mnv nonexistentfile', 'shellcmdline'))
 
   let compl1 = getcompletion('', 'file')[0]
   let compl2 = getcompletion('', 'file')[1]
-  call feedkeys(":MyCmd vim \<Tab>\<C-B>\"\<CR>", 'xt')
-  call assert_equal('"MyCmd vim ' .. compl1, @:)
+  call feedkeys(":MyCmd mnv \<Tab>\<C-B>\"\<CR>", 'xt')
+  call assert_equal('"MyCmd mnv ' .. compl1, @:)
 
-  call feedkeys(":MyCmd vim \<Tab> \<Tab>\<C-B>\"\<CR>", 'xt')
-  call assert_equal('"MyCmd vim ' .. compl1 .. ' ' .. compl1, @:)
+  call feedkeys(":MyCmd mnv \<Tab> \<Tab>\<C-B>\"\<CR>", 'xt')
+  call assert_equal('"MyCmd mnv ' .. compl1 .. ' ' .. compl1, @:)
 
   let compl = getcompletion('', 'file')[1]
-  call feedkeys(":MyCmd vim \<Tab> \<Tab>\<Tab>\<C-B>\"\<CR>", 'xt')
-  call assert_equal('"MyCmd vim ' .. compl1 .. ' ' .. compl2, @:)
+  call feedkeys(":MyCmd mnv \<Tab> \<Tab>\<Tab>\<C-B>\"\<CR>", 'xt')
+  call assert_equal('"MyCmd mnv ' .. compl1 .. ' ' .. compl2, @:)
 
   delcommand MyCmd
 endfunc
@@ -4348,11 +4348,11 @@ endfunc
 " Test for :! shell command argument completion
 func Test_cmdline_complete_bang_cmd_argument()
   set wildoptions=fuzzy
-  call feedkeys(":!vim test_cmdline.\<Tab>\<C-B>\"\<CR>", 'xt')
-  call assert_equal('"!vim test_cmdline.vim', @:)
+  call feedkeys(":!mnv test_cmdline.\<Tab>\<C-B>\"\<CR>", 'xt')
+  call assert_equal('"!mnv test_cmdline.mnv', @:)
   set wildoptions&
-  call feedkeys(":!vim test_cmdline.\<Tab>\<C-B>\"\<CR>", 'xt')
-  call assert_equal('"!vim test_cmdline.vim', @:)
+  call feedkeys(":!mnv test_cmdline.\<Tab>\<C-B>\"\<CR>", 'xt')
+  call assert_equal('"!mnv test_cmdline.mnv', @:)
 endfunc
 
 func Call_cmd_funcs()
@@ -4405,18 +4405,18 @@ func Test_long_error_message()
 endfunc
 
 func Test_cmdline_redraw_tabline()
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   let lines =<< trim END
       set showtabline=2
       autocmd CmdlineEnter * set tabline=foo
   END
   call writefile(lines, 'Xcmdline_redraw_tabline', 'D')
-  let buf = RunVimInTerminal('-S Xcmdline_redraw_tabline', #{rows: 6})
+  let buf = RunMNVInTerminal('-S Xcmdline_redraw_tabline', #{rows: 6})
   call term_sendkeys(buf, ':')
   call WaitForAssert({-> assert_match('^foo', term_getline(buf, 1))})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_wildmenu_pum_disable_while_shown()
@@ -4510,7 +4510,7 @@ endfunc
 func Test_rulerformat_position()
   CheckScreendump
 
-  let buf = RunVimInTerminal('', #{rows: 2, cols: 20})
+  let buf = RunMNVInTerminal('', #{rows: 2, cols: 20})
   call term_sendkeys(buf, ":set ruler rulerformat=longish\<CR>")
   call term_sendkeys(buf, ":set laststatus=0 winwidth=1\<CR>")
   call term_sendkeys(buf, "\<C-W>v\<C-W>|\<C-W>p")
@@ -4518,7 +4518,7 @@ func Test_rulerformat_position()
   call VerifyScreenDump(buf, 'Test_rulerformat_position', {})
 
   " clean up
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 " Test for using "%!" in 'rulerformat' to use a function
@@ -4533,14 +4533,14 @@ func Test_rulerformat_function()
   call writefile(lines, 'Xrulerformat_function', 'D')
 
   let rows = 2
-  let buf = RunVimInTerminal('-S Xrulerformat_function', #{rows: rows, cols: 40})
+  let buf = RunMNVInTerminal('-S Xrulerformat_function', #{rows: rows, cols: 40})
   call term_sendkeys(buf, ":set ruler rulerformat=%!TestRulerFn()\<CR>")
   call term_sendkeys(buf, ":redraw!\<CR>")
   call WaitForTermCurPosAndLinesToMatch(buf, [1, 1], g:test_timeout, (rows, '^\s\+10,20\s\+30%$'))
   call VerifyScreenDump(buf, 'Test_rulerformat_function', {})
 
   " clean up
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_getcompletion_usercmd()
@@ -4661,7 +4661,7 @@ func Test_ex_command_completion()
   " required for :*
   set cpo+=*
   let list = filter(getcompletion('', 'command'), 'exists(":" . v:val) == 0')
-  " :++ and :-- are only valid in Vim9 script context, so they can be ignored
+  " :++ and :-- are only valid in MNV9 script context, so they can be ignored
   call assert_equal(['++', '--'], sort(list))
   call assert_equal(2, exists(':k'))
   call assert_equal(0, exists(':ke'))
@@ -4957,7 +4957,7 @@ func Test_search_wildmenu_screendump()
   [SCRIPT]
   call writefile(lines, 'XTest_search_wildmenu', 'D')
   let rows = 10
-  let buf = RunVimInTerminal('-S XTest_search_wildmenu', {'rows': rows})
+  let buf = RunMNVInTerminal('-S XTest_search_wildmenu', {'rows': rows})
 
   " Pattern has newline at EOF
   call term_sendkeys(buf, "gg2j/e\\n\<f5>")
@@ -5010,7 +5010,7 @@ func Test_search_wildmenu_screendump()
   call VerifyScreenDump(buf, 'Test_search_wildmenu_9', {})
 
   call term_sendkeys(buf, "\<esc>")
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 " Issue #17858
@@ -5028,14 +5028,14 @@ func Test_search_wildmenu_iminsert()
   [SCRIPT]
   call writefile(lines, 'XTest_search_wildmenu', 'D')
   let rows = 12
-  let buf = RunVimInTerminal('-S XTest_search_wildmenu', {'rows': rows})
+  let buf = RunMNVInTerminal('-S XTest_search_wildmenu', {'rows': rows})
 
   call term_sendkeys(buf, "/gl\<Tab>")
   call WaitForTermCurPosAndLinesToMatch(buf, [rows, (strlen('/global') + 1)], g:test_timeout, ((rows - 1), '\<gle-byte\s\+$'))
   call VerifyScreenDump(buf, 'Test_search_wildmenu_iminsert', {})
 
   call term_sendkeys(buf, "\<esc>")
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 " Test wildcharm completion for :s and :g with range
@@ -5058,7 +5058,7 @@ func Test_range_complete()
   for trig in ["\<tab>", "\<c-z>", "\<F8>"]
     call feedkeys($":%s/a{trig}\<f9>", 'xt')
     call assert_equal(['ab', 'a', 'af'], g:compl_info.matches)
-    call feedkeys($":vim9cmd :%s/a{trig}\<f9>", 'xt')
+    call feedkeys($":mnv9cmd :%s/a{trig}\<f9>", 'xt')
     call assert_equal(['ab', 'a', 'af'], g:compl_info.matches)
   endfor
 
@@ -5120,7 +5120,7 @@ func Test_pum_scroll_noselect()
   [SCRIPT]
   call writefile(lines, 'XTest_pum_scroll', 'D')
   let rows = 10
-  let buf = RunVimInTerminal('-S XTest_pum_scroll', {'rows': rows})
+  let buf = RunMNVInTerminal('-S XTest_pum_scroll', {'rows': rows})
 
   call term_sendkeys(buf, ":TestCmd \<tab>" . repeat("\<c-n>", 20))
   call WaitForTermCurPosAndLinesToMatch(buf, [rows, (strlen(':TestCmd a20') + 1)], g:test_timeout, ((rows - 1), '\<a23\s\+$'))
@@ -5131,7 +5131,7 @@ func Test_pum_scroll_noselect()
   call VerifyScreenDump(buf, 'Test_pum_scroll_noselect_2', {})
 
   call term_sendkeys(buf, "\<esc>")
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 " CmdlineChanged shouldn't trigger if command-line text is unchanged
@@ -5215,7 +5215,7 @@ func Test_wildtrigger_update_screen()
   [SCRIPT]
   call writefile(lines, 'XTest_wildtrigger', 'D')
   let rows = 10
-  let buf = RunVimInTerminal('-S XTest_wildtrigger', {'rows': rows})
+  let buf = RunMNVInTerminal('-S XTest_wildtrigger', {'rows': rows})
 
   call term_sendkeys(buf, ":TestCmd a\<F8>")
   call WaitForTermCurPosAndLinesToMatch(buf, [rows, (strlen(':TermCmd a') + 1)], g:test_timeout, ((rows - 1), '\<abc5\s\+$'))
@@ -5246,7 +5246,7 @@ func Test_wildtrigger_update_screen()
   call WaitForTermCurPosAndLinesToMatch(buf, [1, 1], g:test_timeout, (rows, '\<All$'), ((rows - 1), '^\~\s\+$'))
   call VerifyScreenDump(buf, 'Test_wildtrigger_update_screen_4', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 " Issue #17969: With 'noselect', the popup menu should appear next to the
@@ -5261,7 +5261,7 @@ func Test_noselect_expand_env_var()
   [SCRIPT]
   call writefile(lines, 'XTest_wildmenu', 'D')
   let rows = 8
-  let buf = RunVimInTerminal('-S XTest_wildmenu', {'rows': rows})
+  let buf = RunMNVInTerminal('-S XTest_wildmenu', {'rows': rows})
 
   call mkdir('a/b/c', 'pR')
   call writefile(['asdf'], 'a/b/fileXname1')
@@ -5281,7 +5281,7 @@ func Test_noselect_expand_env_var()
 
   " clean up
   call term_sendkeys(buf, "\<Esc>")
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 " Issue #18035: long lines should not get listed twice in the menu when
@@ -5298,7 +5298,7 @@ func Test_long_line_noselect()
   [SCRIPT]
   call writefile(lines, 'XTest_wildmenu', 'D')
   let rows = 8
-  let buf = RunVimInTerminal('-S XTest_wildmenu', {'rows': rows, 'cols': 60})
+  let buf = RunMNVInTerminal('-S XTest_wildmenu', {'rows': rows, 'cols': 60})
 
   call term_sendkeys(buf, ":DoubleEntry \<Tab>")
   call WaitForTermCurPosAndLinesToMatch(buf, [rows, (strlen(':DoubleEntry ') + 1)], g:test_timeout, ((rows - 1), '\<rea>$'))
@@ -5314,7 +5314,7 @@ func Test_long_line_noselect()
 
   " clean up
   call term_sendkeys(buf, "\<Esc>")
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_CmdlineLeave_vchar_keys()
@@ -5375,14 +5375,14 @@ func Test_update_screen_after_wildtrigger()
   [SCRIPT]
   call writefile(lines, 'XTest_wildtrigger', 'D')
   let rows = 10
-  let buf = RunVimInTerminal('-S XTest_wildtrigger', {'rows': rows})
+  let buf = RunMNVInTerminal('-S XTest_wildtrigger', {'rows': rows})
 
   call term_sendkeys(buf, ":term foo")
   call WaitForTermCurPosAndLinesToMatch(buf, [rows, (strlen(':term foo') + 1)])
   call VerifyScreenDump(buf, 'Test_update_screen_wildtrigger_1', {})
 
   call term_sendkeys(buf, "\<esc>")
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_breaklist_args_fails()
@@ -5390,4 +5390,4 @@ func Test_breaklist_args_fails()
   call assert_fails(':breaklist extra', 'E488:')
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_cmdmods.vim b/uvim/src/testdir/test_cmdmods.mnv
index 3b0deab7b5..e8735927a8 100644
--- a/uvim/src/testdir/test_cmdmods.vim
+++ b/uvim/src/testdir/test_cmdmods.mnv
@@ -53,7 +53,7 @@ def Test_keep_cmdmods_names()
   # :k only available in legacy script
   legacy call assert_equal('k', fullcommand(':k'))
   legacy call assert_equal('k', fullcommand(':ke'))
-  # single character commands not supported in Vim9
+  # single character commands not supported in MNV9
   assert_equal('', fullcommand(':k'))
   assert_equal('keepmarks', fullcommand(':ke'))
   assert_equal('keepmarks', fullcommand(':kee'))
@@ -91,5 +91,5 @@ def Test_cmdmod_completion()
   endfor
 enddef
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
 
diff --git a/uvim/src/testdir/test_cmdwin.vim b/uvim/src/testdir/test_cmdwin.mnv
index b25862dad7..e0b9fa1d63 100644
--- a/uvim/src/testdir/test_cmdwin.vim
+++ b/uvim/src/testdir/test_cmdwin.mnv
@@ -1,6 +1,6 @@
 " Tests for editing the command line.
 
-source util/screendump.vim
+source util/screendump.mnv
 
 func Test_getcmdwintype()
   call feedkeys("q/:let a = getcmdwintype()\<CR>:q\<CR>", 'x!')
@@ -54,7 +54,7 @@ func Test_cmdwin_bug()
   sp
   try
     call feedkeys("q::call win_gotoid(" .. winid .. ")\<CR>:q\<CR>", 'x!')
-  catch /^Vim\%((\a\+)\)\=:E11/
+  catch /^MNV\%((\a\+)\)\=:E11/
   endtry
   bw!
 endfunc
@@ -63,13 +63,13 @@ func Test_cmdwin_restore()
   CheckScreendump
 
   let lines =<< trim [SCRIPT]
-    augroup vimHints | au! | augroup END
+    augroup mnvHints | au! | augroup END
     call setline(1, range(30))
     2split
   [SCRIPT]
   call writefile(lines, 'XTest_restore', 'D')
 
-  let buf = RunVimInTerminal('-S XTest_restore', {'rows': 12})
+  let buf = RunMNVInTerminal('-S XTest_restore', {'rows': 12})
   call term_sendkeys(buf, "q:")
   call VerifyScreenDump(buf, 'Test_cmdwin_restore_1', {})
 
@@ -85,25 +85,25 @@ func Test_cmdwin_restore()
   call VerifyScreenDump(buf, 'Test_cmdwin_restore_3', {})
 
   " clean up
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_cmdwin_no_terminal()
   CheckScreendump
 
-  let buf = RunVimInTerminal('', {'rows': 12})
+  let buf = RunMNVInTerminal('', {'rows': 12})
   call term_sendkeys(buf, ":set cmdheight=2\<CR>")
   call term_sendkeys(buf, "q:")
   call term_sendkeys(buf, ":let buf = term_start(['/bin/echo'], #{hidden: 1})\<CR>")
   call VerifyScreenDump(buf, 'Test_cmdwin_no_terminal', {})
   call term_sendkeys(buf, ":q\<CR>")
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_cmdwin_wrong_command()
   CheckScreendump
 
-  let buf = RunVimInTerminal('', {'rows': 12})
+  let buf = RunMNVInTerminal('', {'rows': 12})
   call term_sendkeys(buf, "q:")
   call term_sendkeys(buf, "als\<Esc>")
   call term_sendkeys(buf, "\<C-W>k")
@@ -113,7 +113,7 @@ func Test_cmdwin_wrong_command()
   call VerifyScreenDump(buf, 'Test_cmdwin_wrong_command_2', {})
 
   call term_sendkeys(buf, ":q\<CR>")
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_cmdwin_feedkeys()
@@ -126,7 +126,7 @@ func Test_cmdwin_feedkeys()
 endfunc
 
 " Tests for the issues fixed in 7.4.441.
-" When 'cedit' is set to Ctrl-C, opening the command window hangs Vim
+" When 'cedit' is set to Ctrl-C, opening the command window hangs MNV
 func Test_cmdwin_cedit()
   exe "set cedit=\<C-c>"
   normal! :
@@ -144,7 +144,7 @@ func Test_cmdwin_cedit()
   call assert_equal('@', g:cmd_wintype)
   call assert_equal('command', g:wintype)
 
-  set cedit&vim
+  set cedit&mnv
   delfunc CmdWinType
 endfunc
 
@@ -197,7 +197,7 @@ func Test_cmdwin_interrupted_more_prompt()
   [SCRIPT]
   call writefile(lines, 'XTest_cmdwin', 'D')
 
-  let buf = RunVimInTerminal('-S XTest_cmdwin', {'rows': 18})
+  let buf = RunMNVInTerminal('-S XTest_cmdwin', {'rows': 18})
   " open cmdwin
   call term_sendkeys(buf, "q:")
   call WaitForAssert({-> assert_match('-- More --', term_getline(buf, 18))})
@@ -209,7 +209,7 @@ func Test_cmdwin_interrupted_more_prompt()
   call VerifyScreenDump(buf, 'Test_cmdwin_interrupted', {})
 
   " clean up
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 " Test for recursively getting multiple command line inputs
@@ -586,11 +586,11 @@ func Test_cmdwin_showcmd()
   CheckScreendump
 
   let lines =<< trim [SCRIPT]
-    augroup vimHints | au! | augroup END
+    augroup mnvHints | au! | augroup END
     set showcmd
   [SCRIPT]
   call writefile(lines, 'XTest_cmdwin_showcmd', 'D')
-  let buf = RunVimInTerminal('-S XTest_cmdwin_showcmd', {'rows': 18})
+  let buf = RunMNVInTerminal('-S XTest_cmdwin_showcmd', {'rows': 18})
 
   for keys in ['q:', ":\<C-F>"]
     call term_sendkeys(buf, keys)
@@ -608,7 +608,7 @@ func Test_cmdwin_showcmd()
   endfor
 
   " clean up
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_codestyle.vim b/uvim/src/testdir/test_codestyle.mnv
index ed68e3510e..5466cb40dd 100644
--- a/uvim/src/testdir/test_codestyle.vim
+++ b/uvim/src/testdir/test_codestyle.mnv
@@ -45,12 +45,12 @@ def Test_source_files()
 
     PerformCheck(fname, ';;\+$', 'double semicolon', '')
 
-    # some files don't stick to the Vim style rules
+    # some files don't stick to the MNV style rules
     if fname =~ 'iscygpty.c'
       continue
     endif
 
-    var skip = 'getline(".") =~ "condition) {" || getline(".") =~ "vimglob_func" || getline(".") =~ "{\"" || getline(".") =~ "{\\d" || getline(".") =~ "{{{"'
+    var skip = 'getline(".") =~ "condition) {" || getline(".") =~ "mnvglob_func" || getline(".") =~ "{\"" || getline(".") =~ "{\\d" || getline(".") =~ "{{{"'
     PerformCheck(fname, ')\s*{', 'curly after closing paren', skip)
 
     # Examples in comments use double quotes.
@@ -67,19 +67,19 @@ def Test_source_files()
 enddef
 
 def Test_test_files()
-  for fname in glob('*.vim', 0, 1)
+  for fname in glob('*.mnv', 0, 1)
     g:ignoreSwapExists = 'e'
     exe 'edit ' .. fname
 
     # some files intentionally have misplaced white space
-    if fname =~ 'test_cindent.vim' || fname =~ 'test_join.vim'
+    if fname =~ 'test_cindent.mnv' || fname =~ 'test_join.mnv'
       continue
     endif
 
     # skip files that are known to have a space before a tab
-    if fname !~ 'test_comments.vim'
-        && fname !~ 'test_listchars.vim'
-        && fname !~ 'test_visual.vim'
+    if fname !~ 'test_comments.mnv'
+        && fname !~ 'test_listchars.mnv'
+        && fname !~ 'test_visual.mnv'
       cursor(1, 1)
       var skip = 'getline(".") =~ "codestyle: ignore"'
       var lnum = search(fname =~ "test_regexp_latin" ? '[^á] \t' : ' \t', 'W', 0, 0, skip)
@@ -87,17 +87,17 @@ def Test_test_files()
     endif
 
     # skip files that are known to have trailing white space
-    if fname !~ 'test_cmdline.vim'
-            && fname !~ 'test_let.vim'
-            && fname !~ 'test_tagjump.vim'
-            && fname !~ 'test_vim9_cmd.vim'
-            && fname !~ 'test_vim9_enum.vim'
+    if fname !~ 'test_cmdline.mnv'
+            && fname !~ 'test_let.mnv'
+            && fname !~ 'test_tagjump.mnv'
+            && fname !~ 'test_mnv9_cmd.mnv'
+            && fname !~ 'test_mnv9_enum.mnv'
       cursor(1, 1)
       var lnum = search(
-          fname =~ 'test_vim9_assign.vim' ? '[^=]\s$'
-          : fname =~ 'test_vim9_class.vim' ? '[^)]\s$'
-          : fname =~ 'test_vim9_script.vim' ? '[^,:3]\s$'
-          : fname =~ 'test_visual.vim' ? '[^/]\s$'
+          fname =~ 'test_mnv9_assign.mnv' ? '[^=]\s$'
+          : fname =~ 'test_mnv9_class.mnv' ? '[^)]\s$'
+          : fname =~ 'test_mnv9_script.mnv' ? '[^,:3]\s$'
+          : fname =~ 'test_visual.mnv' ? '[^/]\s$'
           : '[^\\]\s$')
       ReportError('testdir/' .. fname, lnum, 'trailing white space')
     endif
@@ -165,7 +165,7 @@ def Test_help_files()
 
   endfor
 
-  set wrapscan&vim
+  set wrapscan&mnv
   bwipe!
 enddef
 
@@ -195,4 +195,4 @@ def Test_indent_of_source_files()
   endfor
 enddef
 
-" vim: shiftwidth=2 sts=2 expandtab nofoldenable
+" mnv: shiftwidth=2 sts=2 expandtab nofoldenable
diff --git a/uvim/src/testdir/test_command_count.vim b/uvim/src/testdir/test_command_count.mnv
index 59e3ba05c8..46ccce334a 100644
--- a/uvim/src/testdir/test_command_count.vim
+++ b/uvim/src/testdir/test_command_count.mnv
@@ -195,4 +195,4 @@ func Test_command_count_4()
   bwipe!
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_comments.vim b/uvim/src/testdir/test_comments.mnv
index f22f90300e..d236d9cfc4 100644
--- a/uvim/src/testdir/test_comments.vim
+++ b/uvim/src/testdir/test_comments.mnv
@@ -280,4 +280,4 @@ func Test_comment_format_firstline_comment()
   bw!
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_comparators.vim b/uvim/src/testdir/test_comparators.mnv
index 69f255f1df..4cbd424e19 100644
--- a/uvim/src/testdir/test_comparators.vim
+++ b/uvim/src/testdir/test_comparators.mnv
@@ -10,4 +10,4 @@ function Test_Comparators()
   endtry
 endfunction
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_compiler.vim b/uvim/src/testdir/test_compiler.mnv
index 20cae98944..449aae58a7 100644
--- a/uvim/src/testdir/test_compiler.vim
+++ b/uvim/src/testdir/test_compiler.mnv
@@ -19,7 +19,7 @@ func Test_compiler()
   call assert_equal('perl', b:current_compiler)
   call assert_fails('let g:current_compiler', 'E121:')
   let verbose_efm = execute('verbose set efm')
-  call assert_match('Last set from .*[/\\]compiler[/\\]perl.vim ', verbose_efm)
+  call assert_match('Last set from .*[/\\]compiler[/\\]perl.mnv ', verbose_efm)
   " Not using the global value
   call assert_notequal('', &l:efm)
 
@@ -39,13 +39,13 @@ func Test_compiler()
   call assert_fails('let b:current_compiler', 'E121:')
   call assert_fails('let g:current_compiler', 'E121:')
   let verbose_efm = execute('verbose set efm')
-  call assert_match('Last set from .*[/\\]compiler[/\\]make.vim ', verbose_efm)
+  call assert_match('Last set from .*[/\\]compiler[/\\]make.mnv ', verbose_efm)
 
   compiler! perl
   call assert_equal('perl', b:current_compiler)
   call assert_equal('perl', g:current_compiler)
   let verbose_efm = execute('verbose set efm')
-  call assert_match('Last set from .*[/\\]compiler[/\\]perl.vim ', verbose_efm)
+  call assert_match('Last set from .*[/\\]compiler[/\\]perl.mnv ', verbose_efm)
   call assert_equal(verbose_efm, execute('verbose setglobal efm'))
   " Using the global value
   call assert_equal('', &l:efm)
@@ -54,7 +54,7 @@ func Test_compiler()
   call assert_fails('let b:current_compiler', 'E121:')
   call assert_fails('let g:current_compiler', 'E121:')
   let verbose_efm = execute('verbose set efm')
-  call assert_match('Last set from .*[/\\]compiler[/\\]make.vim ', verbose_efm)
+  call assert_match('Last set from .*[/\\]compiler[/\\]make.mnv ', verbose_efm)
   call assert_equal(verbose_efm, execute('verbose setglobal efm'))
   " Using the global value
   call assert_equal('', &l:efm)
@@ -66,23 +66,23 @@ func Test_compiler()
 endfunc
 
 func GetCompilerNames()
-  return glob('$VIMRUNTIME/compiler/*.vim', 0, 1)
-        \ ->map({i, v -> substitute(v, '.*[\\/]\([a-zA-Z0-9_\-]*\).vim', '\1', '')})
+  return glob('$MNVRUNTIME/compiler/*.mnv', 0, 1)
+        \ ->map({i, v -> substitute(v, '.*[\\/]\([a-zA-Z0-9_\-]*\).mnv', '\1', '')})
         \ ->sort()
 endfunc
 
 func Test_compiler_without_arg()
-  let runtime = substitute($VIMRUNTIME, '\\', '/', 'g')
+  let runtime = substitute($MNVRUNTIME, '\\', '/', 'g')
   let a = split(execute('compiler'))
   let exp = GetCompilerNames()
-  call assert_match(runtime .. '/compiler/' .. exp[0] .. '.vim$',  a[0])
-  call assert_match(runtime .. '/compiler/' .. exp[1] .. '.vim$',  a[1])
-  call assert_match(runtime .. '/compiler/' .. exp[-1] .. '.vim$', a[-1])
+  call assert_match(runtime .. '/compiler/' .. exp[0] .. '.mnv$',  a[0])
+  call assert_match(runtime .. '/compiler/' .. exp[1] .. '.mnv$',  a[1])
+  call assert_match(runtime .. '/compiler/' .. exp[-1] .. '.mnv$', a[-1])
 endfunc
 
 " Test executing :compiler from the command line, not from a script
 func Test_compiler_commandline()
-  call system(GetVimCommandClean() .. ' --not-a-term -c "compiler gcc" -c "call writefile([b:current_compiler], ''XcompilerOut'')" -c "quit"')
+  call system(GetMNVCommandClean() .. ' --not-a-term -c "compiler gcc" -c "call writefile([b:current_compiler], ''XcompilerOut'')" -c "quit"')
   call assert_equal(0, v:shell_error)
   call assert_equal(["gcc"], readfile('XcompilerOut'))
 
@@ -290,7 +290,7 @@ func Test_compiler_spotbugs_makeprg()
     call writefile([package], src_dir .. 'package-info.java')
 
     " Note that using "off" for the first _outer_ iteration is preferable
-    " because only then "hlexists()" may be 0 (see "compiler/spotbugs.vim").
+    " because only then "hlexists()" may be 0 (see "compiler/spotbugs.mnv").
     for s in ['off', 'on']
       execute 'syntax ' .. s
 
@@ -315,9 +315,9 @@ endfunc
 
 func s:SpotBugsBeforeFileTypeTryPluginAndClearCache(state)
   " Ponder over "extend(spotbugs#DefaultProperties(), g:spotbugs_properties)"
-  " in "ftplugin/java.vim".
+  " in "ftplugin/java.mnv".
   let g:spotbugs#state = a:state
-  runtime autoload/spotbugs.vim
+  runtime autoload/spotbugs.mnv
 endfunc
 
 func Test_compiler_spotbugs_properties()
@@ -334,7 +334,7 @@ func Test_compiler_spotbugs_properties()
   call writefile(['class �${}'], test_file)
 
   " TEST INTEGRATION WITH A BOGUS COMPILER PLUGIN.
-  if !filereadable($VIMRUNTIME .. '/compiler/foo.vim') && !executable('foo')
+  if !filereadable($MNVRUNTIME .. '/compiler/foo.mnv') && !executable('foo')
     let g:spotbugs_properties = {'compiler': 'foo'}
     " XXX: In case this "if" block is no longer first.
     call s:SpotBugsBeforeFileTypeTryPluginAndClearCache({
@@ -438,7 +438,7 @@ func Test_compiler_spotbugs_properties()
   defer execute('delfunction g:SpotBugsPostCompilerActionExecutor')
 
   " TEST INTEGRATION WITH A SUPPORTED COMPILER PLUGIN.
-  if filereadable($VIMRUNTIME .. '/compiler/maven.vim')
+  if filereadable($MNVRUNTIME .. '/compiler/maven.mnv')
     let save_PATH = $PATH
     if !executable('mvn')
       if has('win32')
@@ -515,8 +515,8 @@ func Test_compiler_spotbugs_properties()
     let s:spotbugs_results.postActionDone = 0
     " Update path entries.  (Note that we cannot use just "src" because there
     " is another "src" directory nearer the filesystem root directory, i.e.
-    " "vim/vim/src/testdir/Xspotbugs/src", and "s:DispatchAction()" (see
-    " "ftplugin/java.vim") will match "vim/vim/src/testdir/Xspotbugs/tests"
+    " "mnv/mnv/src/testdir/Xspotbugs/src", and "s:DispatchAction()" (see
+    " "ftplugin/java.mnv") will match "mnv/mnv/src/testdir/Xspotbugs/tests"
     " against "src".)
     let g:spotbugs_properties.sourceDirPath = ['Xspotbugs/src']
     let g:spotbugs_properties.classDirPath = ['Xspotbugs/src']
@@ -567,7 +567,7 @@ func Test_compiler_spotbugs_properties()
 
     execute 'edit ' .. test_file
     " Prepare a buffer-local, incomplete variant of properties, relying on
-    " "ftplugin/java.vim" to take care of merging in unique entries, if any,
+    " "ftplugin/java.mnv" to take care of merging in unique entries, if any,
     " from "g:spotbugs_properties".
     let b:spotbugs_properties = {
         \ 'PreCompilerTestAction': function('g:SpotBugsPreTestLocalAction'),
@@ -741,7 +741,7 @@ func Test_compiler_just()
   call assert_equal('just', b:current_compiler)
   call assert_equal('just', &makeprg)
   let verbose_efm = execute('verbose set efm')
-  call assert_match('Last set from .*[/\\]compiler[/\\]just.vim ', verbose_efm)
+  call assert_match('Last set from .*[/\\]compiler[/\\]just.mnv ', verbose_efm)
 
   " Test that the errorformat can parse just error output
   let lines =<< trim END
@@ -765,4 +765,4 @@ func Test_compiler_just()
   compiler make
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_conceal.vim b/uvim/src/testdir/test_conceal.mnv
index de60cd8286..2dd96dc976 100644
--- a/uvim/src/testdir/test_conceal.vim
+++ b/uvim/src/testdir/test_conceal.mnv
@@ -2,7 +2,7 @@
 
 CheckFeature conceal
 
-source util/screendump.vim
+source util/screendump.mnv
 
 func Test_conceal_two_windows()
   CheckScreendump
@@ -25,7 +25,7 @@ func Test_conceal_two_windows()
 
   call writefile(code, 'XTest_conceal', 'D')
   " Check that cursor line is concealed
-  let buf = RunVimInTerminal('-S XTest_conceal', {})
+  let buf = RunMNVInTerminal('-S XTest_conceal', {})
   call VerifyScreenDump(buf, 'Test_conceal_two_windows_01', {})
 
   " Check that with concealed text vertical cursor movement is correct.
@@ -106,7 +106,7 @@ func Test_conceal_two_windows()
   call term_sendkeys(buf, "\<Esc>")
 
   " clean up
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_conceal_with_cursorline()
@@ -124,7 +124,7 @@ func Test_conceal_with_cursorline()
   [CODE]
 
   call writefile(code, 'XTest_conceal_cul', 'D')
-  let buf = RunVimInTerminal('-S XTest_conceal_cul', {})
+  let buf = RunMNVInTerminal('-S XTest_conceal_cul', {})
   call VerifyScreenDump(buf, 'Test_conceal_cul_01', {})
 
   call term_sendkeys(buf, ":wincmd w\r")
@@ -134,7 +134,7 @@ func Test_conceal_with_cursorline()
   call VerifyScreenDump(buf, 'Test_conceal_cul_03', {})
 
   " clean up
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_conceal_with_cursorcolumn()
@@ -158,7 +158,7 @@ func Test_conceal_with_cursorcolumn()
   [CODE]
 
   call writefile(code, 'XTest_conceal_cuc', 'D')
-  let buf = RunVimInTerminal('-S XTest_conceal_cuc', {'rows': 10, 'cols': 40})
+  let buf = RunMNVInTerminal('-S XTest_conceal_cuc', {'rows': 10, 'cols': 40})
   call VerifyScreenDump(buf, 'Test_conceal_cuc_01', {})
 
   " move cursor to the end of line (the cursor jumps to the next screen line)
@@ -166,7 +166,7 @@ func Test_conceal_with_cursorcolumn()
   call VerifyScreenDump(buf, 'Test_conceal_cuc_02', {})
 
   " clean up
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 " Check that 'cursorline' and 'wincolor' apply to the whole line in presence
@@ -182,7 +182,7 @@ func Test_conceal_wrapped_cursorline_wincolor()
   [CODE]
 
   call writefile(code, 'XTest_conceal_cul_wcr', 'D')
-  let buf = RunVimInTerminal('-S XTest_conceal_cul_wcr', {'rows': 4, 'cols': 40})
+  let buf = RunMNVInTerminal('-S XTest_conceal_cul_wcr', {'rows': 4, 'cols': 40})
   call VerifyScreenDump(buf, 'Test_conceal_cul_wcr_01', {})
 
   call term_sendkeys(buf, ":set wincolor=ErrorMsg\n")
@@ -192,7 +192,7 @@ func Test_conceal_wrapped_cursorline_wincolor()
   call VerifyScreenDump(buf, 'Test_conceal_cul_wcr_03', {})
 
   " clean up
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 " Same as Test_conceal_wrapped_cursorline_wincolor(), but with 'rightleft'.
@@ -208,7 +208,7 @@ func Test_conceal_wrapped_cursorline_wincolor_rightleft()
   [CODE]
 
   call writefile(code, 'XTest_conceal_cul_wcr_rl', 'D')
-  let buf = RunVimInTerminal('-S XTest_conceal_cul_wcr_rl', {'rows': 4, 'cols': 40})
+  let buf = RunMNVInTerminal('-S XTest_conceal_cul_wcr_rl', {'rows': 4, 'cols': 40})
   call VerifyScreenDump(buf, 'Test_conceal_cul_wcr_rl_01', {})
 
   call term_sendkeys(buf, ":set wincolor=ErrorMsg\n")
@@ -218,7 +218,7 @@ func Test_conceal_wrapped_cursorline_wincolor_rightleft()
   call VerifyScreenDump(buf, 'Test_conceal_cul_wcr_rl_03', {})
 
   " clean up
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_conceal_resize_term()
@@ -231,21 +231,21 @@ func Test_conceal_resize_term()
     normal fb
   [CODE]
   call writefile(code, 'XTest_conceal_resize', 'D')
-  let buf = RunVimInTerminal('-S XTest_conceal_resize', {'rows': 6})
+  let buf = RunMNVInTerminal('-S XTest_conceal_resize', {'rows': 6})
   call VerifyScreenDump(buf, 'Test_conceal_resize_01', {})
 
   call win_execute(buf->win_findbuf()[0], 'wincmd +')
   call VerifyScreenDump(buf, 'Test_conceal_resize_02', {})
 
   " clean up
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_conceal_linebreak()
   CheckScreendump
 
   let code =<< trim [CODE]
-      vim9script
+      mnv9script
       &wrap = true
       &conceallevel = 2
       &concealcursor = 'nc'
@@ -260,15 +260,15 @@ func Test_conceal_linebreak()
       syntax region CodeSpan matchgroup=Delimiter start=/\z(`\+\)/ end=/\z1/ concealends
   [CODE]
   call writefile(code, 'XTest_conceal_linebreak', 'D')
-  let buf = RunVimInTerminal('-S XTest_conceal_linebreak', {'rows': 8})
+  let buf = RunMNVInTerminal('-S XTest_conceal_linebreak', {'rows': 8})
   call VerifyScreenDump(buf, 'Test_conceal_linebreak_1', {})
 
   " clean up
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 " Tests for correct display (cursor column position) with +conceal and
-" tabulators.  Need to run this test in a separate Vim instance. Otherwise the
+" tabulators.  Need to run this test in a separate MNV instance. Otherwise the
 " screen is not updated (lazy redraw) and the cursor position is wrong.
 func Test_conceal_cursor_pos()
   let code =<< trim [CODE]
@@ -283,7 +283,7 @@ func Test_conceal_cursor_pos()
     :syntax match test /|/ conceal
     :" Save current cursor position. Only works in <expr> mode, can't be used
     :" with :normal because it moves the cursor to the command line. Thanks
-    :" to ZyX <zyx.vim@gmail.com> for the idea to use an <expr> mapping.
+    :" to ZyX <zyx.mnv@gmail.com> for the idea to use an <expr> mapping.
     :let curpos = []
     :nnoremap <expr> GG ":let curpos += ['".screenrow().":".screencol()."']\n"
     :normal ztj
@@ -354,7 +354,7 @@ func Test_conceal_cursor_pos()
   [CODE]
   call writefile(code, 'XTest_conceal_curpos', 'D')
 
-  if RunVim([], [], '-s XTest_conceal_curpos')
+  if RunMNV([], [], '-s XTest_conceal_curpos')
     call assert_equal([
           \ '2:1', '2:17', '2:20', '3:1', '3:17', '3:20', '5:8', '5:25',
           \ '5:28', '6:8', '6:25', '6:28', '8:1', '8:9', '8:17', '8:25',
@@ -567,7 +567,7 @@ func Run_test_conceal_virtualedit_after_eol(wrap)
     normal! $
   [CODE]
   call writefile(code, 'XTest_conceal_ve_after_eol', 'D')
-  let buf = RunVimInTerminal('-S XTest_conceal_ve_after_eol', {'rows': 3})
+  let buf = RunMNVInTerminal('-S XTest_conceal_ve_after_eol', {'rows': 3})
   call VerifyScreenDump(buf, 'Test_conceal_ve_after_eol_1', {})
   call term_sendkeys(buf, "l")
   call VerifyScreenDump(buf, 'Test_conceal_ve_after_eol_2', {})
@@ -579,7 +579,7 @@ func Run_test_conceal_virtualedit_after_eol(wrap)
   call VerifyScreenDump(buf, 'Test_conceal_ve_after_eol_5', {})
 
   " clean up
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_conceal_virtualedit_after_eol()
@@ -601,7 +601,7 @@ func Run_test_conceal_virtualedit_after_eol_rightleft(wrap)
     normal! $
   [CODE]
   call writefile(code, 'XTest_conceal_ve_after_eol_rl', 'D')
-  let buf = RunVimInTerminal('-S XTest_conceal_ve_after_eol_rl', {'rows': 3})
+  let buf = RunMNVInTerminal('-S XTest_conceal_ve_after_eol_rl', {'rows': 3})
   call VerifyScreenDump(buf, 'Test_conceal_ve_after_eol_rl_1', {})
   call term_sendkeys(buf, "h")
   call VerifyScreenDump(buf, 'Test_conceal_ve_after_eol_rl_2', {})
@@ -613,7 +613,7 @@ func Run_test_conceal_virtualedit_after_eol_rightleft(wrap)
   call VerifyScreenDump(buf, 'Test_conceal_ve_after_eol_rl_5', {})
 
   " clean up
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_conceal_virtualedit_after_eol_rightleft()
@@ -636,7 +636,7 @@ func Run_test_conceal_double_width(wrap)
     normal! $
   [CODE]
   call writefile(code, 'XTest_conceal_double_width', 'D')
-  let buf = RunVimInTerminal('-S XTest_conceal_double_width', {'rows': 4})
+  let buf = RunMNVInTerminal('-S XTest_conceal_double_width', {'rows': 4})
   call VerifyScreenDump(buf, 'Test_conceal_double_width_1', {})
   call term_sendkeys(buf, "gM")
   call VerifyScreenDump(buf, 'Test_conceal_double_width_2', {})
@@ -646,7 +646,7 @@ func Run_test_conceal_double_width(wrap)
   call VerifyScreenDump(buf, 'Test_conceal_double_width_4', {})
 
   " clean up
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_conceal_double_width()
@@ -667,7 +667,7 @@ func Test_conceal_double_width_wrap()
     normal! $
   [CODE]
   call writefile(code, 'XTest_conceal_double_width_wrap', 'D')
-  let buf = RunVimInTerminal('-S XTest_conceal_double_width_wrap', {'rows': 4, 'cols': 20})
+  let buf = RunMNVInTerminal('-S XTest_conceal_double_width_wrap', {'rows': 4, 'cols': 20})
   call VerifyScreenDump(buf, 'Test_conceal_double_width_wrap_1', {})
   call term_sendkeys(buf, "gM")
   call VerifyScreenDump(buf, 'Test_conceal_double_width_wrap_2', {})
@@ -677,7 +677,7 @@ func Test_conceal_double_width_wrap()
   call VerifyScreenDump(buf, 'Test_conceal_double_width_wrap_4', {})
 
   " clean up
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_const.vim b/uvim/src/testdir/test_const.mnv
index 2b79f42feb..386a652adf 100644
--- a/uvim/src/testdir/test_const.vim
+++ b/uvim/src/testdir/test_const.mnv
@@ -6,7 +6,7 @@ endfunc
 func Test_define_var_with_lock()
     const i = 1
     const f = 1.1
-    const s = 'vim'
+    const s = 'mnv'
     const F = funcref('s:noop')
     const l = [1, 2, 3]
     const d = {'foo': 10}
@@ -38,7 +38,7 @@ func Test_define_var_with_lock()
 
     call assert_fails('let i = 1', 'E741:')
     call assert_fails('let f = 1.1', 'E741:')
-    call assert_fails('let s = "vim"', 'E741:')
+    call assert_fails('let s = "mnv"', 'E741:')
     call assert_fails('let F = funcref("s:noop")', 'E741:')
     call assert_fails('let l = [1, 2, 3]', 'E741:')
     call assert_fails('call filter(l, "v:val % 2 == 0")', 'E741:')
@@ -73,7 +73,7 @@ func Test_define_l_var_with_lock()
     " With l: prefix
     const l:i = 1
     const l:f = 1.1
-    const l:s = 'vim'
+    const l:s = 'mnv'
     const l:F = funcref('s:noop')
     const l:l = [1, 2, 3]
     const l:d = {'foo': 10}
@@ -90,7 +90,7 @@ func Test_define_l_var_with_lock()
 
     call assert_fails('let l:i = 1', 'E741:')
     call assert_fails('let l:f = 1.1', 'E741:')
-    call assert_fails('let l:s = "vim"', 'E741:')
+    call assert_fails('let l:s = "mnv"', 'E741:')
     call assert_fails('let l:F = funcref("s:noop")', 'E741:')
     call assert_fails('let l:l = [1, 2, 3]', 'E741:')
     call assert_fails('let l:d = {"foo": 10}', 'E741:')
@@ -127,13 +127,13 @@ func Test_define_script_var_with_lock()
 endfunc
 
 func Test_destructuring_with_lock()
-    const [a, b, c] = [1, 1.1, 'vim']
+    const [a, b, c] = [1, 1.1, 'mnv']
 
     call assert_fails('let a = 1', 'E741:')
     call assert_fails('let b = 1.1', 'E741:')
-    call assert_fails('let c = "vim"', 'E741:')
+    call assert_fails('let c = "mnv"', 'E741:')
 
-    const [d; e] = [1, 1.1, 'vim']
+    const [d; e] = [1, 1.1, 'mnv']
     call assert_fails('let d = 1', 'E741:')
     call assert_fails('let e = [2.2, "a"]', 'E741:')
 endfunc
@@ -141,7 +141,7 @@ endfunc
 func Test_cannot_modify_existing_variable()
     let i = 1
     let f = 1.1
-    let s = 'vim'
+    let s = 'mnv'
     let F = funcref('s:noop')
     let l = [1, 2, 3]
     let d = {'foo': 10}
@@ -155,7 +155,7 @@ func Test_cannot_modify_existing_variable()
 
     call assert_fails('const i = 1', 'E995:')
     call assert_fails('const f = 1.1', 'E995:')
-    call assert_fails('const s = "vim"', 'E995:')
+    call assert_fails('const s = "mnv"', 'E995:')
     call assert_fails('const F = funcref("s:noop")', 'E995:')
     call assert_fails('const l = [1, 2, 3]', 'E995:')
     call assert_fails('const d = {"foo": 10}', 'E995:')
@@ -166,11 +166,11 @@ func Test_cannot_modify_existing_variable()
     call assert_fails('const b = v:true', 'E995:')
     call assert_fails('const n = v:null', 'E995:')
     call assert_fails('const bl = 0zC0FFEE', 'E995:')
-    call assert_fails('const [i, f, s] = [1, 1.1, "vim"]', 'E995:')
+    call assert_fails('const [i, f, s] = [1, 1.1, "mnv"]', 'E995:')
 
     const i2 = 1
     const f2 = 1.1
-    const s2 = 'vim'
+    const s2 = 'mnv'
     const F2 = funcref('s:noop')
     const l2 = [1, 2, 3]
     const d2 = {'foo': 10}
@@ -184,7 +184,7 @@ func Test_cannot_modify_existing_variable()
 
     call assert_fails('const i2 = 1', 'E995:')
     call assert_fails('const f2 = 1.1', 'E995:')
-    call assert_fails('const s2 = "vim"', 'E995:')
+    call assert_fails('const s2 = "mnv"', 'E995:')
     call assert_fails('const F2 = funcref("s:noop")', 'E995:')
     call assert_fails('const l2 = [1, 2, 3]', 'E995:')
     call assert_fails('const d2 = {"foo": 10}', 'E995:')
@@ -195,7 +195,7 @@ func Test_cannot_modify_existing_variable()
     call assert_fails('const b2 = v:true', 'E995:')
     call assert_fails('const n2 = v:null', 'E995:')
     call assert_fails('const bl2 = 0zC0FFEE', 'E995:')
-    call assert_fails('const [i2, f2, s2] = [1, 1.1, "vim"]', 'E995:')
+    call assert_fails('const [i2, f2, s2] = [1, 1.1, "mnv"]', 'E995:')
 endfunc
 
 func Test_const_with_condition()
@@ -277,8 +277,8 @@ endfunc
 func Test_const_with_special_variables()
     call assert_fails('const $FOO = "hello"', 'E996:')
     call assert_fails('const @a = "hello"', 'E996:')
-    call assert_fails('const &filetype = "vim"', 'E996:')
-    call assert_fails('const &l:filetype = "vim"', 'E996:')
+    call assert_fails('const &filetype = "mnv"', 'E996:')
+    call assert_fails('const &l:filetype = "mnv"', 'E996:')
     call assert_fails('const &g:encoding = "utf-8"', 'E996:')
 
     call assert_fails('const [a, $CONST_FOO] = [369, "abc"]', 'E996:')
@@ -332,4 +332,4 @@ func Test_lock_depth_is_2()
     let d2.b[1] = 'd'
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_cpoptions.vim b/uvim/src/testdir/test_cpoptions.mnv
index 2afe3e885e..ae9e28905e 100644
--- a/uvim/src/testdir/test_cpoptions.vim
+++ b/uvim/src/testdir/test_cpoptions.mnv
@@ -187,12 +187,12 @@ func Test_cpo_f()
   let save_cpo = &cpo
   new
   set cpo-=f
-  read test_cpoptions.vim
+  read test_cpoptions.mnv
   call assert_equal('', @%)
   %d
   set cpo+=f
-  read test_cpoptions.vim
-  call assert_equal('test_cpoptions.vim', @%)
+  read test_cpoptions.mnv
+  call assert_equal('test_cpoptions.mnv', @%)
 
   bwipe!
   let &cpo = save_cpo
@@ -217,7 +217,7 @@ endfunc
 " Test for the 'g' flag in 'cpo' (jump to line 1 when re-editing a file)
 func Test_cpo_g()
   let save_cpo = &cpo
-  new test_cpoptions.vim
+  new test_cpoptions.mnv
   set cpo-=g
   normal 20G
   edit
@@ -264,7 +264,7 @@ func Test_cpo_I()
   let &cpo = save_cpo
 endfunc
 
-" Test for the 'j' flag in 'cpo' is in the test_join.vim file.
+" Test for the 'j' flag in 'cpo' is in the test_join.mnv file.
 
 " Test for the 'J' flag in 'cpo' (two spaces after a sentence)
 func Test_cpo_J()
@@ -424,7 +424,7 @@ func Test_cpo_O()
   let &cpo = save_cpo
 endfunc
 
-" Test for the 'p' flag in 'cpo' is in the test_lispindent.vim file.
+" Test for the 'p' flag in 'cpo' is in the test_lispindent.mnv file.
 
 " Test for the 'P' flag in 'cpo' (appending to a file sets the current file
 " name)
@@ -531,7 +531,7 @@ func Test_cpo_S()
   let &cpo = save_cpo
 endfunc
 
-" Test for the 't' flag in 'cpo' is in the test_tagjump.vim file.
+" Test for the 't' flag in 'cpo' is in the test_tagjump.mnv file.
 
 " Test for the 'u' flag in 'cpo' (Vi-compatible undo)
 func Test_cpo_u()
@@ -574,7 +574,7 @@ func Test_cpo_w()
   let &cpo = save_cpo
 endfunc
 
-" Test for the 'W' flag in 'cpo' is in the test_writefile.vim file
+" Test for the 'W' flag in 'cpo' is in the test_writefile.mnv file
 
 " Test for the 'x' flag in 'cpo' (Esc on command-line executes command)
 func Test_cpo_x()
@@ -647,7 +647,7 @@ func Test_cpo_Z()
   let &cpo = save_cpo
 endfunc
 
-" Test for the '!' flag in 'cpo' is in the test_normal.vim file
+" Test for the '!' flag in 'cpo' is in the test_normal.mnv file
 
 " Test for displaying dollar when changing text ('$' flag in 'cpoptions')
 func Test_cpo_dollar()
@@ -662,9 +662,9 @@ func Test_cpo_dollar()
   set cpo+=$
   call setline(1, 'one two three')
   redraw!
-  exe "normal c2w\<F2>vim"
+  exe "normal c2w\<F2>mnv"
   call assert_equal('one tw$ three', g:Line)
-  call assert_equal('vim three', getline(1))
+  call assert_equal('mnv three', getline(1))
   set cpo-=$
   call test_override('ALL', 0)
   delfunc SaveFirstLine
@@ -749,7 +749,7 @@ func Test_cpo_star()
   let &cpo = save_cpo
 endfunc
 
-" Test for the '<' flag in 'cpo' is in the test_mapping.vim file
+" Test for the '<' flag in 'cpo' is in the test_mapping.mnv file
 
 " Test for the '>' flag in 'cpo' (use a new line when appending to a register)
 func Test_cpo_gt()
@@ -837,7 +837,7 @@ func Test_cpo_ampersand()
     preserve
     qall
   [CODE]
-  if RunVim([], after, 'XfileCpoAmp')
+  if RunMNV([], after, 'XfileCpoAmp')
     call assert_equal(1, filereadable('.XfileCpoAmp.swp'))
     call delete('.XfileCpoAmp.swp')
   endif
@@ -858,7 +858,7 @@ func Test_cpo_backslash()
   let &cpo = save_cpo
 endfunc
 
-" Test for the '/' flag in 'cpo' is in the test_substitute.vim file
+" Test for the '/' flag in 'cpo' is in the test_substitute.mnv file
 
 " Test for the '{' flag in 'cpo' (the "{" and "}" commands stop at a {
 " character at the start of a line)
@@ -953,4 +953,4 @@ func Test_cpo_z()
   bw!
   let &cpo = save_cpo
 endfunc
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_crash.vim b/uvim/src/testdir/test_crash.mnv
index 9b673e4e2a..0aee950b6b 100644
--- a/uvim/src/testdir/test_crash.vim
+++ b/uvim/src/testdir/test_crash.mnv
@@ -1,5 +1,5 @@
-" Some tests, that used to crash Vim
-source util/screendump.vim
+" Some tests, that used to crash MNV
+source util/screendump.mnv
 
 CheckScreendump
 
@@ -18,66 +18,66 @@ func Test_crash1()
   CheckNotBSD
   CheckExecutable dash
 
-  " The following used to crash Vim
+  " The following used to crash MNV
   let opts = #{cmd: 'sh'}
-  let vim  = GetVimProg()
+  let mnv  = GetMNVProg()
 
-  let buf = RunVimInTerminal('sh', opts)
+  let buf = RunMNVInTerminal('sh', opts)
 
   let file = 'crash/poc_huaf1'
   let cmn_args = "%s -u NONE -i NONE -n -e -s -S %s -c ':qa!'"
-  let args = printf(cmn_args, vim, file)
+  let args = printf(cmn_args, mnv, file)
   call s:RunCommandAndWait(buf, args ..
     \ '  && echo "crash 1: [OK]" > X_crash1_result.txt')
 
   let file = 'crash/poc_huaf2'
-  let args = printf(cmn_args, vim, file)
+  let args = printf(cmn_args, mnv, file)
   call s:RunCommandAndWait(buf, args ..
     \ '  && echo "crash 2: [OK]" >> X_crash1_result.txt')
 
   let file = 'crash/poc_huaf3'
-  let args = printf(cmn_args, vim, file)
+  let args = printf(cmn_args, mnv, file)
   call s:RunCommandAndWait(buf, args ..
     \ '  && echo "crash 3: [OK]" >> X_crash1_result.txt')
 
   let file = 'crash/bt_quickfix_poc'
-  let args = printf(cmn_args, vim, file)
+  let args = printf(cmn_args, mnv, file)
   call s:RunCommandAndWait(buf, args ..
     \ '  && echo "crash 4: [OK]" >> X_crash1_result.txt')
   " clean up
   call delete('Xerr')
 
-  let file = 'crash/poc_tagfunc.vim'
-  let args = printf(cmn_args, vim, file)
-  " using || because this poc causes vim to exit with exitstatus != 0
+  let file = 'crash/poc_tagfunc.mnv'
+  let args = printf(cmn_args, mnv, file)
+  " using || because this poc causes mnv to exit with exitstatus != 0
   call s:RunCommandAndWait(buf, args ..
     \ '  || echo "crash 5: [OK]" >> X_crash1_result.txt')
 
 
   let file = 'crash/bt_quickfix1_poc'
-  let args = printf(cmn_args, vim, file)
+  let args = printf(cmn_args, mnv, file)
   call s:RunCommandAndWait(buf, args ..
     \ '  && echo "crash 6: [OK]" >> X_crash1_result.txt')
   " clean up
   call delete('X')
 
-  let file = 'crash/vim_regsub_both_poc'
-  let args = printf(cmn_args, vim, file)
+  let file = 'crash/mnv_regsub_both_poc'
+  let args = printf(cmn_args, mnv, file)
   call s:RunCommandAndWait(buf, args ..
     \ '  && echo "crash 7: [OK]" >> X_crash1_result.txt')
 
-  let file = 'crash/vim_msg_trunc_poc'
-  let args = printf(cmn_args, vim, file)
+  let file = 'crash/mnv_msg_trunc_poc'
+  let args = printf(cmn_args, mnv, file)
   call s:RunCommandAndWait(buf, args ..
     \ '  || echo "crash 8: [OK]" >> X_crash1_result.txt')
 
   let file = 'crash/crash_scrollbar'
-  let args = printf(cmn_args, vim, file)
+  let args = printf(cmn_args, mnv, file)
   call s:RunCommandAndWait(buf, args ..
     \ '  && echo "crash 9: [OK]" >> X_crash1_result.txt')
 
   let file = 'crash/editing_arg_idx_POC_1'
-  let args = printf(cmn_args, vim, file)
+  let args = printf(cmn_args, mnv, file)
   call s:RunCommandAndWait(buf, args ..
     \ '  || echo "crash 10: [OK]" >> X_crash1_result.txt')
   call delete('Xerr')
@@ -111,40 +111,40 @@ func Test_crash1_2()
   CheckNotBSD
   CheckExecutable dash
 
-  " The following used to crash Vim
+  " The following used to crash MNV
   let opts = #{cmd: 'sh'}
-  let vim  = GetVimProg()
+  let mnv  = GetMNVProg()
   let result = 'X_crash1_2_result.txt'
 
-  let buf = RunVimInTerminal('sh', opts)
+  let buf = RunMNVInTerminal('sh', opts)
 
   let file = 'crash/poc1'
   let cmn_args = "%s -u NONE -i NONE -n -e -s -S %s -c ':qa!'"
-  let args = printf(cmn_args, vim, file)
+  let args = printf(cmn_args, mnv, file)
   call s:RunCommandAndWait(buf, args ..
     \ '  && echo "crash 1: [OK]" > '.. result)
 
   let file = 'crash/poc_win_enter_ext'
   let cmn_args = "%s -u NONE -i NONE -n -e -s -S %s -c ':qa!'"
-  let args = printf(cmn_args, vim, file)
+  let args = printf(cmn_args, mnv, file)
   call s:RunCommandAndWait(buf, args ..
     \ '  && echo "crash 2: [OK]" >> '.. result)
 
   let file = 'crash/poc_suggest_trie_walk'
   let cmn_args = "%s -u NONE -i NONE -n -e -s -S %s -c ':qa!'"
-  let args = printf(cmn_args, vim, file)
+  let args = printf(cmn_args, mnv, file)
   call s:RunCommandAndWait(buf, args ..
     \ '  && echo "crash 3: [OK]" >> '.. result)
 
   let file = 'crash/poc_did_set_langmap'
   let cmn_args = "%s -u NONE -i NONE -n -X -m -n -e -s -S %s -c ':qa!'"
-  let args = printf(cmn_args, vim, file)
+  let args = printf(cmn_args, mnv, file)
   call s:RunCommandAndWait(buf, args ..
     \ ' ; echo "crash 4: [OK]" >> '.. result)
 
   let file = 'crash/reverse_text_overflow'
   let cmn_args = "%s -u NONE -i NONE -n -X -m -n -e -s -S %s -c ':qa!'"
-  let args = printf(cmn_args, vim, file)
+  let args = printf(cmn_args, mnv, file)
   call s:RunCommandAndWait(buf, args ..
     \ ' ; echo "crash 5: [OK]" >> '.. result)
 
@@ -165,7 +165,7 @@ func Test_crash1_2()
   END
   call writefile(lines, file, 'D')
   let cmn_args = "%s -u NONE -i NONE -X -m -n -e -s -u %s -c ':qa!'"
-  let args = printf(cmn_args, vim, file)
+  let args = printf(cmn_args, mnv, file)
   call s:RunCommandAndWait(buf, args ..
     \ ' && echo "crash 6: [OK]" >> '.. result)
 
@@ -191,52 +191,52 @@ endfunc
 " We are not really asserting anything here, it's just important
 " that ASAN does not detect any issues.
 func Test_crash1_3()
-  let vim  = GetVimProg()
-  let buf = RunVimInTerminal('sh', #{cmd: 'sh'})
+  let mnv  = GetMNVProg()
+  let buf = RunMNVInTerminal('sh', #{cmd: 'sh'})
 
   let file = 'crash/poc_ex_substitute'
   let cmn_args = "%s -u NONE -i NONE -n -e -s -S %s -c ':qa!'"
-  let args = printf(cmn_args, vim, file)
+  let args = printf(cmn_args, mnv, file)
   call s:RunCommandAndWait(buf, args)
 
   let file = 'crash/poc_uaf_exec_instructions'
   let cmn_args = "%s -u NONE -i NONE -n -e -s -S %s -c ':qa!'"
-  let args = printf(cmn_args, vim, file)
+  let args = printf(cmn_args, mnv, file)
   call s:RunCommandAndWait(buf, args)
 
   let file = 'crash/poc_uaf_check_argument_types'
   let cmn_args = "%s -u NONE -i NONE -n -e -s -S %s -c ':qa!'"
-  let args = printf(cmn_args, vim, file)
+  let args = printf(cmn_args, mnv, file)
   call s:RunCommandAndWait(buf, args)
 
   let file = 'crash/double_free'
   let cmn_args = "%s -u NONE -i NONE -n -e -s -S %s -c ':qa!'"
-  let args = printf(cmn_args, vim, file)
+  let args = printf(cmn_args, mnv, file)
   call s:RunCommandAndWait(buf, args)
 
   let file = 'crash/dialog_changed_uaf'
   let cmn_args = "%s -u NONE -i NONE -n -e -s -S %s -c ':qa!'"
-  let args = printf(cmn_args, vim, file)
+  let args = printf(cmn_args, mnv, file)
   call s:RunCommandAndWait(buf, args)
 
   let file = 'crash/nullpointer'
   let cmn_args = "%s -u NONE -i NONE -n -e -s -S %s -c ':qa!'"
-  let args = printf(cmn_args, vim, file)
+  let args = printf(cmn_args, mnv, file)
   call s:RunCommandAndWait(buf, args)
 
   let file = 'crash/heap_overflow3'
   let cmn_args = "%s -u NONE -i NONE -n -X -m -n -e -s -S %s -c ':qa!'"
-  let args = printf(cmn_args, vim, file)
+  let args = printf(cmn_args, mnv, file)
   call s:RunCommandAndWait(buf, args)
 
   let file = 'crash/heap_overflow_glob2regpat'
   let cmn_args = "%s -u NONE -i NONE -n -X -m -n -e -s -S %s -c ':qa!'"
-  let args = printf(cmn_args, vim, file)
+  let args = printf(cmn_args, mnv, file)
   call s:RunCommandAndWait(buf, args)
 
   let file = 'crash/nullptr_regexp_nfa'
   let cmn_args = "%s -u NONE -i NONE -n -X -m -n -e -s -S %s -c ':qa!'"
-  let args = printf(cmn_args, vim, file)
+  let args = printf(cmn_args, mnv, file)
   call s:RunCommandAndWait(buf, args)
 
   " clean up
@@ -246,10 +246,10 @@ endfunc
 
 func Test_crash2()
   CheckScreendump
-  " The following used to crash Vim
+  " The following used to crash MNV
   let opts = #{wait_for_ruler: 0, rows: 20}
   let args = ' -u NONE -i NONE -n -e -s -S '
-  let buf = RunVimInTerminal(args .. ' crash/vim_regsub_both', opts)
+  let buf = RunMNVInTerminal(args .. ' crash/mnv_regsub_both', opts)
   call VerifyScreenDump(buf, 'Test_crash_01', {})
   exe buf .. "bw!"
 endfunc
@@ -266,17 +266,17 @@ func Test_crash_bufwrite()
     w! ++enc=ucs4 Xoutput
     call writefile(['done'], 'Xbufwrite')
   END
-  call writefile(lines, 'Xvimrc')
+  call writefile(lines, 'Xmnvrc')
   let opts = #{wait_for_ruler: 0, rows: 20}
-  let args = ' -u NONE -i NONE -b -S Xvimrc'
-  let buf = RunVimInTerminal(args .. ' samples/buffer-test.txt', opts)
+  let args = ' -u NONE -i NONE -b -S Xmnvrc'
+  let buf = RunMNVInTerminal(args .. ' samples/buffer-test.txt', opts)
   call TermWait(buf, 1000)
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
   call WaitForAssert({-> assert_true(filereadable('Xbufwrite'))})
   call assert_equal(['done'], readfile('Xbufwrite'))
   call delete('Xbufwrite')
   call delete('Xoutput')
-  call delete('Xvimrc')
+  call delete('Xmnvrc')
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_crypt.vim b/uvim/src/testdir/test_crypt.mnv
index d540fbbd62..6b67e854d9 100644
--- a/uvim/src/testdir/test_crypt.vim
+++ b/uvim/src/testdir/test_crypt.mnv
@@ -19,27 +19,27 @@ else
 endif
 
 func Common_head_only(text)
-  " This was crashing Vim
+  " This was crashing MNV
   split Xtest_head.txt
   call setline(1, a:text)
   wq
   call feedkeys(":split Xtest_head.txt\<CR>foobar\<CR>", "tx")
   call delete('Xtest_head.txt')
-  call assert_match('VimCrypt', getline(1))
+  call assert_match('MNVCrypt', getline(1))
   bwipe!
 endfunc
 
 func Test_head_only_2()
-  call Common_head_only('VimCrypt~02!abc')
+  call Common_head_only('MNVCrypt~02!abc')
 endfunc
 
 func Test_head_only_3()
-  call Common_head_only('VimCrypt~03!abc')
+  call Common_head_only('MNVCrypt~03!abc')
 endfunc
 
 func Test_head_only_4()
   CheckFeature sodium
-  call Common_head_only('VimCrypt~04!abc')
+  call Common_head_only('MNVCrypt~04!abc')
 endfunc
 
 func Crypt_uncrypt(method)
@@ -89,23 +89,23 @@ endfunc
 
 func Test_crypt_sodium_v2_startup()
   CheckFeature sodium
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
-  let buf = RunVimInTerminal('--cmd "set cm=xchacha20v2" -x Xfoo', #{wait_for_ruler: 0, rows: 6})
+  let buf = RunMNVInTerminal('--cmd "set cm=xchacha20v2" -x Xfoo', #{wait_for_ruler: 0, rows: 6})
   call g:TermWait(buf, g:RunningWithValgrind() ? 1000 : 50)
   call term_sendkeys(buf, "foo\<CR>foo\<CR>")
   call term_sendkeys(buf, "ifoo\<Esc>")
   call term_sendkeys(buf, "ZZ")
   call TermWait(buf)
 
-  " Wait for Vim to write the file and exit.  Then wipe out the terminal buffer.
+  " Wait for MNV to write the file and exit.  Then wipe out the terminal buffer.
   call WaitForAssert({-> assert_equal("finished", term_getstatus(buf))})
   exe buf .. 'bwipe!'
   call assert_true(filereadable('Xfoo'))
 
-  let buf = RunVimInTerminal('--cmd "set ch=3 cm=xchacha20v2 key=foo" Xfoo', #{wait_for_ruler: 0, rows: 10})
+  let buf = RunMNVInTerminal('--cmd "set ch=3 cm=xchacha20v2 key=foo" Xfoo', #{wait_for_ruler: 0, rows: 10})
   call g:TermWait(buf, g:RunningWithValgrind() ? 1000 : 50)
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 
   call delete('Xfoo')
 endfunc
@@ -141,25 +141,25 @@ func Uncrypt_stable_xxd(method, hex, key, uncrypted_text, verbose)
 endfunc
 
 func Test_uncrypt_zip()
-  call Uncrypt_stable('zip', "VimCrypt~01!\u0006\u001clV'\u00de}Mg\u00a0\u00ea\u00a3V\u00a9\u00e7\u0007E#3\u008e2U\u00e9\u0097", "foofoo", ["1234567890", "aábbccddeëff"])
+  call Uncrypt_stable('zip', "MNVCrypt~01!\u0006\u001clV'\u00de}Mg\u00a0\u00ea\u00a3V\u00a9\u00e7\u0007E#3\u008e2U\u00e9\u0097", "foofoo", ["1234567890", "aábbccddeëff"])
 endfunc
 
 func Test_uncrypt_blowfish()
-  call Uncrypt_stable('blowfish', "VimCrypt~02!k)\u00be\u0017\u0097#\u0016\u00ddS\u009c\u00f5=\u00ba\u00e0\u00c8#\u00a5M\u00b4\u0086J\u00c3A\u00cd\u00a5M\u00b4\u0086!\u0080\u0015\u009b\u00f5\u000f\u00e1\u00d2\u0019\u0082\u0016\u0098\u00f7\u000d\u00da", "barbar", ["asdfasdfasdf", "0001112223333"])
+  call Uncrypt_stable('blowfish', "MNVCrypt~02!k)\u00be\u0017\u0097#\u0016\u00ddS\u009c\u00f5=\u00ba\u00e0\u00c8#\u00a5M\u00b4\u0086J\u00c3A\u00cd\u00a5M\u00b4\u0086!\u0080\u0015\u009b\u00f5\u000f\u00e1\u00d2\u0019\u0082\u0016\u0098\u00f7\u000d\u00da", "barbar", ["asdfasdfasdf", "0001112223333"])
 endfunc
 
 func Test_uncrypt_blowfish2a()
-  call Uncrypt_stable('blowfish', "VimCrypt~03!\u001e\u00d1N\u00e3;\u00d3\u00c0\u00a0^C)\u0004\u00f7\u007f.\u00b6\u00abF\u000eS\u0019\u00e0\u008b6\u00d2[T\u00cb\u00a7\u0085\u00d8\u00be9\u000b\u00812\u000bQ\u00b3\u00cc@\u0097\u000f\u00df\u009a\u00adIv\u00aa.\u00d8\u00c9\u00ee\u009e`\u00bd$\u00af%\u00d0", "barburp", ["abcdefghijklmnopqrstuvwxyz", "!@#$%^&*()_+=-`~"])
+  call Uncrypt_stable('blowfish', "MNVCrypt~03!\u001e\u00d1N\u00e3;\u00d3\u00c0\u00a0^C)\u0004\u00f7\u007f.\u00b6\u00abF\u000eS\u0019\u00e0\u008b6\u00d2[T\u00cb\u00a7\u0085\u00d8\u00be9\u000b\u00812\u000bQ\u00b3\u00cc@\u0097\u000f\u00df\u009a\u00adIv\u00aa.\u00d8\u00c9\u00ee\u009e`\u00bd$\u00af%\u00d0", "barburp", ["abcdefghijklmnopqrstuvwxyz", "!@#$%^&*()_+=-`~"])
 endfunc
 
 func Test_uncrypt_blowfish2()
-  call Uncrypt_stable('blowfish2', "VimCrypt~03!\u001e\u00d1N\u00e3;\u00d3\u00c0\u00a0^C)\u0004\u00f7\u007f.\u00b6\u00abF\u000eS\u0019\u00e0\u008b6\u00d2[T\u00cb\u00a7\u0085\u00d8\u00be9\u000b\u00812\u000bQ\u00b3\u00cc@\u0097\u000f\u00df\u009a\u00adIv\u00aa.\u00d8\u00c9\u00ee\u009e`\u00bd$\u00af%\u00d0", "barburp", ["abcdefghijklmnopqrstuvwxyz", "!@#$%^&*()_+=-`~"])
+  call Uncrypt_stable('blowfish2', "MNVCrypt~03!\u001e\u00d1N\u00e3;\u00d3\u00c0\u00a0^C)\u0004\u00f7\u007f.\u00b6\u00abF\u000eS\u0019\u00e0\u008b6\u00d2[T\u00cb\u00a7\u0085\u00d8\u00be9\u000b\u00812\u000bQ\u00b3\u00cc@\u0097\u000f\u00df\u009a\u00adIv\u00aa.\u00d8\u00c9\u00ee\u009e`\u00bd$\u00af%\u00d0", "barburp", ["abcdefghijklmnopqrstuvwxyz", "!@#$%^&*()_+=-`~"])
 endfunc
 
 func Test_uncrypt_xchacha20()
   CheckFeature sodium
   let hex =<< trim END
-  00000000: 5669 6d43 7279 7074 7e30 3421 6b7d e607  vimCrypt~04!k}..
+  00000000: 5669 6d43 7279 7074 7e30 3421 6b7d e607  mnvCrypt~04!k}..
   00000010: 4ea4 e99f 923e f67f 7b59 a80d 3bca 2f06  N....>..{Y..;./.
   00000020: fa11 b951 8d09 0dc9 470f e7cf 8b90 4310  ...Q....G.....C.
   00000030: 653b b83b e493 378b 0390 0e38 f912 626b  e;.;..7....8..bk
@@ -178,7 +178,7 @@ func Test_uncrypt_xchacha20v2_custom()
   CheckFeature sodium
   " Test, reading xchacha20v2 with custom encryption parameters
   let hex =<< trim END
-  00000000: 5669 6d43 7279 7074 7e30 3521 934b f288  VimCrypt~05!.K..
+  00000000: 5669 6d43 7279 7074 7e30 3521 934b f288  MNVCrypt~05!.K..
   00000010: 10ba 8bc9 25a0 8876 f85c f135 6fb8 518b  ....%..v.\.5o.Q.
   00000020: b133 9af1 0300 0000 0000 0000 0000 0010  .3..............
   00000030: 0000 0000 0200 0000 b973 5f33 80e9 54fc  .........s_3..T.
@@ -189,7 +189,7 @@ func Test_uncrypt_xchacha20v2_custom()
   END
   try
     call Uncrypt_stable_xxd('xchacha20v2', hex, "foobar", ["", "foo", "bar", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10"], 1)
-  catch /^Vim\%((\a\+)\)\=:E1230:/ " sodium_mlock() not possible, may happen at Github CI
+  catch /^MNV\%((\a\+)\)\=:E1230:/ " sodium_mlock() not possible, may happen at Github CI
     throw 'Skipped: sodium_mlock() not possible'
   endtry
   call assert_match('xchacha20v2: using custom \w\+ "\d\+" for Key derivation.', execute(':messages'))
@@ -199,7 +199,7 @@ func Test_uncrypt_xchacha20v2()
   CheckFeature sodium
   " Test, reading xchacha20v2
   let hex =<< trim END
-  00000000: 5669 6d43 7279 7074 7e30 3521 9f20 4e14  VimCrypt~05!. N.
+  00000000: 5669 6d43 7279 7074 7e30 3521 9f20 4e14  MNVCrypt~05!. N.
   00000010: c7da c1bd 7dea 8fbc db6c 38e6 7a77 6fef  ....}....l8.zwo.
   00000020: 82dd 964b 0300 0000 0000 0000 0000 0010  ...K............
   00000030: 0000 0000 0200 0000 a97c 2f00 0b9d 19eb  .........|/.....
@@ -213,7 +213,7 @@ func Test_uncrypt_xchacha20v2()
   END
   try
     call Uncrypt_stable_xxd('xchacha20v2', hex, "foo1234", ["abcdefghijklmnopqrstuvwxyzäöü", 'ZZZ_äüöÄÜÖ_!@#$%^&*()_+=-`~"'], 0)
-  catch /^Vim\%((\a\+)\)\=:E1230:/ " sodium_mlock() not possible, may happen at Github CI
+  catch /^MNV\%((\a\+)\)\=:E1230:/ " sodium_mlock() not possible, may happen at Github CI
     throw 'Skipped: sodium_mlock() not possible'
   endtry
 endfunc
@@ -226,7 +226,7 @@ func Test_uncrypt_xchacha20_invalid()
   try
     call feedkeys(":split samples/crypt_sodium_invalid.txt\<CR>sodium\<CR>", 'xt')
     call assert_false(1, 'should not happen')
-  catch /^Vim\%((\a\+)\)\=:E1230:/ " sodium_mlock() not possible, may happen at Github CI
+  catch /^MNV\%((\a\+)\)\=:E1230:/ " sodium_mlock() not possible, may happen at Github CI
     throw 'Skipped: sodium_mlock() not possible'
   catch
     call assert_exception('pre-mature')
@@ -243,7 +243,7 @@ func Test_uncrypt_xchacha20_2()
   CheckFeature sodium
 
   sp Xcrypt_sodium.txt
-  " Create a larger file, so that Vim will write in several blocks
+  " Create a larger file, so that MNV will write in several blocks
   call setline(1, range(1, 4000))
   call assert_equal(1, &swapfile)
   set cryptmethod=xchacha20
@@ -264,7 +264,7 @@ func Test_uncrypt_xchacha20_2()
   call assert_match('"Xcrypt_sodium.txt".*4000L, 18893B written', execute(':message'))
   bw!
   call delete('Xcrypt_sodium.txt')
-  set cryptmethod&vim
+  set cryptmethod&mnv
 
 endfunc
 
@@ -272,7 +272,7 @@ func Test_uncrypt_xchacha20v2_2()
   CheckFeature sodium
 
   sp Xcrypt_sodium_v2.txt
-  " Create a larger file, so that Vim will write in several blocks
+  " Create a larger file, so that MNV will write in several blocks
   call setline(1, range(1, 4000))
   call assert_equal(1, &swapfile)
   set cryptmethod=xchacha20v2
@@ -282,7 +282,7 @@ func Test_uncrypt_xchacha20v2_2()
   call assert_match("Note: Encryption of swapfile not supported, disabling swap file", execute(':messages'))
   try
     w!
-  catch /^Vim\%((\a\+)\)\=:E1230:/ " sodium_mlock() not possible, may happen at Github CI
+  catch /^MNV\%((\a\+)\)\=:E1230:/ " sodium_mlock() not possible, may happen at Github CI
     throw 'Skipped: sodium_mlock() not possible'
   endtry
   " encrypted using xchacha20
@@ -290,7 +290,7 @@ func Test_uncrypt_xchacha20v2_2()
   bw!
 	try
 		call feedkeys(":verbose :sp Xcrypt_sodium_v2.txt\<CR>sodium\<CR>", 'xt')
-  catch /^Vim\%((\a\+)\)\=:E1230:/ " sodium_mlock() not possible, may happen at Github CI
+  catch /^MNV\%((\a\+)\)\=:E1230:/ " sodium_mlock() not possible, may happen at Github CI
     throw 'Skipped: sodium_mlock() not possible'
   endtry
   " successfully decrypted
@@ -302,7 +302,7 @@ func Test_uncrypt_xchacha20v2_2()
   call assert_match('"Xcrypt_sodium_v2.txt".*4000L, 18893B written', execute(':message'))
   bw!
   call delete('Xcrypt_sodium_v2.txt')
-  set cryptmethod&vim
+  set cryptmethod&mnv
 
 endfunc
 
@@ -329,14 +329,14 @@ func Test_uncrypt_xchacha20_3_persistent_undo()
     set undolevels=100
     try
       w!
-    catch /^Vim\%((\a\+)\)\=:E1230:/ " sodium_mlock() not possible, may happen at Github CI
+    catch /^MNV\%((\a\+)\)\=:E1230:/ " sodium_mlock() not possible, may happen at Github CI
     throw 'Skipped: sodium_mlock() not possible'
     endtry
     call assert_equal(0, &undofile)
     bw!
     try
       call feedkeys(":sp Xcrypt_sodium_undo.txt\<CR>sodium\<CR>", 'xt')
-    catch /^Vim\%((\a\+)\)\=:E1230:/ " sodium_mlock() not possible, may happen at Github CI
+    catch /^MNV\%((\a\+)\)\=:E1230:/ " sodium_mlock() not possible, may happen at Github CI
     throw 'Skipped: sodium_mlock() not possible'
     endtry
     " should fail
@@ -364,7 +364,7 @@ endfunc
 func Test_uncrypt_unknown_method()
   split Xuncrypt_unknown.txt
   set bin noeol key= fenc=latin1
-  call setline(1, "VimCrypt~93!\u001e\u00d1")
+  call setline(1, "MNVCrypt~93!\u001e\u00d1")
   w!
   bwipe!
   set nobin
@@ -464,13 +464,13 @@ func Test_uncrypt_empty()
   CheckFeature sodium
 
   let hex =<< trim END
-  00000000: 5669 6d43 7279 7074 7e30 3521 f02f 52ed  VimCrypt~05!./R.
+  00000000: 5669 6d43 7279 7074 7e30 3521 f02f 52ed  MNVCrypt~05!./R.
   00000010: adc3 e5f3 e06c 2fc8 3ce3 ffde d48b 95fe  .....l/.<.......
   00000020: 341e 74f7 0200 0000 0000 0000 0000 0004  4.t.............
   00000030: 0000 0000 0200 0000                      ........
   END
 
-  call Uncrypt_stable_xxd('xchacha20v2', hex, "vim", [""], 0)
+  call Uncrypt_stable_xxd('xchacha20v2', hex, "mnv", [""], 0)
 endfunc
 
 " Regression test for issue #19425
@@ -491,4 +491,4 @@ func Test_crypt_off_by_one()
   bwipe!
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_cscope.vim b/uvim/src/testdir/test_cscope.mnv
index ddd4de0b89..eea82ba16f 100644
--- a/uvim/src/testdir/test_cscope.vim
+++ b/uvim/src/testdir/test_cscope.mnv
@@ -71,8 +71,8 @@ func Test_cscopeWithCscopeConnections()
     " Test: Find this text string
     for cmd in ['cs find t Bram', 'cs find 4 Bram']
       let a = execute(cmd)
-      call assert_match('(1 of 1): <<<unknown>>>  \* VIM - Vi IMproved^Iby Bram Moolenaar', a)
-      call assert_equal(' * VIM - Vi IMproved	by Bram Moolenaar', getline('.'))
+      call assert_match('(1 of 1): <<<unknown>>>  \* MNV - MNV is not Vim^Iby Bram Moolenaar', a)
+      call assert_equal(' * MNV - MNV is not Vim	by Bram Moolenaar', getline('.'))
     endfor
 
     " Test: Find this egrep pattern
@@ -147,8 +147,8 @@ func Test_cscopeWithCscopeConnections()
 
     " Test: test with scscope
     let a = execute('scs find t Bram')
-    call assert_match('(1 of 1): <<<unknown>>>  \* VIM - Vi IMproved^Iby Bram Moolenaar', a)
-    call assert_equal(' * VIM - Vi IMproved	by Bram Moolenaar', getline('.'))
+    call assert_match('(1 of 1): <<<unknown>>>  \* MNV - MNV is not Vim^Iby Bram Moolenaar', a)
+    call assert_equal(' * MNV - MNV is not Vim	by Bram Moolenaar', getline('.'))
 
     " Test: cscope help
     for cmd in ['cs', 'cs help', 'cs xxx']
@@ -333,4 +333,4 @@ func Test_withoutCscopeConnection()
 endfunc
 
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_cursor_func.vim b/uvim/src/testdir/test_cursor_func.mnv
index 73169649df..0c565005c5 100644
--- a/uvim/src/testdir/test_cursor_func.vim
+++ b/uvim/src/testdir/test_cursor_func.mnv
@@ -625,4 +625,4 @@ func Test_virtcol2col()
   bw!
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_cursorline.vim b/uvim/src/testdir/test_cursorline.mnv
index 1aa04c3cb3..196e87e678 100644
--- a/uvim/src/testdir/test_cursorline.vim
+++ b/uvim/src/testdir/test_cursorline.mnv
@@ -1,6 +1,6 @@
 " Test for cursorline and cursorlineopt
 
-source util/screendump.vim
+source util/screendump.mnv
 
 func s:screen_attr(lnum) abort
   return map(range(1, 8), 'screenattr(a:lnum, v:val)')
@@ -134,7 +134,7 @@ func Test_cursorline_screenline()
   call extend(lines, lines2)
   call writefile(lines, filename, 'D')
   " basic test
-  let buf = RunVimInTerminal('-S '. filename, #{rows: 20})
+  let buf = RunMNVInTerminal('-S '. filename, #{rows: 20})
   call VerifyScreenDump(buf, 'Test_'. filename. '_1', {})
   call term_sendkeys(buf, "fagj")
   call VerifyScreenDump(buf, 'Test_'. filename. '_2', {})
@@ -194,7 +194,7 @@ func Test_cursorline_screenline()
   call VerifyScreenDump(buf, 'Test_'. filename. '_24', {})
   call term_sendkeys(buf, ":set list& cursorlineopt& listchars&\<cr>")
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_cursorline_redraw()
@@ -219,7 +219,7 @@ was last set.  Example: >
 <  shiftwidth=4 ~
 	  Last set from modeline line 1 ~
   cindent ~
-	  Last set from /usr/local/share/vim/vim60/ftplugin/c.vim line 30 ~
+	  Last set from /usr/local/share/mnv/mnv60/ftplugin/c.mnv line 30 ~
 This is only done when specific option values are requested, not for ":verbose
 set all" or ":verbose set" without an argument.
 When the option was set by hand there is no "Last set" message.
@@ -233,14 +233,14 @@ END
   END
   call writefile(script, 'Xscript', 'D')
 
-  let buf = RunVimInTerminal('-S Xscript Xtextfile', #{rows: 20, cols: 40})
+  let buf = RunMNVInTerminal('-S Xscript Xtextfile', #{rows: 20, cols: 40})
   call VerifyScreenDump(buf, 'Test_cursorline_redraw_1', {})
   call term_sendkeys(buf, "zt")
   call TermWait(buf)
   call term_sendkeys(buf, "\<C-U>")
   call VerifyScreenDump(buf, 'Test_cursorline_redraw_2', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_cursorline_callback()
@@ -260,11 +260,11 @@ func Test_cursorline_callback()
   END
   call writefile(lines, 'Xcul_timer', 'D')
 
-  let buf = RunVimInTerminal('-S Xcul_timer', #{rows: 8})
+  let buf = RunMNVInTerminal('-S Xcul_timer', #{rows: 8})
   call TermWait(buf, 310)
   call VerifyScreenDump(buf, 'Test_cursorline_callback_1', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_cursorline_screenline_resize()
@@ -278,14 +278,14 @@ func Test_cursorline_screenline_resize()
   END
   call writefile(lines, 'Xcul_screenline_resize', 'D')
 
-  let buf = RunVimInTerminal('-S Xcul_screenline_resize', #{rows: 8})
+  let buf = RunMNVInTerminal('-S Xcul_screenline_resize', #{rows: 8})
   call VerifyScreenDump(buf, 'Test_cursorline_screenline_resize_1', {})
   call term_sendkeys(buf, ":vertical resize -4\<CR>")
   call VerifyScreenDump(buf, 'Test_cursorline_screenline_resize_2', {})
   call term_sendkeys(buf, ":set cpoptions+=n\<CR>")
   call VerifyScreenDump(buf, 'Test_cursorline_screenline_resize_3', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_cursorline_screenline_update()
@@ -306,7 +306,7 @@ func Test_cursorline_screenline_update()
   END
   call writefile(lines, 'Xcul_screenline', 'D')
 
-  let buf = RunVimInTerminal('-S Xcul_screenline', #{rows: 8})
+  let buf = RunMNVInTerminal('-S Xcul_screenline', #{rows: 8})
   call term_sendkeys(buf, "A")
   call VerifyScreenDump(buf, 'Test_cursorline_screenline_1', {})
   call term_sendkeys(buf, "\<F2>")
@@ -315,14 +315,14 @@ func Test_cursorline_screenline_update()
   call VerifyScreenDump(buf, 'Test_cursorline_screenline_3', {})
   call term_sendkeys(buf, "\<Esc>")
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_cursorline_screenline_zero_width()
   CheckOption foldcolumn
 
   set cursorline culopt=screenline winminwidth=1 foldcolumn=1
-  " This used to crash Vim
+  " This used to crash MNV
   1vnew | redraw
 
   bwipe!
@@ -345,7 +345,7 @@ func Test_cursorline_cursorbind_horizontal_scroll()
   END
   call writefile(lines, 'Xhor_scroll', 'D')
 
-  let buf = RunVimInTerminal('-S Xhor_scroll', #{rows: 8})
+  let buf = RunMNVInTerminal('-S Xhor_scroll', #{rows: 8})
   call term_sendkeys(buf, "20l")
   call VerifyScreenDump(buf, 'Test_hor_scroll_1', {})
   call term_sendkeys(buf, "10l")
@@ -361,8 +361,8 @@ func Test_cursorline_cursorbind_horizontal_scroll()
   call term_sendkeys(buf, "40l")
   call VerifyScreenDump(buf, 'Test_hor_scroll_5', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_curswant.vim b/uvim/src/testdir/test_curswant.mnv
index d4f86a145b..0e2d3f537b 100644
--- a/uvim/src/testdir/test_curswant.vim
+++ b/uvim/src/testdir/test_curswant.mnv
@@ -23,13 +23,13 @@ func Test_curswant()
 endfunc
 
 func Test_normal_gm()
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
   let lines =<< trim END
     call setline(1, repeat(["  abcd\tefgh\tij"], 10))
     call cursor(1, 1)
   END
   call writefile(lines, 'XtestCurswant', 'D')
-  let buf = RunVimInTerminal('-S XtestCurswant', #{rows: 10})
+  let buf = RunMNVInTerminal('-S XtestCurswant', #{rows: 10})
   if has("folding")
     call term_sendkeys(buf, "jVjzf")
     " gm
@@ -60,9 +60,9 @@ func Test_normal_gm()
   call term_sendkeys(buf, ":echo virtcol('.')\<cr>")
   call WaitFor({-> term_getline(buf, 10) =~ '^3\s\+'})
   " clean up
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
   wincmd p
   wincmd c
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_debugger.vim b/uvim/src/testdir/test_debugger.mnv
index aa014c4342..a75f12f85c 100644
--- a/uvim/src/testdir/test_debugger.vim
+++ b/uvim/src/testdir/test_debugger.mnv
@@ -1,14 +1,14 @@
-" Tests for the Vim script debug commands
+" Tests for the MNV script debug commands
 
-source util/screendump.vim
+source util/screendump.mnv
 
-CheckRunVimInTerminal
+CheckRunMNVInTerminal
 
 func CheckCWD()
   " Check that the longer lines don't wrap due to the length of the script name
-  " in cwd. Need to subtract by 1 since Vim will still wrap the message if it
+  " in cwd. Need to subtract by 1 since MNV will still wrap the message if it
   " just fits.
-  let script_len = len( getcwd() .. '/Xtest1.vim' )
+  let script_len = len( getcwd() .. '/Xtest1.mnv' )
   let longest_line = len( 'Breakpoint in "" line 1' )
   if script_len > ( 75 - longest_line - 1 )
     throw 'Skipped: Your CWD has too many characters'
@@ -33,7 +33,7 @@ def s:CheckDbgOutput(buf: number, lines: list<string>, options = {})
   endfor
 enddef
 
-" Run a Vim debugger command
+" Run a MNV debugger command
 " If the expected output argument is supplied, then check for it.
 def s:RunDbgCmd(buf: number, cmd: string, ...extra: list<any>)
   term_sendkeys(buf, cmd .. "\r")
@@ -50,7 +50,7 @@ enddef
 
 " Debugger tests
 def Test_Debugger()
-  # Create a Vim script with some functions
+  # Create a MNV script with some functions
   var lines =<< trim END
 	func Foo()
 	  let var1 = 1
@@ -72,7 +72,7 @@ def Test_Debugger()
 	  endtry
 	  return var1
 	endfunc
-        def Vim9Func()
+        def MNV9Func()
           for cmd in ['confirm', 'xxxxxxx']
             for _ in [1, 2]
               echo cmd
@@ -80,12 +80,12 @@ def Test_Debugger()
           endfor
         enddef
   END
-  writefile(lines, 'XtestDebug.vim', 'D')
+  writefile(lines, 'XtestDebug.mnv', 'D')
 
-  # Start Vim in a terminal
-  var buf = g:RunVimInTerminal('-S XtestDebug.vim', {})
+  # Start MNV in a terminal
+  var buf = g:RunMNVInTerminal('-S XtestDebug.mnv', {})
 
-  # Start the Vim debugger
+  # Start the MNV debugger
   s:RunDbgCmd(buf, ':debug echo Foo()', ['cmd: echo Foo()'])
 
   # Create a few stack frames by stepping through functions
@@ -299,14 +299,14 @@ def Test_Debugger()
   s:RunDbgCmd(buf, 'step')
   s:RunDbgCmd(buf, 'step')
   s:RunDbgCmd(buf, 'interrupt', [
-	      'Exception thrown: Vim:Interrupt',
+	      'Exception thrown: MNV:Interrupt',
 	      'function Bazz',
 	      'line 5: catch'])
   s:RunDbgCmd(buf, 'c')
 
   # Test showing local variable in :def function
-  s:RunDbgCmd(buf, ':breakadd func 2 Vim9Func')
-  s:RunDbgCmd(buf, ':call Vim9Func()', ['line 2:             for _ in [1, 2]'])
+  s:RunDbgCmd(buf, ':breakadd func 2 MNV9Func')
+  s:RunDbgCmd(buf, ':call MNV9Func()', ['line 2:             for _ in [1, 2]'])
   s:RunDbgCmd(buf, 'next', ['line 2: for _ in [1, 2]'])
   s:RunDbgCmd(buf, 'echo cmd', ['confirm'])
   s:RunDbgCmd(buf, 'breakdel *')
@@ -329,7 +329,7 @@ def Test_Debugger()
   s:RunDbgCmd(buf, 'quit')
   s:RunDbgCmd(buf, 'enew! | only!')
 
-  g:StopVimInTerminal(buf)
+  g:StopMNVInTerminal(buf)
 enddef
 
 func Test_Debugger_breakadd()
@@ -342,22 +342,22 @@ func Test_Debugger_breakadd()
 	let var3 = 30
 	let var4 = 40
   END
-  call writefile(lines, 'XdebugBreakadd.vim', 'D')
+  call writefile(lines, 'XdebugBreakadd.mnv', 'D')
 
-  " Start Vim in a terminal
-  let buf = RunVimInTerminal('XdebugBreakadd.vim', {})
-  call s:RunDbgCmd(buf, ':breakadd file 2 XdebugBreakadd.vim')
+  " Start MNV in a terminal
+  let buf = RunMNVInTerminal('XdebugBreakadd.mnv', {})
+  call s:RunDbgCmd(buf, ':breakadd file 2 XdebugBreakadd.mnv')
   call s:RunDbgCmd(buf, ':4 | breakadd here')
-  call s:RunDbgCmd(buf, ':source XdebugBreakadd.vim', ['line 2: let var2 = 20'])
+  call s:RunDbgCmd(buf, ':source XdebugBreakadd.mnv', ['line 2: let var2 = 20'])
   call s:RunDbgCmd(buf, 'cont', ['line 4: let var4 = 40'])
   call s:RunDbgCmd(buf, 'cont')
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 
   %bw!
 
   call assert_fails('breakadd here', 'E32:')
-  call assert_fails('breakadd file Xtest.vim /\)/', 'E55:')
+  call assert_fails('breakadd file Xtest.mnv /\)/', 'E55:')
 endfunc
 
 " Test for expression breakpoint set using ":breakadd expr <expr>"
@@ -377,23 +377,23 @@ func Test_Debugger_breakadd_expr()
     let g:Xtest_var += 1
     call Foo()
   END
-  call writefile(lines, 'XbreakExpr.vim', 'D')
+  call writefile(lines, 'XbreakExpr.mnv', 'D')
 
-  " Start Vim in a terminal
-  let buf = RunVimInTerminal('XbreakExpr.vim', {})
+  " Start MNV in a terminal
+  let buf = RunMNVInTerminal('XbreakExpr.mnv', {})
   call s:RunDbgCmd(buf, ':let g:Xtest_var = 10')
   call s:RunDbgCmd(buf, ':breakadd expr g:Xtest_var')
   let expected =<< trim eval END
     Oldval = "10"
     Newval = "11"
-    {fnamemodify('XbreakExpr.vim', ':p')}[7]..function Foo
+    {fnamemodify('XbreakExpr.mnv', ':p')}[7]..function Foo
     line 1: eval 1
   END
   call s:RunDbgCmd(buf, ':source %', expected)
   let expected =<< trim eval END
     Oldval = "11"
     Newval = "12"
-    {fnamemodify('XbreakExpr.vim', ':p')}[9]..function Foo
+    {fnamemodify('XbreakExpr.mnv', ':p')}[9]..function Foo
     line 1: eval 1
   END
   call s:RunDbgCmd(buf, 'cont', expected)
@@ -406,35 +406,35 @@ func Test_Debugger_breakadd_expr()
   let expected =<< trim eval END
     Oldval = "13"
     Newval = "(does not exist)"
-    {fnamemodify('XbreakExpr.vim', ':p')}[7]..function Foo
+    {fnamemodify('XbreakExpr.mnv', ':p')}[7]..function Foo
     line 1: eval 1
   END
   call s:RunDbgCmd(buf, ':source %', expected)
   let expected =<< trim eval END
-    {fnamemodify('XbreakExpr.vim', ':p')}[7]..function Foo
+    {fnamemodify('XbreakExpr.mnv', ':p')}[7]..function Foo
     line 2: eval 2
   END
   call s:RunDbgCmd(buf, 'cont', expected)
   let expected =<< trim eval END
     Oldval = "14"
     Newval = "(does not exist)"
-    {fnamemodify('XbreakExpr.vim', ':p')}[9]..function Foo
+    {fnamemodify('XbreakExpr.mnv', ':p')}[9]..function Foo
     line 1: eval 1
   END
   call s:RunDbgCmd(buf, 'cont', expected)
   let expected =<< trim eval END
-    {fnamemodify('XbreakExpr.vim', ':p')}[9]..function Foo
+    {fnamemodify('XbreakExpr.mnv', ':p')}[9]..function Foo
     line 2: eval 2
   END
   call s:RunDbgCmd(buf, 'cont', expected)
   call s:RunDbgCmd(buf, 'cont')
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
-def Test_Debugger_breakadd_vim9_expr()
+def Test_Debugger_breakadd_mnv9_expr()
   var lines =<< trim END
-      vim9script
+      mnv9script
       func g:EarlyFunc()
       endfunc
       breakadd expr DoesNotExist()
@@ -442,10 +442,10 @@ def Test_Debugger_breakadd_vim9_expr()
       endfunc
       breakdel *
   END
-  writefile(lines, 'XdebugBreak9expr.vim', 'D')
+  writefile(lines, 'XdebugBreak9expr.mnv', 'D')
 
-  # Start Vim in a terminal
-  var buf = g:RunVimInTerminal('-S XdebugBreak9expr.vim', {wait_for_ruler: 0})
+  # Start MNV in a terminal
+  var buf = g:RunMNVInTerminal('-S XdebugBreak9expr.mnv', {wait_for_ruler: 0})
   call g:TermWait(buf, g:RunningWithValgrind() ? 1000 : 50)
 
   # Despite the failure the functions are defined
@@ -454,12 +454,12 @@ def Test_Debugger_breakadd_vim9_expr()
   s:RunDbgCmd(buf, ':function g:LaterFunc',
      ['function LaterFunc()', 'endfunction'], {match: 'pattern'})
 
-  call g:StopVimInTerminal(buf)
+  call g:StopMNVInTerminal(buf)
 enddef
 
 def Test_Debugger_break_at_return()
   var lines =<< trim END
-      vim9script
+      mnv9script
       def g:GetNum(): number
         return 1
           + 2
@@ -467,23 +467,23 @@ def Test_Debugger_break_at_return()
       enddef
       breakadd func GetNum
   END
-  writefile(lines, 'XdebugBreakRet.vim', 'D')
+  writefile(lines, 'XdebugBreakRet.mnv', 'D')
 
-  # Start Vim in a terminal
-  var buf = g:RunVimInTerminal('-S XdebugBreakRet.vim', {wait_for_ruler: 0})
+  # Start MNV in a terminal
+  var buf = g:RunMNVInTerminal('-S XdebugBreakRet.mnv', {wait_for_ruler: 0})
   call g:TermWait(buf, g:RunningWithValgrind() ? 1000 : 50)
 
   s:RunDbgCmd(buf, ':call GetNum()',
      ['line 1: return 1  + 2  + 3'], {match: 'pattern'})
 
-  call g:StopVimInTerminal(buf)
+  call g:StopMNVInTerminal(buf)
 enddef
 
 func Test_Backtrace_Through_Source()
   CheckCWD
   let file1 =<< trim END
     func SourceAnotherFile()
-      source Xtest2.vim
+      source Xtest2.mnv
     endfunc
 
     func CallAFunction()
@@ -495,7 +495,7 @@ func Test_Backtrace_Through_Source()
       call CallAFunction()
     endfunc
   END
-  call writefile(file1, 'Xtest1.vim', 'D')
+  call writefile(file1, 'Xtest1.mnv', 'D')
 
   let file2 =<< trim END
     func DoAThing()
@@ -508,9 +508,9 @@ func Test_Backtrace_Through_Source()
 
     call File2Function()
   END
-  call writefile(file2, 'Xtest2.vim', 'D')
+  call writefile(file2, 'Xtest2.mnv', 'D')
 
-  let buf = RunVimInTerminal('-S Xtest1.vim', {})
+  let buf = RunMNVInTerminal('-S Xtest1.mnv', {})
 
   call s:RunDbgCmd(buf,
                 \ ':debug call GlobalFunction()',
@@ -522,13 +522,13 @@ func Test_Backtrace_Through_Source()
                                     \ 'line 1: call CallAFunction()'])
 
   call s:RunDbgCmd(buf, 'step', ['line 1: call SourceAnotherFile()'])
-  call s:RunDbgCmd(buf, 'step', ['line 1: source Xtest2.vim'])
+  call s:RunDbgCmd(buf, 'step', ['line 1: source Xtest2.mnv'])
 
   call s:RunDbgCmd(buf, 'backtrace', ['>backtrace',
                                     \ '  2 function GlobalFunction[1]',
                                     \ '  1 CallAFunction[1]',
                                     \ '->0 SourceAnotherFile',
-                                    \ 'line 1: source Xtest2.vim'])
+                                    \ 'line 1: source Xtest2.mnv'])
 
   " Step into the 'source' command. Note that we print the full trace all the
   " way though the source command.
@@ -538,7 +538,7 @@ func Test_Backtrace_Through_Source()
         \ '  3 function GlobalFunction[1]',
         \ '  2 CallAFunction[1]',
         \ '  1 SourceAnotherFile[1]',
-        \ '->0 script ' .. getcwd() .. '/Xtest2.vim',
+        \ '->0 script ' .. getcwd() .. '/Xtest2.mnv',
         \ 'line 1: func DoAThing()'])
 
   call s:RunDbgCmd( buf, 'up' )
@@ -547,7 +547,7 @@ func Test_Backtrace_Through_Source()
         \ '  3 function GlobalFunction[1]',
         \ '  2 CallAFunction[1]',
         \ '->1 SourceAnotherFile[1]',
-        \ '  0 script ' .. getcwd() .. '/Xtest2.vim',
+        \ '  0 script ' .. getcwd() .. '/Xtest2.mnv',
         \ 'line 1: func DoAThing()' ] )
 
   call s:RunDbgCmd( buf, 'up' )
@@ -556,7 +556,7 @@ func Test_Backtrace_Through_Source()
         \ '  3 function GlobalFunction[1]',
         \ '->2 CallAFunction[1]',
         \ '  1 SourceAnotherFile[1]',
-        \ '  0 script ' .. getcwd() .. '/Xtest2.vim',
+        \ '  0 script ' .. getcwd() .. '/Xtest2.mnv',
         \ 'line 1: func DoAThing()' ] )
 
   call s:RunDbgCmd( buf, 'up' )
@@ -565,7 +565,7 @@ func Test_Backtrace_Through_Source()
         \ '->3 function GlobalFunction[1]',
         \ '  2 CallAFunction[1]',
         \ '  1 SourceAnotherFile[1]',
-        \ '  0 script ' .. getcwd() .. '/Xtest2.vim',
+        \ '  0 script ' .. getcwd() .. '/Xtest2.mnv',
         \ 'line 1: func DoAThing()' ] )
 
   call s:RunDbgCmd( buf, 'up', [ 'frame at highest level: 3' ] )
@@ -574,7 +574,7 @@ func Test_Backtrace_Through_Source()
         \ '->3 function GlobalFunction[1]',
         \ '  2 CallAFunction[1]',
         \ '  1 SourceAnotherFile[1]',
-        \ '  0 script ' .. getcwd() .. '/Xtest2.vim',
+        \ '  0 script ' .. getcwd() .. '/Xtest2.mnv',
         \ 'line 1: func DoAThing()' ] )
 
   call s:RunDbgCmd( buf, 'down' )
@@ -583,7 +583,7 @@ func Test_Backtrace_Through_Source()
         \ '  3 function GlobalFunction[1]',
         \ '->2 CallAFunction[1]',
         \ '  1 SourceAnotherFile[1]',
-        \ '  0 script ' .. getcwd() .. '/Xtest2.vim',
+        \ '  0 script ' .. getcwd() .. '/Xtest2.mnv',
         \ 'line 1: func DoAThing()' ] )
 
   call s:RunDbgCmd( buf, 'down' )
@@ -592,7 +592,7 @@ func Test_Backtrace_Through_Source()
         \ '  3 function GlobalFunction[1]',
         \ '  2 CallAFunction[1]',
         \ '->1 SourceAnotherFile[1]',
-        \ '  0 script ' .. getcwd() .. '/Xtest2.vim',
+        \ '  0 script ' .. getcwd() .. '/Xtest2.mnv',
         \ 'line 1: func DoAThing()' ] )
 
   call s:RunDbgCmd( buf, 'down' )
@@ -601,7 +601,7 @@ func Test_Backtrace_Through_Source()
         \ '  3 function GlobalFunction[1]',
         \ '  2 CallAFunction[1]',
         \ '  1 SourceAnotherFile[1]',
-        \ '->0 script ' .. getcwd() .. '/Xtest2.vim',
+        \ '->0 script ' .. getcwd() .. '/Xtest2.mnv',
         \ 'line 1: func DoAThing()' ] )
 
   call s:RunDbgCmd( buf, 'down', [ 'frame is zero' ] )
@@ -614,7 +614,7 @@ func Test_Backtrace_Through_Source()
         \ '  3 function GlobalFunction[1]',
         \ '  2 CallAFunction[1]',
         \ '  1 SourceAnotherFile[1]',
-        \ '->0 script ' .. getcwd() .. '/Xtest2.vim',
+        \ '->0 script ' .. getcwd() .. '/Xtest2.mnv',
         \ 'line 9: call File2Function()'])
 
   call s:RunDbgCmd(buf, 'step', ['line 1: call DoAThing()'])
@@ -624,12 +624,12 @@ func Test_Backtrace_Through_Source()
         \ '  5 function GlobalFunction[1]',
         \ '  4 CallAFunction[1]',
         \ '  3 SourceAnotherFile[1]',
-        \ '  2 script ' .. getcwd() .. '/Xtest2.vim[9]',
+        \ '  2 script ' .. getcwd() .. '/Xtest2.mnv[9]',
         \ '  1 function File2Function[1]',
         \ '->0 DoAThing',
         \ 'line 1: echo "DoAThing"'])
 
-  " Now, step (back to Xfile1.vim), and call the function _in_ Xfile2.vim
+  " Now, step (back to Xfile1.mnv), and call the function _in_ Xfile2.mnv
   call s:RunDbgCmd(buf, 'step', ['line 1: End of function'])
   call s:RunDbgCmd(buf, 'step', ['line 1: End of function'])
   call s:RunDbgCmd(buf, 'step', ['line 10: End of sourced file'])
@@ -649,14 +649,14 @@ func Test_Backtrace_Through_Source()
         \ '->0 File2Function',
         \ 'line 1: call DoAThing()'])
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_Backtrace_Autocmd()
   CheckCWD
   let file1 =<< trim END
     func SourceAnotherFile()
-      source Xtest2.vim
+      source Xtest2.mnv
     endfunc
 
     func CallAFunction()
@@ -670,7 +670,7 @@ func Test_Backtrace_Autocmd()
 
     au User TestGlobalFunction :call GlobalFunction() | echo "Done"
   END
-  call writefile(file1, 'Xtest1.vim', 'D')
+  call writefile(file1, 'Xtest1.mnv', 'D')
 
   let file2 =<< trim END
     func DoAThing()
@@ -683,9 +683,9 @@ func Test_Backtrace_Autocmd()
 
     call File2Function()
   END
-  call writefile(file2, 'Xtest2.vim', 'D')
+  call writefile(file2, 'Xtest2.mnv', 'D')
 
-  let buf = RunVimInTerminal('-S Xtest1.vim', {})
+  let buf = RunMNVInTerminal('-S Xtest1.mnv', {})
 
   call s:RunDbgCmd(buf,
                 \ ':debug doautocmd User TestGlobalFunction',
@@ -707,7 +707,7 @@ func Test_Backtrace_Autocmd()
         \ 'line 1: call CallAFunction()'])
 
   call s:RunDbgCmd(buf, 'step', ['line 1: call SourceAnotherFile()'])
-  call s:RunDbgCmd(buf, 'step', ['line 1: source Xtest2.vim'])
+  call s:RunDbgCmd(buf, 'step', ['line 1: source Xtest2.mnv'])
 
   call s:RunDbgCmd(buf, 'backtrace', [
         \ '>backtrace',
@@ -715,7 +715,7 @@ func Test_Backtrace_Autocmd()
         \ '  2 function GlobalFunction[1]',
         \ '  1 CallAFunction[1]',
         \ '->0 SourceAnotherFile',
-        \ 'line 1: source Xtest2.vim'])
+        \ 'line 1: source Xtest2.mnv'])
 
   " Step into the 'source' command. Note that we print the full trace all the
   " way though the source command.
@@ -726,7 +726,7 @@ func Test_Backtrace_Autocmd()
         \ '  3 function GlobalFunction[1]',
         \ '  2 CallAFunction[1]',
         \ '  1 SourceAnotherFile[1]',
-        \ '->0 script ' .. getcwd() .. '/Xtest2.vim',
+        \ '->0 script ' .. getcwd() .. '/Xtest2.mnv',
         \ 'line 1: func DoAThing()'])
 
   call s:RunDbgCmd( buf, 'up' )
@@ -736,7 +736,7 @@ func Test_Backtrace_Autocmd()
         \ '  3 function GlobalFunction[1]',
         \ '  2 CallAFunction[1]',
         \ '->1 SourceAnotherFile[1]',
-        \ '  0 script ' .. getcwd() .. '/Xtest2.vim',
+        \ '  0 script ' .. getcwd() .. '/Xtest2.mnv',
         \ 'line 1: func DoAThing()' ] )
 
   call s:RunDbgCmd( buf, 'up' )
@@ -746,7 +746,7 @@ func Test_Backtrace_Autocmd()
         \ '  3 function GlobalFunction[1]',
         \ '->2 CallAFunction[1]',
         \ '  1 SourceAnotherFile[1]',
-        \ '  0 script ' .. getcwd() .. '/Xtest2.vim',
+        \ '  0 script ' .. getcwd() .. '/Xtest2.mnv',
         \ 'line 1: func DoAThing()' ] )
 
   call s:RunDbgCmd( buf, 'up' )
@@ -756,7 +756,7 @@ func Test_Backtrace_Autocmd()
         \ '->3 function GlobalFunction[1]',
         \ '  2 CallAFunction[1]',
         \ '  1 SourceAnotherFile[1]',
-        \ '  0 script ' .. getcwd() .. '/Xtest2.vim',
+        \ '  0 script ' .. getcwd() .. '/Xtest2.mnv',
         \ 'line 1: func DoAThing()' ] )
 
   call s:RunDbgCmd( buf, 'up' )
@@ -766,7 +766,7 @@ func Test_Backtrace_Autocmd()
         \ '  3 function GlobalFunction[1]',
         \ '  2 CallAFunction[1]',
         \ '  1 SourceAnotherFile[1]',
-        \ '  0 script ' .. getcwd() .. '/Xtest2.vim',
+        \ '  0 script ' .. getcwd() .. '/Xtest2.mnv',
         \ 'line 1: func DoAThing()' ] )
 
   call s:RunDbgCmd( buf, 'up', [ 'frame at highest level: 4' ] )
@@ -776,7 +776,7 @@ func Test_Backtrace_Autocmd()
         \ '  3 function GlobalFunction[1]',
         \ '  2 CallAFunction[1]',
         \ '  1 SourceAnotherFile[1]',
-        \ '  0 script ' .. getcwd() .. '/Xtest2.vim',
+        \ '  0 script ' .. getcwd() .. '/Xtest2.mnv',
         \ 'line 1: func DoAThing()' ] )
 
   call s:RunDbgCmd( buf, 'down' )
@@ -786,7 +786,7 @@ func Test_Backtrace_Autocmd()
         \ '->3 function GlobalFunction[1]',
         \ '  2 CallAFunction[1]',
         \ '  1 SourceAnotherFile[1]',
-        \ '  0 script ' .. getcwd() .. '/Xtest2.vim',
+        \ '  0 script ' .. getcwd() .. '/Xtest2.mnv',
         \ 'line 1: func DoAThing()' ] )
 
 
@@ -797,7 +797,7 @@ func Test_Backtrace_Autocmd()
         \ '  3 function GlobalFunction[1]',
         \ '->2 CallAFunction[1]',
         \ '  1 SourceAnotherFile[1]',
-        \ '  0 script ' .. getcwd() .. '/Xtest2.vim',
+        \ '  0 script ' .. getcwd() .. '/Xtest2.mnv',
         \ 'line 1: func DoAThing()' ] )
 
   call s:RunDbgCmd( buf, 'down' )
@@ -807,7 +807,7 @@ func Test_Backtrace_Autocmd()
         \ '  3 function GlobalFunction[1]',
         \ '  2 CallAFunction[1]',
         \ '->1 SourceAnotherFile[1]',
-        \ '  0 script ' .. getcwd() .. '/Xtest2.vim',
+        \ '  0 script ' .. getcwd() .. '/Xtest2.mnv',
         \ 'line 1: func DoAThing()' ] )
 
   call s:RunDbgCmd( buf, 'down' )
@@ -817,7 +817,7 @@ func Test_Backtrace_Autocmd()
         \ '  3 function GlobalFunction[1]',
         \ '  2 CallAFunction[1]',
         \ '  1 SourceAnotherFile[1]',
-        \ '->0 script ' .. getcwd() .. '/Xtest2.vim',
+        \ '->0 script ' .. getcwd() .. '/Xtest2.mnv',
         \ 'line 1: func DoAThing()' ] )
 
   call s:RunDbgCmd( buf, 'down', [ 'frame is zero' ] )
@@ -831,7 +831,7 @@ func Test_Backtrace_Autocmd()
         \ '  3 function GlobalFunction[1]',
         \ '  2 CallAFunction[1]',
         \ '  1 SourceAnotherFile[1]',
-        \ '->0 script ' .. getcwd() .. '/Xtest2.vim',
+        \ '->0 script ' .. getcwd() .. '/Xtest2.mnv',
         \ 'line 9: call File2Function()'])
 
   call s:RunDbgCmd(buf, 'step', ['line 1: call DoAThing()'])
@@ -842,12 +842,12 @@ func Test_Backtrace_Autocmd()
         \ '  5 function GlobalFunction[1]',
         \ '  4 CallAFunction[1]',
         \ '  3 SourceAnotherFile[1]',
-        \ '  2 script ' .. getcwd() .. '/Xtest2.vim[9]',
+        \ '  2 script ' .. getcwd() .. '/Xtest2.mnv[9]',
         \ '  1 function File2Function[1]',
         \ '->0 DoAThing',
         \ 'line 1: echo "DoAThing"'])
 
-  " Now, step (back to Xfile1.vim), and call the function _in_ Xfile2.vim
+  " Now, step (back to Xfile1.mnv), and call the function _in_ Xfile2.mnv
   call s:RunDbgCmd(buf, 'step', ['line 1: End of function'])
   call s:RunDbgCmd(buf, 'step', ['line 1: End of function'])
   call s:RunDbgCmd(buf, 'step', ['line 10: End of sourced file'])
@@ -902,14 +902,14 @@ func Test_Backtrace_Autocmd()
         \ '->0 User Autocommands for "TestGlobalFunction"',
         \ 'cmd: echo "Done"'])
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_Backtrace_CmdLine()
   CheckCWD
   let file1 =<< trim END
     func SourceAnotherFile()
-      source Xtest2.vim
+      source Xtest2.mnv
     endfunc
 
     func CallAFunction()
@@ -923,7 +923,7 @@ func Test_Backtrace_CmdLine()
 
     au User TestGlobalFunction :call GlobalFunction() | echo "Done"
   END
-  call writefile(file1, 'Xtest1.vim', 'D')
+  call writefile(file1, 'Xtest1.mnv', 'D')
 
   let file2 =<< trim END
     func DoAThing()
@@ -936,13 +936,13 @@ func Test_Backtrace_CmdLine()
 
     call File2Function()
   END
-  call writefile(file2, 'Xtest2.vim', 'D')
+  call writefile(file2, 'Xtest2.mnv', 'D')
 
-  let buf = RunVimInTerminal(
-        \ '-S Xtest1.vim -c "debug call GlobalFunction()"',
+  let buf = RunMNVInTerminal(
+        \ '-S Xtest1.mnv -c "debug call GlobalFunction()"',
         \ {'wait_for_ruler': 0})
 
-  " Need to wait for the vim-in-terminal to be ready.
+  " Need to wait for the mnv-in-terminal to be ready.
   " With valgrind this can take quite long.
   call s:CheckDbgOutput(buf, ['command line',
                             \ 'cmd: call GlobalFunction()'], #{msec: 5000})
@@ -961,17 +961,17 @@ func Test_Backtrace_CmdLine()
         \ '->0 function GlobalFunction',
         \ 'line 1: call CallAFunction()'])
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_Backtrace_DefFunction()
   CheckCWD
   let file1 =<< trim END
-    vim9script
-    import './Xtest2.vim' as imp
+    mnv9script
+    import './Xtest2.mnv' as imp
 
     def SourceAnotherFile()
-      source Xtest2.vim
+      source Xtest2.mnv
     enddef
 
     def CallAFunction()
@@ -986,10 +986,10 @@ func Test_Backtrace_DefFunction()
 
     defcompile
   END
-  call writefile(file1, 'Xtest1.vim', 'D')
+  call writefile(file1, 'Xtest1.mnv', 'D')
 
   let file2 =<< trim END
-    vim9script
+    mnv9script
 
     def DoAThing(): number
       var a = 100 * 2
@@ -1004,9 +1004,9 @@ func Test_Backtrace_DefFunction()
     defcompile
     File2Function()
   END
-  call writefile(file2, 'Xtest2.vim', 'D')
+  call writefile(file2, 'Xtest2.mnv', 'D')
 
-  let buf = RunVimInTerminal('-S Xtest1.vim', {})
+  let buf = RunMNVInTerminal('-S Xtest1.mnv', {})
 
   call s:RunDbgCmd(buf,
                 \ ':debug call GlobalFunction()',
@@ -1024,11 +1024,11 @@ func Test_Backtrace_DefFunction()
         \ #{match: 'pattern'})
 
   call s:RunDbgCmd(buf, 'step', ['line 1: SourceAnotherFile()'])
-  call s:RunDbgCmd(buf, 'step', ['line 1: source Xtest2.vim'])
+  call s:RunDbgCmd(buf, 'step', ['line 1: source Xtest2.mnv'])
   " Repeated line, because we first are in the compiled function before the
   " EXEC and then in do_cmdline() before the :source command.
-  call s:RunDbgCmd(buf, 'step', ['line 1: source Xtest2.vim'])
-  call s:RunDbgCmd(buf, 'step', ['line 1: vim9script'])
+  call s:RunDbgCmd(buf, 'step', ['line 1: source Xtest2.mnv'])
+  call s:RunDbgCmd(buf, 'step', ['line 1: mnv9script'])
   call s:RunDbgCmd(buf, 'step', ['line 3: def DoAThing(): number'])
   call s:RunDbgCmd(buf, 'step', ['line 9: export def File2Function()'])
   call s:RunDbgCmd(buf, 'step', ['line 13: defcompile'])
@@ -1038,7 +1038,7 @@ func Test_Backtrace_DefFunction()
         \ '\V  3 function GlobalFunction[2]',
         \ '\V  2 <SNR>\.\*_CallAFunction[1]',
         \ '\V  1 <SNR>\.\*_SourceAnotherFile[1]',
-        \ '\V->0 script ' .. getcwd() .. '/Xtest2.vim',
+        \ '\V->0 script ' .. getcwd() .. '/Xtest2.mnv',
         \ '\Vline 14: File2Function()'],
         \ #{match: 'pattern'})
 
@@ -1049,17 +1049,17 @@ func Test_Backtrace_DefFunction()
         \ '\V  3 function GlobalFunction[2]',
         \ '\V  2 <SNR>\.\*_CallAFunction[1]',
         \ '\V  1 <SNR>\.\*_SourceAnotherFile[1]',
-        \ '\V->0 script ' .. getcwd() .. '/Xtest2.vim',
+        \ '\V->0 script ' .. getcwd() .. '/Xtest2.mnv',
         \ '\Vline 15: End of sourced file'],
         \ #{match: 'pattern'})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_DefFunction_expr()
   CheckCWD
   let file3 =<< trim END
-      vim9script
+      mnv9script
       g:someVar = "foo"
       def g:ChangeVar()
         g:someVar = "bar"
@@ -1067,19 +1067,19 @@ func Test_DefFunction_expr()
       enddef
       defcompile
   END
-  call writefile(file3, 'Xtest3.vim', 'D')
-  let buf = RunVimInTerminal('-S Xtest3.vim', {})
+  call writefile(file3, 'Xtest3.mnv', 'D')
+  let buf = RunMNVInTerminal('-S Xtest3.mnv', {})
 
   call s:RunDbgCmd(buf, ':breakadd expr g:someVar')
   call s:RunDbgCmd(buf, ':call g:ChangeVar()', ['Oldval = "''foo''"', 'Newval = "''bar''"', 'function ChangeVar', 'line 2: echo "changed"'])
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_debug_def_and_legacy_function()
   CheckCWD
   let file =<< trim END
-    vim9script
+    mnv9script
     def g:SomeFunc()
       echo "here"
       echo "and"
@@ -1102,9 +1102,9 @@ func Test_debug_def_and_legacy_function()
 
     breakadd func 2 g:SomeFunc
   END
-  call writefile(file, 'XtestDebug.vim', 'D')
+  call writefile(file, 'XtestDebug.mnv', 'D')
 
-  let buf = RunVimInTerminal('-S XtestDebug.vim', {})
+  let buf = RunMNVInTerminal('-S XtestDebug.mnv', {})
 
   call s:RunDbgCmd(buf,':call SomeFunc()', ['line 2: echo "and"'])
   call s:RunDbgCmd(buf,'next', ['line 3: echo "there"'])
@@ -1118,13 +1118,13 @@ func Test_debug_def_and_legacy_function()
 
   call s:RunDbgCmd(buf, 'cont')
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_debug_def_function()
   CheckCWD
   let file =<< trim END
-    vim9script
+    mnv9script
     def g:Func()
       var n: number
       def Closure(): number
@@ -1174,9 +1174,9 @@ func Test_debug_def_function()
            | eval 2 + 3
     enddef
   END
-  call writefile(file, 'Xtest.vim', 'D')
+  call writefile(file, 'Xtest.mnv', 'D')
 
-  let buf = RunVimInTerminal('-S Xtest.vim', {})
+  let buf = RunMNVInTerminal('-S Xtest.mnv', {})
 
   call s:RunDbgCmd(buf,
                 \ ':debug call Func()',
@@ -1240,13 +1240,13 @@ func Test_debug_def_function()
   call s:RunDbgCmd(buf, ':call FuncWithSplitLine()', ['function FuncWithSplitLine', 'line 1: eval 1 + 2 | eval 2 + 3'])
 
   call s:RunDbgCmd(buf, 'cont')
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_debug_def_function_with_lambda()
   CheckCWD
   let lines =<< trim END
-     vim9script
+     mnv9script
      def g:Func()
        var s = 'a'
        ['b']->map((_, v) => s)
@@ -1254,9 +1254,9 @@ func Test_debug_def_function_with_lambda()
      enddef
      breakadd func 2 g:Func
   END
-  call writefile(lines, 'XtestLambda.vim', 'D')
+  call writefile(lines, 'XtestLambda.mnv', 'D')
 
-  let buf = RunVimInTerminal('-S XtestLambda.vim', {})
+  let buf = RunMNVInTerminal('-S XtestLambda.mnv', {})
 
   call s:RunDbgCmd(buf,
                 \ ':call g:Func()',
@@ -1266,7 +1266,7 @@ func Test_debug_def_function_with_lambda()
                 \ ['function Func', 'line 3: echo "done"'])
 
   call s:RunDbgCmd(buf, 'cont')
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 def Test_debug_backtrace_level()
@@ -1279,12 +1279,12 @@ def Test_debug_backtrace_level()
       let s:file1_var .= a:arg
       let local_var = s:file1_var .. ' test1'
       let g:global_var .= local_var
-      source Xtest2.vim
+      source Xtest2.mnv
     endfunc
 
     call s:File1Func( 'arg1' )
   END
-  writefile(lines, 'Xtest1.vim', 'D')
+  writefile(lines, 'Xtest1.mnv', 'D')
 
   lines =<< trim END
     let s:file2_var = 'file2'
@@ -1297,14 +1297,14 @@ def Test_debug_backtrace_level()
 
     call s:File2Func( 'arg2' )
   END
-  writefile(lines, 'Xtest2.vim', 'D')
+  writefile(lines, 'Xtest2.mnv', 'D')
 
-  var file1 = getcwd() .. '/Xtest1.vim'
-  var file2 = getcwd() .. '/Xtest2.vim'
+  var file1 = getcwd() .. '/Xtest1.mnv'
+  var file2 = getcwd() .. '/Xtest2.mnv'
 
-  # set a breakpoint and source file1.vim
-  var buf = g:RunVimInTerminal(
-        '-c "breakadd file 1 Xtest1.vim" -S Xtest1.vim',
+  # set a breakpoint and source file1.mnv
+  var buf = g:RunMNVInTerminal(
+        '-c "breakadd file 1 Xtest1.mnv" -S Xtest1.mnv',
         {wait_for_ruler: 0})
 
   s:CheckDbgOutput(buf, [
@@ -1390,7 +1390,7 @@ def Test_debug_backtrace_level()
   s:RunDbgCmd(buf, 'echo local_var', [ 'file1arg1 test1' ] )
   s:RunDbgCmd(buf, 'echo l:local_var', [ 'file1arg1 test1' ] )
 
-  s:RunDbgCmd(buf, 'step', [ 'line 4: source Xtest2.vim' ] )
+  s:RunDbgCmd(buf, 'step', [ 'line 4: source Xtest2.mnv' ] )
   s:RunDbgCmd(buf, 'step', [ 'line 1: let s:file2_var = ''file2''' ] )
   s:RunDbgCmd(buf, 'backtrace', [
         '\V>backtrace',
@@ -1457,7 +1457,7 @@ def Test_debug_backtrace_level()
   s:RunDbgCmd(buf, 'echo s:file2_var', [ 'file2' ] )
 
   s:RunDbgCmd(buf, 'cont')
-  g:StopVimInTerminal(buf)
+  g:StopMNVInTerminal(buf)
 enddef
 
 " Test for setting a breakpoint on a :endif where the :if condition is false
@@ -1477,7 +1477,7 @@ func Test_breakpt_endif_intr()
     let caught_intr = 0
     debuggreedy
     call feedkeys(":call F()\<CR>quit\<CR>", "xt")
-  catch /^Vim:Interrupt$/
+  catch /^MNV:Interrupt$/
     call assert_match('\.F, line 4', v:throwpoint)
     let caught_intr = 1
   endtry
@@ -1507,7 +1507,7 @@ func Test_breakpt_else_intr()
     let caught_intr = 0
     debuggreedy
     call feedkeys(":call F()\<CR>quit\<CR>", "xt")
-  catch /^Vim:Interrupt$/
+  catch /^MNV:Interrupt$/
     call assert_match('\.F, line 4', v:throwpoint)
     let caught_intr = 1
   endtry
@@ -1535,7 +1535,7 @@ func Test_breakpt_endwhile_intr()
     let caught_intr = 0
     debuggreedy
     call feedkeys(":call F()\<CR>quit\<CR>", "xt")
-  catch /^Vim:Interrupt$/
+  catch /^MNV:Interrupt$/
     call assert_match('\.F, line 4', v:throwpoint)
     let caught_intr = 1
   endtry
@@ -1566,4 +1566,4 @@ func Test_breakpt_scriptlocal_func()
   exe "delfunc " .. funcname
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_delete.vim b/uvim/src/testdir/test_delete.mnv
index 63e83d3b77..aa436829eb 100644
--- a/uvim/src/testdir/test_delete.vim
+++ b/uvim/src/testdir/test_delete.mnv
@@ -1,6 +1,6 @@
 " Test for delete().
 
-source util/screendump.vim
+source util/screendump.mnv
 
 func Test_file_delete()
   split Xfdelfile
@@ -110,13 +110,13 @@ endfunc
 " This should no longer trigger ml_get errors
 func Test_delete_ml_get_errors()
   CheckScreendump
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
   let lines =<< trim END
     set noshowcmd noruler scrolloff=0
-    source samples/matchparen.vim
+    source samples/matchparen.mnv
   END
   call writefile(lines, 'XDelete_ml_get_error', 'D')
-  let buf = RunVimInTerminal('-S XDelete_ml_get_error samples/box.txt', #{rows: 10, wait_for_ruler: 0})
+  let buf = RunMNVInTerminal('-S XDelete_ml_get_error samples/box.txt', #{rows: 10, wait_for_ruler: 0})
   call TermWait(buf)
   call term_sendkeys(buf, "249GV\<C-End>d")
   call TermWait(buf)
@@ -126,7 +126,7 @@ func Test_delete_ml_get_errors()
   call term_sendkeys(buf, ":mess\<cr>")
   call VerifyScreenDump(buf, 'Test_delete_ml_get_errors_1', {})
   call term_sendkeys(buf, ":q!\<cr>")
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_diffmode.vim b/uvim/src/testdir/test_diffmode.mnv
index 1a78407565..ffed3c0cb5 100644
--- a/uvim/src/testdir/test_diffmode.vim
+++ b/uvim/src/testdir/test_diffmode.mnv
@@ -1,6 +1,6 @@
 " Tests for diff mode
 
-source util/screendump.vim
+source util/screendump.mnv
 
 func Test_diff_fold_sync()
   enew!
@@ -831,7 +831,7 @@ func No_Test_diffpatch_restricted()
     qa!
   END
   call writefile(lines, 'Xrestricted', 'D')
-  if RunVim([], [], '-Z --clean -S Xrestricted')
+  if RunMNV([], [], '-Z --clean -S Xrestricted')
     call assert_equal([], readfile('Xresult'))
   endif
   call delete('Xresult')
@@ -1026,8 +1026,8 @@ func Test_diff_screen()
 
   " Test 1: Add a line in beginning of file 2
   call WriteDiffFiles(0, [1, 2, 3, 4, 5, 6, 7, 8, 9, 10], [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10])
-  let buf = RunVimInTerminal('-d -S XdiffSetup Xdifile1 Xdifile2', {})
-  " Set autoread mode, so that Vim won't complain once we re-write the test
+  let buf = RunMNVInTerminal('-d -S XdiffSetup Xdifile1 Xdifile2', {})
+  " Set autoread mode, so that MNV won't complain once we re-write the test
   " files
   call term_sendkeys(buf, ":set autoread\<CR>\<c-w>w:set autoread\<CR>\<c-w>w")
 
@@ -1086,7 +1086,7 @@ func Test_diff_screen()
   call VerifyScreenDump(buf, 'Test_diff_09', {})
 
   " Test 10-11: with/without indent-heuristic
-  call term_sendkeys(buf, ":set diffopt&vim\<cr>")
+  call term_sendkeys(buf, ":set diffopt&mnv\<cr>")
   call WriteDiffFiles(buf, ['', '  def finalize(values)', '', '    values.each do |v|', '      v.finalize', '    end'],
       \ ['', '  def finalize(values)', '', '    values.each do |v|', '      v.prepare', '    end', '',
       \ '    values.each do |v|', '      v.finalize', '    end'])
@@ -1121,7 +1121,7 @@ func Test_diff_screen()
   call WriteDiffFiles(buf, ['int main()', '{', '   printf("Hello, World!");', '   return 0;', '}'],
       \ ['int main()', '{', '   if (0)', '   {', '      printf("Hello, World!");', '      return 0;', '   }', '}'])
   call term_sendkeys(buf, ":diffupdate!\<cr>")
-  call term_sendkeys(buf, ":set diffopt&vim diffopt+=filler diffopt+=iwhite\<cr>")
+  call term_sendkeys(buf, ":set diffopt&mnv diffopt+=filler diffopt+=iwhite\<cr>")
   call VerifyScreenDump(buf, 'Test_diff_15', {})
   call term_sendkeys(buf, ":set diffopt+=internal\<cr>")
   call VerifyScreenDump(buf, 'Test_diff_16', {})
@@ -1186,7 +1186,7 @@ func Test_diff_screen()
 
 
   " clean up
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
   call delete('Xdifile1')
   call delete('Xdifile2')
 endfunc
@@ -1203,7 +1203,7 @@ func Test_diff_with_scroll_and_change()
 	exe "normal Gl5\<C-E>"
   END
   call writefile(lines, 'Xtest_scroll_change', 'D')
-  let buf = RunVimInTerminal('-S Xtest_scroll_change', {})
+  let buf = RunMNVInTerminal('-S Xtest_scroll_change', {})
 
   call VerifyScreenDump(buf, 'Test_diff_scroll_change_01', {})
 
@@ -1214,7 +1214,7 @@ func Test_diff_with_scroll_and_change()
   call VerifyScreenDump(buf, 'Test_diff_scroll_change_03', {})
 
   " clean up
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_diff_with_cursorline()
@@ -1229,7 +1229,7 @@ func Test_diff_with_cursorline()
 	\ 'windo diffthis',
 	\ '2wincmd w',
 	\ ], 'Xtest_diff_cursorline', 'D')
-  let buf = RunVimInTerminal('-S Xtest_diff_cursorline', {})
+  let buf = RunMNVInTerminal('-S Xtest_diff_cursorline', {})
 
   call VerifyScreenDump(buf, 'Test_diff_with_cursorline_01', {})
   call term_sendkeys(buf, "j")
@@ -1238,7 +1238,7 @@ func Test_diff_with_cursorline()
   call VerifyScreenDump(buf, 'Test_diff_with_cursorline_03', {})
 
   " clean up
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_diff_with_cursorline_number()
@@ -1256,14 +1256,14 @@ func Test_diff_with_cursorline_number()
       1wincmd w
   END
   call writefile(lines, 'Xtest_diff_cursorline_number', 'D')
-  let buf = RunVimInTerminal('-S Xtest_diff_cursorline_number', {})
+  let buf = RunMNVInTerminal('-S Xtest_diff_cursorline_number', {})
 
   call VerifyScreenDump(buf, 'Test_diff_with_cursorline_number_01', {})
   call term_sendkeys(buf, ":set cursorlineopt=number\r")
   call VerifyScreenDump(buf, 'Test_diff_with_cursorline_number_02', {})
 
   " clean up
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_diff_with_cursorline_breakindent()
@@ -1282,7 +1282,7 @@ func Test_diff_with_cursorline_breakindent()
     2wincmd w
   END
   call writefile(lines, 'Xtest_diff_cursorline_breakindent', 'D')
-  let buf = RunVimInTerminal('-S Xtest_diff_cursorline_breakindent', {})
+  let buf = RunMNVInTerminal('-S Xtest_diff_cursorline_breakindent', {})
 
   call term_sendkeys(buf, "gg0")
   call VerifyScreenDump(buf, 'Test_diff_with_cul_bri_01', {})
@@ -1294,7 +1294,7 @@ func Test_diff_with_cursorline_breakindent()
   call VerifyScreenDump(buf, 'Test_diff_with_cul_bri_04', {})
 
   " clean up
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_diff_breakindent_after_filler()
@@ -1309,11 +1309,11 @@ func Test_diff_breakindent_after_filler()
     norm! G$
   END
   call writefile(lines, 'Xtest_diff_breakindent_after_filler', 'D')
-  let buf = RunVimInTerminal('-S Xtest_diff_breakindent_after_filler', #{rows: 8, cols: 45})
+  let buf = RunMNVInTerminal('-S Xtest_diff_breakindent_after_filler', #{rows: 8, cols: 45})
   call VerifyScreenDump(buf, 'Test_diff_breakindent_after_filler', {})
 
   " clean up
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_diff_with_syntax()
@@ -1342,12 +1342,12 @@ func Test_diff_with_syntax()
 	diffsplit Xprogram2.c
   END
   call writefile(lines, 'Xtest_diff_syntax', 'D')
-  let buf = RunVimInTerminal('-S Xtest_diff_syntax', {})
+  let buf = RunMNVInTerminal('-S Xtest_diff_syntax', {})
 
   call VerifyScreenDump(buf, 'Test_diff_syntax_1', {})
 
   " clean up
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_diff_of_diff()
@@ -1362,7 +1362,7 @@ func Test_diff_of_diff()
 	\ '1wincmd w',
 	\ 'setlocal number',
 	\ ], 'Xtest_diff_diff', 'D')
-  let buf = RunVimInTerminal('-S Xtest_diff_diff', {})
+  let buf = RunMNVInTerminal('-S Xtest_diff_diff', {})
 
   call VerifyScreenDump(buf, 'Test_diff_of_diff_01', {})
 
@@ -1370,7 +1370,7 @@ func Test_diff_of_diff()
   call VerifyScreenDump(buf, 'Test_diff_of_diff_02', {})
 
   " clean up
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func CloseoffSetup()
@@ -1488,7 +1488,7 @@ func Test_diff_rnu()
     setlocal number rnu foldcolumn=0
   END
   call writefile(content, 'Xtest_diff_rnu', 'D')
-  let buf = RunVimInTerminal('-S Xtest_diff_rnu', {})
+  let buf = RunMNVInTerminal('-S Xtest_diff_rnu', {})
 
   call VerifyScreenDump(buf, 'Test_diff_rnu_01', {})
 
@@ -1498,7 +1498,7 @@ func Test_diff_rnu()
   call VerifyScreenDump(buf, 'Test_diff_rnu_03', {})
 
   " clean up
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_diff_multilineconceal()
@@ -1547,7 +1547,7 @@ func Test_diff_filler_cursorcolumn()
     redraw!
   END
   call writefile(content, 'Xtest_diff_cuc', 'D')
-  let buf = RunVimInTerminal('-S Xtest_diff_cuc', {})
+  let buf = RunMNVInTerminal('-S Xtest_diff_cuc', {})
 
   call VerifyScreenDump(buf, 'Test_diff_cuc_01', {})
 
@@ -1562,7 +1562,7 @@ func Test_diff_filler_cursorcolumn()
   call VerifyScreenDump(buf, 'Test_diff_cuc_04', {})
 
   " clean up
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 " Test for adding/removing lines inside diff chunks, between diff chunks
@@ -1664,7 +1664,7 @@ func Test_diff_binary()
     redraw!
   END
   call writefile(content, 'Xtest_diff_bin', 'D')
-  let buf = RunVimInTerminal('-S Xtest_diff_bin', {})
+  let buf = RunMNVInTerminal('-S Xtest_diff_bin', {})
 
   " Test using internal diff
   call VerifyScreenDump(buf, 'Test_diff_bin_01', {})
@@ -1683,8 +1683,8 @@ func Test_diff_binary()
   call VerifyScreenDump(buf, 'Test_diff_bin_04', {})
 
   " clean up
-  call StopVimInTerminal(buf)
-  set diffopt&vim
+  call StopMNVInTerminal(buf)
+  set diffopt&mnv
 endfunc
 
 " Test for using the 'zi' command to invert 'foldenable' in diff windows (test
@@ -1790,13 +1790,13 @@ func Test_diff_scroll()
       // four lines
   END
   call writefile(right, 'Xright', 'D')
-  let buf = RunVimInTerminal('-d Xleft Xright', {'rows': 12})
+  let buf = RunMNVInTerminal('-d Xleft Xright', {'rows': 12})
   call term_sendkeys(buf, "\<C-W>\<C-W>jjjj")
   call VerifyScreenDump(buf, 'Test_diff_scroll_1', {})
   call term_sendkeys(buf, "j")
   call VerifyScreenDump(buf, 'Test_diff_scroll_2', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 " This was scrolling too many lines.
@@ -1871,7 +1871,10 @@ endfunc
 func Test_diff_manipulations()
   set diff
   split 0
-  sil! norm R
doobdeuR
doobdeuR
doobdeu
+  sil! norm R
+doobdeuR
+doobdeuR
+doobdeu
 
   set nodiff
   %bwipe!
@@ -2118,14 +2121,14 @@ func Test_diffexpr_with_diff_func()
     vert split Xdifffunc2.txt
     diffthis
   END
-  call writefile(lines, 'XsetupDiffFunc.vim', 'D')
+  call writefile(lines, 'XsetupDiffFunc.mnv', 'D')
 
-  call writefile(['zero', 'one', 'two', 'three'], 'Xdifffunc1.txt', 'D')
+  call writefilMNV'zero', 'one', 'two', 'three'], 'Xdifffunc1.txt', 'D')
   call writefile(['one', 'twox', 'three', 'four'], 'Xdifffunc2.txt', 'D')
-
-  let buf = RunVimInTerminal('-S XsetupDiffFunc.vim', {'rows': 12})
+MNV
+  let buf = RunMNVInTerminal('-S XsetupDiffFunc.mnv', {'rows': 12})
   call VerifyScreenDump(buf, 'Test_difffunc_diffexpr_1', {})
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_diff_toggle_wrap_skipcol_leftcol()
@@ -2229,10 +2232,10 @@ func Test_diff_overlapped_diff_blocks_will_be_merged()
       endif
     endfunc
   END
-  call writefile(lines, 'XdiffSetup', 'D')
+  call writefilMNVines, 'XdiffSetup', 'D')
 
   call WriteDiffFiles(0, [], [])
-  let buf = RunVimInTerminal('-d -S XdiffSetup Xdifile1 Xdifile2', {})
+  let buf = RunMNVInTerminal('-d -S XdiffSetup Xdifile1 Xdifile2', {})
   call term_sendkeys(buf, ":set autoread\<CR>\<c-w>w:set autoread\<CR>\<c-w>w")
 
   call WriteDiffFiles(buf, ["a", "b"], ["x", "x"])
@@ -2256,14 +2259,14 @@ func Test_diff_overlapped_diff_blocks_will_be_merged()
   call writefile(["x", "x", "c"], "Xdinew1")
   call writefile(["1c1", "1a2"], "Xdiout1")
   call term_sendkeys(buf, ":set diffexpr=DiffExprStub()\<CR>:")
-  call VerifyBoth(buf, "Test_diff_overlapped_2.03", "")
+  call VeriMNVoth(buf, "Test_diff_overlapped_2.03", "")
   call term_sendkeys(buf, ":set diffexpr&\<CR>:")
 
-  call StopVimInTerminal(buf)
-  wincmd c
+  call StopMNVInTerminal(buf)
+  wincmd cMNV
 
   call WriteDiffFiles3(0, [], [], [])
-  let buf = RunVimInTerminal('-d -S XdiffSetup Xdifile1 Xdifile2 Xdifile3', {})
+  let buf = RunMNVInTerminal('-d -S XdiffSetup Xdifile1 Xdifile2 Xdifile3', {})
   call term_sendkeys(buf, ":set autoread\<CR>\<c-w>w:set autoread\<CR>\<c-w>w:set autoread\<CR>\<c-w>w")
 
   call WriteDiffFiles3(buf, ["a", "b", "c"], ["a", "x", "c"], ["y", "b", "c"])
@@ -2436,10 +2439,10 @@ func Test_diff_overlapped_diff_blocks_will_be_merged()
 
   " File 3 has 2 overlaps. An add and another add. First overlap's expansion hits
   " the 2nd one. Make sure we adjust the diff block to have more lines.
-  call WriteDiffFiles3(buf, ["foo", "a", "b", "c", "d", "bar"], ["foo", "w", "x", "y", "z", "u", "bar"], ["foo", "1", "a", "b", "3", "4", "d", "bar"])
+  call WritMNVffFiles3(buf, ["foo", "a", "b", "c", "d", "bar"], ["foo", "w", "x", "y", "z", "u", "bar"], ["foo", "1", "a", "b", "3", "4", "d", "bar"])
   call VerifyBoth(buf, "Test_diff_overlapped_3.44", "")
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 " switching windows in diff mode caused an unnecessary scroll
@@ -2452,10 +2455,10 @@ func Test_diff_topline_noscroll()
     call setline(1, range(1,10) + range(50,60))
     windo diffthis
     norm! G
-    exe "norm! 30\<C-y>"
+    exe "norm! MNV<C-y>"
   END
   call writefile(content, 'Xcontent', 'D')
-  let buf = RunVimInTerminal('-S Xcontent', {'rows': 20})
+  let buf = RunMNVInTerminal('-S Xcontent', {'rows': 20})
   call VerifyScreenDump(buf, 'Test_diff_topline_1', {})
   call term_sendkeys(buf, ":echo line('w0', 1001)\<cr>")
   call term_wait(buf)
@@ -2463,18 +2466,18 @@ func Test_diff_topline_noscroll()
   call term_sendkeys(buf, "\<C-W>p")
   call term_wait(buf)
   call VerifyScreenDump(buf, 'Test_diff_topline_3', {})
-  call term_sendkeys(buf, "\<C-W>p")
+  call termMNVndkeys(buf, "\<C-W>p")
   call term_wait(buf)
   call VerifyScreenDump(buf, 'Test_diff_topline_4', {})
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 " Test inline highlighting which shows what's different within each diff block
 func Test_diff_inline()
-  CheckScreendump
+  CheckScreenduMNV
 
   call WriteDiffFiles(0, [], [])
-  let buf = RunVimInTerminal('-d Xdifile1 Xdifile2', {})
+  let buf = RunMNVInTerminal('-d Xdifile1 Xdifile2', {})
   call term_sendkeys(buf, ":set autoread\<CR>\<c-w>w:set autoread\<CR>\<c-w>w")
 
   call WriteDiffFiles(buf, ["abcdef ghi jk n", "x", "y"], ["aBcef gHi lm n", "y", "z"])
@@ -2586,17 +2589,17 @@ func Test_diff_inline()
   call VerifyInternal(buf, "Test_diff_inline_multiline_07", " diffopt+=inline:char")
   call VerifyInternal(buf, "Test_diff_inline_multiline_08", " diffopt+=inline:char,iwhite")
   call VerifyInternal(buf, "Test_diff_inline_multiline_09", " diffopt+=inline:char,iwhiteeol")
-  call VerifyInternal(buf, "Test_diff_inline_multiline_10", " diffopt+=inline:char,iwhiteall")
+  call VeriMNVnternal(buf, "Test_diff_inline_multiline_10", " diffopt+=inline:char,iwhiteall")
   call term_sendkeys(buf, ":windo set nolist\<CR>")
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_diff_inline_multibuffer()
-  CheckScreendump
+  CheckScreenduMNV
 
   call WriteDiffFiles3(0, [], [], [])
-  let buf = RunVimInTerminal('-d Xdifile1 Xdifile2 Xdifile3', {})
+  let buf = RunMNVInTerminal('-d Xdifile1 Xdifile2 Xdifile3', {})
   call term_sendkeys(buf, ":windo set autoread\<CR>:1wincmd w\<CR>")
   call term_sendkeys(buf, ":hi DiffTextAdd ctermbg=blue\<CR>")
 
@@ -2640,10 +2643,10 @@ func Test_diff_inline_multibuffer()
   call VerifyInternal(buf, "Test_diff_inline_multibuffer_06", " diffopt+=inline:char")
   call term_sendkeys(buf, ":diffoff\<CR>")
   call VerifyInternal(buf, "Test_diff_inline_multibuffer_07", " diffopt+=inline:char")
-  call term_sendkeys(buf, ":diffthis\<CR>")
+  call termMNVndkeys(buf, ":diffthis\<CR>")
   call VerifyInternal(buf, "Test_diff_inline_multibuffer_06", " diffopt+=inline:char")
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 " Test that when using multi-buffer diff, an empty block would be correctly
@@ -2653,21 +2656,21 @@ func Test_diff_inline_multibuffer_empty_block()
 
   call writefile(['anchor1', '1234567890abcde', 'anchor2'], 'Xdifile1')
   call writefile(['anchor1', '1234567--0abc-e', 'anchor2'], 'Xdifile2')
-  call writefile(['anchor1', 'anchor2'], 'Xdifile3')
+  call writefilMNV'anchor1', 'anchor2'], 'Xdifile3')
   call writefile(['anchor1', '1???????90abcd?', 'anchor2'], 'Xdifile4')
 
-  let buf = RunVimInTerminal('-d Xdifile1 Xdifile2 Xdifile3 Xdifile4', {})
+  let buf =MNVnMNVInTerminal('-d Xdifile1 Xdifile2 Xdifile3 Xdifile4', {})
   call VerifyInternal(buf, "Test_diff_inline_multibuffer_empty_block_01", " diffopt+=inline:char")
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_diffget_diffput_linematch()
   CheckScreendump
-  call delete('.Xdifile1.swp')
+  call delete('MNVifile1.swp')
   call delete('.Xdifile2.swp')
   call WriteDiffFiles(0, [], [])
-  let buf = RunVimInTerminal('-d Xdifile1 Xdifile2', {})
+  let buf = RunMNVInTerminal('-d Xdifile1 Xdifile2', {})
   call term_sendkeys(buf, ":set autoread\<CR>\<c-w>w:set autoread\<CR>\<c-w>w")
 
   " enable linematch
@@ -2863,18 +2866,18 @@ func Test_diffget_diffput_linematch()
   " put from window 2 using dp line 17
   call term_sendkeys(buf, "2\<c-w>w")
   call term_sendkeys(buf, "17gg")
-  call term_sendkeys(buf, ":diffput\<CR>")
+  call termMNVndkeys(buf, ":diffput\<CR>")
   call VerifyScreenDump(buf, 'Test_diff_get_put_linematch_19', {})
   " clean up
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_linematch_diff()
   CheckScreendump
-  call delete('.Xdifile1.swp')
+  call delete('MNVifile1.swp')
   call delete('.Xdifile2.swp')
   call WriteDiffFiles(0, [], [])
-  let buf = RunVimInTerminal('-d Xdifile1 Xdifile2', {})
+  let buf = RunMNVInTerminal('-d Xdifile1 Xdifile2', {})
   call term_sendkeys(buf, ":set autoread\<CR>\<c-w>w:set autoread\<CR>\<c-w>w")
 
   " enable linematch
@@ -2891,18 +2894,18 @@ func Test_linematch_diff()
   " test that filler is always implicitly set by linematch
   call term_sendkeys(buf, ":set diffopt-=filler\<CR>")
   call term_sendkeys(buf, ":\<CR>") " clear cmdline
-  call VerifyScreenDump(buf, 'Test_linematch_diff1', {})
+  call VeriMNVcreenDump(buf, 'Test_linematch_diff1', {})
 
   " clean up
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_linematch_diff_iwhite()
   CheckScreendump
-  call delete('.Xdifile1.swp')
+  call delete('MNVifile1.swp')
   call delete('.Xdifile2.swp')
   call WriteDiffFiles(0, [], [])
-  let buf = RunVimInTerminal('-d Xdifile1 Xdifile2', {})
+  let buf = RunMNVInTerminal('-d Xdifile1 Xdifile2', {})
   call term_sendkeys(buf, ":set autoread\<CR>\<c-w>w:set autoread\<CR>\<c-w>w")
 
   " setup a diff with 2 files and set linematch:30, with ignore white
@@ -2918,18 +2921,18 @@ func Test_linematch_diff_iwhite()
       \ '  // }',
       \ '}'])
   call VerifyScreenDump(buf, 'Test_linematch_diff_iwhite1', {})
-  call term_sendkeys(buf, ":set diffopt+=iwhiteall\<CR>")
+  call termMNVndkeys(buf, ":set diffopt+=iwhiteall\<CR>")
   call VerifyScreenDump(buf, 'Test_linematch_diff_iwhite2', {})
   " clean up
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_linematch_diff_grouping()
   CheckScreendump
-  call delete('.Xdifile1.swp')
+  call delete('MNVifile1.swp')
   call delete('.Xdifile2.swp')
   call WriteDiffFiles(0, [], [])
-  let buf = RunVimInTerminal('-d Xdifile1 Xdifile2', {})
+  let buf = RunMNVInTerminal('-d Xdifile1 Xdifile2', {})
   call term_sendkeys(buf, ":set autoread\<CR>\<c-w>w:set autoread\<CR>\<c-w>w")
 
   " a diff that would result in multiple groups before grouping optimization
@@ -2956,18 +2959,18 @@ func Test_linematch_diff_grouping()
       \ '?A',
       \ '?B',
       \ '?C',
-      \ '?C'])
+      \ '?CMNV
   call VerifyScreenDump(buf, 'Test_linematch_diff_grouping2', {})
   " clean up
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_linematch_diff_scroll()
   CheckScreendump
-  call delete('.Xdifile1.swp')
+  call delete('MNVifile1.swp')
   call delete('.Xdifile2.swp')
   call WriteDiffFiles(0, [], [])
-  let buf = RunVimInTerminal('-d Xdifile1 Xdifile2', {})
+  let buf = RunMNVInTerminal('-d Xdifile1 Xdifile2', {})
   call term_sendkeys(buf, ":set autoread\<CR>\<c-w>w:set autoread\<CR>\<c-w>w")
 
   " a diff that would result in multiple groups before grouping optimization
@@ -2988,18 +2991,18 @@ func Test_linematch_diff_scroll()
   call VerifyScreenDump(buf, 'Test_linematch_diff_grouping_scroll0', {})
   call term_sendkeys(buf, "3\<c-e>")
   call VerifyScreenDump(buf, 'Test_linematch_diff_grouping_scroll1', {})
-  call term_sendkeys(buf, "3\<c-e>")
+  call termMNVndkeys(buf, "3\<c-e>")
   call VerifyScreenDump(buf, 'Test_linematch_diff_grouping_scroll2', {})
   " clean up
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_linematch_line_limit_exceeded()
   CheckScreendump
-  call delete('.Xdifile1.swp')
+  call delete('MNVifile1.swp')
   call delete('.Xdifile2.swp')
   call WriteDiffFiles(0, [], [])
-  let buf = RunVimInTerminal('-d Xdifile1 Xdifile2', {})
+  let buf = RunMNVInTerminal('-d Xdifile1 Xdifile2', {})
   call term_sendkeys(buf, ":set autoread\<CR>\<c-w>w:set autoread\<CR>\<c-w>w")
 
   call term_sendkeys(buf, ":set diffopt=internal,filler,linematch:10\<CR>")
@@ -3038,19 +3041,19 @@ func Test_linematch_line_limit_exceeded()
   call VerifyScreenDump(buf, 'Test_linematch_line_limit_exceeded1', {})
   " after increasing the count to 30, the limit is not exceeded, and the
   " alignment algorithm will run on the largest diff block here
-  call term_sendkeys(buf, ":set diffopt+=linematch:30\<CR>")
+  call termMNVndkeys(buf, ":set diffopt+=linematch:30\<CR>")
   call VerifyScreenDump(buf, 'Test_linematch_line_limit_exceeded2', {})
   " clean up
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_linematch_3diffs()
   CheckScreendump
   call delete('.Xdifile1.swp')
-  call delete('.Xdifile2.swp')
+  call delete('MNVifile2.swp')
   call delete('.Xdifile3.swp')
   call WriteDiffFiles3(0, [], [], [])
-  let buf = RunVimInTerminal('-d Xdifile1 Xdifile2 Xdifile3', {})
+  let buf = RunMNVInTerminal('-d Xdifile1 Xdifile2 Xdifile3', {})
   call term_sendkeys(buf, "1\<c-w>w:set autoread\<CR>")
   call term_sendkeys(buf, "2\<c-w>w:set autoread\<CR>")
   call term_sendkeys(buf, "3\<c-w>w:set autoread\<CR>")
@@ -3076,10 +3079,10 @@ func Test_linematch_3diffs()
         \ "  common line",
         \ "      BBB",
         \ "      BBB",
-        \ "      BBB"])
+        \ "MNV   BBB"])
   call VerifyScreenDump(buf, 'Test_linematch_3diffs1', {})
   " clean up
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 " this used to access invalid memory
@@ -3094,16 +3097,16 @@ func Test_linematch_3diffs_sanity_check()
     call feedkeys("GAklm\<esc>")
     call feedkeys("o")
   END
-  call writefile(lines, 'Xlinematch_3diffs.vim', 'D')
+  call writefile(lines, 'Xlinematch_3diffs.mnv', 'D')
   call writefile(['abcd', 'def', 'hij'], 'Xfile_linematch1', 'D')
-  call writefile(['defq', 'hijk', 'nopq'], 'Xfile_linematch2', 'D')
+  call writefilMNV'defq', 'hijk', 'nopq'], 'Xfile_linematch2', 'D')
   call writefile(['hijklm', 'nopqr', 'stuv'], 'Xfile_linematch3', 'D')
   call WriteDiffFiles3(0, [], [], [])
-  let buf = RunVimInTerminal('-d -S Xlinematch_3diffs.vim Xfile_linematch1 Xfile_linematch2 Xfile_linematch3', {})
-  call VerifyScreenDump(buf, 'Test_linematch_3diffs2', {})
+  let buf = RunMNVInTerminal('-d -S Xlinematch_3diffs.mnv Xfile_linematch1 Xfile_linematch2 Xfile_linematch3', {})
+  call VeriMNVcreenDump(buf, 'Test_linematch_3diffs2', {})
 
   " clean up
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_diffanchors()
@@ -3112,10 +3115,10 @@ func Test_diffanchors()
       \ ["anchorA1", "1", "2", "3",
       \  "100", "101", "102", "anchorB", "103", "104", "105"],
       \ ["100", "101", "102", "anchorB", "103", "104", "105",
-      \  "anchorA2", "1", "2", "3"],
+      \  "anchoMNV", "1", "2", "3"],
       \ ["100", "anchorB", "103",
       \  "anchorA3", "1", "2", "3"])
-  let buf = RunVimInTerminal('-d Xdifile1 Xdifile2 Xdifile3', {})
+  let buf = RunMNVInTerminal('-d Xdifile1 Xdifile2 Xdifile3', {})
 
   " Simple diff without any anchors
   call VerifyInternal(buf, "Test_diff_anchors_00", "")
@@ -3164,10 +3167,10 @@ func Test_diffanchors()
   call VerifyInternal(buf, "Test_diff_anchors_02", " diffopt+=anchor")
 
   " Test multiple diff anchors on the same line in file 1.
-  call term_sendkeys(buf, ":1wincmd w\<CR>:setlocal dia=1,1\<CR>")
+  call term_sendkeys(buf, ":1wincmd w\<CR>:setlocal dia=1,1\<CMNV)
   call VerifyInternal(buf, "Test_diff_anchors_04", " diffopt+=anchor")
 
-  " Test that if one file has fewer diff anchors than others. Vim should only
+  " Test that if one file has fewer diff anchors than others. MNV should only
   " use the minimum in this case.
   call term_sendkeys(buf, ":1wincmd w\<CR>:setlocal dia=8\<CR>")
   call VerifyInternal(buf, "Test_diff_anchors_05", " diffopt+=anchor")
@@ -3184,10 +3187,10 @@ func Test_diffanchors()
 
   " Intentionally set an invalid anchor with wrong line number. Should fall
   " back to treat it as if no anchors are used at all.
-  call term_sendkeys(buf, ":1wincmd w\<CR>:setlocal dia=1,10,8,2,1000 | silent! diffupdate\<CR>:")
+  call termMNVndkeys(buf, ":1wincmd w\<CR>:setlocal dia=1,10,8,2,1000 | silent! diffupdate\<CR>:")
   call VerifyScreenDump(buf, "Test_diff_anchors_00", {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 " Test that scrollbind and topline calculations work correctly, even when diff
@@ -3196,10 +3199,10 @@ func Test_diffanchors_scrollbind_topline()
   CheckScreendump
 
   " Simple overlapped line anchored to be adjacent to each other
-  call WriteDiffFiles(0,
+  call WriteDifMNVles(0,
       \ ["anchor1", "diff1a", "anchor2"],
       \ ["anchor1", "diff2a", "anchor2"])
-  let buf = RunVimInTerminal('-d Xdifile1 Xdifile2', {})
+  let buf = RunMNVInTerminal('-d Xdifile1 Xdifile2', {})
 
   call term_sendkeys(buf, ":1wincmd w\<CR>:setlocal dia=2\<CR>")
   call term_sendkeys(buf, ":2wincmd w\<CR>:setlocal dia=3\<CR>")
@@ -3217,10 +3220,10 @@ func Test_diffanchors_scrollbind_topline()
   call VerifyInternal(buf, "Test_diff_anchors_scrollbind_topline_05", " diffopt+=anchor diffopt-=filler")
   call term_sendkeys(buf, "\<Esc>\<C-E>")
   call VerifyScreenDump(buf, "Test_diff_anchors_scrollbind_topline_06", {})
-  call term_sendkeys(buf, "\<C-E>")
+  call termMNVndkeys(buf, "\<C-E>")
   call VerifyScreenDump(buf, "Test_diff_anchors_scrollbind_topline_07", {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_diffanchors_scrollbind_topline2()
@@ -3228,10 +3231,10 @@ func Test_diffanchors_scrollbind_topline2()
 
   " More-complicated case with 3 files and multiple overlapping diff blocks
   call WriteDiffFiles3(0,
-      \ ["anchor1"],
+      \ ["anchoMNV],
       \ ["diff2a", "diff2b", "diff2c", "diff2d", "anchor2"],
       \ ["diff3a", "diff3c", "diff3d", "anchor3", "diff3e"])
-  let buf = RunVimInTerminal('-d Xdifile1 Xdifile2 Xdifile3', {})
+  let buf = RunMNVInTerminal('-d Xdifile1 Xdifile2 Xdifile3', {})
 
   call term_sendkeys(buf, ":1wincmd w\<CR>:setlocal dia=1,1,2\<CR>")
   call term_sendkeys(buf, ":2wincmd w\<CR>:setlocal dia=3,5,6\<CR>")
@@ -3257,10 +3260,10 @@ func Test_diffanchors_scrollbind_topline2()
   call VerifyScreenDump(buf, "Test_diff_anchors_scrollbind_topline_15", {})
   call term_sendkeys(buf, "\<C-E>")
   call VerifyScreenDump(buf, "Test_diff_anchors_scrollbind_topline_16", {})
-  call term_sendkeys(buf, "\<C-E>")
+  call termMNVndkeys(buf, "\<C-E>")
   call VerifyScreenDump(buf, "Test_diff_anchors_scrollbind_topline_17", {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 " Test that setting 'diffanchors' will update the diff.
@@ -3560,19 +3563,19 @@ func Test_diff_add_prop_in_autocmd()
     autocmd OptionSet diff call prop_add(1, 1, #{type: 'myprop', length: 100})
     set diffexpr=MyDiff()
   END
-  call writefile(lines, 'Xtest_diff_add_prop_in_autocmd', 'D')
+  call writefilMNVines, 'Xtest_diff_add_prop_in_autocmd', 'D')
   call writefile(['foo', 'bar', 'baz'], 'Xdiffsplit_file', 'D')
 
-  let buf = RunVimInTerminal('-S Xtest_diff_add_prop_in_autocmd', {})
-  call term_sendkeys(buf, ":diffsplit Xdiffsplit_file\<CR>")
+  let buf = RunMNVInTerminal('-S Xtest_diff_add_prop_in_autocmd', {})
+  call termMNVndkeys(buf, ":diffsplit Xdiffsplit_file\<CR>")
   call VerifyScreenDump(buf, 'Test_diff_add_prop_in_autocmd_01', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
-
+MNV
 " this was causing a use-after-free by calling winframe_remove() recursively
 func Test_diffexpr_wipe_buffers()
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   let lines =<< trim END
     def DiffFuncExpr()
@@ -3592,14 +3595,14 @@ func Test_diffexpr_wipe_buffers()
     wincm w
     hid
     %bw!
-  END
+  ENDMNV
   call writefile(lines, 'Xtest_diffexpr_wipe', 'D')
 
-  let buf = RunVimInTerminal('Xtest_diffexpr_wipe', {})
-  call term_sendkeys(buf, ":so\<CR>")
+  let buf = RunMNVInTerminal('Xtest_diffexpr_wipe', {})
+  call termMNVndkeys(buf, ":so\<CR>")
   call WaitForAssert({-> assert_match('4 buffers wiped out', term_getline(buf, 20))})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_diffput_to_empty_buf()
@@ -3611,10 +3614,10 @@ func Test_diffput_to_empty_buf()
     windo diffthis
     windo set cursorline nofoldenable
     wincmd t
-  END
+  ENDMNV
   call writefile(lines, 'Xtest_diffput_to_empty_buf', 'D')
 
-  let buf = RunVimInTerminal('-S Xtest_diffput_to_empty_buf', {})
+  let buf = RunMNVInTerminal('-S Xtest_diffput_to_empty_buf', {})
   call VerifyScreenDump(buf, 'Test_diffput_to_empty_buf_01', {})
   call term_sendkeys(buf, '0')  " Trigger an initial 'cursorbind' check.
   call VerifyScreenDump(buf, 'Test_diffput_to_empty_buf_01', {})
@@ -3622,10 +3625,10 @@ func Test_diffput_to_empty_buf()
   call VerifyScreenDump(buf, 'Test_diffput_to_empty_buf_02', {})
   call term_sendkeys(buf, ":redraw!\<CR>")
   call VerifyScreenDump(buf, 'Test_diffput_to_empty_buf_02', {})
-  call term_sendkeys(buf, 'j')
+  call termMNVndkeys(buf, 'j')
   call VerifyScreenDump(buf, 'Test_diffput_to_empty_buf_03', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_digraph.vim b/uvim/src/testdir/test_digraph.mnv
index 96b2b63baf..c2512c06a2 100644
--- a/uvim/src/testdir/test_digraph.vim
+++ b/uvim/src/testdir/test_digraph.mnv
@@ -427,7 +427,7 @@ func Test_digraphs_option()
   call Put_Dig_BS("0","0")
   call Put_Dig_BS("e","l")
   call assert_equal(['�', 'ü', '∞', 'l'], getline(line('.')-3,line('.')))
-  set nodigraph ww&vim
+  set nodigraph ww&mnv
   bw!
 endfunc
 
@@ -507,8 +507,8 @@ endfunc
 
 " Test for the characters displayed on the screen when entering a digraph
 func Test_entering_digraph()
-  CheckRunVimInTerminal
-  let buf = RunVimInTerminal('', {'rows': 6})
+  CheckRunMNVInTerminal
+  let buf = RunMNVInTerminal('', {'rows': 6})
   call term_sendkeys(buf, "i\<C-K>")
   call TermWait(buf)
   call assert_equal('?', term_getline(buf, 1))
@@ -518,7 +518,7 @@ func Test_entering_digraph()
   call term_sendkeys(buf, "2")
   call TermWait(buf)
   call assert_equal('½', term_getline(buf, 1))
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_digraph_set_function()
@@ -624,4 +624,4 @@ func Test_digraph_angle_bracket_patch()
   call assert_equal('⟩', digraph_get(']>'))
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_display.vim b/uvim/src/testdir/test_display.mnv
index cbb4f4fc6d..957e367b1a 100644
--- a/uvim/src/testdir/test_display.vim
+++ b/uvim/src/testdir/test_display.mnv
@@ -4,7 +4,7 @@ if !has('gui_running') && has('unix')
   set term=ansi
 endif
 
-source util/screendump.vim
+source util/screendump.mnv
 
 func Test_display_foldcolumn()
   CheckFeature folding
@@ -77,7 +77,7 @@ func Test_scroll_without_region()
     set laststatus=2
   END
   call writefile(lines, 'Xtestscroll', 'D')
-  let buf = RunVimInTerminal('-S Xtestscroll', #{rows: 10})
+  let buf = RunMNVInTerminal('-S Xtestscroll', #{rows: 10})
 
   call VerifyScreenDump(buf, 'Test_scroll_no_region_1', {})
 
@@ -99,7 +99,7 @@ func Test_scroll_without_region()
   call VerifyScreenDump(buf, 'Test_scroll_no_region_6', {})
 
   " clean up
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_display_listchars_precedes()
@@ -170,12 +170,12 @@ func Test_scroll_CursorLineNr_update()
   END
   let filename = 'Xdrawscreen'
   call writefile(lines, filename, 'D')
-  let buf = RunVimInTerminal('-S '.filename, #{rows: 5, cols: 50})
+  let buf = RunMNVInTerminal('-S '.filename, #{rows: 5, cols: 50})
   call term_sendkeys(buf, "k")
   call VerifyScreenDump(buf, 'Test_winline_rnu', {})
 
   " clean up
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 " check a long file name does not result in the hit-enter prompt
@@ -184,7 +184,7 @@ func Test_edit_long_file_name()
 
   let longName = 'x'->repeat(min([&columns, 255]))
   call writefile([], longName, 'D')
-  let buf = RunVimInTerminal('-N -u NONE --cmd ":set noshowcmd noruler" ' .. longName, #{rows: 8})
+  let buf = RunMNVInTerminal('-N -u NONE --cmd ":set noshowcmd noruler" ' .. longName, #{rows: 8})
 
   call VerifyScreenDump(buf, 'Test_long_file_name_1', {})
 
@@ -192,8 +192,8 @@ func Test_edit_long_file_name()
   call VerifyScreenDump(buf, 'Test_long_file_name_2', {})
 
   " clean up
-  call StopVimInTerminal(buf)
-  set ruler&vim
+  call StopMNVInTerminal(buf)
+  set ruler&mnv
 endfunc
 
 func Test_edit_long_file_name_with_ruler()
@@ -201,7 +201,7 @@ func Test_edit_long_file_name_with_ruler()
 
   let longName = 'x'->repeat(min([&columns, 255]))
   call writefile([], longName, 'D')
-  let buf = RunVimInTerminal('-N -u NONE --cmd ":set noshowcmd" ' .. longName, #{rows: 8})
+  let buf = RunMNVInTerminal('-N -u NONE --cmd ":set noshowcmd" ' .. longName, #{rows: 8})
 
   call VerifyScreenDump(buf, 'Test_long_file_name_3', {})
 
@@ -209,7 +209,7 @@ func Test_edit_long_file_name_with_ruler()
   call VerifyScreenDump(buf, 'Test_long_file_name_4', {})
 
   " clean up
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_unprintable_fileformats()
@@ -224,25 +224,25 @@ func Test_unprintable_fileformats()
   END
   let filename = 'Xunprintable'
   call writefile(lines, filename, 'D')
-  let buf = RunVimInTerminal('-S '.filename, #{rows: 9, cols: 50})
+  let buf = RunMNVInTerminal('-S '.filename, #{rows: 9, cols: 50})
   call VerifyScreenDump(buf, 'Test_display_unprintable_01', {})
   call term_sendkeys(buf, "\<C-W>\<C-W>\<C-L>")
   call VerifyScreenDump(buf, 'Test_display_unprintable_02', {})
 
   " clean up
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_display_scroll_at_topline()
   CheckScreendump
 
-  let buf = RunVimInTerminal('', #{cols: 20})
+  let buf = RunMNVInTerminal('', #{cols: 20})
   call term_sendkeys(buf, ":call setline(1, repeat('a', 21))\<CR>")
   call TermWait(buf)
   call term_sendkeys(buf, "O\<Esc>")
   call VerifyScreenDump(buf, 'Test_display_scroll_at_topline', #{rows: 4})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_display_scroll_update_visual()
@@ -256,13 +256,13 @@ func Test_display_scroll_update_visual()
       call sign_place(2, 'bar', 'foo', bufnr(), { 'lnum': 1 })
       autocmd CursorMoved * if getcurpos()[1] == 2 | call sign_unplace('bar', { 'id': 1 }) | endif
   END
-  call writefile(lines, 'XupdateVisual.vim', 'D')
+  call writefile(lines, 'XupdateVisual.mnv', 'D')
 
-  let buf = RunVimInTerminal('-S XupdateVisual.vim', #{rows: 8, cols: 60})
+  let buf = RunMNVInTerminal('-S XupdateVisual.mnv', #{rows: 8, cols: 60})
   call term_sendkeys(buf, "VG7kk")
   call VerifyScreenDump(buf, 'Test_display_scroll_update_visual', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_display_scroll_setline()
@@ -287,9 +287,9 @@ func Test_display_scroll_setline()
                       \ |   call sign_unplace('bar', #{id: 2})
                       \ | endif
   END
-  call writefile(lines, 'XscrollSetline.vim', 'D')
+  call writefile(lines, 'XscrollSetline.mnv', 'D')
 
-  let buf = RunVimInTerminal('-S XscrollSetline.vim', #{rows: 15, cols: 20})
+  let buf = RunMNVInTerminal('-S XscrollSetline.mnv', #{rows: 15, cols: 20})
   call VerifyScreenDump(buf, 'Test_display_scroll_setline_1', {})
   call term_sendkeys(buf, '19k')
   call VerifyScreenDump(buf, 'Test_display_scroll_setline_2', {})
@@ -302,7 +302,7 @@ func Test_display_scroll_setline()
   call term_sendkeys(buf, 'k')
   call VerifyScreenDump(buf, 'Test_display_scroll_setline_6', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_display_hit_enter_setline()
@@ -311,9 +311,9 @@ func Test_display_hit_enter_setline()
   let lines =<< trim END
     call setline(1, range(1, 100))
   END
-  call writefile(lines, 'XhitEnterSetline.vim', 'D')
+  call writefile(lines, 'XhitEnterSetline.mnv', 'D')
 
-  let buf = RunVimInTerminal('-S XhitEnterSetline.vim', #{rows: 8, cols: 40})
+  let buf = RunMNVInTerminal('-S XhitEnterSetline.mnv', #{rows: 8, cols: 40})
   call VerifyScreenDump(buf, 'Test_display_hit_enter_setline_1', {})
   call term_sendkeys(buf, ':echo "abc\ndef\nghi"')
   call term_sendkeys(buf, "\<CR>")
@@ -321,7 +321,7 @@ func Test_display_hit_enter_setline()
   call term_sendkeys(buf, ":call setline(2, repeat('foo', 35))\<CR>")
   call VerifyScreenDump(buf, 'Test_display_hit_enter_setline_3', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 " Test for 'eob' (EndOfBuffer) item in 'fillchars'
@@ -483,13 +483,13 @@ func Test_local_fillchars()
       setlocal fillchars=stl:4,stlnc:d,vert:>,eob:o
   END
   call writefile(lines, 'Xdisplayfillchars', 'D')
-  let buf = RunVimInTerminal('-S Xdisplayfillchars', #{rows: 12})
+  let buf = RunMNVInTerminal('-S Xdisplayfillchars', #{rows: 12})
   call VerifyScreenDump(buf, 'Test_display_fillchars_1', {})
 
   call term_sendkeys(buf, ":wincmd k\r")
   call VerifyScreenDump(buf, 'Test_display_fillchars_2', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_display_linebreak_breakat()
@@ -529,7 +529,7 @@ func Run_Test_display_lastline(euro)
     let lines[2] = 'set fillchars=vert:\|,lastline:€'
   endif
   call writefile(lines, 'XdispLastline', 'D')
-  let buf = RunVimInTerminal('-S XdispLastline', #{rows: 10})
+  let buf = RunMNVInTerminal('-S XdispLastline', #{rows: 10})
   call VerifyScreenDump(buf, $'Test_display_lastline_{a:euro}1', {})
 
   call term_sendkeys(buf, ":set display=lastline\<CR>")
@@ -549,7 +549,7 @@ func Run_Test_display_lastline(euro)
   call term_sendkeys(buf, ":2vsplit\<CR>")
   call VerifyScreenDump(buf, $'Test_display_lastline_{a:euro}6', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_display_lastline_dump()
@@ -576,7 +576,7 @@ func Test_display_long_lastline()
   END
 
   call writefile(lines, 'XdispLongline', 'D')
-  let buf = RunVimInTerminal('-S XdispLongline', #{rows: 14, cols: 35})
+  let buf = RunMNVInTerminal('-S XdispLongline', #{rows: 14, cols: 35})
 
   call term_sendkeys(buf, "736|")
   call VerifyScreenDump(buf, 'Test_display_long_line_1', {})
@@ -595,7 +595,7 @@ func Test_display_long_lastline()
   call term_sendkeys(buf, "x")
   call VerifyScreenDump(buf, 'Test_display_long_line_4', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 " Moving the cursor to a line that doesn't fit in the window should show
@@ -609,7 +609,7 @@ func Test_display_cursor_long_line()
   END
 
   call writefile(lines, 'XdispCursorLongline', 'D')
-  let buf = RunVimInTerminal('-S XdispCursorLongline', #{rows: 8})
+  let buf = RunMNVInTerminal('-S XdispCursorLongline', #{rows: 8})
 
   call VerifyScreenDump(buf, 'Test_display_cursor_long_line_1', {})
 
@@ -628,7 +628,7 @@ func Test_display_cursor_long_line()
    call term_sendkeys(buf, '$ge')
    call VerifyScreenDump(buf, 'Test_display_cursor_long_line_4', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_change_wrapped_line_cpo_dollar()
@@ -645,7 +645,7 @@ func Test_change_wrapped_line_cpo_dollar()
     call cursor(3, 1)
   END
   call writefile(lines, 'Xwrapped_cpo_dollar', 'D')
-  let buf = RunVimInTerminal('-S Xwrapped_cpo_dollar', #{rows: 10, cols: 45})
+  let buf = RunMNVInTerminal('-S Xwrapped_cpo_dollar', #{rows: 10, cols: 45})
 
   call VerifyScreenDump(buf, 'Test_change_wrapped_line_cpo_dollar_01', {})
   call term_sendkeys(buf, 'ct!')
@@ -664,7 +664,7 @@ func Test_change_wrapped_line_cpo_dollar()
 
   call term_sendkeys(buf, ":silent undo | echo\<CR>")
   call VerifyScreenDump(buf, 'Test_change_wrapped_line_cpo_dollar_01', {})
-  call term_sendkeys(buf, ":source samples/matchparen.vim\<CR>")
+  call term_sendkeys(buf, ":source samples/matchparen.mnv\<CR>")
   call term_sendkeys(buf, 'ct(')
   call VerifyScreenDump(buf, 'Test_change_wrapped_line_cpo_dollar_07', {})
   call term_sendkeys(buf, 'y')
@@ -689,7 +689,7 @@ func Test_change_wrapped_line_cpo_dollar()
   call TermWait(buf, 50)
   call VerifyScreenDump(buf, 'Test_change_wrapped_line_cpo_dollar_15', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_edit.vim b/uvim/src/testdir/test_edit.mnv
index 6ac115d775..5ea1a2221d 100644
--- a/uvim/src/testdir/test_edit.vim
+++ b/uvim/src/testdir/test_edit.mnv
@@ -4,10 +4,10 @@ if exists("+t_kD")
   let &t_kD="[3;*~"
 endif
 
-source util/screendump.vim
+source util/screendump.mnv
 
 " Needs to come first until the bug in getchar() is
-" fixed: https://groups.google.com/d/msg/vim_dev/fXL9yme4H4c/bOR-U6_bAQAJ
+" fixed: https://groups.google.com/d/msg/mnv_dev/fXL9yme4H4c/bOR-U6_bAQAJ
 func Test_edit_00b()
   new
   call setline(1, ['abc '])
@@ -291,7 +291,7 @@ func Test_edit_11()
   call cursor(3, 1)
   call feedkeys("i/* comment */", 'tnix')
   call assert_equal(['{', "\<tab>\<tab>int c;", "\<tab>\<tab>\<tab>/* comment */"], getline(1, '$'))
-  set cinkeys&vim indentkeys&vim
+  set cinkeys&mnv indentkeys&mnv
   set nocindent indentexpr=
   delfu Do_Indent
   bw!
@@ -318,7 +318,7 @@ func Test_edit_11_indentexpr()
   call cursor(1, 1)
   call feedkeys("othen\<cr>that\<cr>fi", 'tnix')
   call assert_equal(['if [ $this ]', "then", "\<tab>that", "fi"], getline(1, '$'))
-  set cinkeys&vim indentkeys&vim
+  set cinkeys&mnv indentkeys&mnv
   set nocindent indentexpr=
   delfu Do_Indent
 
@@ -432,11 +432,11 @@ func Test_edit_13()
 endfunc
 
 " Test for autoindent removing indent when insert mode is stopped.  Some parts
-" of the code is exercised only when interactive mode is used. So use Vim in a
+" of the code is exercised only when interactive mode is used. So use MNV in a
 " terminal.
 func Test_autoindent_remove_indent()
-  CheckRunVimInTerminal
-  let buf = RunVimInTerminal('-N Xarifile', {'rows': 6, 'cols' : 20})
+  CheckRunMNVInTerminal
+  let buf = RunMNVInTerminal('-N Xarifile', {'rows': 6, 'cols' : 20})
   call TermWait(buf)
   call term_sendkeys(buf, ":set autoindent\n")
   " leaving insert mode in a new line with indent added by autoindent, should
@@ -453,17 +453,17 @@ func Test_autoindent_remove_indent()
   call TermWait(buf, 50)
   call term_sendkeys(buf, ":w\n")
   call TermWait(buf)
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
   call assert_equal(["\tfoo", '', repeat('x', 20)], readfile('Xarifile'))
   call delete('Xarifile')
 endfunc
 
 " Test for autoindent removing indent when insert mode is stopped and
 " autocomplete is enabled.  Some parts of the code is exercised only when
-" interactive mode is used. So use Vim in a terminal.
+" interactive mode is used. So use MNV in a terminal.
 func Test_autoindent_remove_indent_with_autocomplete()
-  CheckRunVimInTerminal
-  let buf = RunVimInTerminal('-N Xarifile', {'rows': 6, 'cols' : 20})
+  CheckRunMNVInTerminal
+  let buf = RunMNVInTerminal('-N Xarifile', {'rows': 6, 'cols' : 20})
   call TermWait(buf)
   call term_sendkeys(buf, ":set autoindent autocomplete\n")
   " leaving insert mode in a new line with indent added by autoindent, should
@@ -480,7 +480,7 @@ func Test_autoindent_remove_indent_with_autocomplete()
   call TermWait(buf, 50)
   call term_sendkeys(buf, ":w\n")
   call TermWait(buf)
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
   call assert_equal(["\tfoo", '', repeat('x', 20)], readfile('Xarifile'))
   call delete('Xarifile')
 endfunc
@@ -611,7 +611,7 @@ func Test_edit_00a_CTRL_A()
   call cursor(1, 1)
   try
     call feedkeys("A\<NUL>", 'tnix')
-  catch /^Vim\%((\a\+)\)\=:E29/
+  catch /^MNV\%((\a\+)\)\=:E29/
     call assert_true(1, 'E29 error caught')
   endtry
   call cursor(1, 1)
@@ -665,7 +665,7 @@ func Test_edit_CTRL_I()
   new
   call setline(1, [path. "/", ''])
   call feedkeys("Arunt\<c-x>\<c-f>\<tab>\<cr>\<esc>", 'tnix')
-  call assert_match('runtest\.vim', getline(1))
+  call assert_match('runtest\.mnv', getline(1))
   %d
   call writefile(['one', 'two', 'three'], 'Xinclude.txt', 'D')
   let include='#include Xinclude.txt'
@@ -880,36 +880,36 @@ func Test_edit_CTRL_S()
   " the rest is already covered
   new
   if !has("spell")
-    call setline(1, 'vim')
+    call setline(1, 'mnv')
     call feedkeys("A\<c-x>ss\<cr>\<esc>", 'tnix')
-    call assert_equal(['vims', ''], getline(1, '$'))
+    call assert_equal(['mnvs', ''], getline(1, '$'))
     bw!
     return
   endif
-  call setline(1, 'vim')
+  call setline(1, 'mnv')
   " spell option not yet set
   try
     call feedkeys("A\<c-x>\<c-s>\<cr>\<esc>", 'tnix')
-  catch /^Vim\%((\a\+)\)\=:E756/
+  catch /^MNV\%((\a\+)\)\=:E756/
     call assert_true(1, 'error caught')
   endtry
-  call assert_equal(['vim', ''], getline(1, '$'))
+  call assert_equal(['mnv', ''], getline(1, '$'))
   %d
   setl spell spelllang=en
-  call setline(1, 'vim')
+  call setline(1, 'mnv')
   call cursor(1, 1)
   call feedkeys("A\<c-x>\<c-s>\<cr>\<esc>", 'tnix')
-  call assert_equal(['Vim', ''], getline(1, '$'))
+  call assert_equal(['MNV', ''], getline(1, '$'))
   %d
-  call setline(1, 'vim')
+  call setline(1, 'mnv')
   call cursor(1, 1)
   call feedkeys("A\<c-x>\<c-s>\<down>\<cr>\<esc>", 'tnix')
   call assert_equal(['Aim'], getline(1, '$'))
   %d
-  call setline(1, 'vim')
+  call setline(1, 'mnv')
   call cursor(1, 1)
   call feedkeys("A\<c-x>\<c-s>\<c-p>\<cr>\<esc>", 'tnix')
-  call assert_equal(['vim', ''], getline(1, '$'))
+  call assert_equal(['mnv', ''], getline(1, '$'))
   %d
   " empty buffer
   call cursor(1, 1)
@@ -1133,7 +1133,7 @@ func Test_edit_CTRL_U()
   try
     call feedkeys("A\<c-x>\<c-u>", 'tnix')
     call assert_fails(1, 'unknown completion function')
-  catch /^Vim\%((\a\+)\)\=:E117/
+  catch /^MNV\%((\a\+)\)\=:E117/
     call assert_true(1, 'E117 error caught')
   endtry
   set completefunc=
@@ -1175,7 +1175,7 @@ func Test_edit_DROP()
   try
     call feedkeys("i\<Drop>\<Esc>", 'tnix')
     call assert_fails(1, 'Invalid register name')
-  catch /^Vim\%((\a\+)\)\=:E353/
+  catch /^MNV\%((\a\+)\)\=:E353/
     call assert_true(1, 'error caught')
   endtry
   bw!
@@ -1497,7 +1497,7 @@ func Test_edit_forbidden()
   try
     call feedkeys("ix\<esc>", 'tnix')
     call assert_fails(1, 'textlock')
-  catch /^Vim\%((\a\+)\)\=:E565/ " catch E565: not allowed here
+  catch /^MNV\%((\a\+)\)\=:E565/ " catch E565: not allowed here
   endtry
   " TODO: Might be a bug: should x really be inserted here
   call assert_equal(['xa'], getline(1, '$'))
@@ -1505,7 +1505,7 @@ func Test_edit_forbidden()
   try
     call feedkeys("ix\<esc>", 'tnix')
     call assert_fails(1, 'unknown function')
-  catch /^Vim\%((\a\+)\)\=:E117/ " catch E117: unknown function
+  catch /^MNV\%((\a\+)\)\=:E117/ " catch E117: unknown function
   endtry
   au! InsertCharPre
 
@@ -1522,7 +1522,7 @@ func Test_edit_forbidden()
   try
     call feedkeys("i\<c-x>\<c-u>\<esc>", 'tnix')
     call assert_fails(1, 'change in complete function')
-  catch /^Vim\%((\a\+)\)\=:E565/ " catch E565
+  catch /^MNV\%((\a\+)\)\=:E565/ " catch E565
   endtry
   delfu Complete
   set completefunc=
@@ -1613,7 +1613,7 @@ func Test_edit_complete_very_long_name()
     return
   endtry
 
-  " Try to get the Vim window position before setting 'columns', so that we can
+  " Try to get the MNV window position before setting 'columns', so that we can
   " move the window back to where it was.
   let winposx = getwinposx()
   let winposy = getwinposy()
@@ -1957,7 +1957,7 @@ endfunc
 " Using :edit without leaving 'insertmode' should not cause Insert mode to be
 " re-entered immediately after <C-L>
 func Test_edit_insertmode_ex_edit()
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   let lines =<< trim END
     set insertmode noruler
@@ -1965,7 +1965,7 @@ func Test_edit_insertmode_ex_edit()
   END
   call writefile(lines, 'Xtest_edit_insertmode_ex_edit', 'D')
 
-  let buf = RunVimInTerminal('-S Xtest_edit_insertmode_ex_edit', #{rows: 6, wait_for_ruler: 0})
+  let buf = RunMNVInTerminal('-S Xtest_edit_insertmode_ex_edit', #{rows: 6, wait_for_ruler: 0})
   " Somehow when using valgrind "INSERT" does not show up unless we send
   " something to the terminal.
   for i in range(30)
@@ -1980,7 +1980,7 @@ func Test_edit_insertmode_ex_edit()
   call WaitForAssert({-> assert_notmatch('^-- INSERT --\s*$', term_getline(buf, 6))})
 
   " clean up
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 " Pressing escape in 'insertmode' should beep
@@ -2064,9 +2064,9 @@ endfunc
 " Test for positioning cursor after CTRL-R expression failed
 func Test_edit_ctrl_r_failed()
   CheckScreendump
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
-  let buf = RunVimInTerminal('', #{rows: 6, cols: 60})
+  let buf = RunMNVInTerminal('', #{rows: 6, cols: 60})
 
   " trying to insert a blob produces an error
   call term_sendkeys(buf, "i\<C-R>=0z\<CR>")
@@ -2075,7 +2075,7 @@ func Test_edit_ctrl_r_failed()
   call term_sendkeys(buf, ":\<Esc>")
   call VerifyScreenDump(buf, 'Test_edit_ctlr_r_failed_1', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 " When a character is inserted at the last position of the last line in a
@@ -2089,7 +2089,7 @@ func Test_edit_lastline_scroll()
   new
   let h = winheight(0)
   let lines = ['one', 'two', 'three']
-  let lines += repeat(['vim'], h - 4)
+  let lines += repeat(['mnv'], h - 4)
   call setline(1, lines)
   call setline(h, repeat('x', winwidth(0) - 1))
   call feedkeys("GAx", 'xt')
@@ -2214,7 +2214,7 @@ func Test_edit_shift_bs()
   " FIXME: this works interactively, but the test fails
   throw 'Skipped: Shift-Backspace Test not working correctly :('
 
-  " Need to run this in Win32 Terminal, do not use CheckRunVimInTerminal
+  " Need to run this in Win32 Terminal, do not use CheckRunMNVInTerminal
   if !has("terminal")
     return
   endif
@@ -2225,13 +2225,13 @@ func Test_edit_shift_bs()
   END
   call writefile(lines, 'Xtest_edit_shift_bs', 'D')
 
-  let buf = RunVimInTerminal('-S Xtest_edit_shift_bs', #{rows: 3})
+  let buf = RunMNVInTerminal('-S Xtest_edit_shift_bs', #{rows: 3})
   call term_sendkeys(buf, "A\<S-BS>-\<esc>")
   call TermWait(buf, 50)
   call assert_equal('ab-', term_getline(buf, 1))
 
   " clean up
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_edit_Ctrl_RSB()
@@ -2457,4 +2457,4 @@ func Test_edit_CAR_with_completion()
   bw!
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_environ.vim b/uvim/src/testdir/test_environ.mnv
index 05d4f1f07c..88871adbd6 100644
--- a/uvim/src/testdir/test_environ.vim
+++ b/uvim/src/testdir/test_environ.mnv
@@ -27,7 +27,7 @@ func Test_setenv()
 endfunc
 
 func Test_special_env()
-  " The value for $HOME is cached internally by Vim, ensure the value is up to
+  " The value for $HOME is cached internally by MNV, ensure the value is up to
   " date.
   let orig_ENV = $HOME
 
@@ -69,7 +69,7 @@ func Test_mac_locale()
   CheckFeature osxdarwin
 
   " If $LANG is not set then the system locale will be used.
-  " Run Vim after unsetting all the locale environmental vars, and capture the
+  " Run MNV after unsetting all the locale environmental vars, and capture the
   " output of :lang.
   let lang_results = system("unset LANG; unset LC_MESSAGES; unset LC_CTYPE; " ..
             \ shellescape(v:progpath) ..
@@ -84,4 +84,4 @@ func Test_mac_locale()
         \ "Default locale should have UTF-8 encoding set, and LC_NUMERIC set to 'C'")
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_erasebackword.vim b/uvim/src/testdir/test_erasebackword.mnv
index b917e66d33..bf543bbea2 100644
--- a/uvim/src/testdir/test_erasebackword.vim
+++ b/uvim/src/testdir/test_erasebackword.mnv
@@ -3,20 +3,20 @@
 func Test_erasebackword()
   enew
 
-  exe "normal o www�ん���世界ワールドvim \<C-W>"
+  exe "normal o www�ん���世界ワールドmnv \<C-W>"
   call assert_equal(' www�ん���世界ワールド', getline('.'))
-  exe "normal o www�ん���世界ワールドvim \<C-W>\<C-W>"
+  exe "normal o www�ん���世界ワールドmnv \<C-W>\<C-W>"
   call assert_equal(' www�ん���世界', getline('.'))
-  exe "normal o www�ん���世界ワールドvim \<C-W>\<C-W>\<C-W>"
+  exe "normal o www�ん���世界ワールドmnv \<C-W>\<C-W>\<C-W>"
   call assert_equal(' www�ん���', getline('.'))
-  exe "normal o www�ん���世界ワールドvim \<C-W>\<C-W>\<C-W>\<C-W>"
+  exe "normal o www�ん���世界ワールドmnv \<C-W>\<C-W>\<C-W>\<C-W>"
   call assert_equal(' www', getline('.'))
-  exe "normal o www�ん���世界ワールドvim \<C-W>\<C-W>\<C-W>\<C-W>\<C-W>"
+  exe "normal o www�ん���世界ワールドmnv \<C-W>\<C-W>\<C-W>\<C-W>\<C-W>"
   call assert_equal(' ', getline('.'))
-  exe "normal o www�ん���世界ワールドvim \<C-W>\<C-W>\<C-W>\<C-W>\<C-W>\<C-W>"
+  exe "normal o www�ん���世界ワールドmnv \<C-W>\<C-W>\<C-W>\<C-W>\<C-W>\<C-W>"
   call assert_equal('', getline('.'))
 
   enew!
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_escaped_glob.vim b/uvim/src/testdir/test_escaped_glob.mnv
index 5da2a790d8..0c35e3c130 100644
--- a/uvim/src/testdir/test_escaped_glob.vim
+++ b/uvim/src/testdir/test_escaped_glob.mnv
@@ -24,10 +24,10 @@ function Test_glob()
 endfunction
 
 function Test_globpath()
-  sandbox call assert_equal("sautest/autoload/globone.vim\nsautest/autoload/globtwo.vim",
-        \ globpath('sautest/autoload', 'glob*.vim'))
-  sandbox call assert_equal(['sautest/autoload/globone.vim', 'sautest/autoload/globtwo.vim'],
-        \ 'glob*.vim'->globpath('sautest/autoload', 0, 1))
+  sandbox call assert_equal("sautest/autoload/globone.mnv\nsautest/autoload/globtwo.mnv",
+        \ globpath('sautest/autoload', 'glob*.mnv'))
+  sandbox call assert_equal(['sautest/autoload/globone.mnv', 'sautest/autoload/globtwo.mnv'],
+        \ 'glob*.mnv'->globpath('sautest/autoload', 0, 1))
 endfunction
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_eval_stuff.vim b/uvim/src/testdir/test_eval_stuff.mnv
index 39b1227aef..39b1227aef 100644
--- a/uvim/src/testdir/test_eval_stuff.vim
+++ b/uvim/src/testdir/test_eval_stuff.mnv
diff --git a/uvim/src/testdir/test_ex_equal.vim b/uvim/src/testdir/test_ex_equal.mnv
index bb6608206a..ee33c871d5 100644
--- a/uvim/src/testdir/test_ex_equal.vim
+++ b/uvim/src/testdir/test_ex_equal.mnv
@@ -31,4 +31,4 @@ func Test_ex_equal()
   bwipe!
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_ex_mode.vim b/uvim/src/testdir/test_ex_mode.mnv
index 686662b176..953f3bc80d 100644
--- a/uvim/src/testdir/test_ex_mode.vim
+++ b/uvim/src/testdir/test_ex_mode.mnv
@@ -62,8 +62,8 @@ endfunc
 
 " Test substitute confirmation prompt :%s/pat/str/c in Ex mode
 func Test_Ex_substitute()
-  CheckRunVimInTerminal
-  let buf = RunVimInTerminal('', {'rows': 6})
+  CheckRunMNVInTerminal
+  let buf = RunMNVInTerminal('', {'rows': 6})
 
   call term_sendkeys(buf, ":call setline(1, repeat(['foo foo'], 4))\<CR>")
   call term_sendkeys(buf, ":set number\<CR>")
@@ -99,7 +99,7 @@ func Test_Ex_substitute()
   call term_sendkeys(buf, ":vi\<CR>")
   call WaitForAssert({-> assert_match('foo bar', term_getline(buf, 1))}, 1000)
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 " Test for displaying lines from an empty buffer in Ex mode
@@ -152,15 +152,15 @@ func Skip_Test_open_command_state()
   let sourced = ["!f\u0083\x02\<Esc>z=0"]
   call writefile(sourced, 'Xsourced', 'b')
 
-  CheckRunVimInTerminal
-  let buf = RunVimInTerminal('-u NONE -i NONE -n -m -X -Z -e -s -S XopenScript -c qa!', #{rows: 6, wait_for_ruler: 0, no_clean: 1})
+  CheckRunMNVInTerminal
+  let buf = RunMNVInTerminal('-u NONE -i NONE -n -m -X -Z -e -s -S XopenScript -c qa!', #{rows: 6, wait_for_ruler: 0, no_clean: 1})
   sleep 3
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 " Test for :g/pat/visual to run vi commands in Ex mode
-" This used to hang Vim before 8.2.0274.
+" This used to hang MNV before 8.2.0274.
 func Test_Ex_global()
   new
   call setline(1, ['', 'foo', 'bar', 'foo', 'bar', 'foo'])
@@ -202,10 +202,10 @@ func Test_Ex_shell()
 endfunc
 
 " Test for pressing Ctrl-C in :append inside a loop in Ex mode
-" This used to hang Vim
+" This used to hang MNV
 func Test_Ex_append_in_loop()
-  CheckRunVimInTerminal
-  let buf = RunVimInTerminal('', {'rows': 6})
+  CheckRunMNVInTerminal
+  let buf = RunMNVInTerminal('', {'rows': 6})
 
   call term_sendkeys(buf, "gQ")
   call term_sendkeys(buf, "for i in range(1)\<CR>")
@@ -222,7 +222,7 @@ func Test_Ex_append_in_loop()
   call term_sendkeys(buf, "vi\<CR>")
   call WaitForAssert({-> assert_match('foo', term_getline(buf, 1))}, 1000)
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 " In Ex-mode, a backslash escapes a newline
@@ -251,7 +251,7 @@ func Test_ex_mode_errors()
   let caught_e565 = 0
   try
     call feedkeys("ix\<esc>", 'xt')
-  catch /^Vim\%((\a\+)\)\=:E565/ " catch E565
+  catch /^MNV\%((\a\+)\)\=:E565/ " catch E565
     let caught_e565 = 1
   endtry
   call assert_equal(1, caught_e565)
@@ -293,7 +293,7 @@ func Test_ex_mode_with_global()
     qall!
   END
   call writefile(lines, 'Xexmodescript', 'D')
-  call assert_equal(1, RunVim([], [], '-e -s -S Xexmodescript'))
+  call assert_equal(1, RunMNV([], [], '-e -s -S Xexmodescript'))
   call assert_equal(['done'], readfile('Xdidexmode'))
 
   call delete('logfile')
@@ -312,7 +312,7 @@ func Test_ex_mode_count_overflow()
     qall!
   END
   call writefile(lines, 'Xexmodescript', 'D')
-  call assert_equal(1, RunVim([], [], '-e -s -S Xexmodescript -c qa'))
+  call assert_equal(1, RunMNV([], [], '-e -s -S Xexmodescript -c qa'))
   call assert_equal(['done'], readfile('Xdidexmode'))
 
   call delete('Xdidexmode')
@@ -335,7 +335,7 @@ func Test_empty_command_visual_mode()
       :qall!
   END
   call writefile(lines, 'Xexmodescript', 'D')
-  call assert_equal(1, RunVim([], [], '-u NONE -e -s -S Xexmodescript'))
+  call assert_equal(1, RunMNV([], [], '-u NONE -e -s -S Xexmodescript'))
 
   " This may cause a dialog to be displayed for an empty command, ignore it.
   call delete('guidialogfile')
@@ -345,14 +345,19 @@ endfunc
 func Test_backslash_multiline()
   new
   call setline(1, 'enum')
-  call feedkeys('Qg/enum/i\
\
.', "xt")
+  call feedkeys('Qg/enum/i\
+\
+.', "xt")
   call assert_equal(["", "enum"], getline(1, 2))
 endfunc
 
 " Test using backslash in ex-mode after patch 9.1.0535
 func Test_backslash_multiline2()
   new
-  call feedkeys('Qa
X \\
Y
.', "xt")
+  call feedkeys('Qa
+X \\
+Y
+.', "xt")
   call assert_equal(['X \\', "Y"], getline(1, 2))
 endfunc
 
@@ -400,4 +405,4 @@ func Test_ex_empty_command_newline()
   unlet g:var
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_ex_undo.vim b/uvim/src/testdir/test_ex_undo.mnv
index 48a87df024..9b620dfb0c 100644
--- a/uvim/src/testdir/test_ex_undo.vim
+++ b/uvim/src/testdir/test_ex_undo.mnv
@@ -18,4 +18,4 @@ func Test_ex_undo()
   quit!
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_ex_z.vim b/uvim/src/testdir/test_ex_z.mnv
index 4607d96856..19f97fe5f4 100644
--- a/uvim/src/testdir/test_ex_z.vim
+++ b/uvim/src/testdir/test_ex_z.mnv
@@ -18,7 +18,7 @@ func Test_z()
   let a = execute('20z+3')
   " FIXME: I would expect the same result as '20z3' since 'help z'
   " says: Specifying no mark at all is the same as "+".
-  " However it " gives "\n21\n22\n23" instead. Bug in Vim or in ":help :z"?
+  " However it " gives "\n21\n22\n23" instead. Bug in MNV or in ":help :z"?
   "call assert_equal("\n20\n21\n22", a)
   "call assert_equal(22, line('.'))
 
@@ -81,7 +81,7 @@ func Test_z()
   bw!
 endfunc
 
-" :z! is the same as :z but count uses the Vim window height when not specified.
+" :z! is the same as :z but count uses the MNV window height when not specified.
 func Test_z_bang()
   4split
   call setline(1, range(1, 20))
@@ -100,7 +100,7 @@ endfunc
 
 func Test_z_overflow()
   " This used to access invalid memory as a result of an integer overflow
-  " and freeze vim.
+  " and freeze mnv.
   normal ox
   normal Heat
   z777777776666666
@@ -114,4 +114,4 @@ func Test_z_negative_lnum()
   bwipe!
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_excmd.vim b/uvim/src/testdir/test_excmd.mnv
index c671adfe94..797c52b4f2 100644
--- a/uvim/src/testdir/test_excmd.vim
+++ b/uvim/src/testdir/test_excmd.mnv
@@ -1,6 +1,6 @@
 " Tests for various Ex commands.
 
-source util/screendump.vim
+source util/screendump.mnv
 
 func Test_ex_delete()
   new
@@ -137,7 +137,7 @@ func Test_append_cmd()
 endfunc
 
 func Test_append_cmd_empty_buf()
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
   let lines =<< trim END
     func Timer(timer)
       append
@@ -148,12 +148,12 @@ func Test_append_cmd_empty_buf()
     call timer_start(10, 'Timer')
   END
   call writefile(lines, 'Xtest_append_cmd_empty_buf', 'D')
-  let buf = RunVimInTerminal('-S Xtest_append_cmd_empty_buf', {'rows': 6})
+  let buf = RunMNVInTerminal('-S Xtest_append_cmd_empty_buf', {'rows': 6})
   call WaitForAssert({-> assert_equal('bbbbb', term_getline(buf, 2))})
   call WaitForAssert({-> assert_equal('aaaaa', term_getline(buf, 1))})
 
   " clean up
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 " Test for the :insert command
@@ -185,7 +185,7 @@ func Test_insert_cmd()
 endfunc
 
 func Test_insert_cmd_empty_buf()
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
   let lines =<< trim END
     func Timer(timer)
       insert
@@ -196,12 +196,12 @@ func Test_insert_cmd_empty_buf()
     call timer_start(10, 'Timer')
   END
   call writefile(lines, 'Xtest_insert_cmd_empty_buf', 'D')
-  let buf = RunVimInTerminal('-S Xtest_insert_cmd_empty_buf', {'rows': 6})
+  let buf = RunMNVInTerminal('-S Xtest_insert_cmd_empty_buf', {'rows': 6})
   call WaitForAssert({-> assert_equal('bbbbb', term_getline(buf, 2))})
   call WaitForAssert({-> assert_equal('aaaaa', term_getline(buf, 1))})
 
   " clean up
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 " Test for the :change command
@@ -250,7 +250,7 @@ endfunc
 " Test for the :confirm command dialog
 func Test_confirm_cmd()
   CheckNotGui
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   call writefile(['foo1'], 'Xfoo', 'D')
   call writefile(['bar1'], 'Xbar', 'D')
@@ -265,11 +265,11 @@ func Test_confirm_cmd()
     wincmd b
   END
   call writefile(lines, 'Xscript', 'D')
-  let buf = RunVimInTerminal('-S Xscript', {'rows': 20})
+  let buf = RunMNVInTerminal('-S Xscript', {'rows': 20})
   call term_sendkeys(buf, ":confirm qall\n")
   call WaitForAssert({-> assert_match('\[Y\]es, (N)o, Save (A)ll, (D)iscard All, (C)ancel: ', term_getline(buf, 20))}, 1000)
   call term_sendkeys(buf, "A")
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 
   call assert_equal(['foo2'], readfile('Xfoo'))
   call assert_equal(['bar2'], readfile('Xbar'))
@@ -284,11 +284,11 @@ func Test_confirm_cmd()
     wincmd b
   END
   call writefile(lines, 'Xscript')
-  let buf = RunVimInTerminal('-S Xscript', {'rows': 20})
+  let buf = RunMNVInTerminal('-S Xscript', {'rows': 20})
   call term_sendkeys(buf, ":confirm qall\n")
   call WaitForAssert({-> assert_match('\[Y\]es, (N)o, Save (A)ll, (D)iscard All, (C)ancel: ', term_getline(buf, 20))}, 1000)
   call term_sendkeys(buf, "D")
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 
   call assert_equal(['foo2'], readfile('Xfoo'))
   call assert_equal(['bar2'], readfile('Xbar'))
@@ -303,13 +303,13 @@ func Test_confirm_cmd()
     wincmd b
   END
   call writefile(lines, 'Xscript')
-  let buf = RunVimInTerminal('-S Xscript', {'rows': 20})
+  let buf = RunMNVInTerminal('-S Xscript', {'rows': 20})
   call term_sendkeys(buf, ":confirm qall\n")
   call WaitForAssert({-> assert_match('\[Y\]es, (N)o, Save (A)ll, (D)iscard All, (C)ancel: ', term_getline(buf, 20))}, 1000)
   call term_sendkeys(buf, "N")
   call WaitForAssert({-> assert_match('\[Y\]es, (N)o, (C)ancel: ', term_getline(buf, 20))}, 1000)
   call term_sendkeys(buf, "Y")
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 
   call assert_equal(['foo4'], readfile('Xfoo'))
   call assert_equal(['bar2'], readfile('Xbar'))
@@ -317,7 +317,7 @@ endfunc
 
 func Test_confirm_cmd_cancel()
   CheckNotGui
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   " Test for closing a window with a modified buffer
   let lines =<< trim END
@@ -326,7 +326,7 @@ func Test_confirm_cmd_cancel()
     call setline(1, 'abc')
   END
   call writefile(lines, 'Xscript', 'D')
-  let buf = RunVimInTerminal('-S Xscript', {'rows': 20})
+  let buf = RunMNVInTerminal('-S Xscript', {'rows': 20})
   call term_sendkeys(buf, ":confirm close\n")
   call WaitForAssert({-> assert_match('^\[Y\]es, (N)o, (C)ancel: *$',
         \ term_getline(buf, 20))}, 1000)
@@ -338,7 +338,7 @@ func Test_confirm_cmd_cancel()
   call term_sendkeys(buf, "N")
   call WaitForAssert({-> assert_match('^ *0,0-1         All$',
         \ term_getline(buf, 20))}, 1000)
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 " The ":confirm" prompt was sometimes used with the terminal in cooked mode.
@@ -346,7 +346,7 @@ endfunc
 " prompt from the ":conf q" and ":conf wq" commands.
 func Test_confirm_q_wq()
   CheckNotGui
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   call writefile(['foo'], 'Xfoo', 'D')
 
@@ -356,7 +356,7 @@ func Test_confirm_q_wq()
     edit Xfoo
   END
   call writefile(lines, 'Xscript', 'D')
-  let buf = RunVimInTerminal('-S Xscript', {'rows': 20})
+  let buf = RunMNVInTerminal('-S Xscript', {'rows': 20})
   call term_sendkeys(buf, ":confirm q\n")
   call WaitForAssert({-> assert_match('^\[Y\]es, (N)o, (C)ancel: *$',
         \ term_getline(buf, 20))}, 1000)
@@ -372,12 +372,12 @@ func Test_confirm_q_wq()
   call WaitForAssert({-> assert_notmatch('^\[Y\]es, (N)o, (C)ancel: C*$',
         \ term_getline(buf, 20))}, 1000)
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_confirm_write_ro()
   CheckNotGui
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   call writefile(['foo'], 'Xconfirm_write_ro', 'D')
   let lines =<< trim END
@@ -386,7 +386,7 @@ func Test_confirm_write_ro()
     norm Abar
   END
   call writefile(lines, 'Xscript', 'D')
-  let buf = RunVimInTerminal('-S Xscript', {'rows': 20})
+  let buf = RunMNVInTerminal('-S Xscript', {'rows': 20})
 
   " Try to write with 'ro' option.
   call term_sendkeys(buf, ":set ro | confirm w\n")
@@ -425,17 +425,17 @@ func Test_confirm_write_ro()
         \            term_getline(buf, 19))}, 1000)
   call assert_equal(['foo'], readfile('Xconfirm_write_ro'))
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_confirm_write_partial_file()
   CheckNotGui
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   call writefile(['a', 'b', 'c', 'd'], 'Xwrite_partial', 'D')
   call writefile(['set nobackup ff=unix cmdheight=2',
         \         'edit Xwrite_partial'], 'Xscript', 'D')
-  let buf = RunVimInTerminal('-S Xscript', {'rows': 20})
+  let buf = RunMNVInTerminal('-S Xscript', {'rows': 20})
 
   call term_sendkeys(buf, ":confirm 2,3w\n")
   call WaitForAssert({-> assert_match('^Write partial file? *$',
@@ -459,7 +459,7 @@ func Test_confirm_write_partial_file()
         \            term_getline(buf, 20))}, 1000)
   call assert_equal(['b', 'c'], readfile('Xwrite_partial'))
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 " Test for the :print command
@@ -630,7 +630,7 @@ func Sandbox_tests()
     call assert_fails("call prompt_setprompt(1, '')", 'E48:')
   endif
   call assert_fails("let $TESTVAR=1", 'E48:')
-  call assert_fails("call feedkeys('ivim')", 'E48:')
+  call assert_fails("call feedkeys('imnv')", 'E48:')
   call assert_fails("source! Xsomefile", 'E48:')
   call assert_fails("call delete('Xthatfile')", 'E48:')
   call assert_fails("call writefile([], 'Xanotherfile')", 'E48:')
@@ -645,19 +645,19 @@ func Sandbox_tests()
   call assert_fails('call system("ls")', 'E48:')
   call assert_fails('call systemlist("ls")', 'E48:')
   if has('clientserver')
-    call assert_fails('let s=remote_expr("gvim", "2+2")', 'E48:')
+    call assert_fails('let s=remote_expr("gmnv", "2+2")', 'E48:')
     if !has('win32')
       " remote_foreground() doesn't throw an error message on MS-Windows
-      call assert_fails('call remote_foreground("gvim")', 'E48:')
+      call assert_fails('call remote_foreground("gmnv")', 'E48:')
     endif
-    call assert_fails('let s=remote_peek("gvim")', 'E48:')
-    call assert_fails('let s=remote_read("gvim")', 'E48:')
-    call assert_fails('let s=remote_send("gvim", "abc")', 'E48:')
-    call assert_fails('let s=server2client("gvim", "abc")', 'E48:')
+    call assert_fails('let s=remote_peek("gmnv")', 'E48:')
+    call assert_fails('let s=remote_read("gmnv")', 'E48:')
+    call assert_fails('let s=remote_send("gmnv", "abc")', 'E48:')
+    call assert_fails('let s=server2client("gmnv", "abc")', 'E48:')
   endif
   if has('terminal')
     call assert_fails('terminal', 'E48:')
-    call assert_fails('call term_start("vim")', 'E48:')
+    call assert_fails('call term_start("mnv")', 'E48:')
     call assert_fails('call term_dumpwrite(1, "Xdumpfile")', 'E48:')
   endif
   if has('channel')
@@ -665,7 +665,7 @@ func Sandbox_tests()
     call assert_fails("call ch_open('localhost:8765')", 'E48:')
   endif
   if has('job')
-    call assert_fails("call job_start('vim')", 'E48:')
+    call assert_fails("call job_start('mnv')", 'E48:')
   endif
   if has('unix') && has('libcall')
     call assert_fails("echo libcall('libc.so', 'getenv', 'HOME')", 'E48:')
@@ -752,12 +752,12 @@ func Test_drop_modified_file()
   END
   call writefile([''], 'Xdrop_modified.txt', 'D')
   call writefile(lines, 'Xtest_drop_modified', 'D')
-  let buf = RunVimInTerminal('-S Xtest_drop_modified Xdrop_modified.txt', {'rows': 10,'columns': 40})
+  let buf = RunMNVInTerminal('-S Xtest_drop_modified Xdrop_modified.txt', {'rows': 10,'columns': 40})
   call term_sendkeys(buf, ":drop Xdrop_modified.txt\<CR>")
   call VerifyScreenDump(buf, 'Test_drop_modified_1', {})
 
   " clean up
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_exec_while_if.vim b/uvim/src/testdir/test_exec_while_if.mnv
index 3f13b09945..81b05dc49a 100644
--- a/uvim/src/testdir/test_exec_while_if.vim
+++ b/uvim/src/testdir/test_exec_while_if.mnv
@@ -40,4 +40,4 @@ func Test_exec_while_if()
         \ "9x"], getline(1, 10))
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_execute_func.vim b/uvim/src/testdir/test_execute_func.mnv
index 3e6c2fe922..01ddca68a3 100644
--- a/uvim/src/testdir/test_execute_func.vim
+++ b/uvim/src/testdir/test_execute_func.mnv
@@ -1,6 +1,6 @@
 " test execute()
 
-import './util/vim9.vim' as v9
+import './util/mnv9.mnv' as v9
 
 func NestedEval()
   let nested = execute('echo "nested\nlines"')
@@ -170,21 +170,21 @@ func Test_win_execute_visual_redraw()
 endfunc
 
 func Test_win_execute_on_startup()
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   let lines =<< trim END
-      vim9script
+      mnv9script
       [repeat('x', &columns)]->writefile('Xfile1')
       silent tabedit Xfile2
       var id = win_getid()
       silent tabedit Xfile3
-      autocmd VimEnter * win_execute(id, 'close')
+      autocmd MNVEnter * win_execute(id, 'close')
   END
   call writefile(lines, 'XwinExecute', 'D')
-  let buf = RunVimInTerminal('-p Xfile1 -Nu XwinExecute', {})
+  let buf = RunMNVInTerminal('-p Xfile1 -Nu XwinExecute', {})
 
   " this was crashing on exit with EXITFREE defined
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 
   call delete('Xfile1')
 endfunc
@@ -225,4 +225,4 @@ func Test_win_execute_tabpagewinnr()
   %bwipe!
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_exists.vim b/uvim/src/testdir/test_exists.mnv
index c886f0b9f4..427e319da1 100644
--- a/uvim/src/testdir/test_exists.vim
+++ b/uvim/src/testdir/test_exists.mnv
@@ -1,6 +1,6 @@
 " Tests for the exists() function
 
-import './util/vim9.vim' as v9
+import './util/mnv9.mnv' as v9
 
 func Test_exists()
   augroup myagroup
@@ -69,11 +69,11 @@ func Test_exists()
   call assert_equal(0, exists('+autoprint'))
 
   " Existing environment variable
-  let $EDITOR_NAME = 'Vim Editor'
+  let $EDITOR_NAME = 'MNV Editor'
   call assert_equal(1, exists('$EDITOR_NAME'))
   if has('unix')
     " ${name} environment variables are supported only on Unix-like systems
-    call assert_equal(1, exists('${VIM}'))
+    call assert_equal(1, exists('${MNV}'))
   endif
   " Non-existing environment variable
   call assert_equal(0, exists('$NON_ENV_VAR'))
@@ -282,9 +282,9 @@ func Test_exists()
   unlet b:curly_{str}_var
   call assert_equal(0, exists('b:curly_{str}_var'))
 
-  " Existing Vim internal variable
+  " Existing MNV internal variable
   call assert_equal(1, exists('v:version'))
-  " Non-existing Vim internal variable
+  " Non-existing MNV internal variable
   call assert_equal(0, exists('v:non_exists_var'))
 
   " Existing script-local variable
@@ -346,7 +346,7 @@ endfunc
 " Test for using exists() with class and object variables and methods.
 func Test_exists_class_object()
   let lines =<< trim END
-    vim9script
+    mnv9script
     class A
       var var1: number = 10
       static var var2: number = 10
@@ -390,4 +390,4 @@ func Test_exists_class_object()
   call v9.CheckSourceSuccess(lines)
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_exists_autocmd.vim b/uvim/src/testdir/test_exists_autocmd.mnv
index 58ad9b526e..07b1774345 100644
--- a/uvim/src/testdir/test_exists_autocmd.vim
+++ b/uvim/src/testdir/test_exists_autocmd.mnv
@@ -25,4 +25,4 @@ function Test_AutoCommands()
   call assert_false(exists("#BufEnter#<buffer>"))
 endfunction
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_exit.vim b/uvim/src/testdir/test_exit.mnv
index 77852f21d8..d265c72a27 100644
--- a/uvim/src/testdir/test_exit.vim
+++ b/uvim/src/testdir/test_exit.mnv
@@ -1,4 +1,4 @@
-" Tests for exiting Vim.
+" Tests for exiting MNV.
 
 func Test_exiting()
   let after =<< trim [CODE]
@@ -7,7 +7,7 @@ func Test_exiting()
     quit
   [CODE]
 
-  if RunVim([], after, '')
+  if RunMNV([], after, '')
     call assert_equal(['QuitPre', 'ExitPre'], readfile('Xtestout'))
   endif
   call delete('Xtestout')
@@ -20,7 +20,7 @@ func Test_exiting()
     quit
   [CODE]
 
-  if RunVim([], after, '')
+  if RunMNV([], after, '')
     call assert_equal(['QuitPre', 'ExitPre'], readfile('Xtestout'))
   endif
   call delete('Xtestout')
@@ -33,7 +33,7 @@ func Test_exiting()
     qall
   [CODE]
 
-  if RunVim([], after, '')
+  if RunMNV([], after, '')
     call assert_equal(['QuitPre', 'ExitPre'], readfile('Xtestout'))
   endif
   call delete('Xtestout')
@@ -52,7 +52,7 @@ func Test_exiting()
     quit
   [CODE]
 
-  if RunVim([], after, '')
+  if RunMNV([], after, '')
     call assert_equal(['QuitPre', 'ExitPre', 'QuitPre', 'ExitPre'],
 	  \ readfile('Xtestout'))
   endif
@@ -73,7 +73,7 @@ func Test_exiting()
     quit
   [CODE]
 
-  if RunVim([], after, '')
+  if RunMNV([], after, '')
     call assert_equal(['QuitPre', 'ExitPre', 'QuitPre', 'ExitPre'],
 	  \ readfile('Xtestout'))
   endif
@@ -86,7 +86,7 @@ func Test_exiting()
     wqall
   [CODE]
 
-  if RunVim([], after, '')
+  if RunMNV([], after, '')
     call assert_equal(['QuitPre', 'ExitPre'], readfile('Xtestout'))
   endif
   call delete('Xtestout')
@@ -100,34 +100,34 @@ func Test_exiting()
     call setline(1, 'NOT REACHED') | write | qall
   [CODE]
 
-  if RunVim([], after, '')
+  if RunMNV([], after, '')
     call assert_equal(['SHOULD BE WRITTEN'], readfile('Xwritebuf'))
   endif
   call delete('Xwritebuf')
 endfunc
 
-" Test for getting the Vim exit code from v:exiting
+" Test for getting the MNV exit code from v:exiting
 func Test_exit_code()
   call assert_equal(v:null, v:exiting)
 
   let before =<< trim [CODE]
     au QuitPre * call writefile(['qp = ' .. v:exiting], 'Xtestout', 'a')
     au ExitPre * call writefile(['ep = ' .. v:exiting], 'Xtestout', 'a')
-    au VimLeavePre * call writefile(['lp = ' .. v:exiting], 'Xtestout', 'a')
-    au VimLeave * call writefile(['l = ' .. v:exiting], 'Xtestout', 'a')
+    au MNVLeavePre * call writefile(['lp = ' .. v:exiting], 'Xtestout', 'a')
+    au MNVLeave * call writefile(['l = ' .. v:exiting], 'Xtestout', 'a')
   [CODE]
 
-  if RunVim(before, ['quit'], '')
+  if RunMNV(before, ['quit'], '')
     call assert_equal(['qp = v:null', 'ep = v:null', 'lp = 0', 'l = 0'], readfile('Xtestout'))
   endif
   call delete('Xtestout')
 
-  if RunVim(before, ['cquit'], '')
+  if RunMNV(before, ['cquit'], '')
     call assert_equal(['lp = 1', 'l = 1'], readfile('Xtestout'))
   endif
   call delete('Xtestout')
 
-  if RunVim(before, ['cquit 4'], '')
+  if RunMNV(before, ['cquit 4'], '')
     call assert_equal(['lp = 4', 'l = 4'], readfile('Xtestout'))
   endif
   call delete('Xtestout')
@@ -140,9 +140,9 @@ func Test_exit_error_reading_input()
   CheckNotAsan
   CheckNotValgrind
 
-  call writefile([":au VimLeave * call writefile(['l = ' .. v:exiting], 'Xtestout')", ":tabnew", "q:"], 'Xscript', 'bD')
+  call writefile([":au MNVLeave * call writefile(['l = ' .. v:exiting], 'Xtestout')", ":tabnew", "q:"], 'Xscript', 'bD')
 
-  if RunVim([], [], '<Xscript')
+  if RunMNV([], [], '<Xscript')
     call assert_equal(1, v:shell_error)
     call assert_equal(['l = 1'], readfile('Xtestout'))
   endif
@@ -150,4 +150,4 @@ func Test_exit_error_reading_input()
 endfun
 
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_expand.vim b/uvim/src/testdir/test_expand.mnv
index 62bbd92a9e..61b04ecc0e 100644
--- a/uvim/src/testdir/test_expand.vim
+++ b/uvim/src/testdir/test_expand.mnv
@@ -77,9 +77,9 @@ func Test_expandcmd()
   edit Xpandfile4
   let bnum = bufnr('Xpandfile2')
   call assert_equal('e Xpandfile2', expandcmd('e #' . bnum))
-  call setline('.', 'Vim!@#')
-  call assert_equal('e Vim', expandcmd('e <cword>'))
-  call assert_equal('e Vim!@#', expandcmd('e <cWORD>'))
+  call setline('.', 'MNV!@#')
+  call assert_equal('e MNV', expandcmd('e <cword>'))
+  call assert_equal('e MNV!@#', expandcmd('e <cWORD>'))
   enew!
   edit Xpandfile.java
   call assert_equal('e Xpandfile.py', expandcmd('e %:r.py'))
@@ -148,7 +148,7 @@ func Test_source_sfile()
     :qall!
   [SCRIPT]
   call writefile(lines, 'Xscript', 'D')
-  if RunVim([], [], '--clean -s Xscript')
+  if RunMNV([], [], '--clean -s Xscript')
     call assert_equal([
           \ 'E1274: No script file name to substitute for "<script>"',
           \ 'E498: No :source file name to substitute for "<sfile>"'],
@@ -231,4 +231,4 @@ func Test_expand_script_source()
   delfunc F2
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_expand_dllpath.vim b/uvim/src/testdir/test_expand_dllpath.mnv
index 8e489724bd..ac08b79c57 100644
--- a/uvim/src/testdir/test_expand_dllpath.vim
+++ b/uvim/src/testdir/test_expand_dllpath.mnv
@@ -33,4 +33,4 @@ call s:generate_test_if_exists('pythonthreedll')
 call s:generate_test_if_exists('rubydll')
 call s:generate_test_if_exists('tcldll')
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_expand_func.vim b/uvim/src/testdir/test_expand_func.mnv
index a2611e7329..a1652ec8fc 100644
--- a/uvim/src/testdir/test_expand_func.vim
+++ b/uvim/src/testdir/test_expand_func.mnv
@@ -36,17 +36,17 @@ func Test_expand_sflnum()
 endfunc
 
 func Test_expand_sfile_and_stack()
-  call assert_match('test_expand_func\.vim$', s:sfile)
-  let expected = 'script .*testdir/runtest.vim\[\d\+\]\.\.function RunTheTest\[\d\+\]\.\.Test_expand_sfile_and_stack'
+  call assert_match('test_expand_func\.mnv$', s:sfile)
+  let expected = 'script .*testdir/runtest.mnv\[\d\+\]\.\.function RunTheTest\[\d\+\]\.\.Test_expand_sfile_and_stack'
   call assert_match(expected .. '$', expand('<sfile>'))
   call assert_match(expected .. '\[4\]$' , expand('<stack>'))
 
   " Call in script-local function
-  call assert_match('script .*testdir/runtest.vim\[\d\+\]\.\.function RunTheTest\[\d\+\]\.\.Test_expand_sfile_and_stack\[7\]\.\.<SNR>\d\+_expand_sfile$', s:expand_sfile())
+  call assert_match('script .*testdir/runtest.mnv\[\d\+\]\.\.function RunTheTest\[\d\+\]\.\.Test_expand_sfile_and_stack\[7\]\.\.<SNR>\d\+_expand_sfile$', s:expand_sfile())
 
   " Call in command
   command Sfile echo expand('<sfile>')
-  call assert_match('script .*testdir/runtest.vim\[\d\+\]\.\.function RunTheTest\[\d\+\]\.\.Test_expand_sfile_and_stack$', trim(execute('Sfile')))
+  call assert_match('script .*testdir/runtest.mnv\[\d\+\]\.\.function RunTheTest\[\d\+\]\.\.Test_expand_sfile_and_stack$', trim(execute('Sfile')))
   delcommand Sfile
 
   " Use <stack> from sourced script.
@@ -128,22 +128,22 @@ endfunc
 
 " Test for 'wildignore' with expand()
 func Test_expand_wildignore()
-  set wildignore=*.vim
-  call assert_equal('', expand('test_expand_func.vim'))
-  call assert_equal('', expand('test_expand_func.vim', 0))
-  call assert_equal([], expand('test_expand_func.vim', 0, 1))
-  call assert_equal('test_expand_func.vim', expand('test_expand_func.vim', 1))
-  call assert_equal(['test_expand_func.vim'],
-        \ expand('test_expand_func.vim', 1, 1))
+  set wildignore=*.mnv
+  call assert_equal('', expand('test_expand_func.mnv'))
+  call assert_equal('', expand('test_expand_func.mnv', 0))
+  call assert_equal([], expand('test_expand_func.mnv', 0, 1))
+  call assert_equal('test_expand_func.mnv', expand('test_expand_func.mnv', 1))
+  call assert_equal(['test_expand_func.mnv'],
+        \ expand('test_expand_func.mnv', 1, 1))
   call assert_fails("call expand('*', [])", 'E745:')
   set wildignore&
 endfunc
 
-" Passing a long string to expand with 'wildignorecase' should not crash Vim.
+" Passing a long string to expand with 'wildignorecase' should not crash MNV.
 func Test_expand_long_str()
   set wildignorecase
   call expand('a'->repeat(99999))
   set wildignorecase&
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_expr.vim b/uvim/src/testdir/test_expr.mnv
index 70b2bcc1ad..365d4d3f5e 100644
--- a/uvim/src/testdir/test_expr.vim
+++ b/uvim/src/testdir/test_expr.mnv
@@ -1,6 +1,6 @@
 " Tests for expressions.
 
-import './util/vim9.vim' as v9
+import './util/mnv9.mnv' as v9
 
 func Test_equal()
   let base = {}
@@ -64,7 +64,7 @@ func Test_op_ternary()
       call assert_fails('echo [1] ? "yes" : "no"', 'E745:')
       call assert_fails('echo {} ? "yes" : "no"', 'E728:')
   END
-  call v9.CheckLegacyAndVim9Success(lines)
+  call v9.CheckLegacyAndMNV9Success(lines)
 
   call assert_equal('no', 'x' ? 'yes' : 'no')
   call v9.CheckDefAndScriptFailure(["'x' ? 'yes' : 'no'"], 'E1135:')
@@ -105,7 +105,7 @@ func Test_op_falsy()
         call assert_equal(456, test_null_channel() ?? 456)
       endif
   END
-  call v9.CheckLegacyAndVim9Success(lines)
+  call v9.CheckLegacyAndMNV9Success(lines)
 endfunc
 
 func Test_dict()
@@ -125,9 +125,9 @@ func Test_dict()
       LET d[ 'b' ] = 'bbb'
       call assert_equal('bbb', d[ 'b' ])
   END
-  call v9.CheckLegacyAndVim9Success(lines)
+  call v9.CheckLegacyAndMNV9Success(lines)
 
-  call v9.CheckLegacyAndVim9Failure(["VAR i = has_key([], 'a')"], ['E1206:', 'E1013:', 'E1206:'])
+  call v9.CheckLegacyAndMNV9Failure(["VAR i = has_key([], 'a')"], ['E1206:', 'E1013:', 'E1206:'])
 endfunc
 
 func Test_strgetchar()
@@ -140,10 +140,10 @@ func Test_strgetchar()
       call assert_equal(-1, strgetchar('axb', 3))
       call assert_equal(-1, strgetchar('', 0))
   END
-  call v9.CheckLegacyAndVim9Success(lines)
+  call v9.CheckLegacyAndMNV9Success(lines)
 
-  call v9.CheckLegacyAndVim9Failure(["VAR c = strgetchar([], 1)"], ['E730:', 'E1013:', 'E1174:'])
-  call v9.CheckLegacyAndVim9Failure(["VAR c = strgetchar('axb', [])"], ['E745:', 'E1013:', 'E1210:'])
+  call v9.CheckLegacyAndMNV9Failure(["VAR c = strgetchar([], 1)"], ['E730:', 'E1013:', 'E1174:'])
+  call v9.CheckLegacyAndMNV9Failure(["VAR c = strgetchar('axb', [])"], ['E745:', 'E1013:', 'E1210:'])
 endfunc
 
 func Test_strcharpart()
@@ -162,7 +162,7 @@ func Test_strcharpart()
 
       call assert_equal('edit', "editor"[-10 : 3])
   END
-  call v9.CheckLegacyAndVim9Success(lines)
+  call v9.CheckLegacyAndMNV9Success(lines)
 
   call assert_fails('call strcharpart("", 0, 0, {})', ['E728:', 'E728:'])
   call assert_fails('call strcharpart("", 0, 0, -1)', ['E1023:', 'E1023:'])
@@ -177,9 +177,9 @@ func Test_getreg_empty_list()
       call add(x, 'foo')
       call assert_equal(['foo'], y)
   END
-  call v9.CheckLegacyAndVim9Success(lines)
+  call v9.CheckLegacyAndMNV9Success(lines)
 
-  call v9.CheckLegacyAndVim9Failure(['call getreg([])'], ['E730:', 'E1013:', 'E1174:'])
+  call v9.CheckLegacyAndMNV9Failure(['call getreg([])'], ['E730:', 'E1013:', 'E1174:'])
 endfunc
 
 func Test_loop_over_null_list()
@@ -189,7 +189,7 @@ func Test_loop_over_null_list()
         call assert_report('should not get here')
       endfor
   END
-  call v9.CheckLegacyAndVim9Success(lines)
+  call v9.CheckLegacyAndMNV9Success(lines)
 
   let lines =<< trim END
       var nulllist = null_list
@@ -242,12 +242,12 @@ func Test_setreg_null_list()
   let lines =<< trim END
       call setreg('x', test_null_list())
   END
-  call v9.CheckLegacyAndVim9Success(lines)
+  call v9.CheckLegacyAndMNV9Success(lines)
 endfunc
 
 func Test_special_char()
   " The failure is only visible using valgrind.
-  call v9.CheckLegacyAndVim9Failure(['echo "\<C-">'], ['E15:', 'E1004:', 'E1004:'])
+  call v9.CheckLegacyAndMNV9Failure(['echo "\<C-">'], ['E15:', 'E1004:', 'E1004:'])
 endfunc
 
 func Test_method_with_prefix()
@@ -255,7 +255,7 @@ func Test_method_with_prefix()
       call assert_equal(TRUE, !range(5)->empty())
       call assert_equal(FALSE, !-3)
   END
-  call v9.CheckLegacyAndVim9Success(lines)
+  call v9.CheckLegacyAndMNV9Success(lines)
 
   call assert_equal([0, 1, 2], --3->range())
   call v9.CheckDefAndScriptFailure(['eval --3->range()'], 'E15:')
@@ -285,9 +285,9 @@ func Test_option_value()
       call assert_equal("", &cpo)
       set cpo=abcdefgi
       call assert_equal("abcdefgi", &cpo)
-      set cpo&vim
+      set cpo&mnv
   END
-  call v9.CheckLegacyAndVim9Success(lines)
+  call v9.CheckLegacyAndMNV9Success(lines)
 endfunc
 
 func Test_printf_misc()
@@ -478,12 +478,12 @@ func Test_printf_misc()
       call assert_equal('1%', printf('%d%%', 1))
       call assert_notequal('', printf('%p', "abc"))
   END
-  call v9.CheckLegacyAndVim9Success(lines)
+  call v9.CheckLegacyAndMNV9Success(lines)
 
-  call v9.CheckLegacyAndVim9Failure(["call printf('123', 3)"], "E767:")
+  call v9.CheckLegacyAndMNV9Failure(["call printf('123', 3)"], "E767:")
 
   " this was using uninitialized memory
-  call v9.CheckLegacyAndVim9Failure(["eval ''->printf()"], "E119:")
+  call v9.CheckLegacyAndMNV9Failure(["eval ''->printf()"], "E119:")
 endfunc
 
 func Test_printf_float()
@@ -592,26 +592,26 @@ func Test_printf_float()
       call assert_equal('nan', printf('%S', 0.0 / 0.0))
       call assert_equal('nan', printf('%S', -0.0 / 0.0))
   END
-  call v9.CheckLegacyAndVim9Success(lines)
+  call v9.CheckLegacyAndMNV9Success(lines)
 
-  call v9.CheckLegacyAndVim9Failure(['echo printf("%f", "a")'], 'E807:')
+  call v9.CheckLegacyAndMNV9Failure(['echo printf("%f", "a")'], 'E807:')
 endfunc
 
 func Test_printf_errors()
-  call v9.CheckLegacyAndVim9Failure(['echo printf("%d", {})'], 'E728:')
-  call v9.CheckLegacyAndVim9Failure(['echo printf("%d", [])'], 'E745:')
-  call v9.CheckLegacyAndVim9Failure(['echo printf("%d", 1, 2)'], 'E767:')
-  call v9.CheckLegacyAndVim9Failure(['echo printf("%*d", 1)'], 'E766:')
-  call v9.CheckLegacyAndVim9Failure(['echo printf("%s")'], 'E766:')
-  call v9.CheckLegacyAndVim9Failure(['echo printf("%d", 1.2)'], 'E805:')
-  call v9.CheckLegacyAndVim9Failure(['echo printf("%f")'], 'E766:')
+  call v9.CheckLegacyAndMNV9Failure(['echo printf("%d", {})'], 'E728:')
+  call v9.CheckLegacyAndMNV9Failure(['echo printf("%d", [])'], 'E745:')
+  call v9.CheckLegacyAndMNV9Failure(['echo printf("%d", 1, 2)'], 'E767:')
+  call v9.CheckLegacyAndMNV9Failure(['echo printf("%*d", 1)'], 'E766:')
+  call v9.CheckLegacyAndMNV9Failure(['echo printf("%s")'], 'E766:')
+  call v9.CheckLegacyAndMNV9Failure(['echo printf("%d", 1.2)'], 'E805:')
+  call v9.CheckLegacyAndMNV9Failure(['echo printf("%f")'], 'E766:')
 endfunc
 
 func Test_printf_64bit()
   let lines =<< trim END
       call assert_equal("123456789012345", printf('%d', 123456789012345))
   END
-  call v9.CheckLegacyAndVim9Success(lines)
+  call v9.CheckLegacyAndMNV9Success(lines)
 endfunc
 
 func Test_printf_spec_s()
@@ -639,7 +639,7 @@ func Test_printf_spec_s()
       #" partial
       call assert_equal(string(function('printf', ['%s'])), printf('%s', function('printf', ['%s'])))
   END
-  call v9.CheckLegacyAndVim9Success(lines)
+  call v9.CheckLegacyAndMNV9Success(lines)
 endfunc
 
 func Test_printf_spec_b()
@@ -655,14 +655,14 @@ func Test_printf_spec_b()
       call assert_equal("11100000100100010000110000011011101111101111001", printf('%b', 123456789012345))
       call assert_equal("1111111111111111111111111111111111111111111111111111111111111111", printf('%b', -1))
   END
-  call v9.CheckLegacyAndVim9Success(lines)
+  call v9.CheckLegacyAndMNV9Success(lines)
 endfunc
 
 func Test_max_min_errors()
-  call v9.CheckLegacyAndVim9Failure(['call max(v:true)'], ['E712:', 'E1013:', 'E1530:'])
-  call v9.CheckLegacyAndVim9Failure(['call max(v:true)'], ['max()', 'E1013:', 'E1530:'])
-  call v9.CheckLegacyAndVim9Failure(['call min(v:true)'], ['E712:', 'E1013:', 'E1530:'])
-  call v9.CheckLegacyAndVim9Failure(['call min(v:true)'], ['min()', 'E1013:', 'E1530:'])
+  call v9.CheckLegacyAndMNV9Failure(['call max(v:true)'], ['E712:', 'E1013:', 'E1530:'])
+  call v9.CheckLegacyAndMNV9Failure(['call max(v:true)'], ['max()', 'E1013:', 'E1530:'])
+  call v9.CheckLegacyAndMNV9Failure(['call min(v:true)'], ['E712:', 'E1013:', 'E1530:'])
+  call v9.CheckLegacyAndMNV9Failure(['call min(v:true)'], ['min()', 'E1013:', 'E1530:'])
 endfunc
 
 func Test_function_with_funcref()
@@ -686,7 +686,7 @@ func Test_function_with_funcref()
   call v9.CheckScriptSuccess(lines)
 
   let lines =<< trim END
-      vim9script
+      mnv9script
       var F = function('type')
       var Fref = function(F)
       call assert_equal(v:t_string, Fref('x'))
@@ -726,16 +726,16 @@ func Test_funcref()
   call assert_fails('echo test_null_function()->funcref()', 'E475: Invalid argument: NULL')
 endfunc
 
-" Test for calling function() and funcref() outside of a Vim script context.
+" Test for calling function() and funcref() outside of a MNV script context.
 func Test_function_outside_script()
   let cleanup =<< trim END
     call writefile([execute('messages')], 'Xtest.out')
     qall
   END
-  call writefile(cleanup, 'Xverify.vim', 'D')
-  call RunVim([], [], "-c \"echo function('s:abc')\" -S Xverify.vim")
+  call writefile(cleanup, 'Xverify.mnv', 'D')
+  call RunMNV([], [], "-c \"echo function('s:abc')\" -S Xverify.mnv")
   call assert_match('E81: Using <SID> not in a', readfile('Xtest.out')[0])
-  call RunVim([], [], "-c \"echo funcref('s:abc')\" -S Xverify.vim")
+  call RunMNV([], [], "-c \"echo funcref('s:abc')\" -S Xverify.mnv")
   call assert_match('E81: Using <SID> not in a', readfile('Xtest.out')[0])
   call delete('Xtest.out')
 endfunc
@@ -753,9 +753,9 @@ func Test_setmatches()
       eval set->setmatches()
       call assert_equal(exp, getmatches())
   END
-  call v9.CheckLegacyAndVim9Success(lines)
+  call v9.CheckLegacyAndMNV9Success(lines)
 
-  call v9.CheckLegacyAndVim9Failure(['VAR m = setmatches([], [])'], ['E745:', 'E1013:', 'E1210:'])
+  call v9.CheckLegacyAndMNV9Failure(['VAR m = setmatches([], [])'], ['E745:', 'E1013:', 'E1210:'])
 endfunc
 
 func Test_empty_concatenate()
@@ -763,19 +763,19 @@ func Test_empty_concatenate()
       call assert_equal('b', 'a'[4 : 0] .. 'b')
       call assert_equal('b', 'b' .. 'a'[4 : 0])
   END
-  call v9.CheckLegacyAndVim9Success(lines)
+  call v9.CheckLegacyAndMNV9Success(lines)
 endfunc
 
 func Test_broken_number()
-  call v9.CheckLegacyAndVim9Failure(['VAR X = "bad"', 'echo 1X'], 'E15:')
-  call v9.CheckLegacyAndVim9Failure(['VAR X = "bad"', 'echo 0b1X'], 'E15:')
-  call v9.CheckLegacyAndVim9Failure(['echo 0b12'], 'E15:')
-  call v9.CheckLegacyAndVim9Failure(['VAR X = "bad"', 'echo 0x1X'], 'E15:')
-  call v9.CheckLegacyAndVim9Failure(['VAR X = "bad"', 'echo 011X'], 'E15:')
+  call v9.CheckLegacyAndMNV9Failure(['VAR X = "bad"', 'echo 1X'], 'E15:')
+  call v9.CheckLegacyAndMNV9Failure(['VAR X = "bad"', 'echo 0b1X'], 'E15:')
+  call v9.CheckLegacyAndMNV9Failure(['echo 0b12'], 'E15:')
+  call v9.CheckLegacyAndMNV9Failure(['VAR X = "bad"', 'echo 0x1X'], 'E15:')
+  call v9.CheckLegacyAndMNV9Failure(['VAR X = "bad"', 'echo 011X'], 'E15:')
 
-  call v9.CheckLegacyAndVim9Success(['call assert_equal(2, str2nr("2a"))'])
+  call v9.CheckLegacyAndMNV9Success(['call assert_equal(2, str2nr("2a"))'])
 
-  call v9.CheckLegacyAndVim9Failure(['inoremap <Char-0b1z> b'], 'E474:')
+  call v9.CheckLegacyAndMNV9Failure(['inoremap <Char-0b1z> b'], 'E474:')
 endfunc
 
 func Test_eval_after_if()
@@ -866,19 +866,19 @@ func Test_expr_completion()
   call assert_equal("\"echo 'Hello' | cwindow", @:)
 
   " completion for environment variable
-  let $X_VIM_TEST_COMPLETE_ENV = 'foo'
-  call feedkeys(":let $X_VIM_TEST_COMPLETE_E\<C-A>\<C-B>\"\<CR>", 'tx')
-  call assert_match('"let $X_VIM_TEST_COMPLETE_ENV', @:)
-  unlet $X_VIM_TEST_COMPLETE_ENV
+  let $X_MNV_TEST_COMPLETE_ENV = 'foo'
+  call feedkeys(":let $X_MNV_TEST_COMPLETE_E\<C-A>\<C-B>\"\<CR>", 'tx')
+  call assert_match('"let $X_MNV_TEST_COMPLETE_ENV', @:)
+  unlet $X_MNV_TEST_COMPLETE_ENV
 endfunc
 
 " Test for errors in expression evaluation
 func Test_expr_eval_error()
-  call v9.CheckLegacyAndVim9Failure(["VAR i = 'abc' .. []"], ['E730:', 'E1105:', 'E730:'])
-  call v9.CheckLegacyAndVim9Failure(["VAR l = [] + 10"], ['E745:', 'E1051:', 'E745:'])
-  call v9.CheckLegacyAndVim9Failure(["VAR v = 10 + []"], ['E745:', 'E1051:', 'E745:'])
-  call v9.CheckLegacyAndVim9Failure(["VAR v = 10 / []"], ['E745:', 'E1036:', 'E745:'])
-  call v9.CheckLegacyAndVim9Failure(["VAR v = -{}"], ['E728:', 'E1012:', 'E728:'])
+  call v9.CheckLegacyAndMNV9Failure(["VAR i = 'abc' .. []"], ['E730:', 'E1105:', 'E730:'])
+  call v9.CheckLegacyAndMNV9Failure(["VAR l = [] + 10"], ['E745:', 'E1051:', 'E745:'])
+  call v9.CheckLegacyAndMNV9Failure(["VAR v = 10 + []"], ['E745:', 'E1051:', 'E745:'])
+  call v9.CheckLegacyAndMNV9Failure(["VAR v = 10 / []"], ['E745:', 'E1036:', 'E745:'])
+  call v9.CheckLegacyAndMNV9Failure(["VAR v = -{}"], ['E728:', 'E1012:', 'E728:'])
 endfunc
 
 func Test_white_in_function_call()
@@ -914,7 +914,7 @@ func Test_float_compare()
       #" +infinity != -infinity
       call assert_true((1.0 / 0) != -(2.0 / 0))
   END
-  call v9.CheckLegacyAndVim9Success(lines)
+  call v9.CheckLegacyAndMNV9Success(lines)
 endfunc
 
 func Test_string_interp()
@@ -930,7 +930,7 @@ func Test_string_interp()
     #" String conversion.
     call assert_equal('hello from ' .. v:version, $"hello from {v:version}")
     call assert_equal('hello from ' .. v:version, $'hello from {v:version}')
-    #" Paper over a small difference between Vim script behaviour.
+    #" Paper over a small difference between MNV script behaviour.
     call assert_equal(string(v:true), $"{v:true}")
     call assert_equal('(1+1=2)', $"(1+1={1 + 1})")
     #" Hex-escaped opening brace: char2nr('{') == 0x7b
@@ -975,7 +975,7 @@ func Test_string_interp()
     call assert_fails('echo $"{}"', 'E15:')
     call assert_fails('echo $"{   }"', 'E15:')
   END
-  call v9.CheckLegacyAndVim9Success(lines)
+  call v9.CheckLegacyAndMNV9Success(lines)
 
   let lines =<< trim END
     call assert_equal('5', $"{({x -> x + 1})(4)}")
@@ -1036,18 +1036,18 @@ func Test_bitwise_shift()
     call assert_equal(4, 64 >> 2 >> 2)
     call assert_true(1 << 2 << 2 == 256 >> 2 >> 2)
   END
-  call v9.CheckLegacyAndVim9Success(lines)
-
-  call v9.CheckLegacyAndVim9Failure(['VAR v = 2 << -1'], ['E1283:', 'E1283:', 'E1283:'])
-  call v9.CheckLegacyAndVim9Failure(['VAR a = 2', 'VAR b = -1', 'VAR v = a << b'], ['E1283:', 'E1283:', 'E1283:'])
-  call v9.CheckLegacyAndVim9Failure(['VAR v = "8" >> 2'], ['E1282:', 'E1282:', 'E1282:'])
-  call v9.CheckLegacyAndVim9Failure(['VAR v = 1 << "2"'], ['E1282:', 'E1282:', 'E1282:'])
-  call v9.CheckLegacyAndVim9Failure(['VAR a = "8"', 'VAR b = 2', 'VAR v = a << b'], ['E1282:', 'E1012:', 'E1282:'])
-  call v9.CheckLegacyAndVim9Failure(['VAR a = 8', 'VAR b = "2"', 'VAR v = a >> b'], ['E1282:', 'E1012:', 'E1282:'])
-  call v9.CheckLegacyAndVim9Failure(['VAR v = ![] << 1'], ['E745:', 'E1012:', 'E1282:'])
-  call v9.CheckLegacyAndVim9Failure(['VAR v = 1 << ![]'], ['E745:', 'E1012:', 'E1282:'])
-  call v9.CheckLegacyAndVim9Failure(['VAR v = ![] >> 1'], ['E745:', 'E1012:', 'E1282:'])
-  call v9.CheckLegacyAndVim9Failure(['VAR v = 1 >> ![]'], ['E745:', 'E1012:', 'E1282:'])
+  call v9.CheckLegacyAndMNV9Success(lines)
+
+  call v9.CheckLegacyAndMNV9Failure(['VAR v = 2 << -1'], ['E1283:', 'E1283:', 'E1283:'])
+  call v9.CheckLegacyAndMNV9Failure(['VAR a = 2', 'VAR b = -1', 'VAR v = a << b'], ['E1283:', 'E1283:', 'E1283:'])
+  call v9.CheckLegacyAndMNV9Failure(['VAR v = "8" >> 2'], ['E1282:', 'E1282:', 'E1282:'])
+  call v9.CheckLegacyAndMNV9Failure(['VAR v = 1 << "2"'], ['E1282:', 'E1282:', 'E1282:'])
+  call v9.CheckLegacyAndMNV9Failure(['VAR a = "8"', 'VAR b = 2', 'VAR v = a << b'], ['E1282:', 'E1012:', 'E1282:'])
+  call v9.CheckLegacyAndMNV9Failure(['VAR a = 8', 'VAR b = "2"', 'VAR v = a >> b'], ['E1282:', 'E1012:', 'E1282:'])
+  call v9.CheckLegacyAndMNV9Failure(['VAR v = ![] << 1'], ['E745:', 'E1012:', 'E1282:'])
+  call v9.CheckLegacyAndMNV9Failure(['VAR v = 1 << ![]'], ['E745:', 'E1012:', 'E1282:'])
+  call v9.CheckLegacyAndMNV9Failure(['VAR v = ![] >> 1'], ['E745:', 'E1012:', 'E1282:'])
+  call v9.CheckLegacyAndMNV9Failure(['VAR v = 1 >> ![]'], ['E745:', 'E1012:', 'E1282:'])
   call v9.CheckDefAndScriptFailure(['echo 1<< 2'], ['E1004:', 'E1004:'])
   call v9.CheckDefAndScriptFailure(['echo 1 <<2'], ['E1004:', 'E1004:'])
   call v9.CheckDefAndScriptFailure(['echo 1>> 2'], ['E1004:', 'E1004:'])
@@ -1063,7 +1063,7 @@ func Test_bitwise_shift()
 
   " Error in the second expression of "<<"
   let lines =<< trim END
-    vim9script
+    mnv9script
     def Fn()
       var x = 1 << y
     enddef
@@ -1116,4 +1116,4 @@ func Test_bitwise_shift()
   call assert_equal(64, MultBy2_A()(32))
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_expr_utf8.vim b/uvim/src/testdir/test_expr_utf8.mnv
index c6d2e4ed7e..d730f92897 100644
--- a/uvim/src/testdir/test_expr_utf8.vim
+++ b/uvim/src/testdir/test_expr_utf8.mnv
@@ -41,4 +41,4 @@ func Test_strcharpart()
   call assert_fails("let v = strcharpart('abc', 0, 0, 2)", 'E1023:')
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_file_perm.vim b/uvim/src/testdir/test_file_perm.mnv
index 69e0e6916d..8ea0f6adbf 100644
--- a/uvim/src/testdir/test_file_perm.vim
+++ b/uvim/src/testdir/test_file_perm.mnv
@@ -26,4 +26,4 @@ func Test_file_perm()
   call assert_fails("call setfperm('Xpermfile', 'rwxrwxrwxrw')", 'E475:')
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_file_size.vim b/uvim/src/testdir/test_file_size.mnv
index ae15d1a94c..1fed5d7188 100644
--- a/uvim/src/testdir/test_file_size.vim
+++ b/uvim/src/testdir/test_file_size.mnv
@@ -56,4 +56,4 @@ func Test_File_Read_Write()
   call delete("Xtest")
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_filechanged.vim b/uvim/src/testdir/test_filechanged.mnv
index 36503cfba0..d1d61edfca 100644
--- a/uvim/src/testdir/test_filechanged.vim
+++ b/uvim/src/testdir/test_filechanged.mnv
@@ -1,4 +1,4 @@
-" Tests for when a file was changed outside of Vim.
+" Tests for when a file was changed outside of MNV.
 
 func Test_FileChangedShell_reload()
   CheckUnix
@@ -302,4 +302,4 @@ func Test_file_changed_wipeout()
   %bw!
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_filecopy.vim b/uvim/src/testdir/test_filecopy.mnv
index 956f3d7180..4029866373 100644
--- a/uvim/src/testdir/test_filecopy.vim
+++ b/uvim/src/testdir/test_filecopy.mnv
@@ -66,4 +66,4 @@ func Test_copy_fails()
   call assert_fails('call filecopy(0z, "Xfilecopy")', 'E1174:')
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_fileformat.vim b/uvim/src/testdir/test_fileformat.mnv
index a5687f9fbf..fd8046f9c3 100644
--- a/uvim/src/testdir/test_fileformat.vim
+++ b/uvim/src/testdir/test_fileformat.mnv
@@ -308,18 +308,18 @@ func Test_fileformat_plusplus_read()
   call assert_fails('e ++abc1 Xfile1', 'E474:')
 endfunc
 
-" When Vim starts up with an empty buffer the first item in 'fileformats' is
+" When MNV starts up with an empty buffer the first item in 'fileformats' is
 " used as the 'fileformat'.
 func Test_fileformat_on_startup()
   let after =<< trim END
     call writefile([&fileformat], 'Xonsfile', 'a')
     quit
   END
-  call RunVim(["set ffs=dos,unix,mac"], after, '')
-  call RunVim(["set ffs=mac,dos,unix"], after, '')
-  call RunVim(["set ffs=unix,mac,dos"], after, '')
+  call RunMNV(["set ffs=dos,unix,mac"], after, '')
+  call RunMNV(["set ffs=mac,dos,unix"], after, '')
+  call RunMNV(["set ffs=unix,mac,dos"], after, '')
   call assert_equal(['dos', 'mac', 'unix'], readfile('Xonsfile'))
   call delete('Xonsfile')
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_filetype.vim b/uvim/src/testdir/test_filetype.mnv
index e24471b6f2..1c05db5d59 100644
--- a/uvim/src/testdir/test_filetype.vim
+++ b/uvim/src/testdir/test_filetype.mnv
@@ -1,8 +1,8 @@
 " Test :setfiletype
 
-" Make VIMRUNTIME and &rtp absolute.
+" Make MNVRUNTIME and &rtp absolute.
 " Otherwise, a :lcd inside a test would break the relative ../../runtime path.
-let $VIMRUNTIME = fnamemodify($VIMRUNTIME, ':p')
+let $MNVRUNTIME = fnamemodify($MNVRUNTIME, ':p')
 let &rtp = join(map(split(&rtp, ','), 'fnamemodify(v:val, ":p")'), ',')
 
 func Test_backup_strip()
@@ -21,8 +21,8 @@ func Test_detection()
   augroup filetypedetect
     au BufNewFile,BufRead *	call assert_equal(1, did_filetype())
   augroup END
-  new something.vim
-  call assert_equal('vim', &filetype)
+  new something.mnv
+  call assert_equal('mnv', &filetype)
 
   bwipe!
   filetype off
@@ -949,8 +949,8 @@ def s:GetFilenameChecks(): dict<list<string>>
     vgrindefs: ['vgrindefs'],
     vhdl: ['file.hdl', 'file.vhd', 'file.vhdl', 'file.vbe', 'file.vst', 'file.vhdl_123', 'file.vho', 'some.vhdl_1', 'some.vhdl_1-file'],
     vhs: ['file.tape'],
-    vim: ['file.vim', '.exrc', '_exrc', 'some-vimrc', 'some-vimrc-file', 'vimrc', 'vimrc-file', '.netrwhist'],
-    viminfo: ['.viminfo', '_viminfo'],
+    mnv: ['file.mnv', '.exrc', '_exrc', 'some-mnvrc', 'some-mnvrc-file', 'mnvrc', 'mnvrc-file', '.netrwhist'],
+    mnvinfo: ['.mnvinfo', '_mnvinfo'],
     vmasm: ['file.mar'],
     voscm: ['file.cm'],
     vrml: ['file.wrl'],
@@ -1065,7 +1065,7 @@ def s:GetFalsePositiveChecks(): dict<list<list<string>>>
       }
 enddef
 
-" Filetypes detected from the file contents by scripts.vim
+" Filetypes detected from the file contents by scripts.mnv
 def s:GetScriptChecks(): dict<list<list<string>>>
   return {
     virata: [['% Virata'],
@@ -1142,7 +1142,7 @@ def s:GetScriptChecks(): dict<list<list<string>>>
     janet:  [['#!/path/janet']],
     dart:   [['#!/path/dart']],
     bpftrace:  [['#!/path/bpftrace']],
-    vim:    [['#!/path/vim']],
+    mnv:    [['#!/path/mnv']],
   }
 enddef
 
@@ -1202,7 +1202,7 @@ endfunc
 
 " Test for ':filetype indent on' and ':filetype indent off' commands
 func Test_filetype_indent_off()
-  new Xtest.vim
+  new Xtest.mnv
   filetype indent on
   call assert_equal(1, g:did_indent_on)
   call assert_equal(['filetype detection:ON  plugin:OFF  indent:ON'],
@@ -1221,22 +1221,22 @@ func Test_undo_ftplugin_on_buffer_reuse()
   let b:undo_ftplugin = ":let g:var='exists'"
   let g:bufnr = bufnr('%')
   " no changes done to the buffer, so the buffer will be re-used
-  e $VIMRUNTIME/defaults.vim
+  e $MNVRUNTIME/defaults.mnv
   call assert_equal(g:bufnr, bufnr('%'))
   call assert_equal('exists', get(g:, 'var', 'fail'))
   unlet! g:bufnr g:var
 
   " try to wipe the buffer
   enew
-  bw defaults.vim
+  bw defaults.mnv
   let b:undo_ftplugin = ':bw'
-  call assert_fails(':e $VIMRUNTIME/defaults.vim', 'E937:')
+  call assert_fails(':e $MNVRUNTIME/defaults.mnv', 'E937:')
 
   " try to split the window
   enew
-  bw defaults.vim
-  let b:undo_ftplugin = ':sp $VIMRUNTIME/defaults.vim'
-  call assert_fails(':e $VIMRUNTIME/defaults.vim', 'E242:')
+  bw defaults.mnv
+  let b:undo_ftplugin = ':sp $MNVRUNTIME/defaults.mnv'
+  call assert_fails(':e $MNVRUNTIME/defaults.mnv', 'E242:')
 
   bwipe!
   filetype off
@@ -1827,20 +1827,20 @@ func Test_help_file()
   filetype on
   call assert_true(mkdir('doc', 'pR'))
 
-  call writefile(['some text', 'vim:ft=help:'], 'doc/help.txt', 'D')
+  call writefile(['some text', 'mnv:ft=help:'], 'doc/help.txt', 'D')
   call s:Check_help_with_iskeyword('doc/help.txt')
 
-  call writefile(['some text', 'Copyright: |manual-copyright| vim:ft=help:'],
+  call writefile(['some text', 'Copyright: |manual-copyright| mnv:ft=help:'],
         \ 'doc/help1.txt', 'D')
   call s:Check_help_with_iskeyword('doc/help1.txt')
 
-  call writefile(['some text', 'vim:noet:ft=help:'], 'doc/help2.txt', 'D')
+  call writefile(['some text', 'mnv:noet:ft=help:'], 'doc/help2.txt', 'D')
   call s:Check_help_with_iskeyword('doc/help2.txt')
 
-  call writefile(['some text', 'vim: noet ft=help'], 'doc/help3.txt', 'D')
+  call writefile(['some text', 'mnv: noet ft=help'], 'doc/help3.txt', 'D')
   call s:Check_help_with_iskeyword('doc/help3.txt')
 
-  call writefile(['some text', 'vim: ft=help noet'], 'doc/help4.txt', 'D')
+  call writefile(['some text', 'mnv: ft=help noet'], 'doc/help4.txt', 'D')
   call s:Check_help_with_iskeyword('doc/help4.txt')
 
   call writefile(['some text'], 'doc/nothelp.txt', 'D')
@@ -1848,7 +1848,7 @@ func Test_help_file()
   call assert_notequal('help', &filetype)
   bwipe!
 
-  call writefile(['some text', '`vim:ft=help`'], 'doc/nothelp1.txt', 'D')
+  call writefile(['some text', '`mnv:ft=help`'], 'doc/nothelp1.txt', 'D')
   split doc/nothelp1.txt
   call assert_notequal('help', &filetype)
   bwipe!
@@ -2268,7 +2268,7 @@ func Test_sc_file()
   filetype on
 
   " SC classes are defined with '+ Class {}'
-  call writefile(['+ SCNvim {', '*methodArgs {|method|'], 'srcfile.sc')
+  call writefile(['+ SCNmnv {', '*methodArgs {|method|'], 'srcfile.sc')
   split srcfile.sc
   call assert_equal('supercollider', &filetype)
   bwipe!
@@ -3042,11 +3042,11 @@ func Test_vba_file()
   call assert_equal('vb', &filetype)
   bwipe!
 
-  " Vimball Archiver (ft=vim)
+  " MNVball Archiver (ft=mnv)
 
-  call writefile(['" Vimball Archiver by Charles E. Campbell, Ph.D.', 'UseVimball', 'finish'], 'Xfile.vba', 'D')
+  call writefile(['" MNVball Archiver by Charles E. Campbell, Ph.D.', 'UseMNVball', 'finish'], 'Xfile.vba', 'D')
   split Xfile.vba
-  call assert_equal('vim', &filetype)
+  call assert_equal('mnv', &filetype)
   bwipe!
 
   filetype off
@@ -3235,13 +3235,13 @@ func Test_make_file()
   call assert_equal('gnu', get(b:, 'make_flavor', ''))
   bwipe!
 
-  call writefile(['vim := $(wildcard *.vim)'], 'XMakefile.mak', 'D')
+  call writefile(['mnv := $(wildcard *.mnv)'], 'XMakefile.mak', 'D')
   split XMakefile.mak
   call assert_equal('gnu', get(b:, 'make_flavor', ''))
   bwipe!
 
   " Microsoft Makefile
-  call writefile(['# Makefile for Windows', '!if "$(VIMDLL)" == "yes"'], 'XMakefile.mak', 'D')
+  call writefile(['# Makefile for Windows', '!if "$(MNVDLL)" == "yes"'], 'XMakefile.mak', 'D')
   split XMakefile.mak
   call assert_equal('microsoft', get(b:, 'make_flavor', ''))
   bwipe!
@@ -3276,7 +3276,7 @@ endfunc
 func Test_nroff_file()
   filetype on
 
-  call writefile(['.TH VIM 1 "YYYY Mth DD"'], 'Xfile.1', 'D')
+  call writefile(['.TH MNV 1 "YYYY Mth DD"'], 'Xfile.1', 'D')
   split Xfile.1
   call assert_equal('nroff', &filetype)
   bwipe!
@@ -3413,4 +3413,4 @@ func Test_app_file()
   filetype off
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_filter_cmd.vim b/uvim/src/testdir/test_filter_cmd.mnv
index 4edcb6636a..71dab052cb 100644
--- a/uvim/src/testdir/test_filter_cmd.vim
+++ b/uvim/src/testdir/test_filter_cmd.mnv
@@ -122,9 +122,9 @@ func Test_filter_commands()
   let &helplang=helplang
 
   " Test filtering :llist command
-  call setloclist(0, [{"filename": "/path/vim.c"}, {"filename": "/path/vim.h"}, {"module": "Main.Test"}])
+  call setloclist(0, [{"filename": "/path/mnv.c"}, {"filename": "/path/mnv.h"}, {"module": "Main.Test"}])
   let res = split(execute("filter /\\.c$/ llist"), "\n")
-  call assert_equal([" 1 /path/vim.c:  "], res)
+  call assert_equal([" 1 /path/mnv.c:  "], res)
 
   let res = split(execute("filter /\\.Test$/ llist"), "\n")
   call assert_equal([" 3 Main.Test:  "], res)
@@ -194,4 +194,4 @@ func Test_filter_scriptnames()
   call assert_match('filter_cmd', lines[0])
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_filter_map.vim b/uvim/src/testdir/test_filter_map.mnv
index d3f8327e88..542985ffa3 100644
--- a/uvim/src/testdir/test_filter_map.vim
+++ b/uvim/src/testdir/test_filter_map.mnv
@@ -1,6 +1,6 @@
 " Test filter() and map()
 
-import './util/vim9.vim' as v9
+import './util/mnv9.mnv' as v9
 
 " list with expression string
 func Test_filter_map_list_expr_string()
@@ -266,7 +266,7 @@ func Test_foreach_blob()
     call assert_equal(0z0001020304, foreach(0z0001020304, 'call add(g:test_variable, v:val)'))
     call assert_equal([0, 1, 2, 3, 4], g:test_variable)
   END
-  call v9.CheckLegacyAndVim9Success(lines)
+  call v9.CheckLegacyAndMNV9Success(lines)
 
   func! s:foreach1(index, val) abort
     call add(g:test_variable, a:val)
@@ -311,7 +311,7 @@ func Test_filter_map_string()
     call assert_equal('', filter('', "v:val == 'a'"))
     call assert_equal('', filter(test_null_string(), "v:val == 'a'"))
   END
-  call v9.CheckLegacyAndVim9Success(lines)
+  call v9.CheckLegacyAndMNV9Success(lines)
 
   " map()
   let lines =<< trim END
@@ -330,7 +330,7 @@ func Test_filter_map_string()
     call assert_fails('echo map("abc", "10")', 'E928:')
     call assert_fails('echo map("abc", "a10")', 'E121:')
   END
-  call v9.CheckLegacyAndVim9Success(lines)
+  call v9.CheckLegacyAndMNV9Success(lines)
 
   " mapnew()
   let lines =<< trim END
@@ -347,7 +347,7 @@ func Test_filter_map_string()
     call assert_equal('', mapnew('', "v:val == 'a'"))
     call assert_equal('', mapnew(test_null_string(), "v:val == 'a'"))
   END
-  call v9.CheckLegacyAndVim9Success(lines)
+  call v9.CheckLegacyAndMNV9Success(lines)
 
   " foreach()
   let lines =<< trim END
@@ -360,7 +360,7 @@ func Test_filter_map_string()
     call assert_equal(s, foreach(s, 'call add(g:test_variable, v:val)'))
     call assert_equal(['�', 'i', '�', '�', '�'], g:test_variable)
   END
-  call v9.CheckLegacyAndVim9Success(lines)
+  call v9.CheckLegacyAndMNV9Success(lines)
   func! s:foreach1(index, val) abort
     call add(g:test_variable, a:val)
     return [ 11, 12, 13, 14 ]
@@ -404,7 +404,7 @@ func Test_filter_map_string()
     call assert_equal('@ström', map('Åström', LSTART i, x LMIDDLE x =~ nr2char(0xc5) .. '\%C' ? '@' : x LEND))
     call assert_equal('Åstr@m', map('Åström', LSTART i, x LMIDDLE x =~ nr2char(0xf6) .. '\%C' ? '@' : x LEND))
   END
-  call v9.CheckLegacyAndVim9Success(lines)
+  call v9.CheckLegacyAndMNV9Success(lines)
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_find_complete.vim b/uvim/src/testdir/test_find_complete.mnv
index 079fb78043..3e75e6b69e 100644
--- a/uvim/src/testdir/test_find_complete.vim
+++ b/uvim/src/testdir/test_find_complete.mnv
@@ -161,4 +161,4 @@ func Test_find_complete()
   set path&
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_findfile.vim b/uvim/src/testdir/test_findfile.mnv
index 42c3fb6431..1fd6c7b69b 100644
--- a/uvim/src/testdir/test_findfile.vim
+++ b/uvim/src/testdir/test_findfile.mnv
@@ -1,6 +1,6 @@
 " Test findfile() and finddir()
 
-import './util/vim9.vim' as v9
+import './util/mnv9.mnv' as v9
 
 let s:files = [ 'Xfinddir1/foo',
       \         'Xfinddir1/bar',
@@ -755,7 +755,7 @@ func Test_findfunc_callback()
   call assert_equal(['abc19', v:false], g:FindFunc2Args)
   delfunc s:FindFunc2
 
-  " Using Vim9 lambda expression in legacy context should fail
+  " Using MNV9 lambda expression in legacy context should fail
   set findfunc=(pat,\ cmdexpand)\ =>\ FindFunc1(pat,\ v:false)
   let g:FindFunc1Args = []
   call assert_fails('find abc20', 'E117:')
@@ -780,17 +780,17 @@ func Test_findfunc_callback()
     return ['findfunc2']
   endfunc
 
-  " Vim9 tests
+  " MNV9 tests
   let lines =<< trim END
-    vim9script
+    mnv9script
 
-    def g:Vim9findFunc(pat: string, cmdexpand: bool): list<string>
+    def g:MNV9findFunc(pat: string, cmdexpand: bool): list<string>
       g:FindFunc1Args = [pat, cmdexpand]
-      return ['vim9findfunc']
+      return ['mnv9findfunc']
     enddef
 
     # Test for using a def function with findfunc
-    set findfunc=function('g:Vim9findFunc')
+    set findfunc=function('g:MNV9findFunc')
     g:FindFunc1Args = []
     find abc21
     assert_equal(['abc21', false], g:FindFunc1Args)
@@ -821,8 +821,8 @@ func Test_findfunc_callback()
     call writefile([execute('messages')], 'Xtest.out')
     qall
   END
-  call writefile(cleanup, 'Xverify.vim', 'D')
-  call RunVim([], [], "-c \"set findfunc=s:abc\" -S Xverify.vim")
+  call writefile(cleanup, 'Xverify.mnv', 'D')
+  call RunMNV([], [], "-c \"set findfunc=s:abc\" -S Xverify.mnv")
   call assert_match('E81: Using <SID> not in a', readfile('Xtest.out')[0])
   call delete('Xtest.out')
 
@@ -866,4 +866,4 @@ func Test_path_env_variable_with_whitespaces()
     enew
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_fixeol.vim b/uvim/src/testdir/test_fixeol.mnv
index 41d47d6a06..7dd7ef854b 100644
--- a/uvim/src/testdir/test_fixeol.vim
+++ b/uvim/src/testdir/test_fixeol.mnv
@@ -115,4 +115,4 @@ func Test_eof()
   enew!
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_flatten.vim b/uvim/src/testdir/test_flatten.mnv
index a79014de5a..9d8d83cf5b 100644
--- a/uvim/src/testdir/test_flatten.vim
+++ b/uvim/src/testdir/test_flatten.mnv
@@ -106,4 +106,4 @@ func Test_flattennew()
   call assert_equal([1, 11, 101, 1001], flattennew(l4))
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_float_func.vim b/uvim/src/testdir/test_float_func.mnv
index db08dd5014..6e6c50035a 100644
--- a/uvim/src/testdir/test_float_func.vim
+++ b/uvim/src/testdir/test_float_func.mnv
@@ -1,6 +1,6 @@
 " test float functions
 
-import './util/vim9.vim' as v9
+import './util/mnv9.mnv' as v9
 
 func Test_abs()
   call assert_equal('1.23', string(abs(1.23)))
@@ -260,7 +260,7 @@ def Test_float_quotes()
 enddef
 
 func Test_float_quotes_from_legacy()
-  call assert_equal("\n123456.789", execute("vim9 echo 12'34'56.789"))
+  call assert_equal("\n123456.789", execute("mnv9 echo 12'34'56.789"))
 endfunc
 
 func Test_float2nr()
@@ -385,4 +385,4 @@ func Test_float_misc()
   call assert_equal('[-123.4, 2.0e-20]', string([-123.4, 2.0e-20]))
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_fnameescape.vim b/uvim/src/testdir/test_fnameescape.mnv
index e24d64dcf9..3e7bd82408 100644
--- a/uvim/src/testdir/test_fnameescape.vim
+++ b/uvim/src/testdir/test_fnameescape.mnv
@@ -24,4 +24,4 @@ func Test_fnameescape()
   call assert_equal('\>', fnameescape('>'))
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_fnamemodify.vim b/uvim/src/testdir/test_fnamemodify.mnv
index 4e61343fa4..b10305926e 100644
--- a/uvim/src/testdir/test_fnamemodify.vim
+++ b/uvim/src/testdir/test_fnamemodify.mnv
@@ -55,9 +55,9 @@ func Test_fnamemodify()
   call assert_equal('''abc"%"def''', fnamemodify('abc"%"def', ':S'))
   call assert_equal('''abc''\'''' ''\''''def''', fnamemodify('abc'' ''def', ':S'))
   call assert_equal('''abc''\''''%''\''''def''', fnamemodify('abc''%''def', ':S'))
-  sp test_alot.vim
+  sp test_alot.mnv
   call assert_equal(expand('%:r:S'), shellescape(expand('%:r')))
-  call assert_equal('test_alot,''test_alot'',test_alot.vim', join([expand('%:r'), expand('%:r:S'), expand('%')], ','))
+  call assert_equal('test_alot,''test_alot'',test_alot.mnv', join([expand('%:r'), expand('%:r:S'), expand('%')], ','))
   quit
 
   call assert_equal("'abc\ndef'", fnamemodify("abc\ndef", ':S'))
@@ -105,4 +105,4 @@ func Test_fnamemodify_fail()
   call assert_fails('call fnamemodify("x", {})', 'E731:')
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_fold.vim b/uvim/src/testdir/test_fold.mnv
index c377a95737..b8a89739f0 100644
--- a/uvim/src/testdir/test_fold.vim
+++ b/uvim/src/testdir/test_fold.mnv
@@ -1,6 +1,6 @@
 " Test for folding
 
-source util/screendump.vim
+source util/screendump.mnv
 
 func PrepIndent(arg)
   return [a:arg] + repeat(["\t".a:arg], 5)
@@ -386,7 +386,7 @@ endfunc
 func Test_foldexpr_compiled()
   new
   let lines =<< trim END
-      vim9script
+      mnv9script
       def FoldFunc(): number
         return v:lnum
       enddef
@@ -922,7 +922,7 @@ func Test_foldopen_exception()
   catch
     let a = matchstr(v:exception,'^[^ ]*')
   endtry
-  call assert_equal('Vim(foldopen):E490:', a)
+  call assert_equal('MNV(foldopen):E490:', a)
 
   let a = 'No error caught'
   try
@@ -965,14 +965,14 @@ func Test_folds_with_rnu()
 	\ 'set fdm=marker rnu foldcolumn=2',
 	\ 'call setline(1, ["{{{1", "nline 1", "{{{1", "line 2"])',
 	\ ], 'Xtest_folds_with_rnu', 'D')
-  let buf = RunVimInTerminal('-S Xtest_folds_with_rnu', {})
+  let buf = RunMNVInTerminal('-S Xtest_folds_with_rnu', {})
 
   call VerifyScreenDump(buf, 'Test_folds_with_rnu_01', {})
   call term_sendkeys(buf, "j")
   call VerifyScreenDump(buf, 'Test_folds_with_rnu_02', {})
 
   " clean up
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_folds_marker_in_comment2()
@@ -1109,7 +1109,7 @@ func Test_undo_fold_deletion()
   redo
   eval getline(1, '$')->assert_equal([''])
 
-  set fdm&vim
+  set fdm&mnv
   bwipe!
 endfunc
 
@@ -1420,7 +1420,7 @@ func Test_foldclose_opt()
   END
   call writefile(lines, 'Xscript', 'D')
   let rows = 10
-  let buf = RunVimInTerminal('-S Xscript', {'rows': rows})
+  let buf = RunMNVInTerminal('-S Xscript', {'rows': rows})
   call term_wait(buf)
   call term_sendkeys(buf, ":set noruler\n")
   call term_wait(buf)
@@ -1443,7 +1443,7 @@ func Test_foldclose_opt()
   call WaitForAssert({-> assert_equal('four', term_getline(buf, 3))})
 
   " clean up
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 
   call assert_equal(['[-1,2,2,-1]', '[-1,-1,-1,-1]', '[-1,2,2,-1]',
         \ '[-1,-1,-1,-1]', '[-1,2,2,-1]'], readfile('Xoutput'))
@@ -1477,7 +1477,7 @@ endfunc
 func Test_foldtext_and_fillchars_rightleft()
   CheckFeature rightleft
   CheckScreendump
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   let script_lines =<< trim END
     let longtext = 'Lorem ipsum dolor sit amet, consectetur adipiscing'
@@ -1490,14 +1490,14 @@ func Test_foldtext_and_fillchars_rightleft()
     set noshowmode noshowcmd
   END
   call writefile(script_lines, 'XTest_foldtext_and_fillchars_rightleft', 'D')
-  let buf = RunVimInTerminal('-S XTest_foldtext_and_fillchars_rightleft', {'rows': 5, 'cols': 70})
+  let buf = RunMNVInTerminal('-S XTest_foldtext_and_fillchars_rightleft', {'rows': 5, 'cols': 70})
 
   call VerifyScreenDump(buf, 'Test_foldtext_and_fillchars_rightleft_01', {})
   call term_sendkeys(buf, ":call setline(1, [g:multibyte, g:multibyte, g:multibyte])\<CR>")
   call VerifyScreenDump(buf, 'Test_foldtext_and_fillchars_rightleft_02', {})
 
   " clean up
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 " Test for foldtextresult() with 'rightleft' enabled
@@ -1726,7 +1726,7 @@ func Test_foldtext_in_modeline()
     func T()
       let i = 1
     endfunc
-    " vim: foldenable foldtext=ModelineFoldText()
+    " mnv: foldenable foldtext=ModelineFoldText()
   END
   call writefile(lines, 'Xmodelinefoldtext', 'D')
 
@@ -1811,7 +1811,7 @@ func Test_foldexpr_in_modeline()
       ccc
      bbb
     aaa
-    " vim: foldenable foldmethod=expr foldexpr=ModelineFoldExpr()
+    " mnv: foldenable foldmethod=expr foldexpr=ModelineFoldExpr()
   END
   call writefile(lines, 'Xmodelinefoldexpr', 'D')
 
@@ -2010,7 +2010,8 @@ func Test_indent_with_L_command()
   " The "L" command moved the cursor to line zero, causing the text saved for
   " undo to use line number -1, which caused trouble for undo later.
   new
-  sil! norm 8R
V{zf8=Lu
+  sil! norm 8R
+V{zf8=Lu
   bwipe!
 endfunc
 
@@ -2105,4 +2106,4 @@ func Test_cursor_fold_marker_undo()
   bwipe!
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_format.vim b/uvim/src/testdir/test_format.mnv
index b7c8b121a4..360c1fecb3 100644
--- a/uvim/src/testdir/test_format.vim
+++ b/uvim/src/testdir/test_format.mnv
@@ -1,6 +1,6 @@
 " Tests for expressions.
 
-import './util/vim9.vim' as v9
+import './util/mnv9.mnv' as v9
 
 func Test_printf_pos_misc()
   let lines =<< trim END
@@ -102,7 +102,7 @@ func Test_printf_pos_misc()
       call assert_equal('9 hi 7654321', printf('%2$ld %1$s %3$lu', "hi", 9, 7654321))
       call assert_equal('9 0.000000e+00 7654321', printf('%2$ld %1$e %3$lu', 0.0, 9, 7654321))
   END
-  call v9.CheckLegacyAndVim9Success(lines)
+  call v9.CheckLegacyAndMNV9Success(lines)
 
 endfunc
 
@@ -224,131 +224,131 @@ func Test_printf_pos_float()
       call assert_equal('nan', printf('%1$S', 0.0 / 0.0))
       call assert_equal('nan', printf('%1$S', -0.0 / 0.0))
   END
-  call v9.CheckLegacyAndVim9Success(lines)
+  call v9.CheckLegacyAndMNV9Success(lines)
 endfunc
 
 func Test_printf_pos_errors()
-  call v9.CheckLegacyAndVim9Failure(['echo printf("%1$d", {})'], 'E728:')
-  call v9.CheckLegacyAndVim9Failure(['echo printf("%1$d", [])'], 'E745:')
-  call v9.CheckLegacyAndVim9Failure(['echo printf("%1$d", 1, 2)'], 'E767:')
-  call v9.CheckLegacyAndVim9Failure(['echo printf("%*d", 1)'], 'E766:')
-  call v9.CheckLegacyAndVim9Failure(['echo printf("%1$s")'], 'E1503:')
-  call v9.CheckLegacyAndVim9Failure(['echo printf("%1$d", 1.2)'], 'E805:')
-  call v9.CheckLegacyAndVim9Failure(['echo printf("%1$f")'], 'E1503:')
-
-  call v9.CheckLegacyAndVim9Failure(['echo printf("%f", "a")'], 'E807:')
-
-  call v9.CheckLegacyAndVim9Failure(["call printf('%1$d%2$d', 1, 3, 4)"], "E767:")
-
-  call v9.CheckLegacyAndVim9Failure(["call printf('%2$d%d', 1, 3)"], "E1500:")
-  call v9.CheckLegacyAndVim9Failure(["call printf('%d%2$d', 1, 3)"], "E1500:")
-  call v9.CheckLegacyAndVim9Failure(["call printf('%2$*1$d%d', 1, 3)"], "E1500:")
-  call v9.CheckLegacyAndVim9Failure(["call printf('%d%2$*1$d', 1, 3)"], "E1500:")
-  call v9.CheckLegacyAndVim9Failure(["call printf('%2$.*1$d%d', 1, 3)"], "E1500:")
-  call v9.CheckLegacyAndVim9Failure(["call printf('%d%2$.*1$d', 1, 3)"], "E1500:")
-  call v9.CheckLegacyAndVim9Failure(["call printf('%1$%')"], "E1500:")
-  call v9.CheckLegacyAndVim9Failure(["call printf('%1$')"], "E1500:")
-  call v9.CheckLegacyAndVim9Failure(["call printf('%1$_')"], "E1500:")
-  call v9.CheckLegacyAndVim9Failure(["call printf('%1$*3$.*d', 3)"], "E1500:")
-  call v9.CheckLegacyAndVim9Failure(["call printf('%1$*.*2$d', 3)"], "E1500:")
-  call v9.CheckLegacyAndVim9Failure(["call printf('%1$*.*d', 3)"], "E1500:")
-  call v9.CheckLegacyAndVim9Failure(["call printf('%*.*1$d', 3)"], "E1500:")
-  call v9.CheckLegacyAndVim9Failure(["call printf('%*1$.*d', 3)"], "E1500:")
-  call v9.CheckLegacyAndVim9Failure(["call printf('%*1$.*1$d', 3)"], "E1500:")
-
-  call v9.CheckLegacyAndVim9Failure(["call printf('%2$d', 3, 3)"], "E1501:")
-
-  call v9.CheckLegacyAndVim9Failure(["call printf('%2$*1$d %1$ld', 3, 3)"], "E1502:")
-  call v9.CheckLegacyAndVim9Failure(["call printf('%1$s %1$*1$d', 3)"], "E1502:")
-  call v9.CheckLegacyAndVim9Failure(["call printf('%1$p %1$*1$d', 3)"], "E1502:")
-  call v9.CheckLegacyAndVim9Failure(["call printf('%1$f %1$*1$d', 3)"], "E1502:")
-  call v9.CheckLegacyAndVim9Failure(["call printf('%1$lud %1$*1$d', 3)"], "E1502:")
-  call v9.CheckLegacyAndVim9Failure(["call printf('%1$llud %1$*1$d', 3)"], "E1502:")
-  call v9.CheckLegacyAndVim9Failure(["call printf('%1$lld %1$*1$d', 3)"], "E1502:")
-  call v9.CheckLegacyAndVim9Failure(["call printf('%1$s %1$*1$d', 3)"], "E1502:")
-  call v9.CheckLegacyAndVim9Failure(["call printf('%1$c %1$*1$d', 3)"], "E1502:")
-  call v9.CheckLegacyAndVim9Failure(["call printf('%1$ld %1$*1$d', 3)"], "E1502:")
-  call v9.CheckLegacyAndVim9Failure(["call printf('%1$ld %2$*1$d', 3, 3)"], "E1502:")
-  call v9.CheckLegacyAndVim9Failure(["call printf('%1$*1$ld', 3)"], "E1502:")
-  call v9.CheckLegacyAndVim9Failure(["call printf('%1$*1$.*1$ld', 3)"], "E1502:")
-
-  call v9.CheckLegacyAndVim9Failure(["call printf('%1$d%2$d', 3)"], "E1503:")
-
-  call v9.CheckLegacyAndVim9Failure(["call printf('%1$d %1$s', 3)"], "E1504:")
-  call v9.CheckLegacyAndVim9Failure(["call printf('%1$ld %1$s', 3)"], "E1504:")
-  call v9.CheckLegacyAndVim9Failure(["call printf('%1$ud %1$d', 3)"], "E1504:")
-  call v9.CheckLegacyAndVim9Failure(["call printf('%1$s %1$f', 3.0)"], "E1504:")
-  call v9.CheckLegacyAndVim9Failure(["call printf('%1$*1$d %1$ld', 3)"], "E1504:")
-  call v9.CheckLegacyAndVim9Failure(["call printf('%1$s %1$d', 3)"], "E1504:")
-  call v9.CheckLegacyAndVim9Failure(["call printf('%1$p %1$d', 3)"], "E1504:")
-  call v9.CheckLegacyAndVim9Failure(["call printf('%1$f %1$d', 3)"], "E1504:")
-  call v9.CheckLegacyAndVim9Failure(["call printf('%1$lud %1$d', 3)"], "E1504:")
-  call v9.CheckLegacyAndVim9Failure(["call printf('%1$llud %1$d', 3)"], "E1504:")
-  call v9.CheckLegacyAndVim9Failure(["call printf('%1$lld %1$d', 3)"], "E1504:")
-  call v9.CheckLegacyAndVim9Failure(["call printf('%1$s %1$d', 3)"], "E1504:")
-  call v9.CheckLegacyAndVim9Failure(["call printf('%1$c %1$d', 3)"], "E1504:")
-  call v9.CheckLegacyAndVim9Failure(["call printf('%1$ld %1$d', 3)"], "E1504:")
-
-  call v9.CheckLegacyAndVim9Failure(["call printf('%1$.2$d', 3)"], "E1505:")
-  call v9.CheckLegacyAndVim9Failure(["call printf('%01$d', 3)"], "E1505:")
-  call v9.CheckLegacyAndVim9Failure(["call printf('%01$0d', 3)"], "E1505:")
-  call v9.CheckLegacyAndVim9Failure(["call printf('%1$*2d', 3)"], "E1505:")
-  call v9.CheckLegacyAndVim9Failure(["call printf('%1$*3.*2$d', 3)"], "E1505:")
-  call v9.CheckLegacyAndVim9Failure(["call printf('%1$*3$.2$d', 3)"], "E1505:")
-  call v9.CheckLegacyAndVim9Failure(["call printf('%1$*3$.*2d', 3)"], "E1505:")
-  call v9.CheckLegacyAndVim9Failure(["call printf('%1$1$.5d', 5)"], "E1505:")
-  call v9.CheckLegacyAndVim9Failure(["call printf('%1$5.1$d', 5)"], "E1505:")
-  call v9.CheckLegacyAndVim9Failure(["call printf('%1$1$.1$d', 5)"], "E1505:")
-  call v9.CheckLegacyAndVim9Failure(["call printf('%1$*1$.*0$s')"], "E1505:")
-  call v9.CheckLegacyAndVim9Failure(["call printf('%*0$s')"], "E1505:")
-
-  call v9.CheckLegacyAndVim9Failure(["call printf('%.123456789$d', 5)"], "E1510:")
-  call v9.CheckLegacyAndVim9Failure(["call printf('%.123456789d', 5)"], "E1510:")
-  call v9.CheckLegacyAndVim9Failure(["call printf('%123456789$d', 5)"], "E1510:")
-  call v9.CheckLegacyAndVim9Failure(["call printf('%123456789d', 5)"], "E1510:")
-
-  call v9.CheckLegacyAndVim9Failure(["call printf('%123456789$5.5d', 5)"], "E1510:")
-  call v9.CheckLegacyAndVim9Failure(["call printf('%1$123456789.5d', 5)"], "E1510:")
-  call v9.CheckLegacyAndVim9Failure(["call printf('%1$5.123456789d', 5)"], "E1510:")
-  call v9.CheckLegacyAndVim9Failure(["call printf('%123456789$987654321.5d', 5)"], "E1510:")
-  call v9.CheckLegacyAndVim9Failure(["call printf('%1$123456789.987654321d', 5)"], "E1510:")
-  call v9.CheckLegacyAndVim9Failure(["call printf('%123456789$5.987654321d', 5)"], "E1510:")
-
-  call v9.CheckLegacyAndVim9Failure(["call printf('%123456789$*1$.5d', 5)"], "E1510:")
-  call v9.CheckLegacyAndVim9Failure(["call printf('%1$*123456789$.5d', 5)"], "E1510:")
-  call v9.CheckLegacyAndVim9Failure(["call printf('%1$*1$.123456789d', 5)"], "E1510:")
-  call v9.CheckLegacyAndVim9Failure(["call printf('%123456789$*987654321$.5d', 5)"], "E1510:")
-  call v9.CheckLegacyAndVim9Failure(["call printf('%1$*123456789$.987654321d', 5)"], "E1510:")
-  call v9.CheckLegacyAndVim9Failure(["call printf('%123456789$*1$.987654321d', 5)"], "E1510:")
-
-  call v9.CheckLegacyAndVim9Failure(["call printf('%123456789$5.*1$d', 5)"], "E1510:")
-  call v9.CheckLegacyAndVim9Failure(["call printf('%1$123456789.*1$d', 5)"], "E1510:")
-  call v9.CheckLegacyAndVim9Failure(["call printf('%1$5.*123456789$d', 5)"], "E1510:")
-  call v9.CheckLegacyAndVim9Failure(["call printf('%123456789$987654321.*1$d', 5)"], "E1510:")
-  call v9.CheckLegacyAndVim9Failure(["call printf('%1$123456789.*987654321$d', 5)"], "E1510:")
-  call v9.CheckLegacyAndVim9Failure(["call printf('%123456789$5.*987654321$d', 5)"], "E1510:")
-
-  call v9.CheckLegacyAndVim9Failure(["call printf('%123456789$*1$.*1$d', 5)"], "E1510:")
-  call v9.CheckLegacyAndVim9Failure(["call printf('%1$*123456789$.*1$d', 5)"], "E1510:")
-  call v9.CheckLegacyAndVim9Failure(["call printf('%1$*1$.*123456789d', 5)"], "E1510:")
-  call v9.CheckLegacyAndVim9Failure(["call printf('%123456789$*987654321$.*1$d', 5)"], "E1510:")
-  call v9.CheckLegacyAndVim9Failure(["call printf('%1$*123456789$.*987654321$d', 5)"], "E1510:")
-  call v9.CheckLegacyAndVim9Failure(["call printf('%123456789$*1$.*987654321$d', 5)"], "E1510:")
-
-  call v9.CheckLegacyAndVim9Failure(["call printf('%1$*2$.*1$d', 5, 9999999)"], "E1510:")
-  call v9.CheckLegacyAndVim9Failure(["call printf('%1$*1$.*2$d', 5, 9999999)"], "E1510:")
-  call v9.CheckLegacyAndVim9Failure(["call printf('%2$*3$.*1$d', 5, 9999123, 9999321)"], "E1510:")
-  call v9.CheckLegacyAndVim9Failure(["call printf('%1$*2$.*3$d', 5, 9999123, 9999321)"], "E1510:")
-  call v9.CheckLegacyAndVim9Failure(["call printf('%2$*1$.*3$d', 5, 9999123, 9999312)"], "E1510:")
-
-  call v9.CheckLegacyAndVim9Failure(["call printf('%1$*2$d', 5, 9999999)"], "E1510:")
+  call v9.CheckLegacyAndMNV9Failure(['echo printf("%1$d", {})'], 'E728:')
+  call v9.CheckLegacyAndMNV9Failure(['echo printf("%1$d", [])'], 'E745:')
+  call v9.CheckLegacyAndMNV9Failure(['echo printf("%1$d", 1, 2)'], 'E767:')
+  call v9.CheckLegacyAndMNV9Failure(['echo printf("%*d", 1)'], 'E766:')
+  call v9.CheckLegacyAndMNV9Failure(['echo printf("%1$s")'], 'E1503:')
+  call v9.CheckLegacyAndMNV9Failure(['echo printf("%1$d", 1.2)'], 'E805:')
+  call v9.CheckLegacyAndMNV9Failure(['echo printf("%1$f")'], 'E1503:')
+
+  call v9.CheckLegacyAndMNV9Failure(['echo printf("%f", "a")'], 'E807:')
+
+  call v9.CheckLegacyAndMNV9Failure(["call printf('%1$d%2$d', 1, 3, 4)"], "E767:")
+
+  call v9.CheckLegacyAndMNV9Failure(["call printf('%2$d%d', 1, 3)"], "E1500:")
+  call v9.CheckLegacyAndMNV9Failure(["call printf('%d%2$d', 1, 3)"], "E1500:")
+  call v9.CheckLegacyAndMNV9Failure(["call printf('%2$*1$d%d', 1, 3)"], "E1500:")
+  call v9.CheckLegacyAndMNV9Failure(["call printf('%d%2$*1$d', 1, 3)"], "E1500:")
+  call v9.CheckLegacyAndMNV9Failure(["call printf('%2$.*1$d%d', 1, 3)"], "E1500:")
+  call v9.CheckLegacyAndMNV9Failure(["call printf('%d%2$.*1$d', 1, 3)"], "E1500:")
+  call v9.CheckLegacyAndMNV9Failure(["call printf('%1$%')"], "E1500:")
+  call v9.CheckLegacyAndMNV9Failure(["call printf('%1$')"], "E1500:")
+  call v9.CheckLegacyAndMNV9Failure(["call printf('%1$_')"], "E1500:")
+  call v9.CheckLegacyAndMNV9Failure(["call printf('%1$*3$.*d', 3)"], "E1500:")
+  call v9.CheckLegacyAndMNV9Failure(["call printf('%1$*.*2$d', 3)"], "E1500:")
+  call v9.CheckLegacyAndMNV9Failure(["call printf('%1$*.*d', 3)"], "E1500:")
+  call v9.CheckLegacyAndMNV9Failure(["call printf('%*.*1$d', 3)"], "E1500:")
+  call v9.CheckLegacyAndMNV9Failure(["call printf('%*1$.*d', 3)"], "E1500:")
+  call v9.CheckLegacyAndMNV9Failure(["call printf('%*1$.*1$d', 3)"], "E1500:")
+
+  call v9.CheckLegacyAndMNV9Failure(["call printf('%2$d', 3, 3)"], "E1501:")
+
+  call v9.CheckLegacyAndMNV9Failure(["call printf('%2$*1$d %1$ld', 3, 3)"], "E1502:")
+  call v9.CheckLegacyAndMNV9Failure(["call printf('%1$s %1$*1$d', 3)"], "E1502:")
+  call v9.CheckLegacyAndMNV9Failure(["call printf('%1$p %1$*1$d', 3)"], "E1502:")
+  call v9.CheckLegacyAndMNV9Failure(["call printf('%1$f %1$*1$d', 3)"], "E1502:")
+  call v9.CheckLegacyAndMNV9Failure(["call printf('%1$lud %1$*1$d', 3)"], "E1502:")
+  call v9.CheckLegacyAndMNV9Failure(["call printf('%1$llud %1$*1$d', 3)"], "E1502:")
+  call v9.CheckLegacyAndMNV9Failure(["call printf('%1$lld %1$*1$d', 3)"], "E1502:")
+  call v9.CheckLegacyAndMNV9Failure(["call printf('%1$s %1$*1$d', 3)"], "E1502:")
+  call v9.CheckLegacyAndMNV9Failure(["call printf('%1$c %1$*1$d', 3)"], "E1502:")
+  call v9.CheckLegacyAndMNV9Failure(["call printf('%1$ld %1$*1$d', 3)"], "E1502:")
+  call v9.CheckLegacyAndMNV9Failure(["call printf('%1$ld %2$*1$d', 3, 3)"], "E1502:")
+  call v9.CheckLegacyAndMNV9Failure(["call printf('%1$*1$ld', 3)"], "E1502:")
+  call v9.CheckLegacyAndMNV9Failure(["call printf('%1$*1$.*1$ld', 3)"], "E1502:")
+
+  call v9.CheckLegacyAndMNV9Failure(["call printf('%1$d%2$d', 3)"], "E1503:")
+
+  call v9.CheckLegacyAndMNV9Failure(["call printf('%1$d %1$s', 3)"], "E1504:")
+  call v9.CheckLegacyAndMNV9Failure(["call printf('%1$ld %1$s', 3)"], "E1504:")
+  call v9.CheckLegacyAndMNV9Failure(["call printf('%1$ud %1$d', 3)"], "E1504:")
+  call v9.CheckLegacyAndMNV9Failure(["call printf('%1$s %1$f', 3.0)"], "E1504:")
+  call v9.CheckLegacyAndMNV9Failure(["call printf('%1$*1$d %1$ld', 3)"], "E1504:")
+  call v9.CheckLegacyAndMNV9Failure(["call printf('%1$s %1$d', 3)"], "E1504:")
+  call v9.CheckLegacyAndMNV9Failure(["call printf('%1$p %1$d', 3)"], "E1504:")
+  call v9.CheckLegacyAndMNV9Failure(["call printf('%1$f %1$d', 3)"], "E1504:")
+  call v9.CheckLegacyAndMNV9Failure(["call printf('%1$lud %1$d', 3)"], "E1504:")
+  call v9.CheckLegacyAndMNV9Failure(["call printf('%1$llud %1$d', 3)"], "E1504:")
+  call v9.CheckLegacyAndMNV9Failure(["call printf('%1$lld %1$d', 3)"], "E1504:")
+  call v9.CheckLegacyAndMNV9Failure(["call printf('%1$s %1$d', 3)"], "E1504:")
+  call v9.CheckLegacyAndMNV9Failure(["call printf('%1$c %1$d', 3)"], "E1504:")
+  call v9.CheckLegacyAndMNV9Failure(["call printf('%1$ld %1$d', 3)"], "E1504:")
+
+  call v9.CheckLegacyAndMNV9Failure(["call printf('%1$.2$d', 3)"], "E1505:")
+  call v9.CheckLegacyAndMNV9Failure(["call printf('%01$d', 3)"], "E1505:")
+  call v9.CheckLegacyAndMNV9Failure(["call printf('%01$0d', 3)"], "E1505:")
+  call v9.CheckLegacyAndMNV9Failure(["call printf('%1$*2d', 3)"], "E1505:")
+  call v9.CheckLegacyAndMNV9Failure(["call printf('%1$*3.*2$d', 3)"], "E1505:")
+  call v9.CheckLegacyAndMNV9Failure(["call printf('%1$*3$.2$d', 3)"], "E1505:")
+  call v9.CheckLegacyAndMNV9Failure(["call printf('%1$*3$.*2d', 3)"], "E1505:")
+  call v9.CheckLegacyAndMNV9Failure(["call printf('%1$1$.5d', 5)"], "E1505:")
+  call v9.CheckLegacyAndMNV9Failure(["call printf('%1$5.1$d', 5)"], "E1505:")
+  call v9.CheckLegacyAndMNV9Failure(["call printf('%1$1$.1$d', 5)"], "E1505:")
+  call v9.CheckLegacyAndMNV9Failure(["call printf('%1$*1$.*0$s')"], "E1505:")
+  call v9.CheckLegacyAndMNV9Failure(["call printf('%*0$s')"], "E1505:")
+
+  call v9.CheckLegacyAndMNV9Failure(["call printf('%.123456789$d', 5)"], "E1510:")
+  call v9.CheckLegacyAndMNV9Failure(["call printf('%.123456789d', 5)"], "E1510:")
+  call v9.CheckLegacyAndMNV9Failure(["call printf('%123456789$d', 5)"], "E1510:")
+  call v9.CheckLegacyAndMNV9Failure(["call printf('%123456789d', 5)"], "E1510:")
+
+  call v9.CheckLegacyAndMNV9Failure(["call printf('%123456789$5.5d', 5)"], "E1510:")
+  call v9.CheckLegacyAndMNV9Failure(["call printf('%1$123456789.5d', 5)"], "E1510:")
+  call v9.CheckLegacyAndMNV9Failure(["call printf('%1$5.123456789d', 5)"], "E1510:")
+  call v9.CheckLegacyAndMNV9Failure(["call printf('%123456789$987654321.5d', 5)"], "E1510:")
+  call v9.CheckLegacyAndMNV9Failure(["call printf('%1$123456789.987654321d', 5)"], "E1510:")
+  call v9.CheckLegacyAndMNV9Failure(["call printf('%123456789$5.987654321d', 5)"], "E1510:")
+
+  call v9.CheckLegacyAndMNV9Failure(["call printf('%123456789$*1$.5d', 5)"], "E1510:")
+  call v9.CheckLegacyAndMNV9Failure(["call printf('%1$*123456789$.5d', 5)"], "E1510:")
+  call v9.CheckLegacyAndMNV9Failure(["call printf('%1$*1$.123456789d', 5)"], "E1510:")
+  call v9.CheckLegacyAndMNV9Failure(["call printf('%123456789$*987654321$.5d', 5)"], "E1510:")
+  call v9.CheckLegacyAndMNV9Failure(["call printf('%1$*123456789$.987654321d', 5)"], "E1510:")
+  call v9.CheckLegacyAndMNV9Failure(["call printf('%123456789$*1$.987654321d', 5)"], "E1510:")
+
+  call v9.CheckLegacyAndMNV9Failure(["call printf('%123456789$5.*1$d', 5)"], "E1510:")
+  call v9.CheckLegacyAndMNV9Failure(["call printf('%1$123456789.*1$d', 5)"], "E1510:")
+  call v9.CheckLegacyAndMNV9Failure(["call printf('%1$5.*123456789$d', 5)"], "E1510:")
+  call v9.CheckLegacyAndMNV9Failure(["call printf('%123456789$987654321.*1$d', 5)"], "E1510:")
+  call v9.CheckLegacyAndMNV9Failure(["call printf('%1$123456789.*987654321$d', 5)"], "E1510:")
+  call v9.CheckLegacyAndMNV9Failure(["call printf('%123456789$5.*987654321$d', 5)"], "E1510:")
+
+  call v9.CheckLegacyAndMNV9Failure(["call printf('%123456789$*1$.*1$d', 5)"], "E1510:")
+  call v9.CheckLegacyAndMNV9Failure(["call printf('%1$*123456789$.*1$d', 5)"], "E1510:")
+  call v9.CheckLegacyAndMNV9Failure(["call printf('%1$*1$.*123456789d', 5)"], "E1510:")
+  call v9.CheckLegacyAndMNV9Failure(["call printf('%123456789$*987654321$.*1$d', 5)"], "E1510:")
+  call v9.CheckLegacyAndMNV9Failure(["call printf('%1$*123456789$.*987654321$d', 5)"], "E1510:")
+  call v9.CheckLegacyAndMNV9Failure(["call printf('%123456789$*1$.*987654321$d', 5)"], "E1510:")
+
+  call v9.CheckLegacyAndMNV9Failure(["call printf('%1$*2$.*1$d', 5, 9999999)"], "E1510:")
+  call v9.CheckLegacyAndMNV9Failure(["call printf('%1$*1$.*2$d', 5, 9999999)"], "E1510:")
+  call v9.CheckLegacyAndMNV9Failure(["call printf('%2$*3$.*1$d', 5, 9999123, 9999321)"], "E1510:")
+  call v9.CheckLegacyAndMNV9Failure(["call printf('%1$*2$.*3$d', 5, 9999123, 9999321)"], "E1510:")
+  call v9.CheckLegacyAndMNV9Failure(["call printf('%2$*1$.*3$d', 5, 9999123, 9999312)"], "E1510:")
+
+  call v9.CheckLegacyAndMNV9Failure(["call printf('%1$*2$d', 5, 9999999)"], "E1510:")
 endfunc
 
 func Test_printf_pos_64bit()
   let lines =<< trim END
       call assert_equal("123456789012345", printf('%1$d', 123456789012345))
   END
-  call v9.CheckLegacyAndVim9Success(lines)
+  call v9.CheckLegacyAndMNV9Success(lines)
 endfunc
 
 func Test_printf_pos_spec_s()
@@ -376,7 +376,7 @@ func Test_printf_pos_spec_s()
       #" partial
       call assert_equal(string(function('printf', ['%1$s'])), printf('%1$s', function('printf', ['%1$s'])))
   END
-  call v9.CheckLegacyAndVim9Success(lines)
+  call v9.CheckLegacyAndMNV9Success(lines)
 endfunc
 
 func Test_printf_pos_spec_b()
@@ -398,7 +398,7 @@ func Test_printf_pos_spec_b()
       call assert_equal("11100000100100010000110000011011101111101111001", printf('%1$b', 123456789012345))
       call assert_equal("1111111111111111111111111111111111111111111111111111111111111111", printf('%1$b', -1))
   END
-  call v9.CheckLegacyAndVim9Success(lines)
+  call v9.CheckLegacyAndMNV9Success(lines)
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_function_lists.vim b/uvim/src/testdir/test_function_lists.mnv
index bd79f7717f..19dd1e528a 100644
--- a/uvim/src/testdir/test_function_lists.vim
+++ b/uvim/src/testdir/test_function_lists.mnv
@@ -104,4 +104,4 @@ func Test_function_lists()
 
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_functions.vim b/uvim/src/testdir/test_functions.mnv
index 0edfbd27fb..d98a5a8f7e 100644
--- a/uvim/src/testdir/test_functions.vim
+++ b/uvim/src/testdir/test_functions.mnv
@@ -1,7 +1,7 @@
 " Tests for various functions.
 
-source util/screendump.vim
-import './util/vim9.vim' as v9
+source util/screendump.mnv
+import './util/mnv9.mnv' as v9
 
 " Must be done first, since the alternate buffer must be unset.
 func Test_00_bufexists()
@@ -191,7 +191,7 @@ func Test_strwidth()
     exe 'set ambiwidth=' . aw
     call assert_equal(0, strwidth(''))
     call assert_equal(1, strwidth("\t"))
-    call assert_equal(3, strwidth('Vim'))
+    call assert_equal(3, strwidth('MNV'))
     call assert_equal(4, strwidth(1234))
     call assert_equal(5, strwidth(-1234))
 
@@ -946,7 +946,7 @@ func Test_mode()
   call feedkeys("v\<Cmd>call input('')\<CR>\<F2>\<CR>\<Esc>", 'xt')
   call assert_equal("c-c", g:current_modes)
 
-  " Executing commands in Vim Ex mode should return "cv", never "cvr",
+  " Executing commands in MNV Ex mode should return "cv", never "cvr",
   " as Cmdline editing has already ended.
   call feedkeys("gQcall Save_mode()\<CR>vi\<CR>", 'xt')
   call assert_equal('c-cv', g:current_modes)
@@ -1002,7 +1002,7 @@ func Test_mode_screendump()
   CheckScreendump
 
   " Test statusline updates for overstrike mode
-  let buf = RunVimInTerminal('', {'rows': 12})
+  let buf = RunMNVInTerminal('', {'rows': 12})
   call term_sendkeys(buf, ":set laststatus=2 statusline=%!mode(1)\<CR>")
   call term_sendkeys(buf, ":")
   call TermWait(buf)
@@ -1010,7 +1010,7 @@ func Test_mode_screendump()
   call term_sendkeys(buf, "\<Insert>")
   call TermWait(buf)
   call VerifyScreenDump(buf, 'Test_mode_2', {})
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 " Test for append()
@@ -1154,9 +1154,9 @@ func Test_match_func()
   call assert_equal(4,  'testing'->match('ing', 2))
   call assert_equal(-1, match('testing', 'ing', 5))
   call assert_equal(-1, match('testing', 'ing', 8))
-  call assert_equal(1, match(['vim', 'testing', 'execute'], 'ing'))
-  call assert_equal(-1, match(['vim', 'testing', 'execute'], 'img'))
-  call assert_fails("let x=match('vim', [])", 'E730:')
+  call assert_equal(1, match(['mnv', 'testing', 'execute'], 'ing'))
+  call assert_equal(-1, match(['mnv', 'testing', 'execute'], 'img'))
+  call assert_fails("let x=match('mnv', [])", 'E730:')
   call assert_equal(3, match(['a', 'b', 'c', 'a'], 'a', 1))
   call assert_equal(-1, match(['a', 'b', 'c', 'a'], 'a', 5))
   call assert_equal(4,  match('testing', 'ing', -1))
@@ -1170,8 +1170,8 @@ func Test_matchend()
   call assert_equal(7,  'testing'->matchend('ing', 2))
   call assert_equal(-1, matchend('testing', 'ing', 5))
   call assert_equal(-1, matchend('testing', 'ing', 8))
-  call assert_equal(match(['vim', 'testing', 'execute'], 'ing'), matchend(['vim', 'testing', 'execute'], 'ing'))
-  call assert_equal(match(['vim', 'testing', 'execute'], 'img'), matchend(['vim', 'testing', 'execute'], 'img'))
+  call assert_equal(match(['mnv', 'testing', 'execute'], 'ing'), matchend(['mnv', 'testing', 'execute'], 'ing'))
+  call assert_equal(match(['mnv', 'testing', 'execute'], 'img'), matchend(['mnv', 'testing', 'execute'], 'img'))
 endfunc
 
 func Test_matchlist()
@@ -1185,8 +1185,8 @@ func Test_matchstr()
   call assert_equal('ing',  'testing'->matchstr('ing', 2))
   call assert_equal('', matchstr('testing', 'ing', 5))
   call assert_equal('', matchstr('testing', 'ing', 8))
-  call assert_equal('testing', matchstr(['vim', 'testing', 'execute'], 'ing'))
-  call assert_equal('', matchstr(['vim', 'testing', 'execute'], 'img'))
+  call assert_equal('testing', matchstr(['mnv', 'testing', 'execute'], 'ing'))
+  call assert_equal('', matchstr(['mnv', 'testing', 'execute'], 'img'))
 endfunc
 
 func Test_matchstrpos()
@@ -1194,8 +1194,8 @@ func Test_matchstrpos()
   call assert_equal(['ing', 4, 7], 'testing'->matchstrpos('ing', 2))
   call assert_equal(['', -1, -1], matchstrpos('testing', 'ing', 5))
   call assert_equal(['', -1, -1], matchstrpos('testing', 'ing', 8))
-  call assert_equal(['ing', 1, 4, 7], matchstrpos(['vim', 'testing', 'execute'], 'ing'))
-  call assert_equal(['', -1, -1, -1], matchstrpos(['vim', 'testing', 'execute'], 'img'))
+  call assert_equal(['ing', 1, 4, 7], matchstrpos(['mnv', 'testing', 'execute'], 'ing'))
+  call assert_equal(['', -1, -1, -1], matchstrpos(['mnv', 'testing', 'execute'], 'img'))
   call assert_equal(['', -1, -1], matchstrpos(test_null_list(), '\a'))
 endfunc
 
@@ -1237,8 +1237,8 @@ func Test_matchstrlist()
     call assert_equal([{'idx': 0, 'byteidx': 0, 'text': 'acd', 'submatches': ['a', '', 'c', 'd', '', '', '', '', '']}], matchstrlist(['acd'], '\(a\)\?\(b\)\?\(c\)\?\(.*\)', {'submatches': v:true}))
 
     #" null dict argument
-    call assert_equal([{'idx': 0, 'byteidx': 0, 'text': 'vim'}],
-          \ matchstrlist(['vim'], '\w\+', test_null_dict()))
+    call assert_equal([{'idx': 0, 'byteidx': 0, 'text': 'mnv'}],
+          \ matchstrlist(['mnv'], '\w\+', test_null_dict()))
 
     #" Error cases
     call assert_fails("echo matchstrlist('abc', 'a')", 'E1211: List required for argument 1')
@@ -1247,17 +1247,17 @@ func Test_matchstrlist()
     call assert_fails("echo matchstrlist(['abc'], 'a', {'submatches': []})", 'E475: Invalid value for argument submatches')
     call assert_fails("echo matchstrlist(['abc'], '\\@=')", 'E866: (NFA regexp) Misplaced @')
   END
-  call v9.CheckLegacyAndVim9Success(lines)
+  call v9.CheckLegacyAndMNV9Success(lines)
 
   let lines =<< trim END
-    vim9script
+    mnv9script
     # non string items
     matchstrlist([0z10, {'a': 'x'}], 'x')
   END
   call v9.CheckSourceSuccess(lines)
 
   let lines =<< trim END
-    vim9script
+    mnv9script
     def Foo()
       # non string items
       assert_equal([], matchstrlist([0z10, {'a': 'x'}], 'x'))
@@ -1361,13 +1361,13 @@ func Test_matchbufline()
     :%bdelete!
     call assert_fails($"echo matchbufline({bnr}, 'abc', 1, '$'))", 'E681: Buffer is not loaded')
   END
-  call v9.CheckLegacyAndVim9Success(lines)
+  call v9.CheckLegacyAndMNV9Success(lines)
 
   call assert_fails($"echo matchbufline('', 'abc', 'abc', 1)", 'E475: Invalid value for argument lnum')
   call assert_fails($"echo matchbufline('', 'abc', 1, 'abc')", 'E475: Invalid value for argument end_lnum')
 
   let lines =<< trim END
-    vim9script
+    mnv9script
     def Foo()
       echo matchbufline('', 'abc', 'abc', 1)
     enddef
@@ -1376,7 +1376,7 @@ func Test_matchbufline()
   call v9.CheckSourceFailure(lines, 'E1030: Using a String as a Number: "abc"', 1)
 
   let lines =<< trim END
-    vim9script
+    mnv9script
     def Foo()
       echo matchbufline('', 'abc', 1, 'abc')
     enddef
@@ -2176,15 +2176,15 @@ func Test_executable_single_character_dir()
 endfunc
 
 func Test_hostname()
-  let hostname_vim = hostname()
+  let hostname_mnv = hostname()
   if has('unix')
     let hostname_system = systemlist('uname -n')[0]
-    call assert_equal(hostname_vim, hostname_system)
+    call assert_equal(hostname_mnv, hostname_system)
   endif
 endfunc
 
 func Test_getpid()
-  " getpid() always returns the same value within a vim instance.
+  " getpid() always returns the same value within a mnv instance.
   call assert_equal(getpid(), getpid())
   if has('unix')
     call assert_equal(systemlist('echo $PPID')[0], string(getpid()))
@@ -2310,8 +2310,8 @@ func Test_input_func()
 
   " Test for using "shellcmdline" as the completion function
   call feedkeys(":let c = input('Shell? ', '', 'shellcmdline')\<CR>"
-        \ .. "vim test_functions.\<C-A>\<CR>", 'xt')
-  call assert_equal('vim test_functions.vim', c)
+        \ .. "mnv test_functions.\<C-A>\<CR>", 'xt')
+  call assert_equal('mnv test_functions.mnv', c)
   if executable('whoami')
     call feedkeys(":let c = input('Shell? ', '', 'shellcmdline')\<CR>"
           \ .. "whoam\<C-A>\<CR>", 'xt')
@@ -2441,7 +2441,7 @@ func Test_setbufvar_options()
 endfunc
 
 func Test_setbufvar_keep_window_title()
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
   if !has('title') || empty(&t_ts)
     throw "Skipped: can't get/set title"
   endif
@@ -2453,7 +2453,7 @@ func Test_setbufvar_keep_window_title()
       inoremap <F2> <C-R>=setbufvar(g:buf, '&autoindent', 1) ?? ''<CR>
   END
   call writefile(lines, 'Xsetbufvar', 'D')
-  let buf = RunVimInTerminal('-S Xsetbufvar', {})
+  let buf = RunMNVInTerminal('-S Xsetbufvar', {})
   call WaitForAssert({-> assert_match('Xa.txt', term_gettitle(buf))}, 1000)
 
   call term_sendkeys(buf, "i\<F2>")
@@ -2462,7 +2462,7 @@ func Test_setbufvar_keep_window_title()
   call TermWait(buf)
   call assert_match('Xa.txt', term_gettitle(buf))
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_redo_in_nested_functions()
@@ -2512,13 +2512,13 @@ func Test_trim()
   call assert_equal("a", trim("a", ""))
   call assert_equal("", trim("", "a"))
 
-  call assert_equal("vim", trim("  vim  ", " ", 0))
-  call assert_equal("vim  ", trim("  vim  ", " ", 1))
-  call assert_equal("  vim", trim("  vim  ", " ", 2))
-  call assert_fails('eval trim("  vim  ", " ", [])', 'E745:')
-  call assert_fails('eval trim("  vim  ", " ", -1)', 'E475:')
-  call assert_fails('eval trim("  vim  ", " ", 3)', 'E475:')
-  call assert_fails('eval trim("  vim  ", 0)', 'E1174:')
+  call assert_equal("mnv", trim("  mnv  ", " ", 0))
+  call assert_equal("mnv  ", trim("  mnv  ", " ", 1))
+  call assert_equal("  mnv", trim("  mnv  ", " ", 2))
+  call assert_fails('eval trim("  mnv  ", " ", [])', 'E745:')
+  call assert_fails('eval trim("  mnv  ", " ", -1)', 'E475:')
+  call assert_fails('eval trim("  mnv  ", " ", 3)', 'E475:')
+  call assert_fails('eval trim("  mnv  ", 0)', 'E1174:')
 
   let chars = join(map(range(1, 0x20) + [0xa0], {n -> n->nr2char()}), '')
   call assert_equal("x", trim(chars . "x" . chars))
@@ -2678,7 +2678,7 @@ func Test_getchar()
       call assert_equal(0, getchar(0))
       call assert_equal(0, getchar(1))
     END
-    call v9.CheckLegacyAndVim9Success(lines)
+    call v9.CheckLegacyAndMNV9Success(lines)
 
     let lines =<< eval trim END
       call feedkeys("\<*{key}>", '')
@@ -2696,7 +2696,7 @@ func Test_getchar()
       call assert_equal('', getcharstr(0))
       call assert_equal('', getcharstr(1))
     END
-    call v9.CheckLegacyAndVim9Success(lines)
+    call v9.CheckLegacyAndMNV9Success(lines)
   endfor
 
   call assert_fails('call getchar(1, 1)', 'E1206:')
@@ -2728,7 +2728,7 @@ func Test_getchar()
 endfunc
 
 func Test_getchar_cursor_position()
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   let lines =<< trim END
     call setline(1, ['foobar', 'foobar', 'foobar'])
@@ -2741,7 +2741,7 @@ func Test_getchar_cursor_position()
     nnoremap <F6> <Cmd>call getchar(-1, #{cursor: 'hide'})<CR>
   END
   call writefile(lines, 'XgetcharCursorPos', 'D')
-  let buf = RunVimInTerminal('-S XgetcharCursorPos', {'rows': 6})
+  let buf = RunMNVInTerminal('-S XgetcharCursorPos', {'rows': 6})
   call WaitForAssert({-> assert_equal([3, 6], term_getcursor(buf)[0:1])})
 
   call term_sendkeys(buf, "\<F1>")
@@ -2775,7 +2775,7 @@ func Test_getchar_cursor_position()
   call WaitForAssert({-> assert_true(term_getcursor(buf)[2].visible)})
   call assert_equal([3, 6], term_getcursor(buf)[0:1])
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_libcall_libcallnr()
@@ -2786,7 +2786,7 @@ func Test_libcall_libcallnr()
   elseif has('mac')
     let libc = 'libSystem.B.dylib'
   elseif executable('ldd')
-    let libc = matchstr(split(system('ldd ' . GetVimProg())), '/libc\.so\>')
+    let libc = matchstr(split(system('ldd ' . GetMNVProg())), '/libc\.so\>')
   endif
   if get(l:, 'libc', '') ==# ''
     " On Unix, libc.so can be in various places.
@@ -2797,7 +2797,7 @@ func Test_libcall_libcallnr()
       let libc = ''
     elseif has('sun')
       " Set the path to libc.so according to the architecture.
-      let test_bits = system('file ' . GetVimProg())
+      let test_bits = system('file ' . GetMNVProg())
       let test_arch = system('uname -p')
       if test_bits =~ '64-bit' && test_arch =~ 'sparc'
         let libc = '/usr/lib/sparcv9/libc.so'
@@ -3234,7 +3234,7 @@ func Test_charclass()
   call assert_equal(1, charclass('.'))
   call assert_equal(2, charclass('x'))
   call assert_equal(3, charclass("\u203c"))
-  " this used to crash vim
+  " this used to crash mnv
   call assert_equal(0, "xxx"[-1]->charclass())
 endfunc
 
@@ -3304,7 +3304,7 @@ func Test_bufadd_bufload()
 endfunc
 
 func Test_state()
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   let getstate = ":echo 'state: ' .. g:state .. '; mode: ' .. g:mode\<CR>"
 
@@ -3318,9 +3318,9 @@ func Test_state()
 	au Filetype foobar let g:state = state()|let g:mode = mode()
   END
   call writefile(lines, 'XState')
-  let buf = RunVimInTerminal('-S XState', #{rows: 6})
+  let buf = RunMNVInTerminal('-S XState', #{rows: 6})
 
-  " Using a ":" command Vim is busy, thus "S" is returned
+  " Using a ":" command MNV is busy, thus "S" is returned
   call term_sendkeys(buf, ":echo 'state: ' .. state() .. '; mode: ' .. mode()\<CR>")
   call WaitForAssert({-> assert_match('state: S; mode: n', term_getline(buf, 6))}, 1000)
   call term_sendkeys(buf, ":\<CR>")
@@ -3374,7 +3374,7 @@ func Test_state()
   call term_sendkeys(buf, getstate)
   call WaitForAssert({-> assert_match('state: Scs; mode: r', term_getline(buf, 6))}, 1000)
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
   call delete('XState')
 endfunc
 
@@ -3660,19 +3660,19 @@ func Test_echoraw()
     call echoraw("hello\<CR>x")
   END
   call writefile(lines, 'XTest_echoraw')
-  let buf = RunVimInTerminal('-S XTest_echoraw', {'rows': 5, 'cols': 40})
+  let buf = RunMNVInTerminal('-S XTest_echoraw', {'rows': 5, 'cols': 40})
   call VerifyScreenDump(buf, 'Test_functions_echoraw', {})
 
   " clean up
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
   call delete('XTest_echoraw')
 endfunc
 
 " Test for echo highlighting
 func Test_echohl()
   echohl Search
-  echo 'Vim'
-  call assert_equal('Vim', Screenline(&lines))
+  echo 'MNV'
+  call assert_equal('MNV', Screenline(&lines))
   " TODO: How to check the highlight group used by echohl?
   " ScreenAttrs() returns all zeros.
   echohl None
@@ -3727,7 +3727,7 @@ func Test_screen_functions()
   call assert_equal(-1, screenchar(-1, -1))
   call assert_equal([], screenchars(-1, -1))
 
-  " Run this in a separate Vim instance to avoid messing up.
+  " Run this in a separate MNV instance to avoid messing up.
   let after =<< trim [CODE]
     scriptencoding utf-8
     call setline(1, '�')
@@ -3746,7 +3746,7 @@ func Test_screen_functions()
   endif
   for enc in encodings
     let msg = 'enc=' .. enc
-    if RunVim([], after, $'--clean --cmd "set encoding={enc}"')
+    if RunMNV([], after, $'--clean --cmd "set encoding={enc}"')
       call assert_equal([], readfile('Xresult'), msg)
     endif
     call delete('Xresult')
@@ -3961,7 +3961,7 @@ func Test_getmousepos()
 
   vert resize 4
   call test_setmouse(2, 2)
-  " This used to crash Vim
+  " This used to crash MNV
   call assert_equal(#{
         \ screenrow: 2,
         \ screencol: 2,
@@ -3987,7 +3987,7 @@ endfunc
 func Test_glob()
   call assert_equal('', glob(test_null_string()))
   call assert_equal('', globpath(test_null_string(), test_null_string()))
-  call assert_fails("let x = globpath(&rtp, 'syntax/c.vim', [])", 'E745:')
+  call assert_fails("let x = globpath(&rtp, 'syntax/c.mnv', [])", 'E745:')
 
   call writefile([], 'Xglob1')
   call writefile([], 'XGLOB2')
@@ -4081,7 +4081,7 @@ func Test_builtin_check()
   call assert_fails('let l:["trim"] = {x -> " " .. x}', 'E704:')
   call assert_fails('let l:.trim = {x -> " " .. x}', 'E704:')
   let lines =<< trim END
-    vim9script
+    mnv9script
     var trim = (x) => " " .. x
   END
   call v9.CheckScriptFailure(lines, 'E704:')
@@ -4121,14 +4121,14 @@ endfunc
 func Test_funcref_with_underscore()
   " at script level
   let lines =<< trim END
-    vim9script
+    mnv9script
     var _Fn = () => 10
   END
   call v9.CheckSourceFailure(lines, 'E704: Funcref variable name must start with a capital: _Fn')
 
   " inside a function
   let lines =<< trim END
-    vim9script
+    mnv9script
     def Func()
       var _Fn = () => 10
     enddef
@@ -4138,7 +4138,7 @@ func Test_funcref_with_underscore()
 
   " as a function argument
   let lines =<< trim END
-    vim9script
+    mnv9script
     def Func(_Fn: func)
     enddef
     defcompile
@@ -4147,7 +4147,7 @@ func Test_funcref_with_underscore()
 
   " as a lambda argument
   let lines =<< trim END
-    vim9script
+    mnv9script
     var Fn = (_Farg: func) => 10
   END
   call v9.CheckSourceFailure(lines, 'E704: Funcref variable name must start with a capital: _Farg', 2)
@@ -4179,13 +4179,13 @@ func Test_exepath()
     call assert_notequal(exepath('cmd'), '')
 
     let oldNoDefaultCurrentDirectoryInExePath = $NoDefaultCurrentDirectoryInExePath
-    call writefile(['@echo off', 'echo Evil'], 'vim-test-evil.bat')
+    call writefile(['@echo off', 'echo Evil'], 'mnv-test-evil.bat')
     let $NoDefaultCurrentDirectoryInExePath = ''
-    call assert_notequal(exepath("vim-test-evil.bat"), '')
+    call assert_notequal(exepath("mnv-test-evil.bat"), '')
     let $NoDefaultCurrentDirectoryInExePath = '1'
-    call assert_equal(exepath("vim-test-evil.bat"), '')
+    call assert_equal(exepath("mnv-test-evil.bat"), '')
     let $NoDefaultCurrentDirectoryInExePath = oldNoDefaultCurrentDirectoryInExePath
-    call delete('vim-test-evil.bat')
+    call delete('mnv-test-evil.bat')
   else
     call assert_notequal(exepath('sh'), '')
   endif
@@ -4223,7 +4223,7 @@ func Test_virtcol()
 endfunc
 
 func Test_delfunc_while_listing()
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   let lines =<< trim END
       set nocompatible
@@ -4234,7 +4234,7 @@ func Test_delfunc_while_listing()
       au CmdlineLeave : call timer_start(0, {-> execute('delfunc MyFunc622')})
   END
   call writefile(lines, 'Xfunctionclear', 'D')
-  let buf = RunVimInTerminal('-S Xfunctionclear', {'rows': 12})
+  let buf = RunMNVInTerminal('-S Xfunctionclear', {'rows': 12})
 
   " This was using freed memory.  The height of the terminal must be so that
   " the next function to be listed with "j" is the one that is deleted in the
@@ -4245,7 +4245,7 @@ func Test_delfunc_while_listing()
   call TermWait(buf, 50)
   call term_sendkeys(buf, "\<CR>")
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 " Test for the reverse() function with a string
@@ -4259,7 +4259,7 @@ func Test_string_reverse()
       call assert_equal(s2, reverse(s1))
     endfor
   END
-  call v9.CheckLegacyAndVim9Success(lines)
+  call v9.CheckLegacyAndMNV9Success(lines)
 
   " test in latin1 encoding
   let save_enc = &encoding
@@ -4269,7 +4269,7 @@ func Test_string_reverse()
 endfunc
 
 func Test_fullcommand()
-  " this used to crash vim
+  " this used to crash mnv
   call assert_equal('', fullcommand(10))
 endfunc
 
@@ -4296,7 +4296,7 @@ func Test_glob_extended_bash()
 endfunc
 
 " Test for glob() with extended patterns (MS-Windows)
-" Vim doesn't use 'shell' to expand wildcards on MS-Windows.
+" MNV doesn't use 'shell' to expand wildcards on MS-Windows.
 " Unlike bash, it doesn't support {,} expansion.
 func Test_glob_extended_mswin()
   CheckMSWindows
@@ -4361,7 +4361,7 @@ func Test_slice()
     call assert_equal('', 'ὰ̳β�̳γ̳̂δ̳̃ε̳̄ζ̳̅'->slice(1, -5))
     call assert_equal('', 'ὰ̳β�̳γ̳̂δ̳̃ε̳̄ζ̳̅'->slice(1, -6))
   END
-  call v9.CheckLegacyAndVim9Success(lines)
+  call v9.CheckLegacyAndMNV9Success(lines)
 
   call assert_equal(0, slice(v:true, 1))
 endfunc
@@ -4371,9 +4371,9 @@ endfunc
 " Pixel size of a cell is terminal-dependent, so in the test, only the list and size 2 are checked.
 func Test_getcellpixels_for_unix()
   CheckNotMSWindows
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
-  let buf = RunVimInTerminal('', #{rows: 6})
+  let buf = RunMNVInTerminal('', #{rows: 6})
 
   " write getcellpixels() result to current buffer.
   call term_sendkeys(buf, ":redi @\"\<CR>")
@@ -4383,16 +4383,16 @@ func Test_getcellpixels_for_unix()
 
   call WaitForAssert({-> assert_match("\[\d+, \d+\]", term_getline(buf, 3))}, 1000)
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 " Test for getcellpixels() for windows system
-" Windows terminal vim is not support. check return `[]`.
+" Windows terminal mnv is not support. check return `[]`.
 func Test_getcellpixels_for_windows()
   CheckMSWindows
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
-  let buf = RunVimInTerminal('', #{rows: 6})
+  let buf = RunMNVInTerminal('', #{rows: 6})
 
   " write getcellpixels() result to current buffer.
   call term_sendkeys(buf, ":redi @\"\<CR>")
@@ -4402,10 +4402,10 @@ func Test_getcellpixels_for_windows()
 
   call WaitForAssert({-> assert_match("\[\]", term_getline(buf, 3))}, 1000)
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
-" Test for getcellpixels() on gVim
+" Test for getcellpixels() on gMNV
 func Test_getcellpixels_gui()
   if has("gui_running")
     let cellpixels = getcellpixels()
@@ -4461,7 +4461,7 @@ func Test_base64_encoding()
     call assert_fails('call base64_encode([])', 'E1238: Blob required for argument 1')
     call assert_fails('call base64_decode([])', 'E1174: String required for argument 1')
   END
-  call v9.CheckLegacyAndVim9Success(lines)
+  call v9.CheckLegacyAndMNV9Success(lines)
 endfunc
 
 " Tests for the str2blob() function
@@ -4501,7 +4501,7 @@ func Test_str2blob()
     call assert_fails("call str2blob(['அஇ'], {'encoding': 'latin1'})", 'E1516: Unable to convert to ''latin1'' encoding')
     call assert_fails("call str2blob(['��'], {'encoding': 'latin1'})", 'E1516: Unable to convert to ''latin1'' encoding')
   END
-  call v9.CheckLegacyAndVim9Success(lines)
+  call v9.CheckLegacyAndMNV9Success(lines)
 endfunc
 
 " Tests for the blob2str() function
@@ -4566,7 +4566,7 @@ func Test_blob2str()
     call assert_equal(['Hello'], blob2str(0z480065006C006C006F00, {'encoding': 'ucs-2le'}))
     call assert_equal(['Hello'], blob2str(0z480065006C006C006F00, {'encoding': 'ucs2le'}))
   END
-  call v9.CheckLegacyAndVim9Success(lines)
+  call v9.CheckLegacyAndMNV9Success(lines)
 endfunc
 
 " Test for uri_encode() and uri_decode() functions
@@ -4623,7 +4623,7 @@ func Test_uriencoding()
     call assert_equal(expected, uri_encode(cstr))
     call assert_equal(cstr, uri_decode(expected))
   END
-  call v9.CheckLegacyAndVim9Success(lines)
+  call v9.CheckLegacyAndMNV9Success(lines)
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_ga.vim b/uvim/src/testdir/test_ga.mnv
index a0050fa1fe..5f7489d815 100644
--- a/uvim/src/testdir/test_ga.vim
+++ b/uvim/src/testdir/test_ga.mnv
@@ -41,4 +41,4 @@ func Test_ga_command()
   bwipe!
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_getcwd.vim b/uvim/src/testdir/test_getcwd.mnv
index b67dadb735..22808e62e0 100644
--- a/uvim/src/testdir/test_getcwd.vim
+++ b/uvim/src/testdir/test_getcwd.mnv
@@ -28,7 +28,7 @@ endfunc
 " delete the Xtopdir directory during cleanup
 func SetUp()
   set visualbell
-  set nocp viminfo+=nviminfo
+  set nocp mnvinfo+=nmnvinfo
 
   " On windows a swapfile in Xtopdir prevents it from being cleaned up.
   set noswapfile
@@ -265,4 +265,4 @@ function Test_Tab_Local_Cwd()
   new
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_gettext.vim b/uvim/src/testdir/test_gettext.mnv
index 626e2563cc..eae532acc7 100644
--- a/uvim/src/testdir/test_gettext.vim
+++ b/uvim/src/testdir/test_gettext.mnv
@@ -4,12 +4,12 @@ CheckFeature gettext
 
 func Test_gettext()
   call assert_fails('call bindtextdomain("test")', 'E119:')
-  call assert_fails('call bindtextdomain("vim", "test")', 'E475:')
+  call assert_fails('call bindtextdomain("mnv", "test")', 'E475:')
 
   call assert_fails('call gettext(1)', 'E1174:')
   call assert_equal('xxxTESTxxx', gettext("xxxTESTxxx"))
 
-  call assert_equal('xxxTESTxxx', gettext("xxxTESTxxx", "vim"))
+  call assert_equal('xxxTESTxxx', gettext("xxxTESTxxx", "mnv"))
   call assert_equal('xxxTESTxxx', gettext("xxxTESTxxx", "__PACKAGE__"))
   call assert_equal('ERROR: ', gettext("ERROR: ", "__PACKAGE__"))
 
@@ -17,4 +17,4 @@ func Test_gettext()
   call assert_equal('ERRORS: ', ngettext("ERROR: ", "ERRORS: ", 2, "__PACKAGE__"))
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_gettext_cp1251.vim b/uvim/src/testdir/test_gettext_cp1251.mnv
index 0108dbbfca..10cdaad85f 100644
--- a/uvim/src/testdir/test_gettext_cp1251.vim
+++ b/uvim/src/testdir/test_gettext_cp1251.mnv
@@ -13,22 +13,22 @@ func Test_gettext()
 
     try
       language messages ru_RU
-      call assert_equal('ÎØÈÁÊÀ: for __PACKAGE__', gettext("ERROR: ", "__PACKAGE__"))
-    catch /^Vim\%((\a\+)\)\=:E197:/
+      call assert_equal('������: for __PACKAGE__', gettext("ERROR: ", "__PACKAGE__"))
+    catch /^MNV\%((\a\+)\)\=:E197:/
       throw "Skipped: not possible to set locale to ru (missing?)"
     endtry
 
     try
       language messages en_GB.UTF-8
       call assert_equal('ERROR: ', gettext("ERROR: ", "__PACKAGE__"))
-    catch /^Vim\%((\a\+)\)\=:E197:/
+    catch /^MNV\%((\a\+)\)\=:E197:/
       throw "Skipped: not possible to set locale to en (missing?)"
     endtry
 
-  catch /^Vim\%((\a\+)\)\=:E342:/
+  catch /^MNV\%((\a\+)\)\=:E342:/
     throw "Skipped: out of memory executing bindtextdomain()"
   endtry
   set encoding&
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_gettext_make.vim b/uvim/src/testdir/test_gettext_make.mnv
index 2347c8ea10..291ae5adab 100644
--- a/uvim/src/testdir/test_gettext_make.vim
+++ b/uvim/src/testdir/test_gettext_make.mnv
@@ -8,21 +8,21 @@ func Test_gettext_makefile()
     if getenv('GETTEXT_PATH') == v:null
       throw 'Skipped: %GETTEXT_PATH% is not set.'
     endif
-    call system('nmake.exe -f Make_mvc.mak "VIMPROG=' .. getenv('VIMPROG') ..
+    call system('nmake.exe -f Make_mvc.mak "MNVPROG=' .. getenv('MNVPROG') ..
           \ '" "GETTEXT_PATH=' .. getenv('GETTEXT_PATH') ..
           \ '" PLUGPACKAGE=test_gettext
-          \ "PO_PLUG_INPUTLIST=..\testdir\test_gettext_makefile_in1.vim
-          \ ..\testdir\test_gettext_makefile_in2.vim
-          \ ..\testdir\test_gettext_makefile_in3.vim
-          \ ..\testdir\test_gettext_makefile_in4.vim" test_gettext.pot')
+          \ "PO_PLUG_INPUTLIST=..\testdir\test_gettext_makefile_in1.mnv
+          \ ..\testdir\test_gettext_makefile_in2.mnv
+          \ ..\testdir\test_gettext_makefile_in3.mnv
+          \ ..\testdir\test_gettext_makefile_in4.mnv" test_gettext.pot')
   else
 " Will it work on macOS?
     CheckExecutable xgettext
     call system("make -f Makefile PLUGPACKAGE=test_gettext
-          \ PO_PLUG_INPUTLIST=\"../testdir/test_gettext_makefile_in1.vim
-          \ ../testdir/test_gettext_makefile_in2.vim
-          \ ../testdir/test_gettext_makefile_in3.vim
-          \ ../testdir/test_gettext_makefile_in4.vim\" test_gettext.pot")
+          \ PO_PLUG_INPUTLIST=\"../testdir/test_gettext_makefile_in1.mnv
+          \ ../testdir/test_gettext_makefile_in2.mnv
+          \ ../testdir/test_gettext_makefile_in3.mnv
+          \ ../testdir/test_gettext_makefile_in4.mnv\" test_gettext.pot")
   endif
   if v:shell_error != 0
     throw 'Fail to create test_gettext.pot. Error code: ' .. v:shell_error
@@ -46,20 +46,20 @@ func Test_gettext_makefile()
     "Content-Type: text/plain; charset=CHARSET\n"
     "Content-Transfer-Encoding: 8bit\n"
 
-    #: ../testdir/test_gettext_makefile_in1.vim:4 ../testdir/test_gettext_makefile_in1.vim:6
-    #: ../testdir/test_gettext_makefile_in2.vim:5 ../testdir/test_gettext_makefile_in4.vim:4
+    #: ../testdir/test_gettext_makefile_in1.mnv:4 ../testdir/test_gettext_makefile_in1.mnv:6
+    #: ../testdir/test_gettext_makefile_in2.mnv:5 ../testdir/test_gettext_makefile_in4.mnv:4
     msgid "This is a test"
     msgstr ""
 
-    #: ../testdir/test_gettext_makefile_in1.vim:5
+    #: ../testdir/test_gettext_makefile_in1.mnv:5
     msgid "This is another test"
     msgstr ""
 
-    #: ../testdir/test_gettext_makefile_in2.vim:4
+    #: ../testdir/test_gettext_makefile_in2.mnv:4
     msgid "This is a test from the second file"
     msgstr ""
 
-    #: ../testdir/test_gettext_makefile_in4.vim:5
+    #: ../testdir/test_gettext_makefile_in4.mnv:5
     msgid "This is a fourth test"
     msgstr ""
   END
@@ -69,4 +69,4 @@ func Test_gettext_makefile()
   cd -
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_gettext_makefile_in1.vim b/uvim/src/testdir/test_gettext_makefile_in1.mnv
index cbe11591f9..081ee334b6 100644
--- a/uvim/src/testdir/test_gettext_makefile_in1.vim
+++ b/uvim/src/testdir/test_gettext_makefile_in1.mnv
@@ -4,4 +4,4 @@
 echo gettext("This is a test", "test_gettext")
 echo gettext("This is another test", "test_gettext")
 echo gettext("This is a test", "test_gettext")
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/src/testdir/test_gettext_makefile_in2.vim b/uvim/src/testdir/test_gettext_makefile_in2.mnv
index 86d3dd9ed1..0fbb6c6d1e 100644
--- a/uvim/src/testdir/test_gettext_makefile_in2.vim
+++ b/uvim/src/testdir/test_gettext_makefile_in2.mnv
@@ -3,4 +3,4 @@
 
 echo gettext("This is a test from the second file", "test_gettext")
 echo gettext("This is a test", "test_gettext")
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/src/testdir/test_gettext_makefile_in3.vim b/uvim/src/testdir/test_gettext_makefile_in3.mnv
index f4cf93d1a9..8c7ea1e0d7 100644
--- a/uvim/src/testdir/test_gettext_makefile_in3.vim
+++ b/uvim/src/testdir/test_gettext_makefile_in3.mnv
@@ -1,4 +1,4 @@
 " Test file for gettext() package makefile
 " Last Change:	2024 Jun 01
 
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/src/testdir/test_gettext_makefile_in4.vim b/uvim/src/testdir/test_gettext_makefile_in4.mnv
index 7f9f3f7dd5..797fc23245 100644
--- a/uvim/src/testdir/test_gettext_makefile_in4.vim
+++ b/uvim/src/testdir/test_gettext_makefile_in4.mnv
@@ -3,4 +3,4 @@
 
 echo gettext("This is a test", "test_gettext")
 echo gettext("This is a fourth test", "test_gettext")
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/src/testdir/test_gettext_utf8.vim b/uvim/src/testdir/test_gettext_utf8.mnv
index b1ab6f8b0b..9788ba8903 100644
--- a/uvim/src/testdir/test_gettext_utf8.vim
+++ b/uvim/src/testdir/test_gettext_utf8.mnv
@@ -21,7 +21,7 @@ func Test_gettext()
       call assert_equal('%d буфер удалён из пам�ти for __PACKAGE__', ngettext("%d buffer unloaded", "%d buffers unloaded", 1, "__PACKAGE__"))
       call assert_equal('%d буфера удалено из пам�ти for __PACKAGE__', ngettext("%d buffer unloaded", "%d buffers unloaded", 2, "__PACKAGE__"))
       call assert_equal('%d буферов удалено из пам�ти for __PACKAGE__', ngettext("%d buffer unloaded", "%d buffers unloaded", 5, "__PACKAGE__"))
-    catch /^Vim\%((\a\+)\)\=:E197:/
+    catch /^MNV\%((\a\+)\)\=:E197:/
       throw "Skipped: not possible to set locale to ru (missing?)"
     endtry
 
@@ -35,14 +35,14 @@ func Test_gettext()
       call assert_equal('%d buffer unloaded', ngettext("%d buffer unloaded", "%d buffers unloaded", 1, "__PACKAGE__"))
       call assert_equal('%d buffers unloaded', ngettext("%d buffer unloaded", "%d buffers unloaded", 2, "__PACKAGE__"))
       call assert_equal('%d buffers unloaded', ngettext("%d buffer unloaded", "%d buffers unloaded", 5, "__PACKAGE__"))
-    catch /^Vim\%((\a\+)\)\=:E197:/
+    catch /^MNV\%((\a\+)\)\=:E197:/
       throw "Skipped: not possible to set locale to en (missing?)"
     endtry
 
-  catch /^Vim\%((\a\+)\)\=:E342:/
+  catch /^MNV\%((\a\+)\)\=:E342:/
     throw "Skipped: out of memory executing bindtextdomain()"
   endtry
   set encoding&
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_getvar.vim b/uvim/src/testdir/test_getvar.mnv
index 2ff13ef6e3..0666493104 100644
--- a/uvim/src/testdir/test_getvar.vim
+++ b/uvim/src/testdir/test_getvar.mnv
@@ -133,7 +133,7 @@ func Test_get_list()
   call assert_equal(999, get(l, 3, 999))
 endfunc
 
-" get({blob}, {idx} [, {default}]) - in test_blob.vim
+" get({blob}, {idx} [, {default}]) - in test_blob.mnv
 
 " get({lambda}, {what} [, {default}])
 func Test_get_lambda()
@@ -177,6 +177,6 @@ func Test_get_func()
   call assert_equal({'required': 0, 'optional': 0, 'varargs': v:false}, get(NF, 'arity'))
 endfunc
 
-" get({partial}, {what} [, {default}]) - in test_partial.vim
+" get({partial}, {what} [, {default}]) - in test_partial.mnv
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_gf.vim b/uvim/src/testdir/test_gf.mnv
index 4dc01c925b..a0a3158a84 100644
--- a/uvim/src/testdir/test_gf.vim
+++ b/uvim/src/testdir/test_gf.mnv
@@ -5,35 +5,35 @@
 func Test_gf_url()
   enew!
   call append(0, [
-      \ "first test for URL://machine.name/tmp/vimtest2a and other text",
-      \ "second test for URL://machine.name/tmp/vimtest2b. And other text",
-      \ "third test for URL:\\\\machine.name\\vimtest2c and other text",
-      \ "fourth test for URL:\\\\machine.name\\tmp\\vimtest2d, and other text",
-      \ "fifth test for URL://machine.name/tmp?q=vim&opt=yes and other text",
-      \ "sixth test for URL://machine.name:1234?q=vim and other text",
+      \ "first test for URL://machine.name/tmp/mnvtest2a and other text",
+      \ "second test for URL://machine.name/tmp/mnvtest2b. And other text",
+      \ "third test for URL:\\\\machine.name\\mnvtest2c and other text",
+      \ "fourth test for URL:\\\\machine.name\\tmp\\mnvtest2d, and other text",
+      \ "fifth test for URL://machine.name/tmp?q=mnv&opt=yes and other text",
+      \ "sixth test for URL://machine.name:1234?q=mnv and other text",
       \ ])
   call cursor(1,1)
   call search("^first")
   call search("tmp")
-  call assert_equal("URL://machine.name/tmp/vimtest2a", expand("<cfile>"))
+  call assert_equal("URL://machine.name/tmp/mnvtest2a", expand("<cfile>"))
   call search("^second")
   call search("URL")
-  call assert_equal("URL://machine.name/tmp/vimtest2b", expand("<cfile>"))
+  call assert_equal("URL://machine.name/tmp/mnvtest2b", expand("<cfile>"))
   set isf=@,48-57,/,.,-,_,+,,,$,~,\
   call search("^third")
   call search("name")
-  call assert_equal("URL:\\\\machine.name\\vimtest2c", expand("<cfile>"))
+  call assert_equal("URL:\\\\machine.name\\mnvtest2c", expand("<cfile>"))
   call search("^fourth")
   call search("URL")
-  call assert_equal("URL:\\\\machine.name\\tmp\\vimtest2d", expand("<cfile>"))
+  call assert_equal("URL:\\\\machine.name\\tmp\\mnvtest2d", expand("<cfile>"))
 
   call search("^fifth")
   call search("URL")
-  call assert_equal("URL://machine.name/tmp?q=vim&opt=yes", expand("<cfile>"))
+  call assert_equal("URL://machine.name/tmp?q=mnv&opt=yes", expand("<cfile>"))
 
   call search("^sixth")
   call search("URL")
-  call assert_equal("URL://machine.name:1234?q=vim", expand("<cfile>"))
+  call assert_equal("URL://machine.name:1234?q=mnv", expand("<cfile>"))
 
   %d
   call setline(1, "demo://remote_file")
@@ -42,7 +42,7 @@ func Test_gf_url()
   call assert_equal(2, winnr('$'))
   close!
 
-  set isf&vim
+  set isf&mnv
   enew!
 endfunc
 
@@ -178,7 +178,7 @@ func Test_gf_error()
   let caught_e565 = 0
   try
     call feedkeys("ix\<esc>", 'xt')
-  catch /^Vim\%((\a\+)\)\=:E565/ " catch E565
+  catch /^MNV\%((\a\+)\)\=:E565/ " catch E565
     let caught_e565 = 1
   endtry
   call assert_equal(1, caught_e565)
@@ -385,4 +385,4 @@ func Test_gf_with_suffixesadd()
   call chdir(cwd)
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_glob2regpat.vim b/uvim/src/testdir/test_glob2regpat.mnv
index 66ace12adb..1ba53776b6 100644
--- a/uvim/src/testdir/test_glob2regpat.vim
+++ b/uvim/src/testdir/test_glob2regpat.mnv
@@ -1,6 +1,6 @@
 " Test glob2regpat()
 
-import './util/vim9.vim' as v9
+import './util/mnv9.mnv' as v9
 
 func Test_glob2regpat_invalid()
   call assert_equal('^1\.33$', glob2regpat(1.33))
@@ -12,7 +12,7 @@ endfunc
 func Test_glob2regpat_valid()
   call assert_equal('^foo\.', glob2regpat('foo.*'))
   call assert_equal('^foo.$', 'foo?'->glob2regpat())
-  call assert_equal('\.vim$', glob2regpat('*.vim'))
+  call assert_equal('\.mnv$', glob2regpat('*.mnv'))
   call assert_equal('^[abc]$', glob2regpat('[abc]'))
   call assert_equal('^foo bar$', glob2regpat('foo\ bar'))
   call assert_equal('^foo,bar$', glob2regpat('foo,bar'))
@@ -32,4 +32,4 @@ func Test_glob2regpat_valid()
   endif
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_global.vim b/uvim/src/testdir/test_global.mnv
index 598a33913d..a33ca81e25 100644
--- a/uvim/src/testdir/test_global.vim
+++ b/uvim/src/testdir/test_global.mnv
@@ -66,20 +66,20 @@ func Test_global_print()
   v/foo\|bar/p
   call assert_notequal('', v:statusmsg)
 
-  " In Vim9 script this is an error
+  " In MNV9 script this is an error
   let caught = 'no'
   try
-    vim9cmd v/foo\|bar/p
+    mnv9cmd v/foo\|bar/p
   catch /E538/
     let caught = 'yes'
     call assert_match('E538: Pattern found in every line: foo\|bar', v:exception)
   endtry
   call assert_equal('yes', caught)
 
-  " In Vim9 script not matching is an error
+  " In MNV9 script not matching is an error
   let caught = 'no'
   try
-    vim9cmd g/foobarnotfound/p
+    mnv9cmd g/foobarnotfound/p
   catch /E486/
     let caught = 'yes'
     call assert_match('E486: Pattern not found: foobarnotfound', v:exception)
@@ -128,14 +128,14 @@ endfunc
 
 " Test for interrupting :global using Ctrl-C
 func Test_interrupt_global()
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   let lines =<< trim END
     cnoremap ; <Cmd>sleep 10<CR>
     call setline(1, repeat(['foo'], 5))
   END
   call writefile(lines, 'Xtest_interrupt_global', 'D')
-  let buf = RunVimInTerminal('-S Xtest_interrupt_global', {'rows': 6})
+  let buf = RunMNVInTerminal('-S Xtest_interrupt_global', {'rows': 6})
 
   call term_sendkeys(buf, ":g/foo/norm :\<C-V>;\<CR>")
   " Wait for :sleep to start
@@ -150,7 +150,7 @@ func Test_interrupt_global()
   call term_sendkeys(buf, "\<C-C>")
   call WaitForAssert({-> assert_match('Interrupted', term_getline(buf, 5))}, 1000)
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_gn.vim b/uvim/src/testdir/test_gn.mnv
index eb237a25c5..3de867472d 100644
--- a/uvim/src/testdir/test_gn.vim
+++ b/uvim/src/testdir/test_gn.mnv
@@ -121,7 +121,7 @@ func Test_gn_command()
 
   " search using the \zs atom
   call setline(1, [' nnoremap', '', 'nnoremap'])
-  set wrapscan&vim
+  set wrapscan&mnv
   let @/ = '\_s\zsnnoremap'
   $
   norm! cgnmatch
@@ -154,7 +154,7 @@ func Test_gn_command()
   norm! gg0f2vf7gNd
   call assert_equal(['1678'], getline(1,'$'))
   sil! %d _
-  set wrapscan&vim
+  set wrapscan&mnv
 
   " Without 'wrapscan', in visual mode, running gn without a match should fail
   " but the visual mode should be kept.
@@ -218,4 +218,4 @@ func Test_gn_multi_line()
   bwipe!
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_goto.vim b/uvim/src/testdir/test_goto.mnv
index b6a6695d17..b3ef39d5fe 100644
--- a/uvim/src/testdir/test_goto.vim
+++ b/uvim/src/testdir/test_goto.mnv
@@ -446,4 +446,4 @@ func Test_motion_c_comment()
   bw!
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_gui.vim b/uvim/src/testdir/test_gui.mnv
index c686094ca2..e3deaa7a1a 100644
--- a/uvim/src/testdir/test_gui.vim
+++ b/uvim/src/testdir/test_gui.mnv
@@ -2,7 +2,7 @@
 
 CheckCanRunGui
 
-source util/setup_gui.vim
+source util/setup_gui.mnv
 
 func Setup()
   call GUISetUpCommon()
@@ -126,8 +126,8 @@ func Test_quoteplus()
 
   let test_call     = 'Can you hear me?'
   let test_response = 'Yes, I can.'
-  let testee = 'VIMRUNTIME=' .. $VIMRUNTIME .. '; export VIMRUNTIME;'
-        \ .. GetVimCommand() .. ' --noplugin --not-a-term -c ''%s'''
+  let testee = 'MNVRUNTIME=' .. $MNVRUNTIME .. '; export MNVRUNTIME;'
+        \ .. GetMNVCommand() .. ' --noplugin --not-a-term -c ''%s'''
   " Ignore the "failed to create input context" error.
   let cmd = 'call test_ignore_error("E285") | '
         \ . 'gui -f | '
@@ -136,9 +136,9 @@ func Test_quoteplus()
         \ . ':s/' . test_call . '/' . test_response . '/\<CR>'
         \ . '\"+yis'
         \ . ':q!\<CR>", "tx")'
-  let run_vimtest = printf(testee, cmd)
+  let run_mnvtest = printf(testee, cmd)
 
-  " Set the quoteplus register to test_call, and another gvim will launched.
+  " Set the quoteplus register to test_call, and another gmnv will launched.
   " Then, it first tries to paste the content of its own quotedplus register
   " onto it.  Second, it tries to substitute test_response for the pasted
   " sentence.  If the sentence is identical to test_call, the substitution
@@ -148,7 +148,7 @@ func Test_quoteplus()
   " test_response if those quoteplus registers are synchronized properly
   " with/through the X11 clipboard.
   let @+ = test_call
-  call system(run_vimtest)
+  call system(run_mnvtest)
   call assert_equal(test_response, @+)
 
   let @+ = quoteplus_saved
@@ -168,12 +168,12 @@ func Test_gui_read_stdin()
   " displayed.
   " However, when using XIM we might get E285, do use it then.
   if has('xim')
-    let vimcmd = GetVimCommand()
+    let mnvcmd = GetMNVCommand()
   else
-    let vimcmd = substitute(GetVimCommand(), '--not-a-term', '', '')
+    let mnvcmd = substitute(GetMNVCommand(), '--not-a-term', '', '')
   endif
 
-  call system('cat Xstdin | ' .. vimcmd .. ' -f -g -S Xscript -')
+  call system('cat Xstdin | ' .. mnvcmd .. ' -f -g -S Xscript -')
   call assert_equal(['some', 'lines'], readfile('XstdinOK'))
 
   call delete('XstdinOK')
@@ -203,7 +203,7 @@ func Test_set_balloondelay()
   " Edge cases
 
   " XXX This fact should be hidden so that people won't be tempted to write
-  " plugin/TimeMachine.vim.  TODO Add reasonable range checks to the source
+  " plugin/TimeMachine.mnv.  TODO Add reasonable range checks to the source
   " code.
   set balloondelay=-1
   call assert_equal(-1, &balloondelay)
@@ -466,14 +466,14 @@ func Test_set_guifontset()
   for locale in locales
     try
       exec 'language ctype' locale
-    catch /^Vim\%((\a\+)\)\=:E197/
+    catch /^MNV\%((\a\+)\)\=:E197/
       continue
     endtry
     let done = 0
     for fontset in fontsets
       try
 	exec 'set guifontset=' . fontset
-      catch /^Vim\%((\a\+)\)\=:E\%(250\|252\|234\|597\|598\)/
+      catch /^MNV\%((\a\+)\)\=:E\%(250\|252\|234\|597\|598\)/
 	break
       endtry
       let done += 1
@@ -895,7 +895,7 @@ func Test_shell_command()
 endfunc
 
 func Test_syntax_colortest()
-  runtime syntax/colortest.vim
+  runtime syntax/colortest.mnv
   redraw!
   sleep 200m
   bwipe!
@@ -916,9 +916,9 @@ func Test_windowid_variable()
   endif
 endfunc
 
-" Test "vim -g" and also the GUIEnter autocommand.
+" Test "mnv -g" and also the GUIEnter autocommand.
 func Test_gui_dash_g()
-  let cmd = GetVimCommand('Xscriptgui')
+  let cmd = GetMNVCommand('Xscriptgui')
   call writefile([""], "Xtestgui", 'D')
   let lines =<< trim END
 	au GUIEnter * call writefile(["insertmode: " . &insertmode], "Xtestgui")
@@ -929,9 +929,9 @@ func Test_gui_dash_g()
   call WaitForAssert({-> assert_equal(['insertmode: 0'], readfile('Xtestgui'))})
 endfunc
 
-" Test "vim -7" and also the GUIEnter autocommand.
+" Test "mnv -7" and also the GUIEnter autocommand.
 func Test_gui_dash_y()
-  let cmd = GetVimCommand('Xscriptgui')
+  let cmd = GetMNVCommand('Xscriptgui')
   call writefile([""], "Xtestgui", 'D')
   let lines =<< trim END
 	au GUIEnter * call writefile(["insertmode: " . &insertmode], "Xtestgui")
@@ -954,7 +954,7 @@ func Test_gui_run_cmd_in_terminal()
     " assume all the other systems have a cat command
     let cmd = 'cat'
   endif
-  exe "silent !" . cmd . " test_gui.vim"
+  exe "silent !" . cmd . " test_gui.mnv"
   " TODO: how to check that the command ran in a separate terminal?
   " Maybe check for $TERM (dumb vs xterm) in the spawned shell?
   let &guioptions = save_guioptions
@@ -1722,7 +1722,7 @@ func Test_gui_CTRL_SHIFT_V()
 endfunc
 
 func Test_gui_dialog_file()
-  " make sure the file does not exist, otherwise a dialog makes Vim hang
+  " make sure the file does not exist, otherwise a dialog makes MNV hang
   call delete('Xdialfile')
 
   let lines =<< trim END
@@ -1735,7 +1735,7 @@ func Test_gui_dialog_file()
   if has('win32')
     let prefix = '!start '
   endif
-  execute prefix .. GetVimCommand() .. ' -g -f --clean --gui-dialog-file Xdialog -S Xlines'
+  execute prefix .. GetMNVCommand() .. ' -g -f --clean --gui-dialog-file Xdialog -S Xlines'
 
   call WaitForAssert({-> assert_true(filereadable('Xdialog'))})
   call assert_match('Question: Save changes to "Xdialfile"?', readfile('Xdialog')->join('<NL>'))
@@ -1764,14 +1764,14 @@ func Test_gui_lowlevel_keyevent()
     call SendKeys([0x11, kc])
     try
       let ch = getcharstr()
-    catch /^Vim:Interrupt$/
+    catch /^MNV:Interrupt$/
       let ch = "\<c-c>"
     endtry
     call assert_equal(nr2char(kc - 64), ch)
   endfor
 
   " Testing more extensive windows keyboard handling
-  " is covered in test_mswin_event.vim
+  " is covered in test_mswin_event.mnv
 
   bw!
 endfunc
@@ -1803,16 +1803,16 @@ endfunc
 " Test that CursorHold is NOT triggered at startup before a keypress
 func Test_CursorHold_not_triggered_at_startup()
   defer delete('Xcursorhold.log')
-  defer delete('Xcursorhold_test.vim')
+  defer delete('Xcursorhold_test.mnv')
   call writefile([
         \ 'set updatetime=300',
         \ 'let g:cursorhold_triggered = 0',
         \ 'autocmd CursorHold * let g:cursorhold_triggered += 1 | call writefile(["CursorHold triggered"], "Xcursorhold.log", "a")',
         \ 'call timer_start(400, {-> execute(''call writefile(["g:cursorhold_triggered=" . g:cursorhold_triggered], "Xcursorhold.log", "a") | qa!'')})',
-        \ ], 'Xcursorhold_test.vim')
+        \ ], 'Xcursorhold_test.mnv')
 
-  let vimcmd = v:progpath . ' -g -f -N -u NONE -i NONE -S Xcursorhold_test.vim'
-  call system(vimcmd)
+  let mnvcmd = v:progpath . ' -g -f -N -u NONE -i NONE -S Xcursorhold_test.mnv'
+  call system(mnvcmd)
 
   let lines = filereadable('Xcursorhold.log') ? readfile('Xcursorhold.log') : []
 
@@ -1825,7 +1825,7 @@ endfunc
 " Test that Buffers menu generates the correct index for different buffer
 " names for sorting.
 func Test_Buffers_Menu()
-  doautocmd LoadBufferMenu VimEnter
+  doautocmd LoadBufferMenu MNVEnter
 
   " Non-ASCII characters only use the first character as idx
   let idx_emoji = or(char2nr('😑'), 0x40000000)
@@ -1889,4 +1889,4 @@ func Test_guioptions_clipboard()
   let &guioptions = save_guioptions
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_gui_init.vim b/uvim/src/testdir/test_gui_init.mnv
index 1a60a49ec5..32d5a07553 100644
--- a/uvim/src/testdir/test_gui_init.vim
+++ b/uvim/src/testdir/test_gui_init.mnv
@@ -3,7 +3,7 @@
 
 CheckCanRunGui
 
-source util/setup_gui.vim
+source util/setup_gui.mnv
 
 func Setup()
   call GUISetUpCommon()
@@ -23,7 +23,7 @@ func Test_set_guiheadroom()
   CheckX11BasedGui
 
   " The 'expected' value must be consistent with the value specified with
-  " gui_init.vim.
+  " gui_init.mnv.
   call assert_equal(0, &guiheadroom)
 endfunc
 
@@ -41,4 +41,4 @@ func Test_set_guioptions_for_p()
   call assert_match('.*p.*', &guioptions)
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_hardcopy.vim b/uvim/src/testdir/test_hardcopy.mnv
index 33ef4bff1b..1fda49795c 100644
--- a/uvim/src/testdir/test_hardcopy.vim
+++ b/uvim/src/testdir/test_hardcopy.mnv
@@ -1,7 +1,7 @@
 " Test :hardcopy
 
 func Test_printoptions()
-  edit test_hardcopy.vim
+  edit test_hardcopy.mnv
   syn on
 
   for opt in ['left:5in,right:10pt,top:8mm,bottom:2pc',
@@ -138,13 +138,13 @@ endfunc
 func Test_errors()
   CheckFeature postscript
 
-  edit test_hardcopy.vim
+  edit test_hardcopy.mnv
   call assert_fails('hardcopy >', 'E324:')
   bwipe
 endfunc
 
 func Test_dark_background()
-  edit test_hardcopy.vim
+  edit test_hardcopy.mnv
   syn on
 
   for bg in ['dark', 'light']
@@ -209,7 +209,7 @@ endfunc
 
 func Test_printoptions_portrait()
   CheckFeature postscript
-  edit test_hardcopy.vim
+  edit test_hardcopy.mnv
   syn on
 
   set printoptions=portrait:y
@@ -234,4 +234,4 @@ func Test_printoptions_portrait()
   bwipe
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_help.vim b/uvim/src/testdir/test_help.mnv
index 1a52998f9f..1f53ac738c 100644
--- a/uvim/src/testdir/test_help.vim
+++ b/uvim/src/testdir/test_help.mnv
@@ -1,6 +1,6 @@
 " Tests for :help
 
-import './util/vim9.vim' as v9
+import './util/mnv9.mnv' as v9
 
 func Test_help_restore_snapshot()
   help
@@ -148,7 +148,7 @@ func Test_helptag_cmd()
   " Test parsing tags
   call writefile(['*tag1*', 'Example: >', '  *notag1*', 'Example end: *tag2*',
                 \ '>', '  *notag2*', '<',
-                \ '*tag3*', 'Code: >vim', '  *notag3*', 'Code end: *tag4*',
+                \ '*tag3*', 'Code: >mnv', '  *notag3*', 'Code end: *tag4*',
                 \ '>i3config', '  *notag4*', '<'],
     \ 'Xtagdir/a/doc/sample.txt')
   helptags Xtagdir
@@ -228,7 +228,7 @@ func Test_helptag_navigation()
   setl ft=help
   let &l:iskeyword='!-~,^*,^|,^",192-255'
   call cursor(4, 2)
-  " Vim must not escape `[` when expanding the tag
+  " MNV must not escape `[` when expanding the tag
   exe "normal! \<C-]>"
   call assert_equal(2, line('.'))
   bw
@@ -289,4 +289,4 @@ func Test_helpfile_overflow()
   let &helpfile = _helpfile
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_help_tagjump.vim b/uvim/src/testdir/test_help_tagjump.mnv
index 35b0c68692..e4294a8448 100644
--- a/uvim/src/testdir/test_help_tagjump.vim
+++ b/uvim/src/testdir/test_help_tagjump.mnv
@@ -315,4 +315,4 @@ func Test_help_respect_current_file_lang()
   endtry
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_hide.vim b/uvim/src/testdir/test_hide.mnv
index 379d2e3e34..7ff8d1d7da 100644
--- a/uvim/src/testdir/test_hide.vim
+++ b/uvim/src/testdir/test_hide.mnv
@@ -94,4 +94,4 @@ function Test_hide()
   bwipeout! Xf2
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_highlight.vim b/uvim/src/testdir/test_highlight.mnv
index 6b45e8ea82..2cc9f6eb3c 100644
--- a/uvim/src/testdir/test_highlight.vim
+++ b/uvim/src/testdir/test_highlight.mnv
@@ -1,8 +1,8 @@
 " Tests for ":highlight" and highlighting.
 
-source util/screendump.vim
-source util/script_util.vim
-import './util/vim9.vim' as v9
+source util/screendump.mnv
+source util/script_util.mnv
+import './util/mnv9.mnv' as v9
 
 func ClearDict(d)
   for k in keys(a:d)
@@ -543,7 +543,7 @@ func Test_cursorline_after_yank()
 	\ 'set cul rnu',
 	\ 'call setline(1, ["","1","2","3",""])',
 	\ ], 'Xtest_cursorline_yank', 'D')
-  let buf = RunVimInTerminal('-S Xtest_cursorline_yank', {'rows': 8})
+  let buf = RunMNVInTerminal('-S Xtest_cursorline_yank', {'rows': 8})
   call TermWait(buf)
   call term_sendkeys(buf, "Gy3k")
   call TermWait(buf)
@@ -552,7 +552,7 @@ func Test_cursorline_after_yank()
   call VerifyScreenDump(buf, 'Test_cursorline_yank_01', {})
 
   " clean up
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 " Test for issue #4862: pasting above 'cursorline' redraws properly.
@@ -583,14 +583,14 @@ func Test_cursorline_with_visualmode()
 	\ 'set cul',
 	\ 'call setline(1, repeat(["abc"], 50))',
 	\ ], 'Xtest_cursorline_with_visualmode', 'D')
-  let buf = RunVimInTerminal('-S Xtest_cursorline_with_visualmode', {'rows': 12})
+  let buf = RunMNVInTerminal('-S Xtest_cursorline_with_visualmode', {'rows': 12})
   call TermWait(buf)
   call term_sendkeys(buf, "V\<C-f>kkkjk")
 
   call VerifyScreenDump(buf, 'Test_cursorline_with_visualmode_01', {})
 
   " clean up
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_cursorcolumn_insert_on_tab()
@@ -603,7 +603,7 @@ func Test_cursorcolumn_insert_on_tab()
   END
   call writefile(lines, 'Xcuc_insert_on_tab', 'D')
 
-  let buf = RunVimInTerminal('-S Xcuc_insert_on_tab', #{rows: 8})
+  let buf = RunMNVInTerminal('-S Xcuc_insert_on_tab', #{rows: 8})
   call TermWait(buf)
   call VerifyScreenDump(buf, 'Test_cursorcolumn_insert_on_tab_1', {})
 
@@ -619,7 +619,7 @@ func Test_cursorcolumn_insert_on_tab()
   call TermWait(buf)
   call VerifyScreenDump(buf, 'Test_cursorcolumn_insert_on_tab_2', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_cursorcolumn_callback()
@@ -639,11 +639,11 @@ func Test_cursorcolumn_callback()
   END
   call writefile(lines, 'Xcuc_timer', 'D')
 
-  let buf = RunVimInTerminal('-S Xcuc_timer', #{rows: 8})
+  let buf = RunMNVInTerminal('-S Xcuc_timer', #{rows: 8})
   call TermWait(buf, 310)
   call VerifyScreenDump(buf, 'Test_cursorcolumn_callback_1', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_wincolor()
@@ -663,7 +663,7 @@ func Test_wincolor()
 	/here
   END
   call writefile(lines, 'Xtest_wincolor', 'D')
-  let buf = RunVimInTerminal('-S Xtest_wincolor', {'rows': 8})
+  let buf = RunMNVInTerminal('-S Xtest_wincolor', {'rows': 8})
   call TermWait(buf)
   call term_sendkeys(buf, "2G5lvj")
   call TermWait(buf)
@@ -672,7 +672,7 @@ func Test_wincolor()
 
   " clean up
   call term_sendkeys(buf, "\<Esc>")
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_wincolor_listchars()
@@ -688,13 +688,13 @@ func Test_wincolor_listchars()
 	normal 2G5zl
   END
   call writefile(lines, 'Xtest_wincolorlcs', 'D')
-  let buf = RunVimInTerminal('-S Xtest_wincolorlcs', {'rows': 8})
+  let buf = RunMNVInTerminal('-S Xtest_wincolorlcs', {'rows': 8})
 
   call VerifyScreenDump(buf, 'Test_wincolor_lcs', {})
 
   " clean up
   call term_sendkeys(buf, "\<Esc>")
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_colorcolumn()
@@ -712,12 +712,12 @@ func Test_colorcolumn()
 	buf X
   END
   call writefile(lines, 'Xtest_colorcolumn', 'D')
-  let buf = RunVimInTerminal('-S Xtest_colorcolumn', {'rows': 10})
+  let buf = RunMNVInTerminal('-S Xtest_colorcolumn', {'rows': 10})
   call term_sendkeys(buf, ":\<CR>")
   call VerifyScreenDump(buf, 'Test_colorcolumn_1', {})
 
   " clean up
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_colorcolumn_bri()
@@ -728,12 +728,12 @@ func Test_colorcolumn_bri()
 	call setline(1, 'The quick brown fox jumped over the lazy dogs')
   END
   call writefile(lines, 'Xtest_colorcolumn_bri', 'D')
-  let buf = RunVimInTerminal('-S Xtest_colorcolumn_bri', {'rows': 10,'columns': 40})
+  let buf = RunMNVInTerminal('-S Xtest_colorcolumn_bri', {'rows': 10,'columns': 40})
   call term_sendkeys(buf, ":set co=40 linebreak bri briopt=shift:2 cc=40,41,43\<CR>")
   call VerifyScreenDump(buf, 'Test_colorcolumn_2', {})
 
   " clean up
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_colorcolumn_sbr()
@@ -744,12 +744,12 @@ func Test_colorcolumn_sbr()
 	call setline(1, 'The quick brown fox jumped over the lazy dogs')
   END
   call writefile(lines, 'Xtest_colorcolumn_sbr', 'D')
-  let buf = RunVimInTerminal('-S Xtest_colorcolumn_sbr', {'rows': 10,'columns': 40})
+  let buf = RunMNVInTerminal('-S Xtest_colorcolumn_sbr', {'rows': 10,'columns': 40})
   call term_sendkeys(buf, ":set co=40 showbreak=+++>\\  cc=40,41,43\<CR>")
   call VerifyScreenDump(buf, 'Test_colorcolumn_3', {})
 
   " clean up
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_visual_sbr()
@@ -762,14 +762,14 @@ func Test_visual_sbr()
       exe "normal! z1\<CR>"
   END
   call writefile(lines, 'Xtest_visual_sbr', 'D')
-  let buf = RunVimInTerminal('-S Xtest_visual_sbr', {'rows': 6,'columns': 60})
+  let buf = RunMNVInTerminal('-S Xtest_visual_sbr', {'rows': 6,'columns': 60})
 
   call term_sendkeys(buf, "v$")
   call VerifyScreenDump(buf, 'Test_visual_sbr_1', {})
 
   " clean up
   call term_sendkeys(buf, "\<Esc>")
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 " This test must come before the Test_cursorline test, as it appears this
@@ -1103,7 +1103,7 @@ func Test_hlget()
     call assert_equal([], hlget(test_null_string()))
     call assert_equal([], hlget(""))
   END
-  call v9.CheckLegacyAndVim9Success(lines)
+  call v9.CheckLegacyAndMNV9Success(lines)
 
   " Test for resolving highlight group links
   let lines =<< trim END
@@ -1134,7 +1134,7 @@ func Test_hlget()
     call assert_equal([{'id': hlgCid, 'name': 'hlgC',
                       \ 'term': {'bold': v:true}}], hlget('hlgC', v:true))
   END
-  call v9.CheckLegacyAndVim9Success(lines)
+  call v9.CheckLegacyAndMNV9Success(lines)
 
   call assert_fails('call hlget([])', 'E1174:')
   call assert_fails('call hlget("abc", "xyz")', 'E1212:')
@@ -1193,7 +1193,7 @@ func Test_hlset()
     call assert_equal('Search', hlget('NewHLGroup')[0].linksto)
     highlight clear NewHLGroup
   END
-  call v9.CheckLegacyAndVim9Success(lines)
+  call v9.CheckLegacyAndMNV9Success(lines)
 
   " Test for clearing the 'term', 'cterm' and 'gui' attributes of a highlight
   " group.
@@ -1212,7 +1212,7 @@ func Test_hlset()
                 \ hlget('myhlg1'))
     highlight clear myhlg1
   END
-  call v9.CheckLegacyAndVim9Success(lines)
+  call v9.CheckLegacyAndMNV9Success(lines)
 
   " Test for setting all the 'term', 'cterm' and 'gui' attributes of a
   " highlight group
@@ -1231,7 +1231,7 @@ func Test_hlset()
     call assert_equal([{'id': id2, 'name': 'myhlg2', 'gui': attr,
                       \ 'term': attr, 'cterm': attr}], hlget('myhlg2'))
   END
-  call v9.CheckLegacyAndVim9Success(lines)
+  call v9.CheckLegacyAndMNV9Success(lines)
 
   " Test for clearing some of the 'term', 'cterm' and 'gui' attributes of a
   " highlight group
@@ -1247,7 +1247,7 @@ func Test_hlset()
     call assert_equal([{'id': id2, 'name': 'myhlg2', 'gui': attr,
                       \ 'term': attr, 'cterm': attr}], hlget('myhlg2'))
   END
-  call v9.CheckLegacyAndVim9Success(lines)
+  call v9.CheckLegacyAndMNV9Success(lines)
 
   " Test for clearing the attributes and link of a highlight group
   let lines =<< trim END
@@ -1259,7 +1259,7 @@ func Test_hlset()
                       \ hlget('myhlg3'))
     highlight clear hlg3
   END
-  call v9.CheckLegacyAndVim9Success(lines)
+  call v9.CheckLegacyAndMNV9Success(lines)
 
   " Test for setting default attributes for a highlight group
   let lines =<< trim END
@@ -1284,7 +1284,7 @@ func Test_hlset()
                     \ hlget('hlg6'))
     highlight clear hlg6
   END
-  call v9.CheckLegacyAndVim9Success(lines)
+  call v9.CheckLegacyAndMNV9Success(lines)
 
   " Test for setting default links for a highlight group
   let lines =<< trim END
@@ -1314,7 +1314,7 @@ func Test_hlset()
                     \ 'linksto': 'ErrorMsg'}], hlget('hlg9dup'))
     highlight clear hlg9
   END
-  call v9.CheckLegacyAndVim9Success(lines)
+  call v9.CheckLegacyAndMNV9Success(lines)
 
   " Test for force creating a link to a highlight group
   let lines =<< trim END
@@ -1328,7 +1328,7 @@ func Test_hlset()
                     \ 'linksto': 'Search'}], hlget('hlg10'))
     highlight clear hlg10
   END
-  call v9.CheckLegacyAndVim9Success(lines)
+  call v9.CheckLegacyAndMNV9Success(lines)
 
   " Test for empty values of attributes
   call hlset([{'name': 'hlg11', 'cterm': {}}])
@@ -1370,7 +1370,7 @@ func Test_winhighlight()
   END
   call writefile(lines, 'Xtest_winhighlight', 'D')
 
-  let buf = RunVimInTerminal('-S Xtest_winhighlight', {'rows': 8})
+  let buf = RunMNVInTerminal('-S Xtest_winhighlight', {'rows': 8})
   call TermWait(buf)
 
   " Test that window highlight groups are actually local per window
@@ -1469,7 +1469,7 @@ func Test_winhighlight()
   call VerifyScreenDump(buf, 'Test_winhighlight_15', {})
 
   " clean up
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 " Test if 'hlsearch' highlighting works correctly with 'winhighlight'
@@ -1477,7 +1477,7 @@ func Test_winhighlight_hlsearch()
   CheckScreendump
 
   let lines =<< trim END
-  vim9script
+  mnv9script
 
   hi A ctermbg=red ctermfg=white
   hi B ctermbg=red ctermfg=white
@@ -1504,7 +1504,7 @@ func Test_winhighlight_hlsearch()
   END
   call writefile(lines, 'Xtest_winhighlight_hlsearch', 'D')
 
-  let buf = RunVimInTerminal('-S Xtest_winhighlight_hlsearch', {'rows': 20})
+  let buf = RunMNVInTerminal('-S Xtest_winhighlight_hlsearch', {'rows': 20})
   call TermWait(buf)
 
   call term_sendkeys(buf, "\<Esc>/i")
@@ -1522,7 +1522,7 @@ func Test_winhighlight_hlsearch()
 
   call term_sendkeys(buf, "\<Esc>") " Must exit search mode
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 " Test if syntax highlighting works correctly with 'winhighlight'. Also tests
@@ -1531,7 +1531,7 @@ func Test_winhighlight_syntax()
   CheckScreendump
 
   let lines =<< trim END
-  vim9script
+  mnv9script
 
   hi A ctermbg=blue ctermfg=white
   hi link B A
@@ -1544,7 +1544,7 @@ func Test_winhighlight_syntax()
   END
   call writefile(lines, 'Xtest_winhighlight_syntax', 'D')
 
-  let buf = RunVimInTerminal('-S Xtest_winhighlight_syntax', {'rows': 8})
+  let buf = RunMNVInTerminal('-S Xtest_winhighlight_syntax', {'rows': 8})
   call TermWait(buf)
 
   " Since A is the root of the link chain, it should affect all
@@ -1568,7 +1568,7 @@ func Test_winhighlight_syntax()
   call term_sendkeys(buf, "\<Esc>:setlocal whl=A:ErrorMsg,C:ErrorMsg\<CR>")
   call TermWait(buf)
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 " Test if terminal is correctly highlighted using 'winhighlight'
@@ -1581,7 +1581,7 @@ func Test_winhighlight_term()
   END
   call writefile(lines, 'Xtest_winhighlight_term', 'D')
 
-  let buf = RunVimInTerminal('-S Xtest_winhighlight_term', {'rows': 20, 'env': {'PS1': '>'}})
+  let buf = RunMNVInTerminal('-S Xtest_winhighlight_term', {'rows': 20, 'env': {'PS1': '>'}})
   call TermWait(buf)
 
   call term_sendkeys(buf, "\<C-\>\<C-n>\<Esc>:setlocal whl=Terminal:ErrorMsg\<CR>")
@@ -1604,7 +1604,7 @@ func Test_winhighlight_term()
   call term_sendkeys(buf, "\<C-\>\<C-N>\<Esc>:bw!\<CR>")
   call TermWait(buf)
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 " Test if 'winhighlight' works correctly in popup windows
@@ -1613,7 +1613,7 @@ func Test_winhighlight_popupwin()
   CheckUnix
 
   let lines =<< trim END
-  vim9script
+  mnv9script
 
   g:id = popup_dialog("int hello = 10;", {})
 
@@ -1625,7 +1625,7 @@ func Test_winhighlight_popupwin()
   END
   call writefile(lines, 'Xtest_winhighlight_popupwin', 'D')
 
-  let buf = RunVimInTerminal('-S Xtest_winhighlight_popupwin', {'rows': 20})
+  let buf = RunMNVInTerminal('-S Xtest_winhighlight_popupwin', {'rows': 20})
   call TermWait(buf)
 
   call VerifyScreenDump(buf, 'Test_winhighlight_popupwin_1', {})
@@ -1635,14 +1635,14 @@ func Test_winhighlight_popupwin()
 
   call VerifyScreenDump(buf, 'Test_winhighlight_popupwin_2', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 " Test that 'winhighlight' setting is copied over to new split window
 func Test_winhighlight_copy()
   CheckScreendump
 
-  let buf = RunVimInTerminal('', {'rows': 20})
+  let buf = RunMNVInTerminal('', {'rows': 20})
   call TermWait(buf)
 
   call term_sendkeys(buf, "\<Esc>:setlocal cursorline whl=CursorLine:ErrorMsg\<CR>\<Esc>:vsplit\<CR>")
@@ -1650,7 +1650,7 @@ func Test_winhighlight_copy()
 
   call VerifyScreenDump(buf, 'Test_winhighlight_copy_1', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 " Test if using a 'highlight' occasion instead of highlight group name works
@@ -1669,7 +1669,7 @@ func Test_winhighlight_occasion()
   END
   call writefile(lines, 'Xtest_winhighlight_occasion', 'D')
 
-  let buf = RunVimInTerminal('-S Xtest_winhighlight_occasion', {'rows': 20})
+  let buf = RunMNVInTerminal('-S Xtest_winhighlight_occasion', {'rows': 20})
   call TermWait(buf)
 
   call term_sendkeys(buf, "\<Esc>:setlocal whl=!(:A,!.:B,StatusLine:!~\<CR>")
@@ -1677,7 +1677,7 @@ func Test_winhighlight_occasion()
 
   call VerifyScreenDump(buf, 'Test_winhighlight_occasion_1', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_history.vim b/uvim/src/testdir/test_history.mnv
index 2470a5bce5..974c4abaad 100644
--- a/uvim/src/testdir/test_history.vim
+++ b/uvim/src/testdir/test_history.mnv
@@ -315,4 +315,4 @@ func Test_history_max_val()
   set history&
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_hlsearch.vim b/uvim/src/testdir/test_hlsearch.mnv
index 8bf7f0aaeb..3780dc11f3 100644
--- a/uvim/src/testdir/test_hlsearch.vim
+++ b/uvim/src/testdir/test_hlsearch.mnv
@@ -1,6 +1,6 @@
 " Test for v:hlsearch
 
-source util/screendump.vim
+source util/screendump.mnv
 
 func Test_hlsearch()
   new
@@ -74,7 +74,7 @@ endfunc
 
 func Test_hlsearch_Ctrl_R()
   CheckScreendump
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   let lines =<< trim END
       set incsearch hlsearch
@@ -82,18 +82,18 @@ func Test_hlsearch_Ctrl_R()
       put
   END
   call writefile(lines, 'XhlsearchCtrlR', 'D')
-  let buf = RunVimInTerminal('-S XhlsearchCtrlR', #{rows: 6, cols: 60})
+  let buf = RunMNVInTerminal('-S XhlsearchCtrlR', #{rows: 6, cols: 60})
 
   call term_sendkeys(buf, "/\<C-R>\<C-R>\"")
   call VerifyScreenDump(buf, 'Test_hlsearch_ctrlr_1', {})
 
   call term_sendkeys(buf, "\<Esc>")
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_hlsearch_clipboard()
   CheckScreendump
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
   CheckFeature clipboard_working
 
   let lines =<< trim END
@@ -102,13 +102,13 @@ func Test_hlsearch_clipboard()
       put *
   END
   call writefile(lines, 'XhlsearchClipboard', 'D')
-  let buf = RunVimInTerminal('-S XhlsearchClipboard', #{rows: 6, cols: 60})
+  let buf = RunMNVInTerminal('-S XhlsearchClipboard', #{rows: 6, cols: 60})
 
   call term_sendkeys(buf, "/\<C-R>*")
   call VerifyScreenDump(buf, 'Test_hlsearch_ctrlr_1', {})
 
   call term_sendkeys(buf, "\<Esc>")
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_iminsert.vim b/uvim/src/testdir/test_iminsert.mnv
index 918f17d4c9..f3542c3ace 100644
--- a/uvim/src/testdir/test_iminsert.vim
+++ b/uvim/src/testdir/test_iminsert.mnv
@@ -1,6 +1,6 @@
 " Test for 'iminsert'
 
-import './util/vim9.vim' as v9
+import './util/mnv9.mnv' as v9
 
 let s:imactivatefunc_called = 0
 let s:imstatusfunc_called = 0
@@ -78,13 +78,13 @@ func Test_imactivatefunc_imstatusfunc_callback_no_breaks_foldopen()
     %foldclose
   END
   call writefile(lines, 'Xscript', 'D')
-  let buf = RunVimInTerminal('-S Xscript', {})
+  let buf = RunMNVInTerminal('-S Xscript', {})
   call assert_notequal('abc', term_getline(buf, 2))
   call term_sendkeys(buf, "/abc\n")
   call WaitForAssert({-> assert_equal('abc', term_getline(buf, 2))})
 
   " clean up
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 " Test for using an lmap in insert mode
@@ -98,7 +98,7 @@ func Test_lmap_in_insert_mode()
   set iminsert=2
   call feedkeys('$r{', 'xt')
   call assert_equal('wb{', getline(1))
-  call setline(1, 'vim web')
+  call setline(1, 'mnv web')
   set iminsert=1
   call feedkeys('0f{', 'xt')
   call assert_equal(5, col('.'))
@@ -247,9 +247,9 @@ func Test_imactivatefunc_imstatusfunc_callback()
     call assert_equal(14, g:IMactivatefunc_called)
     call assert_equal(28, g:IMstatusfunc_called)
   END
-  call v9.CheckLegacyAndVim9Success(lines)
+  call v9.CheckLegacyAndMNV9Success(lines)
 
-  " Using Vim9 lambda expression in legacy context should fail
+  " Using MNV9 lambda expression in legacy context should fail
   set imactivatefunc=(a)\ =>\ IMactivatefunc1(a)
   set imstatusfunc=IMstatusfunc1
   call assert_fails('normal! i', 'E117:')
@@ -285,9 +285,9 @@ func Test_imactivatefunc_imstatusfunc_callback()
   delfunc g:DictStatusFunc
   delfunc SetIMFunc
 
-  " Vim9 tests
+  " MNV9 tests
   let lines =<< trim END
-    vim9script
+    mnv9script
 
     # Test for using function()
     def IMactivatefunc1(active: number): any
@@ -321,4 +321,4 @@ func Test_imactivatefunc_imstatusfunc_callback()
   %bw!
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_increment.vim b/uvim/src/testdir/test_increment.mnv
index 3a5f5ee028..1b536e14a7 100644
--- a/uvim/src/testdir/test_increment.vim
+++ b/uvim/src/testdir/test_increment.mnv
@@ -2,7 +2,7 @@
 
 func SetUp()
   new dummy
-  set nrformats&vim
+  set nrformats&mnv
 endfunc
 
 func TearDown()
@@ -947,4 +947,4 @@ func Test_normal_increment_signed_hexoct_nr()
   bw!
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_increment_dbcs.vim b/uvim/src/testdir/test_increment_dbcs.mnv
index b090d15077..de4ebb900d 100644
--- a/uvim/src/testdir/test_increment_dbcs.vim
+++ b/uvim/src/testdir/test_increment_dbcs.mnv
@@ -14,15 +14,15 @@ endfunc
 
 func Test_increment_dbcs_1()
   set nrformats+=alpha
-  call setline(1, ["ŽR1"])
+  call setline(1, ["�R1"])
   exec "norm! 0\<C-A>"
-  call assert_equal(["ŽR2"], getline(1, '$'))
+  call assert_equal(["�R2"], getline(1, '$'))
   call assert_equal([0, 1, 3, 0], getpos('.'))
 
-  call setline(1, ["‚`‚a‚b0xDE‚e"])
+  call setline(1, ["�`�a�b0xDE�e"])
   exec "norm! 0\<C-X>"
-  call assert_equal(["‚`‚a‚b0xDD‚e"], getline(1, '$'))
+  call assert_equal(["�`�a�b0xDD�e"], getline(1, '$'))
   call assert_equal([0, 1, 10, 0], getpos('.'))
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_indent.vim b/uvim/src/testdir/test_indent.mnv
index 52d7be1390..424621c52b 100644
--- a/uvim/src/testdir/test_indent.vim
+++ b/uvim/src/testdir/test_indent.mnv
@@ -199,7 +199,7 @@ func Test_modeline_indent_expr()
   func GetIndent()
     return line('.') * 2
   endfunc
-  call writefile(['# vim: indentexpr=GetIndent()'], 'Xmlfile.txt', 'D')
+  call writefile(['# mnv: indentexpr=GetIndent()'], 'Xmlfile.txt', 'D')
   set modelineexpr
   new Xmlfile.txt
   call assert_equal('GetIndent()', &indentexpr)
@@ -329,7 +329,7 @@ func Test_indent_overflow_count2()
   " this only works, when long is 64bits
   try
     setl sw=0x180000000
-  catch /^Vim\%((\a\+)\)\=:E487:/
+  catch /^MNV\%((\a\+)\)\=:E487:/
   throw 'Skipped: value negative on this platform'
   endtry
   call setline(1, "\tabc")
@@ -352,10 +352,10 @@ func Test_mouse_shape_indent_norm_with_gq()
 
     setlocal indentexpr=Indent()
   END
-  call writefile(lines, 'Xindentexpr.vim', 'D')
+  call writefile(lines, 'Xindentexpr.mnv', 'D')
 
   let lines =<< trim END
-    vim9script
+    mnv9script
     var mouse_shapes = []
 
     setline(1, [repeat('a', 80), repeat('b', 80)])
@@ -375,13 +375,13 @@ func Test_mouse_shape_indent_norm_with_gq()
       })
     })
   END
-  call writefile(lines, 'Xmouseshape.vim', 'D')
+  call writefile(lines, 'Xmouseshape.mnv', 'D')
 
-  call RunVim([], [], "-g -S Xindentexpr.vim -S Xmouseshape.vim")
+  call RunMNV([], [], "-g -S Xindentexpr.mnv -S Xmouseshape.mnv")
   call WaitForAssert({-> assert_equal(['rightup-arrow', 'arrow'],
         \ readfile('Xmouseshapes'))}, 300)
 
   call delete('Xmouseshapes')
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_input.vim b/uvim/src/testdir/test_input.mnv
index 46f5858aeb..ba4aa59b8e 100644
--- a/uvim/src/testdir/test_input.vim
+++ b/uvim/src/testdir/test_input.mnv
@@ -108,4 +108,4 @@ func Test_input_noop_keys()
   endfor
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_ins_complete.vim b/uvim/src/testdir/test_ins_complete.mnv
index bf16a93617..f1d139afa9 100644
--- a/uvim/src/testdir/test_ins_complete.vim
+++ b/uvim/src/testdir/test_ins_complete.mnv
@@ -1,11 +1,11 @@
 " Test for insert completion
 
-source util/screendump.vim
-import './util/vim9.vim' as v9
+source util/screendump.mnv
+import './util/mnv9.mnv' as v9
 
 " Test for insert expansion
 func Test_ins_complete()
-  edit test_ins_complete.vim
+  edit test_ins_complete.mnv
   " The files in the current directory interferes with the files
   " used by this test. So use a separate directory for the test.
   call mkdir('Xcpldir')
@@ -111,7 +111,7 @@ func Test_ins_complete_invalid_byte()
     call writefile(['bm9ybTlvMDCAMM4Dbw4OGA4ODg=='], 'Xinvalid64', 'D')
     call system('base64 -d Xinvalid64 > Xinvalid')
     call writefile(['qa!'], 'Xexit', 'D')
-    call RunVim([], [], " -i NONE -n -X -Z -e -m -s -S Xinvalid -S Xexit")
+    call RunMNV([], [], " -i NONE -n -X -Z -e -m -s -S Xinvalid -S Xexit")
     call delete('Xinvalid')
   endif
 endfunc
@@ -179,7 +179,7 @@ func Test_omni_autoload()
   call mkdir(dir, 'pR')
 
   let lines =<< trim END
-      vim9script
+      mnv9script
       export def Func(findstart: bool, base: string): any
           if findstart
               return 1
@@ -191,7 +191,7 @@ func Test_omni_autoload()
           eval 1 + 2
       }
   END
-  call writefile(lines, dir .. '/omni.vim')
+  call writefile(lines, dir .. '/omni.mnv')
 
   new
   setlocal omnifunc=omni#Func
@@ -343,23 +343,23 @@ func Test_CompleteDone_vevent_keys()
   call assert_equal('bar', g:complete_word)
   call assert_equal('omni', g:complete_type)
 
-  call feedkeys("Shello vim visual v\<C-X>\<C-N>\<ESC>", 'tx')
+  call feedkeys("Shello mnv visual v\<C-X>\<C-N>\<ESC>", 'tx')
   call assert_equal('', g:complete_word)
   call assert_equal('keyword', g:complete_type)
 
-  call feedkeys("Shello vim visual v\<C-X>\<C-N>\<C-Y>", 'tx')
-  call assert_equal('vim', g:complete_word)
+  call feedkeys("Shello mnv visual v\<C-X>\<C-N>\<C-Y>", 'tx')
+  call assert_equal('mnv', g:complete_word)
   call assert_equal('keyword', g:complete_type)
 
-  call feedkeys("Shello vim visual v\<C-N>\<ESC>", 'tx')
+  call feedkeys("Shello mnv visual v\<C-N>\<ESC>", 'tx')
   call assert_equal('', g:complete_word)
   call assert_equal('keyword', g:complete_type)
 
-  call feedkeys("Shello vim visual v\<C-N>\<C-Y>", 'tx')
-  call assert_equal('vim', g:complete_word)
+  call feedkeys("Shello mnv visual v\<C-N>\<C-Y>", 'tx')
+  call assert_equal('mnv', g:complete_word)
   call assert_equal('keyword', g:complete_type)
 
-  call feedkeys("Shello vim\<CR>completion test\<CR>\<C-X>\<C-l>\<C-Y>", 'tx')
+  call feedkeys("Shello mnv\<CR>completion test\<CR>\<C-X>\<C-l>\<C-Y>", 'tx')
   call assert_equal('completion test', g:complete_word)
   call assert_equal('whole_line', g:complete_type)
 
@@ -843,7 +843,7 @@ func Test_ins_completeslash()
 
   set noshellslash
   set completeslash=slash
-  call assert_true(stridx(globpath(&rtp, 'syntax/*.vim', 1, 1)[0], '\') != -1)
+  call assert_true(stridx(globpath(&rtp, 'syntax/*.mnv', 1, 1)[0], '\') != -1)
 
   let &shellslash = orig_shellslash
   set completeslash=
@@ -861,13 +861,13 @@ func Test_pum_stopped_by_timer()
   END
 
   call writefile(lines, 'Xpumscript', 'D')
-  let buf = RunVimInTerminal('-S Xpumscript', #{rows: 12})
+  let buf = RunMNVInTerminal('-S Xpumscript', #{rows: 12})
   call term_sendkeys(buf, ":call StartCompl()\<CR>")
   call TermWait(buf, 200)
   call term_sendkeys(buf, "k")
   call VerifyScreenDump(buf, 'Test_pum_stopped_by_timer', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_complete_stopinsert_startinsert()
@@ -893,13 +893,13 @@ func Test_pum_with_folds_two_tabs()
   END
 
   call writefile(lines, 'Xpumscript', 'D')
-  let buf = RunVimInTerminal('-S Xpumscript', #{rows: 10})
+  let buf = RunMNVInTerminal('-S Xpumscript', #{rows: 10})
   call TermWait(buf, 50)
   call term_sendkeys(buf, "a\<C-N>")
   call VerifyScreenDump(buf, 'Test_pum_with_folds_two_tabs', {})
 
   call term_sendkeys(buf, "\<Esc>")
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_pum_with_preview_win()
@@ -917,14 +917,14 @@ func Test_pum_with_preview_win()
   END
 
   call writefile(lines, 'Xpreviewscript', 'D')
-  let buf = RunVimInTerminal('-S Xpreviewscript', #{rows: 12})
+  let buf = RunMNVInTerminal('-S Xpreviewscript', #{rows: 12})
   call term_sendkeys(buf, "Gi\<C-X>\<C-O>")
   call TermWait(buf, 200)
   call term_sendkeys(buf, "\<C-N>")
   call VerifyScreenDump(buf, 'Test_pum_with_preview_win', {})
 
   call term_sendkeys(buf, "\<Esc>")
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_scrollbar_on_wide_char()
@@ -937,11 +937,11 @@ func Test_scrollbar_on_wide_char()
     call setline(5, range(10)->map({i, v -> 'aa' .. v .. 'bb'}))
   END
   call writefile(lines, 'Xwidescript', 'D')
-  let buf = RunVimInTerminal('-S Xwidescript', #{rows: 10})
+  let buf = RunMNVInTerminal('-S Xwidescript', #{rows: 10})
   call term_sendkeys(buf, "A\<C-N>")
   call VerifyScreenDump(buf, 'Test_scrollbar_on_wide_char', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 " Test for inserting the tag search pattern in insert mode
@@ -2181,7 +2181,7 @@ func Test_cpt_func_callback()
     bw!
 
   END
-  call v9.CheckLegacyAndVim9Success(lines)
+  call v9.CheckLegacyAndMNV9Success(lines)
 
   " Test for using a script-local function name
   func s:CompleteFunc3(findstart, base)
@@ -2207,9 +2207,9 @@ func Test_cpt_func_callback()
   delfunc s:CompleteFunc3
   set complete&
 
-  " In Vim9 script s: can be omitted
+  " In MNV9 script s: can be omitted
   let lines =<< trim END
-      vim9script
+      mnv9script
       var CompleteFunc4Args = []
       def CompleteFunc4(findstart: bool, base: string): any
         add(CompleteFunc4Args, [findstart, base])
@@ -2225,22 +2225,22 @@ func Test_cpt_func_callback()
   END
   call v9.CheckScriptSuccess(lines)
 
-  " Vim9 tests
+  " MNV9 tests
   let lines =<< trim END
-    vim9script
+    mnv9script
 
-    def Vim9CompleteFunc(callnr: number, findstart: number, base: string): any
-      add(g:Vim9completeFuncArgs, [callnr, findstart, base])
+    def MNV9CompleteFunc(callnr: number, findstart: number, base: string): any
+      add(g:MNV9completeFuncArgs, [callnr, findstart, base])
       return findstart ? 0 : []
     enddef
 
     # Test for using a def function with completefunc
-    set complete=Ffunction('Vim9CompleteFunc'\\,\ [60])
+    set complete=Ffunction('MNV9CompleteFunc'\\,\ [60])
     new | only
     setline(1, 'one')
-    g:Vim9completeFuncArgs = []
+    g:MNV9completeFuncArgs = []
     feedkeys("A\<C-N>\<Esc>", 'x')
-    assert_equal([[60, 1, ''], [60, 0, 'one']], g:Vim9completeFuncArgs)
+    assert_equal([[60, 1, ''], [60, 0, 'one']], g:MNV9completeFuncArgs)
     bw!
 
     # Test for using a global function name
@@ -2473,7 +2473,7 @@ func Test_completefunc_callback()
     set complete& completefunc&
     :%bw!
   END
-  call v9.CheckLegacyAndVim9Success(lines)
+  call v9.CheckLegacyAndMNV9Success(lines)
 
   " Test for using a script-local function name
   func s:CompleteFunc3(findstart, base)
@@ -2497,9 +2497,9 @@ func Test_completefunc_callback()
   bw!
   delfunc s:CompleteFunc3
 
-  " In Vim9 script s: can be omitted
+  " In MNV9 script s: can be omitted
   let lines =<< trim END
-      vim9script
+      mnv9script
       var CompleteFunc4Args = []
       def CompleteFunc4(findstart: bool, base: string): any
         add(CompleteFunc4Args, [findstart, base])
@@ -2518,7 +2518,7 @@ func Test_completefunc_callback()
   let &completefunc = {a -> 'abc'}
   call feedkeys("A\<C-X>\<C-U>\<Esc>", 'x')
 
-  " Using Vim9 lambda expression in legacy context should fail
+  " Using MNV9 lambda expression in legacy context should fail
   set completefunc=(a,\ b)\ =>\ g:CompleteFunc1(21,\ a,\ b)
   new | only
   let g:CompleteFunc1Args = []
@@ -2545,22 +2545,22 @@ func Test_completefunc_callback()
   delfunc g:DictCompleteFunc
   delfunc SetCompleteFunc
 
-  " Vim9 tests
+  " MNV9 tests
   let lines =<< trim END
-    vim9script
+    mnv9script
 
-    def Vim9CompleteFunc(callnr: number, findstart: number, base: string): any
-      add(g:Vim9completeFuncArgs, [callnr, findstart, base])
+    def MNV9CompleteFunc(callnr: number, findstart: number, base: string): any
+      add(g:MNV9completeFuncArgs, [callnr, findstart, base])
       return findstart ? 0 : []
     enddef
 
     # Test for using a def function with completefunc
-    set completefunc=function('Vim9CompleteFunc',\ [60])
+    set completefunc=function('MNV9CompleteFunc',\ [60])
     new | only
     setline(1, 'one')
-    g:Vim9completeFuncArgs = []
+    g:MNV9completeFuncArgs = []
     feedkeys("A\<C-X>\<C-U>\<Esc>", 'x')
-    assert_equal([[60, 1, ''], [60, 0, 'one']], g:Vim9completeFuncArgs)
+    assert_equal([[60, 1, ''], [60, 0, 'one']], g:MNV9completeFuncArgs)
     bw!
 
     # Test for using a global function name
@@ -2793,7 +2793,7 @@ func Test_omnifunc_callback()
     set complete& omnifunc&
     :%bw!
   END
-  call v9.CheckLegacyAndVim9Success(lines)
+  call v9.CheckLegacyAndMNV9Success(lines)
 
   " Test for using a script-local function name
   func s:OmniFunc3(findstart, base)
@@ -2830,7 +2830,7 @@ func Test_omnifunc_callback()
   let &omnifunc = {a -> 'abc'}
   call feedkeys("A\<C-X>\<C-O>\<Esc>", 'x')
 
-  " Using Vim9 lambda expression in legacy context should fail
+  " Using MNV9 lambda expression in legacy context should fail
   set omnifunc=(a,\ b)\ =>\ OmniFunc1(21,\ a,\ b)
   new | only
   let g:OmniFunc1Args = []
@@ -2857,22 +2857,22 @@ func Test_omnifunc_callback()
   delfunc g:DictOmniFunc
   delfunc SetOmniFunc
 
-  " Vim9 tests
+  " MNV9 tests
   let lines =<< trim END
-    vim9script
+    mnv9script
 
-    def Vim9omniFunc(callnr: number, findstart: number, base: string): any
-      add(g:Vim9omniFunc_Args, [callnr, findstart, base])
+    def MNV9omniFunc(callnr: number, findstart: number, base: string): any
+      add(g:MNV9omniFunc_Args, [callnr, findstart, base])
       return findstart ? 0 : []
     enddef
 
     # Test for using a def function with omnifunc
-    set omnifunc=function('Vim9omniFunc',\ [60])
+    set omnifunc=function('MNV9omniFunc',\ [60])
     new | only
     setline(1, 'one')
-    g:Vim9omniFunc_Args = []
+    g:MNV9omniFunc_Args = []
     feedkeys("A\<C-X>\<C-O>\<Esc>", 'x')
-    assert_equal([[60, 1, ''], [60, 0, 'one']], g:Vim9omniFunc_Args)
+    assert_equal([[60, 1, ''], [60, 0, 'one']], g:MNV9omniFunc_Args)
     bw!
 
     # Test for using a global function name
@@ -3082,7 +3082,7 @@ func Test_thesaurusfunc_callback()
     call assert_equal([[22, 1, ''], [22, 0, 'sun']], g:TsrFunc1Args)
     :%bw!
   END
-  call v9.CheckLegacyAndVim9Success(lines)
+  call v9.CheckLegacyAndMNV9Success(lines)
 
   " Test for using a script-local function name
   func s:TsrFunc3(findstart, base)
@@ -3151,7 +3151,7 @@ func Test_thesaurusfunc_callback()
   let &thesaurusfunc = {a -> 'abc'}
   call feedkeys("A\<C-X>\<C-T>\<Esc>", 'x')
 
-  " Using Vim9 lambda expression in legacy context should fail
+  " Using MNV9 lambda expression in legacy context should fail
   set thesaurusfunc=(a,\ b)\ =>\ TsrFunc1(21,\ a,\ b)
   new | only
   let g:TsrFunc1Args = []
@@ -3191,22 +3191,22 @@ func Test_thesaurusfunc_callback()
   delfunc g:DictTsrFunc
   delfunc SetLocalTsrFunc
 
-  " Vim9 tests
+  " MNV9 tests
   let lines =<< trim END
-    vim9script
+    mnv9script
 
-    def Vim9tsrFunc(callnr: number, findstart: number, base: string): any
-      add(g:Vim9tsrFunc_Args, [callnr, findstart, base])
+    def MNV9tsrFunc(callnr: number, findstart: number, base: string): any
+      add(g:MNV9tsrFunc_Args, [callnr, findstart, base])
       return findstart ? 0 : []
     enddef
 
     # Test for using a def function with thesaurusfunc
-    set thesaurusfunc=function('Vim9tsrFunc',\ [60])
+    set thesaurusfunc=function('MNV9tsrFunc',\ [60])
     new | only
     setline(1, 'one')
-    g:Vim9tsrFunc_Args = []
+    g:MNV9tsrFunc_Args = []
     feedkeys("A\<C-X>\<C-T>\<Esc>", 'x')
-    assert_equal([[60, 1, ''], [60, 0, 'one']], g:Vim9tsrFunc_Args)
+    assert_equal([[60, 1, ''], [60, 0, 'one']], g:MNV9tsrFunc_Args)
     bw!
 
     # Test for using a global function name
@@ -3368,7 +3368,7 @@ func Test_ins_complete_popup_position()
   CheckScreendump
 
   let lines =<< trim END
-      vim9script
+      mnv9script
       set nowrap
       setline(1, ['one', 'two', 'this is line ', 'four'])
       prop_type_add('test', {highlight: 'Error'})
@@ -3379,12 +3379,12 @@ func Test_ins_complete_popup_position()
       })
   END
   call writefile(lines, 'XinsPopup', 'D')
-  let buf = RunVimInTerminal('-S XinsPopup', #{rows: 10})
+  let buf = RunMNVInTerminal('-S XinsPopup', #{rows: 10})
 
   call term_sendkeys(buf, "3GA\<C-N>")
   call VerifyScreenDump(buf, 'Test_ins_complete_popup_position_1', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func GetCompleteInfo()
@@ -3504,17 +3504,17 @@ func Test_complete_info_index()
 endfunc
 
 func Test_complete_changed_complete_info()
-  CheckRunVimInTerminal
-  " this used to crash vim, see #13929
+  CheckRunMNVInTerminal
+  " this used to crash mnv, see #13929
   let lines =<< trim END
     set completeopt=menuone
     autocmd CompleteChanged * call complete_info(['items'])
     call feedkeys("iii\<cr>\<c-p>")
   END
   call writefile(lines, 'Xsegfault', 'D')
-  let buf = RunVimInTerminal('-S Xsegfault', #{rows: 5})
+  let buf = RunMNVInTerminal('-S Xsegfault', #{rows: 5})
   call WaitForAssert({-> assert_match('^ii', term_getline(buf, 1))}, 1000)
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_completefunc_first_call_complete_add()
@@ -5169,7 +5169,7 @@ func Test_shortmess()
   END
 
   call writefile(lines, 'Xpumscript', 'D')
-  let buf = RunVimInTerminal('-S Xpumscript', #{rows: 12})
+  let buf = RunMNVInTerminal('-S Xpumscript', #{rows: 12})
   call term_sendkeys(buf, "Goh\<C-N>")
   call TermWait(buf, 200)
   call VerifyScreenDump(buf, 'Test_shortmess_complmsg_1', {})
@@ -5178,7 +5178,7 @@ func Test_shortmess()
   call TermWait(buf, 200)
   call VerifyScreenDump(buf, 'Test_shortmess_complmsg_2', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 " Test 'complete' containing F{func} that complete from nonkeyword
@@ -5685,7 +5685,7 @@ func Test_scriptlocal_autoload_func()
   call mkdir(dir, 'pR')
 
   let lines =<< trim END
-      vim9script
+      mnv9script
       export def Func(findstart: bool, base: string): any
           if findstart
               return 1
@@ -5694,7 +5694,7 @@ func Test_scriptlocal_autoload_func()
           endif
       enddef
   END
-  call writefile(lines, dir .. '/compl.vim')
+  call writefile(lines, dir .. '/compl.mnv')
 
   call test_override("char_avail", 1)
   new
@@ -5810,7 +5810,7 @@ func Test_autocompletedelay()
     setlocal autocomplete
   [SCRIPT]
   call writefile(lines, 'XTest_autocomplete_delay', 'D')
-  let buf = RunVimInTerminal('-S XTest_autocomplete_delay', {'rows': 10})
+  let buf = RunMNVInTerminal('-S XTest_autocomplete_delay', {'rows': 10})
 
   call term_sendkeys(buf, "Gof")
   call VerifyScreenDump(buf, 'Test_autocompletedelay_1', {})
@@ -5849,7 +5849,7 @@ func Test_autocompletedelay()
   call VerifyScreenDump(buf, 'Test_autocompletedelay_11', {})
 
   call term_sendkeys(buf, "\<esc>")
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 " Preinsert longest prefix when autocomplete
@@ -6075,11 +6075,11 @@ endfunc
 func Test_fuzzy_select_item_when_acl()
   CheckScreendump
   let lines =<< trim [SCRIPT]
-    call setline(1, ["v", "vi", "vim"])
+    call setline(1, ["v", "vi", "mnv"])
     set autocomplete completeopt=menuone,noinsert,fuzzy autocompletedelay=300
   [SCRIPT]
   call writefile(lines, 'XTest_autocomplete_delay', 'D')
-  let buf = RunVimInTerminal('-S XTest_autocomplete_delay', {'rows': 10})
+  let buf = RunMNVInTerminal('-S XTest_autocomplete_delay', {'rows': 10})
 
   call term_sendkeys(buf, "Govi")
   call VerifyScreenDump(buf, 'Test_fuzzy_autocompletedelay_1', {})
@@ -6091,7 +6091,7 @@ func Test_fuzzy_select_item_when_acl()
   call VerifyScreenDump(buf, 'Test_fuzzy_autocompletedelay_3', {})
 
   call term_sendkeys(buf, "\<esc>")
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 " Issue #18378: crash when fuzzy reorders items during refresh:always
@@ -6130,7 +6130,7 @@ func Test_autocompletedelay_longest_preinsert()
     set autocomplete completeopt+=longest autocompletedelay=500
   [SCRIPT]
   call writefile(lines, 'XTest_autocompletedelay', 'D')
-  let buf = RunVimInTerminal('-S XTest_autocompletedelay', {'rows': 10})
+  let buf = RunMNVInTerminal('-S XTest_autocompletedelay', {'rows': 10})
 
   " No spurious characters when autocompletedelay is in effect
   call term_sendkeys(buf, "Goau")
@@ -6161,7 +6161,7 @@ func Test_autocompletedelay_longest_preinsert()
   call VerifyScreenDump(buf, 'Test_autocompletedelay_preinsert_2', {})
 
   call term_sendkeys(buf, "\<esc>")
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 " Issue 18493
@@ -6192,9 +6192,9 @@ func Test_fuzzy_filenames_compl_autocompl()
   call mkdir(dir, 'pR')
   call writefile([], dir .. '/.name')
   call writefile([], dir .. '/name')
-  call writefile([], dir .. '/test.vim')
+  call writefile([], dir .. '/test.mnv')
 
-  let buf = RunVimInTerminal('', {'rows': 10})
+  let buf = RunMNVInTerminal('', {'rows': 10})
   call term_sendkeys(buf, ':call test_override("char_avail", 1)')
   call term_sendkeys(buf, "\<CR>")
   call term_sendkeys(buf, "iset ac cot=fuzzy,longest\<ESC>")
@@ -6202,7 +6202,7 @@ func Test_fuzzy_filenames_compl_autocompl()
   call term_sendkeys(buf, "o.na\<C-X>\<C-F>")  " this used to cause segfault
   call TermWait(buf, 200)
   call VerifyScreenDump(buf, 'Test_fuzzy_filenames_compl_autocompl', {})
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 " Issue 19130
@@ -6236,7 +6236,7 @@ func Test_autocomplete_preinsert_null_leader()
       return col(".") - 1
     endif
     " Return "key" (doesn't start with 'y') and "yellow" (starts with 'y').
-    " Simulates what a fuzzy omnifunc returns (e.g. vimcomplete#Complete with
+    " Simulates what a fuzzy omnifunc returns (e.g. mnvcomplete#Complete with
     " wildoptions=fuzzy).
     return ["key", "yellow"]
   endfunc
@@ -6289,4 +6289,4 @@ func Test_ins_register_preinsert_autocomplete()
   delfunc TestOmni
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab nofoldenable
+" mnv: shiftwidth=2 sts=2 expandtab nofoldenable
diff --git a/uvim/src/testdir/test_ins_complete_no_halt.vim b/uvim/src/testdir/test_ins_complete_no_halt.mnv
index e12925daa9..f5b04aef74 100644
--- a/uvim/src/testdir/test_ins_complete_no_halt.vim
+++ b/uvim/src/testdir/test_ins_complete_no_halt.mnv
@@ -48,4 +48,4 @@ func Test_auto_complete_backwards_no_halt()
   call assert_equal(["auto-complete-halt-test test test test test test test test test test test test test test test test test test test"], getline(1, "$"))
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_interrupt.vim b/uvim/src/testdir/test_interrupt.mnv
index aa7f634302..4edf5b0307 100644
--- a/uvim/src/testdir/test_interrupt.vim
+++ b/uvim/src/testdir/test_interrupt.mnv
@@ -19,7 +19,7 @@ func Test_interrupt()
     au BufWritePre Xinterrupt call s:bufwritepre()
     au BufWritePost Xinterrupt call s:bufwritepost()
     w!
-  catch /^Vim:Interrupt$/
+  catch /^MNV:Interrupt$/
   endtry
   call assert_equal(1, s:bufwritepre_called)
   call assert_equal(0, s:bufwritepost_called)
@@ -29,4 +29,4 @@ func Test_interrupt()
   au! BufWritePost
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_job_fails.vim b/uvim/src/testdir/test_job_fails.mnv
index b8eee916cd..f2c61542d9 100644
--- a/uvim/src/testdir/test_job_fails.vim
+++ b/uvim/src/testdir/test_job_fails.mnv
@@ -12,4 +12,4 @@ func Test_job_start_fails()
   endif
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_join.vim b/uvim/src/testdir/test_join.mnv
index 8f7ccb6733..df257a47dd 100644
--- a/uvim/src/testdir/test_join.vim
+++ b/uvim/src/testdir/test_join.mnv
@@ -217,8 +217,8 @@ ert
   call assert_equal(expected, getline(1, '$'))
 
   set nocompatible
-  set cpoptions&vim
-  set joinspaces&vim
+  set cpoptions&mnv
+  set joinspaces&mnv
   close!
 endfunc
 
@@ -292,10 +292,10 @@ action();
 
   call assert_equal(expected, getline(1, '$'))
 
-  set comments&vim
-  set joinspaces&vim
-  set fo&vim
-  set backspace&vim
+  set comments&mnv
+  set joinspaces&mnv
+  set fo&mnv
+  set backspace&mnv
   close!
 endfunc
 
@@ -445,4 +445,4 @@ func Test_join_lines()
   bwipe!
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_json.vim b/uvim/src/testdir/test_json.mnv
index c65d85c8f0..1a9e75f1d1 100644
--- a/uvim/src/testdir/test_json.vim
+++ b/uvim/src/testdir/test_json.mnv
@@ -388,4 +388,4 @@ func Test_json_decode_depth()
   let &maxfuncdepth = save_mfd
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_jumplist.vim b/uvim/src/testdir/test_jumplist.mnv
index 4b9fcee780..10734346d6 100644
--- a/uvim/src/testdir/test_jumplist.vim
+++ b/uvim/src/testdir/test_jumplist.mnv
@@ -196,4 +196,4 @@ func Test_jumpoptions()
   %bw!
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_lambda.vim b/uvim/src/testdir/test_lambda.mnv
index d1daa127a0..ef52f8420c 100644
--- a/uvim/src/testdir/test_lambda.vim
+++ b/uvim/src/testdir/test_lambda.mnv
@@ -1,6 +1,6 @@
 " Test for lambda and closure
 
-import './util/vim9.vim' as v9
+import './util/mnv9.mnv' as v9
 
 func Test_lambda_feature()
   call assert_equal(1, has('lambda'))
@@ -54,12 +54,12 @@ func Test_lambda_with_timer()
   call assert_true(s:n > m)
 endfunc
 
-func Test_lambda_vim9cmd_linebreak()
+func Test_lambda_mnv9cmd_linebreak()
   CheckFeature timers
 
   let g:test_is_flaky = 1
   let lines =<< trim END
-      vim9cmd call timer_start(10, (x) => {
+      mnv9cmd call timer_start(10, (x) => {
           # comment
           g:result = 'done'
          })
@@ -83,7 +83,7 @@ endfunc
 
 def Test_lamba_compiled_linebreak()
   var lines =<< trim END
-      vim9script
+      mnv9script
 
       def Echo(what: any)
         assert_equal('hello world', what)
@@ -380,4 +380,4 @@ func Test_closure_error()
   call assert_equal(1, caught_932)
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_langmap.vim b/uvim/src/testdir/test_langmap.mnv
index 4a8427732b..0428a750f8 100644
--- a/uvim/src/testdir/test_langmap.vim
+++ b/uvim/src/testdir/test_langmap.mnv
@@ -85,4 +85,4 @@ func Test_langmap()
   quit!
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_largefile.vim b/uvim/src/testdir/test_largefile.mnv
index 4d0e2f051f..fe2b4bcc15 100644
--- a/uvim/src/testdir/test_largefile.vim
+++ b/uvim/src/testdir/test_largefile.mnv
@@ -28,4 +28,4 @@ func Test_largefile()
   call delete(fname)
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_let.vim b/uvim/src/testdir/test_let.mnv
index 0aa8b16434..1034f9c351 100644
--- a/uvim/src/testdir/test_let.vim
+++ b/uvim/src/testdir/test_let.mnv
@@ -1,6 +1,6 @@
 " Tests for the :let command.
 
-import './util/vim9.vim' as v9
+import './util/mnv9.mnv' as v9
 
 func Test_let()
   " Test to not autoload when assigning.  It causes internal error.
@@ -32,9 +32,9 @@ func Test_let()
   call assert_equal(s, out)
 
   " Test for displaying a string variable
-  let s = 'vim'
+  let s = 'mnv'
   let out = execute('let s')
-  let s = "\ns                      vim"
+  let s = "\ns                      mnv"
   call assert_equal(s, out)
 
   " Test for displaying a list variable
@@ -545,13 +545,13 @@ END
   call assert_equal([], var3)
 
   let var3 =<<END
-vim
+mnv
 
 end
   END
 END 
 END
-  call assert_equal(['vim', '', 'end', '  END', 'END '], var3)
+  call assert_equal(['mnv', '', 'end', '  END', 'END '], var3)
 
 	let var1 =<< trim END
 	Line1
@@ -690,7 +690,7 @@ END
   call assert_equal(['change', 'insert', 'append'], d['baz{'])
 endfunc
 
-" Test for evaluating Vim expressions in a heredoc using {expr}
+" Test for evaluating MNV expressions in a heredoc using {expr}
 " Keep near the end, this messes up highlighting.
 func Test_let_heredoc_eval()
   let str = ''
@@ -865,4 +865,4 @@ END
   bw!
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_lineending.vim b/uvim/src/testdir/test_lineending.mnv
index 3f214e496e..bb0d34b1a3 100644
--- a/uvim/src/testdir/test_lineending.vim
+++ b/uvim/src/testdir/test_lineending.mnv
@@ -19,4 +19,4 @@ func Test_lineending()
   call delete('Xfile1')
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_lispindent.vim b/uvim/src/testdir/test_lispindent.mnv
index 770c50115e..d89ecf20a2 100644
--- a/uvim/src/testdir/test_lispindent.vim
+++ b/uvim/src/testdir/test_lispindent.mnv
@@ -1,7 +1,7 @@
 " Tests for 'lispwords' settings being global-local.
 " And  other lisp indent stuff.
 
-set nocompatible viminfo+=nviminfo
+set nocompatible mnvinfo+=nmnvinfo
 
 func Test_global_local_lispwords()
   setglobal lispwords=foo,bar,baz
@@ -126,4 +126,4 @@ func Test_lisp_indent_works()
   bwipe!
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_listchars.vim b/uvim/src/testdir/test_listchars.mnv
index 957a0f4e35..5cf0cfb3f1 100644
--- a/uvim/src/testdir/test_listchars.vim
+++ b/uvim/src/testdir/test_listchars.mnv
@@ -1,6 +1,6 @@
 " Tests for 'listchars' display with 'list' and :list
 
-source util/screendump.vim
+source util/screendump.mnv
 
 func Check_listchars(expected, end_lnum, end_scol = -1, leftcol = 0)
   if a:leftcol > 0
@@ -715,7 +715,7 @@ func Test_listchars_window_local()
   " using a local setting.
   split
   setlocal listchars=tab:<->,lead:_,space:.,trail:@,eol:#
-  setglobal listchars&vim
+  setglobal listchars&mnv
   call assert_equal(['<------>__one..two@@#'], ScreenLines(1, virtcol('$')))
   close
   call assert_equal(['^I  one  two  $'], ScreenLines(1, virtcol('$')))
@@ -726,7 +726,7 @@ func Test_listchars_window_local()
   split
   setlocal listchars=tab:<->,lead:_,space:.,trail:@,eol:#
   call assert_equal(['<------>__one..two@@#'], ScreenLines(1, virtcol('$')))
-  setlocal listchars&vim
+  setlocal listchars&mnv
   call assert_equal(['^I  one  two  $'], ScreenLines(1, virtcol('$')))
   close
   call assert_equal(['{......}--one==two##$'], ScreenLines(1, virtcol('$')))
@@ -782,7 +782,7 @@ func Test_listchars_foldcolumn()
   END
   call writefile(lines, 'XTest_listchars', 'D')
 
-  let buf = RunVimInTerminal('-S XTest_listchars', {'rows': 10, 'cols': 60})
+  let buf = RunMNVInTerminal('-S XTest_listchars', {'rows': 10, 'cols': 60})
 
   call term_sendkeys(buf, "13\<C-W>>")
   call VerifyScreenDump(buf, 'Test_listchars_01', {})
@@ -802,7 +802,7 @@ func Test_listchars_foldcolumn()
   call VerifyScreenDump(buf, 'Test_listchars_07', {})
 
   " clean up
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_listchars_precedes_with_wide_char()
@@ -856,4 +856,4 @@ func Test_listchars_precedes_with_tab()
   bw!
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_listdict.vim b/uvim/src/testdir/test_listdict.mnv
index 316e3614fc..900996b597 100644
--- a/uvim/src/testdir/test_listdict.vim
+++ b/uvim/src/testdir/test_listdict.mnv
@@ -1,7 +1,7 @@
 " Tests for the List and Dict types
 scriptencoding utf-8
 
-import './util/vim9.vim' as v9
+import './util/mnv9.mnv' as v9
 
 func TearDown()
   " Run garbage collection after every test
@@ -26,7 +26,7 @@ func Test_list_create()
   call assert_equal(10, x)
 endfunc
 
-" This was allowed in legacy Vim script
+" This was allowed in legacy MNV script
 let s:list_with_spaces = [1 , 2 , 3]
 
 " List slices
@@ -50,7 +50,7 @@ func Test_list_slice()
       call assert_equal([2], l[-1 : -1])
       call assert_equal([1, 2], l[-2 : -1])
   END
-  call v9.CheckLegacyAndVim9Success(lines)
+  call v9.CheckLegacyAndMNV9Success(lines)
 
   let l = [1, 2]
   call assert_equal([], l[-3 : -1])
@@ -78,7 +78,7 @@ func Test_list_identity()
       call assert_false(l is lx)
       call assert_true(l isnot lx)
   END
-  call v9.CheckLegacyAndVim9Success(lines)
+  call v9.CheckLegacyAndMNV9Success(lines)
 endfunc
 
 " removing items with :unlet
@@ -121,7 +121,7 @@ func Test_list_unlet()
       unlet l[-6 : 2]
       call assert_equal([3], l)
   END
-  call v9.CheckLegacyAndVim9Success(lines)
+  call v9.CheckLegacyAndMNV9Success(lines)
 
   let l = [0, 1, 2, 3]
   unlet l[2:2]
@@ -134,13 +134,13 @@ func Test_list_unlet()
       VAR l = [0, 1, 2, 3]
       unlet l[2 : 1]
   END
-  call v9.CheckLegacyAndVim9Failure(lines, 'E684:')
+  call v9.CheckLegacyAndMNV9Failure(lines, 'E684:')
 
   let lines =<< trim END
       VAR l = [0, 1, 2, 3]
       unlet l[-1 : 2]
   END
-  call v9.CheckLegacyAndVim9Failure(lines, 'E684:')
+  call v9.CheckLegacyAndMNV9Failure(lines, 'E684:')
 endfunc
 
 " assignment to a list
@@ -152,7 +152,7 @@ func Test_list_assign()
       LET [va, vb] = l[2 : 3]
       call assert_equal([2, 3], [va, vb])
   END
-  call v9.CheckLegacyAndVim9Success(lines)
+  call v9.CheckLegacyAndMNV9Success(lines)
 
   let lines =<< trim END
       let l = [0, 1, 2, 3]
@@ -165,7 +165,7 @@ func Test_list_assign()
       var vb = 0
       [va, vb] = l
   END
-  call v9.CheckScriptFailure(['vim9script'] + lines, 'E687:')
+  call v9.CheckScriptFailure(['mnv9script'] + lines, 'E687:')
   call v9.CheckDefExecFailure(lines, 'E1093: Expected 2 items but got 4')
 
   let lines =<< trim END
@@ -179,7 +179,7 @@ func Test_list_assign()
       var vb = 0
       [va, vb] = l[1 : 1]
   END
-  call v9.CheckScriptFailure(['vim9script'] + lines, 'E688:')
+  call v9.CheckScriptFailure(['mnv9script'] + lines, 'E688:')
   call v9.CheckDefExecFailure(lines, 'E1093: Expected 2 items but got 1')
 
   let lines =<< trim END
@@ -190,12 +190,12 @@ func Test_list_assign()
     LET l += [1]
     call assert_equal([1], l)
   END
-  call v9.CheckLegacyAndVim9Success(lines)
+  call v9.CheckLegacyAndMNV9Success(lines)
 
   let lines =<< trim END
     VAR [x, y] = test_null_list()
   END
-  call v9.CheckLegacyAndVim9Failure(lines, [
+  call v9.CheckLegacyAndMNV9Failure(lines, [
         \ 'E714: List required',
         \ 'E1093: Expected 2 items but got 0',
         \ 'E714: List required'])
@@ -213,7 +213,7 @@ func Test_list_range_assign()
       LET l[-4 : -1] = [5, 6]
       call assert_equal([5, 6], l)
   END
-  call v9.CheckLegacyAndVim9Success(lines)
+  call v9.CheckLegacyAndMNV9Success(lines)
 
   let lines =<< trim END
     var l = [7]
@@ -271,7 +271,7 @@ func Test_list_func_remove()
       call assert_equal([2, 3], remove(l, -3, -2))
       call assert_equal([1, 4], l)
   END
-  call v9.CheckLegacyAndVim9Success(lines)
+  call v9.CheckLegacyAndMNV9Success(lines)
 
   " Test invalid cases
   let l = [1, 2, 3, 4]
@@ -295,7 +295,7 @@ func Test_list_add()
       call add(l, test_null_dict())
       call assert_equal([1, [2, 3], [], [], {'k': 3}, {}, {}], l)
   END
-  call v9.CheckLegacyAndVim9Success(lines)
+  call v9.CheckLegacyAndMNV9Success(lines)
 
   " weird legacy behavior
   call assert_equal(1, add(test_null_list(), 4))
@@ -315,7 +315,7 @@ func Test_dict()
       call extend(d, {'b': 'bbb', 'c': 'ccc'}, "keep")
       call assert_equal({'c': 'ccc', '1': 99, 'b': [1, 2, function('strlen')], '3': 33, '-1': {'a': 1}}, d)
   END
-  call v9.CheckLegacyAndVim9Success(lines)
+  call v9.CheckLegacyAndMNV9Success(lines)
 
   let d = {001: 'asd', 'b': [1, 2, function('strlen')], -1: {'a': 1},}
   call assert_equal("{'1': 'asd', 'b': [1, 2, function('strlen')], '-1': {'a': 1}}", string(d))
@@ -351,7 +351,7 @@ func Test_dict()
   call assert_equal(#{g: x}, #{g:x})
 endfunc
 
-" This was allowed in legacy Vim script
+" This was allowed in legacy MNV script
 let s:dict_with_spaces = {'one' : 1 , 'two' : 2 , 'three' : 3}
 let s:dict_with_spaces_lit = #{one : 1 , two : 2 , three : 3}
 
@@ -368,7 +368,7 @@ func Test_dict_identity()
       call assert_false(d is dx)
       call assert_true(d isnot dx)
   END
-  call v9.CheckLegacyAndVim9Success(lines)
+  call v9.CheckLegacyAndMNV9Success(lines)
 endfunc
 
 " removing items with :unlet
@@ -379,7 +379,7 @@ func Test_dict_unlet()
       unlet d[-1]
       call assert_equal({'1': 99, '3': 33}, d)
   END
-  call v9.CheckLegacyAndVim9Success(lines)
+  call v9.CheckLegacyAndMNV9Success(lines)
 endfunc
 
 " manipulating a big Dictionary (hashtable.c has a border of 1000 entries)
@@ -395,7 +395,7 @@ func Test_dict_big()
   catch
     let str = substitute(v:exception, '\v(.{14}).*( "\d{4}").*', '\1\2', '')
   endtry
-  call assert_equal('Vim(let):E716: "1500"', str)
+  call assert_equal('MNV(let):E716: "1500"', str)
 
   " lookup each item
   for i in range(1500)
@@ -453,7 +453,7 @@ func Test_dict_assign()
       LET d._ = 2
       call assert_equal({'a': 1, '_': 2}, d)
   END
-  call v9.CheckLegacyAndVim9Success(lines)
+  call v9.CheckLegacyAndMNV9Success(lines)
 
   let lines =<< trim END
     let n = 0
@@ -461,7 +461,7 @@ func Test_dict_assign()
   END
   call v9.CheckScriptFailure(lines, 'E1203: Dot not allowed after a number: n.key = 3')
   let lines =<< trim END
-    vim9script
+    mnv9script
     var n = 0
     n.key = 3
   END
@@ -495,19 +495,19 @@ func Test_dict_func_remove()
       call assert_equal('b', remove(d, 2))
       call assert_equal({1: 'a', 3: 'c'}, d)
   END
-  call v9.CheckLegacyAndVim9Success(lines)
+  call v9.CheckLegacyAndMNV9Success(lines)
 
   let lines =<< trim END
       VAR d = {1: 'a', 3: 'c'}
       call remove(d, 1, 2)
   END
-  call v9.CheckLegacyAndVim9Failure(lines, 'E118:')
+  call v9.CheckLegacyAndMNV9Failure(lines, 'E118:')
 
   let lines =<< trim END
       VAR d = {1: 'a', 3: 'c'}
       call remove(d, 'a')
   END
-  call v9.CheckLegacyAndVim9Failure(lines, 'E716:')
+  call v9.CheckLegacyAndMNV9Failure(lines, 'E716:')
 
   let lines =<< trim END
       let d = {'a-b': 55}
@@ -516,7 +516,7 @@ func Test_dict_func_remove()
   call v9.CheckScriptFailure(lines, 'E716: Key not present in Dictionary: "a"')
 
   let lines =<< trim END
-      vim9script
+      mnv9script
       var d = {'a-b': 55}
       echo d.a-b
   END
@@ -534,7 +534,7 @@ func Test_dict_func_remove()
   END
   call v9.CheckScriptFailure(lines, 'E730:')
   let lines =<< trim END
-      vim9script
+      mnv9script
       var d = {1: 'a', 3: 'c'}
       call remove(d, [])
   END
@@ -555,7 +555,7 @@ func Test_dict_func_remove_in_use()
   let expected = 'a:' . string(get(d, 'func'))
   call assert_equal(expected, d.func(string(remove(d, 'func'))))
 
-  " similar, in a way it also works in Vim9
+  " similar, in a way it also works in MNV9
   let lines =<< trim END
       VAR d = {1: 1, 2: 'x'}
       func GetArg(a)
@@ -566,7 +566,7 @@ func Test_dict_func_remove_in_use()
       call assert_equal(expected, d.func(string(remove(d, 'func'))))
   END
   call v9.CheckTransLegacySuccess(lines)
-  call v9.CheckTransVim9Success(lines)
+  call v9.CheckTransMNV9Success(lines)
 endfunc
 
 func Test_dict_literal_keys()
@@ -588,7 +588,7 @@ func Test_dict_deepcopy()
       VAR dc = deepcopy(d)
       call deepcopy(d, 1)
   END
-  call v9.CheckLegacyAndVim9Failure(lines, 'E698:')
+  call v9.CheckLegacyAndMNV9Failure(lines, 'E698:')
 
   let lines =<< trim END
       VAR d = {1: 1, 2: '2'}
@@ -599,7 +599,7 @@ func Test_dict_deepcopy()
       VAR l3 = deepcopy(l2)
       call assert_true(l3[1] is l3[2])
   END
-  call v9.CheckLegacyAndVim9Success(lines)
+  call v9.CheckLegacyAndMNV9Success(lines)
 
   call assert_fails("call deepcopy([1, 2], 2)", 'E1212:')
 endfunc
@@ -685,7 +685,7 @@ func Test_list_locked_var()
       endfor
   END
   call v9.CheckTransLegacySuccess(lines)
-  call v9.CheckTransVim9Success(lines)
+  call v9.CheckTransMNV9Success(lines)
 
   call assert_fails("let x=islocked('a b')", 'E488:')
   let mylist = [1, 2, 3]
@@ -696,7 +696,7 @@ endfunc
 
 " Unletting locked variables
 func Test_list_locked_var_unlet()
-  " Not tested with Vim9: script and local variables cannot be unlocked
+  " Not tested with MNV9: script and local variables cannot be unlocked
   let expected = [
 	      \ [['1000-000', 'ppppppp'],
 	      \  ['0000-000', 'ppppppp'],
@@ -801,7 +801,7 @@ func Test_dict_item_lock_unlet()
       unlet d.a
       call assert_equal({'b': 100}, d)
   END
-  call v9.CheckLegacyAndVim9Success(lines)
+  call v9.CheckLegacyAndMNV9Success(lines)
 endfunc
 
 " filter() after lock on dict item
@@ -812,7 +812,7 @@ func Test_dict_lock_filter()
       call filter(d, 'v:key != "a"')
       call assert_equal({'b': 100}, d)
   END
-  call v9.CheckLegacyAndVim9Success(lines)
+  call v9.CheckLegacyAndMNV9Success(lines)
 endfunc
 
 " map() after lock on dict
@@ -825,7 +825,7 @@ func Test_dict_lock_map()
   END
   " This won't work in a :def function
   call v9.CheckTransLegacySuccess(lines)
-  call v9.CheckTransVim9Success(lines)
+  call v9.CheckTransMNV9Success(lines)
 
   " For a :def function use a global dict.
   let lines =<< trim END
@@ -849,7 +849,7 @@ func Test_list_item_lock_map()
   END
   " This won't work in a :def function
   call v9.CheckTransLegacySuccess(lines)
-  call v9.CheckTransVim9Success(lines)
+  call v9.CheckTransMNV9Success(lines)
 endfunc
 
 " Lock one item in a dict
@@ -862,7 +862,7 @@ func Test_dict_item_lock_map()
   END
   " This won't work in a :def function
   call v9.CheckTransLegacySuccess(lines)
-  call v9.CheckTransVim9Success(lines)
+  call v9.CheckTransMNV9Success(lines)
 endfunc
 
 " No extend() after lock on dict item
@@ -1008,7 +1008,7 @@ func Test_reverse_sort_uniq()
       call assert_equal(['bar', 'BAR', 'Bar', 'Foo', 'FOO', 'foo', 'FOOBAR', -1, 0, 0, 0.22, 1.0e-15, 12, 18, 22, 255, 7, 9, [], {}], sort(copy(l), 'i'))
       call assert_equal(['BAR', 'Bar', 'FOO', 'FOOBAR', 'Foo', 'bar', 'foo', -1, 0, 0, 0.22, 1.0e-15, 12, 18, 22, 255, 7, 9, [], {}], sort(copy(l)))
   END
-  call v9.CheckLegacyAndVim9Success(lines)
+  call v9.CheckLegacyAndMNV9Success(lines)
 
   call assert_fails('call reverse({})', 'E1253:')
   call assert_fails('call uniq([1, 2], {x, y -> []})', 'E745:')
@@ -1071,10 +1071,10 @@ func Test_reduce()
       call assert_equal(0x7d, reduce(0z30250861, 'or'))
       call assert_equal('β', reduce('ββββ', 'matchstr'))
   END
-  call v9.CheckLegacyAndVim9Success(lines)
+  call v9.CheckLegacyAndMNV9Success(lines)
 
   call assert_equal({'x': 1, 'y': 1, 'z': 1 }, ['x', 'y', 'z']->reduce({ acc, val -> extend(acc, { val: 1 }) }, {}))
-  vim9 assert_equal({'x': 1, 'y': 1, 'z': 1 }, ['x', 'y', 'z']->reduce((acc, val) => extend(acc, {[val]: 1 }), {}))
+  mnv9 assert_equal({'x': 1, 'y': 1, 'z': 1 }, ['x', 'y', 'z']->reduce((acc, val) => extend(acc, {[val]: 1 }), {}))
 
   call assert_fails("call reduce([], { acc, val -> acc + val })", 'E998: Reduce of an empty List with no initial value')
   call assert_fails("call reduce(range(0), { acc, val -> acc + val })", 'E998: Reduce of an empty List with no initial value')
@@ -1088,10 +1088,10 @@ func Test_reduce()
   call assert_fails("call reduce([1, 2], 'Xdoes_not_exist')", 'E117:')
   call assert_fails("echo reduce(0z01, { acc, val -> 2 * acc + val }, '')", 'E1210:')
 
-  call assert_fails("vim9 reduce(0, (acc, val) => (acc .. val), '')", 'E1253:')
-  call assert_fails("vim9 reduce({}, (acc, val) => (acc .. val), '')", 'E1253:')
-  call assert_fails("vim9 reduce(0.1, (acc, val) => (acc .. val), '')", 'E1253:')
-  call assert_fails("vim9 reduce(function('tr'), (acc, val) => (acc .. val), '')", 'E1253:')
+  call assert_fails("mnv9 reduce(0, (acc, val) => (acc .. val), '')", 'E1253:')
+  call assert_fails("mnv9 reduce({}, (acc, val) => (acc .. val), '')", 'E1253:')
+  call assert_fails("mnv9 reduce(0.1, (acc, val) => (acc .. val), '')", 'E1253:')
+  call assert_fails("mnv9 reduce(function('tr'), (acc, val) => (acc .. val), '')", 'E1253:')
   call assert_fails("call reduce('', { acc, val -> acc + val }, 1)", 'E1174:')
   call assert_fails("call reduce('', { acc, val -> acc + val }, {})", 'E1174:')
   call assert_fails("call reduce('', { acc, val -> acc + val }, 0.1)", 'E1174:')
@@ -1131,7 +1131,7 @@ func Test_str_split()
       call assert_equal(['', 'a', '', 'b', '', 'c', ''], split('abc', '\zs', 1))
       call assert_equal(['abc'], split('abc', '\\%('))
   END
-  call v9.CheckLegacyAndVim9Success(lines)
+  call v9.CheckLegacyAndMNV9Success(lines)
 
   call assert_fails("call split('abc', [])", 'E730:')
   call assert_fails("call split('abc', 'b', [])", 'E745:')
@@ -1148,7 +1148,7 @@ func Test_listdict_compare()
       call assert_false(l != deepcopy(l))
       call assert_false(d != deepcopy(d))
   END
-  call v9.CheckLegacyAndVim9Success(lines)
+  call v9.CheckLegacyAndMNV9Success(lines)
 
   " comparison errors
   call assert_fails('echo [1, 2] =~ {}', 'E691:')
@@ -1182,7 +1182,7 @@ func Test_listdict_compare_complex()
       call assert_true(l == lcopy)
       call assert_true(dict4 == dict4copy)
   END
-  call v9.CheckLegacyAndVim9Success(lines)
+  call v9.CheckLegacyAndMNV9Success(lines)
 endfunc
 
 " Test for extending lists and dictionaries
@@ -1219,7 +1219,7 @@ func Test_listdict_extend()
       call extend(l, [4, 5, 6], -3)
       call assert_equal([4, 5, 6, 1, 2,  3], l)
   END
-  call v9.CheckLegacyAndVim9Success(lines)
+  call v9.CheckLegacyAndMNV9Success(lines)
 
   let l = [1, 2, 3]
   call assert_fails("call extend(l, [4, 5, 6], 4)", 'E684:')
@@ -1246,7 +1246,7 @@ func Test_listdict_extend()
       call extend(d, {'b': 0, 'c': 'C'}, "keep")
       call assert_equal({'a': 'A', 'b': 9, 'c': 'C'}, d)
   END
-  call v9.CheckLegacyAndVim9Success(lines)
+  call v9.CheckLegacyAndMNV9Success(lines)
 
   let d = {'a': 'A', 'b': 'B'}
   call assert_fails("call extend(d, {'b': 0, 'c':'C'}, 'error')", 'E737:')
@@ -1276,7 +1276,7 @@ func Test_listdict_extend()
       call extend(l, l, 3)
       call assert_equal([1, 5, 7, 1, 5, 7], l)
   END
-  call v9.CheckLegacyAndVim9Success(lines)
+  call v9.CheckLegacyAndMNV9Success(lines)
 endfunc
 
 func Test_listdict_extendnew()
@@ -1407,30 +1407,30 @@ endfunc
 
 " List and dict indexing tests
 func Test_listdict_index()
-  call v9.CheckLegacyAndVim9Failure(['echo function("min")[0]'], 'E695:')
-  call v9.CheckLegacyAndVim9Failure(['echo v:true[0]'], 'E909:')
-  call v9.CheckLegacyAndVim9Failure(['echo v:null[0]'], 'E909:')
-  call v9.CheckLegacyAndVim9Failure(['VAR d = {"k": 10}', 'echo d.'], ['E15:', 'E1127:', 'E15:'])
-  call v9.CheckLegacyAndVim9Failure(['VAR d = {"k": 10}', 'echo d[1 : 2]'], 'E719:')
+  call v9.CheckLegacyAndMNV9Failure(['echo function("min")[0]'], 'E695:')
+  call v9.CheckLegacyAndMNV9Failure(['echo v:true[0]'], 'E909:')
+  call v9.CheckLegacyAndMNV9Failure(['echo v:null[0]'], 'E909:')
+  call v9.CheckLegacyAndMNV9Failure(['VAR d = {"k": 10}', 'echo d.'], ['E15:', 'E1127:', 'E15:'])
+  call v9.CheckLegacyAndMNV9Failure(['VAR d = {"k": 10}', 'echo d[1 : 2]'], 'E719:')
 
   call assert_fails("let v = [4, 6][{-> 1}]", 'E729:')
   call v9.CheckDefAndScriptFailure(['var v = [4, 6][() => 1]'], ['E1012:', 'E703:'])
 
-  call v9.CheckLegacyAndVim9Failure(['VAR v = range(5)[2 : []]'], ['E730:', 'E1012:', 'E730:'])
+  call v9.CheckLegacyAndMNV9Failure(['VAR v = range(5)[2 : []]'], ['E730:', 'E1012:', 'E730:'])
 
   call assert_fails("let v = range(5)[2:{-> 2}(]", ['E15:', 'E116:'])
   call v9.CheckDefAndScriptFailure(['var v = range(5)[2 : () => 2(]'], 'E15:')
 
-  call v9.CheckLegacyAndVim9Failure(['VAR v = range(5)[2 : 3'], ['E111:', 'E1097:', 'E111:'])
-  call v9.CheckLegacyAndVim9Failure(['VAR l = insert([1, 2, 3], 4, 10)'], 'E684:')
-  call v9.CheckLegacyAndVim9Failure(['VAR l = insert([1, 2, 3], 4, -10)'], 'E684:')
-  call v9.CheckLegacyAndVim9Failure(['VAR l = insert([1, 2, 3], 4, [])'], ['E745:', 'E1013:', 'E1210:'])
+  call v9.CheckLegacyAndMNV9Failure(['VAR v = range(5)[2 : 3'], ['E111:', 'E1097:', 'E111:'])
+  call v9.CheckLegacyAndMNV9Failure(['VAR l = insert([1, 2, 3], 4, 10)'], 'E684:')
+  call v9.CheckLegacyAndMNV9Failure(['VAR l = insert([1, 2, 3], 4, -10)'], 'E684:')
+  call v9.CheckLegacyAndMNV9Failure(['VAR l = insert([1, 2, 3], 4, [])'], ['E745:', 'E1013:', 'E1210:'])
 
-  call v9.CheckLegacyAndVim9Failure(['VAR l = [1, 2, 3]', 'LET l[i] = 3'], ['E121:', 'E1001:', 'E121:'])
-  call v9.CheckLegacyAndVim9Failure(['VAR l = [1, 2, 3]', 'LET l[1.1] = 4'], ['E805:', 'E1012:', 'E805:'])
-  call v9.CheckLegacyAndVim9Failure(['VAR l = [1, 2, 3]', 'LET l[: i] = [4, 5]'], ['E121:', 'E1001:', 'E121:'])
-  call v9.CheckLegacyAndVim9Failure(['VAR l = [1, 2, 3]', 'LET l[: 3.2] = [4, 5]'], ['E805:', 'E1012:', 'E805:'])
-  call v9.CheckLegacyAndVim9Failure(['VAR t = test_unknown()', 'echo t[0]'], ['E340:', 'E909:', 'E340:', 'E685:'])
+  call v9.CheckLegacyAndMNV9Failure(['VAR l = [1, 2, 3]', 'LET l[i] = 3'], ['E121:', 'E1001:', 'E121:'])
+  call v9.CheckLegacyAndMNV9Failure(['VAR l = [1, 2, 3]', 'LET l[1.1] = 4'], ['E805:', 'E1012:', 'E805:'])
+  call v9.CheckLegacyAndMNV9Failure(['VAR l = [1, 2, 3]', 'LET l[: i] = [4, 5]'], ['E121:', 'E1001:', 'E121:'])
+  call v9.CheckLegacyAndMNV9Failure(['VAR l = [1, 2, 3]', 'LET l[: 3.2] = [4, 5]'], ['E805:', 'E1012:', 'E805:'])
+  call v9.CheckLegacyAndMNV9Failure(['VAR t = test_unknown()', 'echo t[0]'], ['E340:', 'E909:', 'E340:', 'E685:'])
 endfunc
 
 " Test for a null list
@@ -1468,7 +1468,7 @@ func Test_null_list()
       call assert_equal([], sort(l))
       call assert_equal('[]', string(l))
   END
-  call v9.CheckLegacyAndVim9Success(lines)
+  call v9.CheckLegacyAndMNV9Success(lines)
 
   let l = test_null_list()
   call assert_equal([], extend(l, l, 0))
@@ -1509,7 +1509,7 @@ func Test_null_dict()
       call assert_equal(0, remove(test_null_dict(), 'k'))
       call assert_equal('{}', string(d))
   END
-  call v9.CheckLegacyAndVim9Success(lines)
+  call v9.CheckLegacyAndMNV9Success(lines)
 
   let d = test_null_dict()
   call assert_equal({}, extend(d, d, 'keep'))
@@ -1603,7 +1603,7 @@ func Test_deep_nested_listdict_compare()
     VAR l4 = GetNestedList(1002)
     call assert_true(l3 == l4)
   END
-  call v9.CheckLegacyAndVim9Success(lines)
+  call v9.CheckLegacyAndMNV9Success(lines)
 
   let lines =<< trim END
     def GetNestedDict(sz: number): dict<any>
@@ -1626,7 +1626,7 @@ func Test_deep_nested_listdict_compare()
     VAR d4 = GetNestedDict(1002)
     call assert_true(d3 == d4)
   END
-  call v9.CheckLegacyAndVim9Success(lines)
+  call v9.CheckLegacyAndMNV9Success(lines)
 endfunc
 
 " Test for using id()
@@ -1663,7 +1663,7 @@ enddef
 " Test for adding an item to a List with type list<any> by using the list
 " length as the index
 def Test_list_length_as_index()
-  # Append a new item to a list (vim9script)
+  # Append a new item to a list (mnv9script)
   var lines =<< trim END
     var l = []
     l[0] = 'abc'
@@ -1925,7 +1925,7 @@ def Test_list_length_as_index()
 
   # adding a new object to a list of objects
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
     endclass
     var inner: list<A>
@@ -1944,7 +1944,7 @@ def Test_list_length_as_index()
 
   # type check (in a script)
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
     endclass
     class B
@@ -1957,7 +1957,7 @@ def Test_list_length_as_index()
 
   # type check (in a method)
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
     endclass
     class B
@@ -1973,7 +1973,7 @@ def Test_list_length_as_index()
 
   # adding a new enum to a list of enums
   lines =<< trim END
-    vim9script
+    mnv9script
     enum Color
       RED,
       BLUE,
@@ -1995,7 +1995,7 @@ def Test_list_length_as_index()
 
   # type check (in a script)
   lines =<< trim END
-    vim9script
+    mnv9script
     enum Color
       RED,
       BLUE,
@@ -2013,7 +2013,7 @@ def Test_list_length_as_index()
 
   # type check (in a method)
   lines =<< trim END
-    vim9script
+    mnv9script
     enum Color
       RED,
       BLUE,
@@ -2034,7 +2034,7 @@ def Test_list_length_as_index()
 
   # adding a new string to a list of strings (using type alias)
   lines =<< trim END
-    vim9script
+    mnv9script
     type StrType = string
     var inner: list<StrType>
     var outer: list<any> = [inner]
@@ -2053,7 +2053,7 @@ def Test_list_length_as_index()
 
   # type check (using type alias in a script)
   lines =<< trim END
-    vim9script
+    mnv9script
     type StrType = string
     var inner: list<StrType>
     var outer: list<any> = [inner]
@@ -2063,7 +2063,7 @@ def Test_list_length_as_index()
 
   # type check (using type alias in a method)
   lines =<< trim END
-    vim9script
+    mnv9script
     type StrType = string
     def Fn()
       var inner: list<StrType>
@@ -2076,7 +2076,7 @@ def Test_list_length_as_index()
 
   # append to a List object variable which is part of another list
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
       var l: list<string>
     endclass
@@ -2100,7 +2100,7 @@ def Test_list_length_as_index()
 
   # type check (in a script)
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
       var l: list<string>
     endclass
@@ -2113,7 +2113,7 @@ def Test_list_length_as_index()
 
   # type check (in a method)
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
       var l: list<string>
     endclass
@@ -2128,4 +2128,4 @@ def Test_list_length_as_index()
   v9.CheckSourceScriptFailure(lines, 'E1012: Type mismatch; expected string but got blob', 4)
 enddef
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_listener.vim b/uvim/src/testdir/test_listener.mnv
index 8cbd15377a..de78d32734 100644
--- a/uvim/src/testdir/test_listener.vim
+++ b/uvim/src/testdir/test_listener.mnv
@@ -642,7 +642,7 @@ endfunc
 
 " Test if redraws are correctly picked up
 func Test_redraw_listening()
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
   CheckFeature eval
   let lines =<< trim END
     let g:redrawtick = 0
@@ -667,7 +667,7 @@ func Test_redraw_listening()
   defer delete('XRedrawStartResult')
   defer delete('XRedrawEndResult')
 
-  let buf = RunVimInTerminal('-S XTest_redrawlistener', {'rows': 10, 'cols': 78})
+  let buf = RunMNVInTerminal('-S XTest_redrawlistener', {'rows': 10, 'cols': 78})
 
   " We do it in separate chunks so they dont get bunched up into one redraw
   call term_sendkeys(buf, "i") " 1 on startup
@@ -704,12 +704,12 @@ func Test_redraw_listening()
   call WaitForAssert({-> assert_equal(["7", "6"], readfile('XRedrawStartResult'))})
   call WaitForAssert({-> assert_equal(["7", "7"], readfile('XRedrawEndResult'))})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 " Test if another redraw isn't caused right after if on_start callback causes one.
 func Test_redraw_no_redraw()
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
   CheckFeature eval
   let lines =<< trim END
     let g:redrawtick = 0
@@ -728,19 +728,19 @@ func Test_redraw_no_redraw()
   call writefile(lines, 'XTest_redrawlistener', 'D')
   defer delete('XRedrawStartResult')
 
-  let buf = RunVimInTerminal('-S XTest_redrawlistener', {'rows': 10, 'cols': 78})
+  let buf = RunMNVInTerminal('-S XTest_redrawlistener', {'rows': 10, 'cols': 78})
 
   call term_sendkeys(buf, "ione\<Esc>")
   call TermWait(buf)
 
   call WaitForAssert({-> assert_equal(["2"], readfile('XRedrawStartResult'))})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 " Test if listener can be removed in the callback
 func Test_redraw_remove_in_callback()
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
   CheckFeature eval
   let lines =<< trim END
     let g:redrawtick = 0
@@ -758,7 +758,7 @@ func Test_redraw_remove_in_callback()
   call writefile(lines, 'XTest_redrawlistener', 'D')
   defer delete('XRedrawStartResult')
 
-  let buf = RunVimInTerminal('-S XTest_redrawlistener', {'rows': 10, 'cols': 78})
+  let buf = RunMNVInTerminal('-S XTest_redrawlistener', {'rows': 10, 'cols': 78})
 
   call term_sendkeys(buf, "i")
   call TermWait(buf)
@@ -771,7 +771,7 @@ func Test_redraw_remove_in_callback()
 
   call WaitForAssert({-> assert_equal(["1"], readfile('XRedrawStartResult'))})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func s:OnRedraw()
@@ -801,4 +801,4 @@ func Test_listener_blockwise_paste()
   bwipe!
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_listlbr.vim b/uvim/src/testdir/test_listlbr.mnv
index 7430ec626c..f97b5b3b24 100644
--- a/uvim/src/testdir/test_listlbr.vim
+++ b/uvim/src/testdir/test_listlbr.mnv
@@ -6,7 +6,7 @@ scriptencoding latin1
 CheckOption linebreak
 CheckFeature conceal
 
-source util/screendump.vim
+source util/screendump.mnv
 
 function s:screen_lines(lnum, width) abort
   return ScreenLines(a:lnum, a:width)
@@ -54,7 +54,7 @@ func Test_linebreak_with_list()
 \ ]
   call s:compare_lines(expect, lines)
   call s:close_windows()
-  set listchars&vim
+  set listchars&mnv
 endfunc
 
 func Test_linebreak_with_nolist()
@@ -110,7 +110,7 @@ func Test_should_break()
 endfunc
 
 func Test_linebreak_with_conceal()
-  call s:test_windows('setl cpo&vim sbr=+ list conceallevel=2 concealcursor=nv listchars=tab:ab')
+  call s:test_windows('setl cpo&mnv sbr=+ list conceallevel=2 concealcursor=nv listchars=tab:ab')
   call setline(1, "_S_\t bla")
   syn match ConcealVar contained /_/ conceal
   syn match All /.*/ contains=ConcealVar
@@ -167,7 +167,7 @@ func Test_linebreak_reset_restore()
     call setline(1, repeat('a', &columns - 10) .. ' bbbbbbbbbb c')
   END
   call writefile(lines, 'XlbrResetRestore', 'D')
-  let buf = RunVimInTerminal('-S XlbrResetRestore', {'rows': 8})
+  let buf = RunMNVInTerminal('-S XlbrResetRestore', {'rows': 8})
 
   call term_sendkeys(buf, '$v$')
   call WaitForAssert({-> assert_equal(13, term_getcursor(buf)[1])})
@@ -192,7 +192,7 @@ func Test_linebreak_reset_restore()
 
   " clean up
   call term_sendkeys(buf, "\<Esc>")
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_virtual_block()
@@ -385,4 +385,4 @@ func Test_linebreak_no_break_after_whitespace_only()
   call s:close_windows()
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_listlbr_utf8.vim b/uvim/src/testdir/test_listlbr_utf8.mnv
index be77566a79..3840a88f72 100644
--- a/uvim/src/testdir/test_listlbr_utf8.vim
+++ b/uvim/src/testdir/test_listlbr_utf8.mnv
@@ -7,7 +7,7 @@ CheckOption linebreak
 CheckFeature conceal
 CheckFeature signs
 
-source util/screendump.vim
+source util/screendump.mnv
 
 func s:screen_lines(lnum, width) abort
   return ScreenLines(a:lnum, a:width)
@@ -76,7 +76,7 @@ func Test_linebreak_with_list_and_tabs()
   call setline(1, "\t\t\ttext")
   redraw
   bwipe!
-  set nolinebreak nolist listchars&vim tabstop=8
+  set nolinebreak nolist listchars&mnv tabstop=8
 endfunc
 
 func Test_linebreak_with_nolist()
@@ -216,7 +216,7 @@ func Test_colorcolumn_priority()
   call assert_equal(line_attr[1], line_attr[0])
   " Search wins over Colorcolumn
   call assert_equal(line_attr[2], line_attr[3])
-  call s:close_windows('setl hls&vim')
+  call s:close_windows('setl hls&mnv')
 endfunc
 
 func Test_illegal_byte_and_breakat()
@@ -230,7 +230,7 @@ func Test_illegal_byte_and_breakat()
 \ "0><80>            ",
 \ ]
   call s:compare_lines(expect, lines)
-  call s:close_windows('setl brk&vim')
+  call s:close_windows('setl brk&mnv')
 endfunc
 
 func Test_multibyte_wrap_and_breakat()
@@ -243,7 +243,7 @@ func Test_multibyte_wrap_and_breakat()
 \ "�                  ",
 \ ]
   call s:compare_lines(expect, lines)
-  call s:close_windows('setl brk&vim')
+  call s:close_windows('setl brk&mnv')
 endfunc
 
 func Test_chinese_char_on_wrap_column()
@@ -368,9 +368,9 @@ endfunc
 func Test_visual_ends_before_showbreak()
   CheckScreendump
 
-  " Redraw at the end is necessary due to https://github.com/vim/vim/issues/16620
+  " Redraw at the end is necessary due to https://github.com/Project-Tick/Project-Tick/issues/16620
   let lines =<< trim END
-      vim9script
+      mnv9script
       &wrap = true
       &linebreak = true
       &showbreak = '↪ '
@@ -379,10 +379,10 @@ func Test_visual_ends_before_showbreak()
       redraw
   END
   call writefile(lines, 'XvisualEndsBeforeShowbreak', 'D')
-  let buf = RunVimInTerminal('-S XvisualEndsBeforeShowbreak', #{rows: 6})
+  let buf = RunMNVInTerminal('-S XvisualEndsBeforeShowbreak', #{rows: 6})
   call VerifyScreenDump(buf, 'Test_visual_ends_before_showbreak', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_lua.vim b/uvim/src/testdir/test_lua.mnv
index 7e61de22c2..fd299a7570 100644
--- a/uvim/src/testdir/test_lua.vim
+++ b/uvim/src/testdir/test_lua.mnv
@@ -10,7 +10,7 @@ endfunc
 CheckFeature lua
 
 " Depending on the lua version, the error messages are different.
-let [s:major, s:minor, s:patch] = luaeval('vim.lua_version')->split('\.')->map({-> str2nr(v:val)})
+let [s:major, s:minor, s:patch] = luaeval('mnv.lua_version')->split('\.')->map({-> str2nr(v:val)})
 let s:lua_53_or_later = 0
 let s:lua_543 = 0
 if (s:major == 5 && s:minor >= 3) || s:major > 5
@@ -31,7 +31,7 @@ func Test_lua_luado_change_buffer()
 
   let wincount = winnr('$')
   call setline(1, ['one', 'two', 'three'])
-  luado vim.command("new")
+  luado mnv.command("new")
   call assert_equal(wincount + 1, winnr('$'))
 
   %bwipe!
@@ -42,19 +42,19 @@ func Test_lua_luado_delete_lines()
   new
 
   call setline(1, ['one', 'two', 'three'])
-  luado vim.command("%d_")
+  luado mnv.command("%d_")
   call assert_equal([''], getline(1, '$'))
 
   call setline(1, ['one', 'two', 'three'])
-  luado vim.command("1,2d_")
+  luado mnv.command("1,2d_")
   call assert_equal(['three'], getline(1, '$'))
 
   call setline(1, ['one', 'two', 'three'])
-  luado vim.command("2,3d_"); return "REPLACED"
+  luado mnv.command("2,3d_"); return "REPLACED"
   call assert_equal(['REPLACED'], getline(1, '$'))
 
   call setline(1, ['one', 'two', 'three'])
-  2,3luado vim.command("1,2d_"); return "REPLACED"
+  2,3luado mnv.command("1,2d_"); return "REPLACED"
   call assert_equal(['three'], getline(1, '$'))
 
   bwipe!
@@ -69,73 +69,73 @@ func Test_lua_luado()
 
   " Error cases
   call assert_fails('luado string.format()',
-        \ "[string \"vim chunk\"]:1: bad argument #1 to 'format' (string expected, got no value)")
+        \ "[string \"mnv chunk\"]:1: bad argument #1 to 'format' (string expected, got no value)")
   if s:lua_543
-    let msg = "[string \"vim chunk\"]:1: global 'func' is not callable (a nil value)"
+    let msg = "[string \"mnv chunk\"]:1: global 'func' is not callable (a nil value)"
   elseif s:lua_53_or_later
-    let msg = "[string \"vim chunk\"]:1: attempt to call a nil value (global 'func')"
+    let msg = "[string \"mnv chunk\"]:1: attempt to call a nil value (global 'func')"
   else
-    let msg = "[string \"vim chunk\"]:1: attempt to call global 'func' (a nil value)"
+    let msg = "[string \"mnv chunk\"]:1: attempt to call global 'func' (a nil value)"
   endif
   call assert_fails('luado func()', msg)
-  call assert_fails('luado error("failed")', "[string \"vim chunk\"]:1: failed")
+  call assert_fails('luado error("failed")', "[string \"mnv chunk\"]:1: failed")
 endfunc
 
-" Test vim.eval()
+" Test mnv.eval()
 func Test_lua_eval()
   " lua.eval with a number
-  lua v = vim.eval('123')
-  call assert_equal('number', luaeval('vim.type(v)'))
+  lua v = mnv.eval('123')
+  call assert_equal('number', luaeval('mnv.type(v)'))
   call assert_equal(123, luaeval('v'))
 
   " lua.eval with a string
-  lua v = vim.eval('"abc"')
-  call assert_equal('string', 'vim.type(v)'->luaeval())
+  lua v = mnv.eval('"abc"')
+  call assert_equal('string', 'mnv.type(v)'->luaeval())
   call assert_equal('abc', luaeval('v'))
 
   " lua.eval with a list
-  lua v = vim.eval("['a']")
-  call assert_equal('list', luaeval('vim.type(v)'))
+  lua v = mnv.eval("['a']")
+  call assert_equal('list', luaeval('mnv.type(v)'))
   call assert_equal(['a'], luaeval('v'))
 
   " lua.eval with a dict
-  lua v = vim.eval("{'a':'b'}")
-  call assert_equal('dict', luaeval('vim.type(v)'))
+  lua v = mnv.eval("{'a':'b'}")
+  call assert_equal('dict', luaeval('mnv.type(v)'))
   call assert_equal({'a':'b'}, luaeval('v'))
 
   " lua.eval with a blob
-  lua v = vim.eval("0z00112233.deadbeef")
-  call assert_equal('blob', luaeval('vim.type(v)'))
+  lua v = mnv.eval("0z00112233.deadbeef")
+  call assert_equal('blob', luaeval('mnv.type(v)'))
   call assert_equal(0z00112233.deadbeef, luaeval('v'))
 
   " lua.eval with a float
-  lua v = vim.eval('3.14')
-  call assert_equal('number', luaeval('vim.type(v)'))
+  lua v = mnv.eval('3.14')
+  call assert_equal('number', luaeval('mnv.type(v)'))
   call assert_equal(3.14, luaeval('v'))
 
   " lua.eval with a bool
-  lua v = vim.eval('v:true')
-  call assert_equal('boolean', luaeval('vim.type(v)'))
+  lua v = mnv.eval('v:true')
+  call assert_equal('boolean', luaeval('mnv.type(v)'))
   call assert_equal(v:true, luaeval('v'))
-  lua v = vim.eval('v:false')
-  call assert_equal('boolean', luaeval('vim.type(v)'))
+  lua v = mnv.eval('v:false')
+  call assert_equal('boolean', luaeval('mnv.type(v)'))
   call assert_equal(v:false, luaeval('v'))
 
   " lua.eval with a null
-  lua v = vim.eval('v:null')
-  call assert_equal('nil', luaeval('vim.type(v)'))
+  lua v = mnv.eval('v:null')
+  call assert_equal('nil', luaeval('mnv.type(v)'))
   call assert_equal(v:null, luaeval('v'))
 
-  call assert_fails('lua v = vim.eval(nil)',
-        \ "[string \"vim chunk\"]:1: bad argument #1 to 'eval' (string expected, got nil)")
-  call assert_fails('lua v = vim.eval(true)',
-        \ "[string \"vim chunk\"]:1: bad argument #1 to 'eval' (string expected, got boolean)")
-  call assert_fails('lua v = vim.eval({})',
-        \ "[string \"vim chunk\"]:1: bad argument #1 to 'eval' (string expected, got table)")
-  call assert_fails('lua v = vim.eval(print)',
-        \ "[string \"vim chunk\"]:1: bad argument #1 to 'eval' (string expected, got function)")
-  call assert_fails('lua v = vim.eval(vim.buffer())',
-        \ "[string \"vim chunk\"]:1: bad argument #1 to 'eval' (string expected, got userdata)")
+  call assert_fails('lua v = mnv.eval(nil)',
+        \ "[string \"mnv chunk\"]:1: bad argument #1 to 'eval' (string expected, got nil)")
+  call assert_fails('lua v = mnv.eval(true)',
+        \ "[string \"mnv chunk\"]:1: bad argument #1 to 'eval' (string expected, got boolean)")
+  call assert_fails('lua v = mnv.eval({})',
+        \ "[string \"mnv chunk\"]:1: bad argument #1 to 'eval' (string expected, got table)")
+  call assert_fails('lua v = mnv.eval(print)',
+        \ "[string \"mnv chunk\"]:1: bad argument #1 to 'eval' (string expected, got function)")
+  call assert_fails('lua v = mnv.eval(mnv.buffer())',
+        \ "[string \"mnv chunk\"]:1: bad argument #1 to 'eval' (string expected, got userdata)")
 
   lua v = nil
 endfunc
@@ -149,18 +149,18 @@ func Test_luaeval_with_lambda()
   lua hello_luaeval_lambda = nil
 endfunc
 
-" Test vim.window()
+" Test mnv.window()
 func Test_lua_window()
   e Xfoo2
   new Xfoo1
 
   " Window 1 (top window) contains Xfoo1
   " Window 2 (bottom window) contains Xfoo2
-  call assert_equal('Xfoo1', luaeval('vim.window(1):buffer().name'))
-  call assert_equal('Xfoo2', luaeval('vim.window(2):buffer().name'))
+  call assert_equal('Xfoo1', luaeval('mnv.window(1):buffer().name'))
+  call assert_equal('Xfoo2', luaeval('mnv.window(2):buffer().name'))
 
-  " Window 3 does not exist so vim.window(3) should return nil
-  call assert_equal('nil', luaeval('tostring(vim.window(3))'))
+  " Window 3 does not exist so mnv.window(3) should return nil
+  call assert_equal('nil', luaeval('tostring(mnv.window(3))'))
 
   if s:lua_543
     let msg = "[string \"luaeval\"]:1: field 'xyz' is not callable (a nil value)"
@@ -169,82 +169,82 @@ func Test_lua_window()
   else
     let msg = "[string \"luaeval\"]:1: attempt to call field 'xyz' (a nil value)"
   endif
-  call assert_fails("let n = luaeval('vim.window().xyz()')", msg)
-  call assert_fails('lua vim.window().xyz = 1',
-        \ "[string \"vim chunk\"]:1: invalid window property: `xyz'")
+  call assert_fails("let n = luaeval('mnv.window().xyz()')", msg)
+  call assert_fails('lua mnv.window().xyz = 1',
+        \ "[string \"mnv chunk\"]:1: invalid window property: `xyz'")
 
   %bwipe!
 endfunc
 
-" Test vim.window().height
+" Test mnv.window().height
 func Test_lua_window_height()
   new
-  lua vim.window().height = 2
+  lua mnv.window().height = 2
   call assert_equal(2, winheight(0))
-  lua vim.window().height = vim.window().height + 1
+  lua mnv.window().height = mnv.window().height + 1
   call assert_equal(3, winheight(0))
   bwipe!
 endfunc
 
-" Test vim.window().width
+" Test mnv.window().width
 func Test_lua_window_width()
   vert new
-  lua vim.window().width = 2
+  lua mnv.window().width = 2
   call assert_equal(2, winwidth(0))
-  lua vim.window().width = vim.window().width + 1
+  lua mnv.window().width = mnv.window().width + 1
   call assert_equal(3, winwidth(0))
   bwipe!
 endfunc
 
-" Test vim.window().line and vim.window.col
+" Test mnv.window().line and mnv.window.col
 func Test_lua_window_line_col()
   new
   call setline(1, ['line1', 'line2', 'line3'])
-  lua vim.window().line = 2
-  lua vim.window().col = 4
+  lua mnv.window().line = 2
+  lua mnv.window().col = 4
   call assert_equal([0, 2, 4, 0], getpos('.'))
-  lua vim.window().line = vim.window().line + 1
-  lua vim.window().col = vim.window().col - 1
+  lua mnv.window().line = mnv.window().line + 1
+  lua mnv.window().col = mnv.window().col - 1
   call assert_equal([0, 3, 3, 0], getpos('.'))
 
-  call assert_fails('lua vim.window().line = 10',
-        \           '[string "vim chunk"]:1: line out of range')
+  call assert_fails('lua mnv.window().line = 10',
+        \           '[string "mnv chunk"]:1: line out of range')
   bwipe!
 endfunc
 
-" Test vim.call
+" Test mnv.call
 func Test_lua_call()
-  call assert_equal(has('lua'), luaeval('vim.call("has", "lua")'))
-  call assert_equal(printf("Hello %s", "vim"), luaeval('vim.call("printf", "Hello %s", "vim")'))
+  call assert_equal(has('lua'), luaeval('mnv.call("has", "lua")'))
+  call assert_equal(printf("Hello %s", "mnv"), luaeval('mnv.call("printf", "Hello %s", "mnv")'))
 
   " Error cases
-  call assert_fails("call luaeval('vim.call(\"min\", 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21)')",
+  call assert_fails("call luaeval('mnv.call(\"min\", 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21)')",
         \ s:lua_53_or_later
         \ ? '[string "luaeval"]:1: Function called with too many arguments'
         \ : 'Function called with too many arguments')
   lua co = coroutine.create(function () print("hi") end)
-  call assert_fails("call luaeval('vim.call(\"type\", co)')",
+  call assert_fails("call luaeval('mnv.call(\"type\", co)')",
         \ s:lua_53_or_later
         \ ? '[string "luaeval"]:1: lua: cannot convert value'
         \ : 'lua: cannot convert value')
   lua co = nil
-  call assert_fails("call luaeval('vim.call(\"abc\")')",
-        \ ['E117:', s:lua_53_or_later ? '\[string "luaeval"]:1: lua: call_vim_function failed'
-        \                             : 'lua: call_vim_function failed'])
+  call assert_fails("call luaeval('mnv.call(\"abc\")')",
+        \ ['E117:', s:lua_53_or_later ? '\[string "luaeval"]:1: lua: call_mnv_function failed'
+        \                             : 'lua: call_mnv_function failed'])
 endfunc
 
-" Test vim.fn.*
+" Test mnv.fn.*
 func Test_lua_fn()
-  call assert_equal(has('lua'), luaeval('vim.fn.has("lua")'))
-  call assert_equal(printf("Hello %s", "vim"), luaeval('vim.fn.printf("Hello %s", "vim")'))
+  call assert_equal(has('lua'), luaeval('mnv.fn.has("lua")'))
+  call assert_equal(printf("Hello %s", "mnv"), luaeval('mnv.fn.printf("Hello %s", "mnv")'))
 endfunc
 
 " Test setting the current window
 func Test_lua_window_set_current()
   new Xfoo1
-  lua w1 = vim.window()
+  lua w1 = mnv.window()
   new Xfoo2
-  lua w2 = vim.window()
+  lua w2 = mnv.window()
 
   call assert_equal('Xfoo2', bufname('%'))
   lua w1()
@@ -256,13 +256,13 @@ func Test_lua_window_set_current()
   %bwipe!
 endfunc
 
-" Test vim.window().buffer
+" Test mnv.window().buffer
 func Test_lua_window_buffer()
   new Xfoo1
-  lua w1 = vim.window()
+  lua w1 = mnv.window()
   lua b1 = w1.buffer()
   new Xfoo2
-  lua w2 = vim.window()
+  lua w2 = mnv.window()
   lua b2 = w2.buffer()
 
   lua b1()
@@ -274,24 +274,24 @@ func Test_lua_window_buffer()
   %bwipe!
 endfunc
 
-" Test vim.window():previous() and vim.window():next()
+" Test mnv.window():previous() and mnv.window():next()
 func Test_lua_window_next_previous()
   new Xfoo1
   new Xfoo2
   new Xfoo3
   wincmd j
 
-  call assert_equal('Xfoo2', luaeval('vim.window().buffer().name'))
-  call assert_equal('Xfoo1', luaeval('vim.window():next():buffer().name'))
-  call assert_equal('Xfoo3', luaeval('vim.window():previous():buffer().name'))
+  call assert_equal('Xfoo2', luaeval('mnv.window().buffer().name'))
+  call assert_equal('Xfoo1', luaeval('mnv.window():next():buffer().name'))
+  call assert_equal('Xfoo3', luaeval('mnv.window():previous():buffer().name'))
 
   %bwipe!
 endfunc
 
-" Test vim.window():isvalid()
+" Test mnv.window():isvalid()
 func Test_lua_window_isvalid()
   new Xfoo
-  lua w = vim.window()
+  lua w = mnv.window()
   call assert_true(luaeval('w:isvalid()'))
 
   " FIXME: how to test the case when isvalid() returns v:false?
@@ -301,69 +301,69 @@ func Test_lua_window_isvalid()
   bwipe!
 endfunc
 
-" Test vim.buffer() with and without argument
+" Test mnv.buffer() with and without argument
 func Test_lua_buffer()
   new Xfoo1
   let bn1 = bufnr('%')
   new Xfoo2
   let bn2 = bufnr('%')
 
-  " Test vim.buffer() without argument.
-  call assert_equal('Xfoo2', luaeval("vim.buffer().name"))
+  " Test mnv.buffer() without argument.
+  call assert_equal('Xfoo2', luaeval("mnv.buffer().name"))
 
-  " Test vim.buffer() with string argument.
-  call assert_equal('Xfoo1', luaeval("vim.buffer('Xfoo1').name"))
-  call assert_equal('Xfoo2', luaeval("vim.buffer('Xfoo2').name"))
+  " Test mnv.buffer() with string argument.
+  call assert_equal('Xfoo1', luaeval("mnv.buffer('Xfoo1').name"))
+  call assert_equal('Xfoo2', luaeval("mnv.buffer('Xfoo2').name"))
 
-  " Test vim.buffer() with integer argument.
-  call assert_equal('Xfoo1', luaeval("vim.buffer(" . bn1 . ").name"))
-  call assert_equal('Xfoo2', luaeval("vim.buffer(" . bn2 . ").name"))
+  " Test mnv.buffer() with integer argument.
+  call assert_equal('Xfoo1', luaeval("mnv.buffer(" . bn1 . ").name"))
+  call assert_equal('Xfoo2', luaeval("mnv.buffer(" . bn2 . ").name"))
 
   lua bn1, bn2 = nil
   %bwipe!
 endfunc
 
-" Test vim.buffer().name and vim.buffer().fname
+" Test mnv.buffer().name and mnv.buffer().fname
 func Test_lua_buffer_name()
   new
-  call assert_equal('', luaeval('vim.buffer().name'))
-  call assert_equal('', luaeval('vim.buffer().fname'))
+  call assert_equal('', luaeval('mnv.buffer().name'))
+  call assert_equal('', luaeval('mnv.buffer().fname'))
   bwipe!
 
   new Xfoo
-  call assert_equal('Xfoo', luaeval('vim.buffer().name'))
-  call assert_equal(expand('%:p'), luaeval('vim.buffer().fname'))
+  call assert_equal('Xfoo', luaeval('mnv.buffer().name'))
+  call assert_equal(expand('%:p'), luaeval('mnv.buffer().fname'))
   bwipe!
 endfunc
 
-" Test vim.buffer().number
+" Test mnv.buffer().number
 func Test_lua_buffer_number()
   " All numbers in Lua are floating points number (no integers).
-  call assert_equal(bufnr('%'), float2nr(luaeval('vim.buffer().number')))
+  call assert_equal(bufnr('%'), float2nr(luaeval('mnv.buffer().number')))
 endfunc
 
 " Test inserting lines in buffer.
 func Test_lua_buffer_insert()
   new
-  lua vim.buffer()[1] = '3'
-  lua vim.buffer():insert('1', 0)
-  lua vim.buffer():insert('2', 1)
-  lua vim.buffer():insert('4', 10)
+  lua mnv.buffer()[1] = '3'
+  lua mnv.buffer():insert('1', 0)
+  lua mnv.buffer():insert('2', 1)
+  lua mnv.buffer():insert('4', 10)
 
   call assert_equal(['1', '2', '3', '4'], getline(1, '$'))
-  call assert_equal('4', luaeval('vim.buffer()[4]'))
-  call assert_equal(v:null, luaeval('vim.buffer()[5]'))
-  call assert_equal(v:null, luaeval('vim.buffer()[{}]'))
+  call assert_equal('4', luaeval('mnv.buffer()[4]'))
+  call assert_equal(v:null, luaeval('mnv.buffer()[5]'))
+  call assert_equal(v:null, luaeval('mnv.buffer()[{}]'))
   if s:lua_543
-    let msg = "[string \"vim chunk\"]:1: method 'xyz' is not callable (a nil value)"
+    let msg = "[string \"mnv chunk\"]:1: method 'xyz' is not callable (a nil value)"
   elseif s:lua_53_or_later
-    let msg = "[string \"vim chunk\"]:1: attempt to call a nil value (method 'xyz')"
+    let msg = "[string \"mnv chunk\"]:1: attempt to call a nil value (method 'xyz')"
   else
-    let msg = "[string \"vim chunk\"]:1: attempt to call method 'xyz' (a nil value)"
+    let msg = "[string \"mnv chunk\"]:1: attempt to call method 'xyz' (a nil value)"
   endif
-  call assert_fails('lua vim.buffer():xyz()', msg)
-  call assert_fails('lua vim.buffer()[1] = {}',
-        \ '[string "vim chunk"]:1: wrong argument to change')
+  call assert_fails('lua mnv.buffer():xyz()', msg)
+  call assert_fails('lua mnv.buffer()[1] = {}',
+        \ '[string "mnv chunk"]:1: wrong argument to change')
   bwipe!
 endfunc
 
@@ -372,23 +372,23 @@ func Test_lua_buffer_delete()
   new
   call setline(1, ['1', '2', '3'])
   call cursor(3, 1)
-  lua vim.buffer()[2] = nil
+  lua mnv.buffer()[2] = nil
   call assert_equal(['1', '3'], getline(1, '$'))
 
-  call assert_fails('lua vim.buffer()[3] = nil',
-        \           '[string "vim chunk"]:1: invalid line number')
+  call assert_fails('lua mnv.buffer()[3] = nil',
+        \           '[string "mnv chunk"]:1: invalid line number')
   bwipe!
 endfunc
 
-" Test #vim.buffer() i.e. number of lines in buffer
+" Test #mnv.buffer() i.e. number of lines in buffer
 func Test_lua_buffer_number_lines()
   new
   call setline(1, ['a', 'b', 'c'])
-  call assert_equal(3, luaeval('#vim.buffer()'))
+  call assert_equal(3, luaeval('#mnv.buffer()'))
   bwipe!
 endfunc
 
-" Test vim.buffer():next() and vim.buffer():previous()
+" Test mnv.buffer():next() and mnv.buffer():previous()
 " Note that these functions get the next or previous buffers
 " but do not switch buffer.
 func Test_lua_buffer_next_previous()
@@ -397,31 +397,31 @@ func Test_lua_buffer_next_previous()
   new Xfoo3
   b Xfoo2
 
-  lua bn = vim.buffer():next()
-  lua bp = vim.buffer():previous()
+  lua bn = mnv.buffer():next()
+  lua bp = mnv.buffer():previous()
 
-  call assert_equal('Xfoo2', luaeval('vim.buffer().name'))
+  call assert_equal('Xfoo2', luaeval('mnv.buffer().name'))
   call assert_equal('Xfoo1', luaeval('bp.name'))
   call assert_equal('Xfoo3', luaeval('bn.name'))
 
   call assert_equal('Xfoo2', bufname('%'))
 
   lua bn()
-  call assert_equal('Xfoo3', luaeval('vim.buffer().name'))
+  call assert_equal('Xfoo3', luaeval('mnv.buffer().name'))
   call assert_equal('Xfoo3', bufname('%'))
 
   lua bp()
-  call assert_equal('Xfoo1', luaeval('vim.buffer().name'))
+  call assert_equal('Xfoo1', luaeval('mnv.buffer().name'))
   call assert_equal('Xfoo1', bufname('%'))
 
   lua bn, bp = nil
   %bwipe!
 endfunc
 
-" Test vim.buffer():isvalid()
+" Test mnv.buffer():isvalid()
 func Test_lua_buffer_isvalid()
   new Xfoo
-  lua b = vim.buffer()
+  lua b = mnv.buffer()
   call assert_true(luaeval('b:isvalid()'))
 
   " FIXME: how to test the case when isvalid() returns v:false?
@@ -432,17 +432,17 @@ func Test_lua_buffer_isvalid()
 endfunc
 
 func Test_lua_list()
-  call assert_equal([], luaeval('vim.list()'))
+  call assert_equal([], luaeval('mnv.list()'))
 
   let l = []
-  lua l = vim.eval('l')
+  lua l = mnv.eval('l')
   lua l:add(123)
   lua l:add('abc')
   lua l:add(true)
   lua l:add(false)
   lua l:add(nil)
-  lua l:add(vim.eval("[1, 2, 3]"))
-  lua l:add(vim.eval("{'a':1, 'b':2, 'c':3}"))
+  lua l:add(mnv.eval("[1, 2, 3]"))
+  lua l:add(mnv.eval("{'a':1, 'b':2, 'c':3}"))
   call assert_equal([123, 'abc', v:true, v:false, v:null, [1, 2, 3], {'a': 1, 'b': 2, 'c': 3}], l)
   call assert_equal(7, luaeval('#l'))
   call assert_match('^list: \%(0x\)\?\x\+$', luaeval('tostring(l)'))
@@ -452,17 +452,17 @@ func Test_lua_list()
   lua l:insert('first')
   lua l:insert('xx', 3)
   call assert_fails('lua l:insert("xx", -20)',
-        \ '[string "vim chunk"]:1: invalid position')
+        \ '[string "mnv chunk"]:1: invalid position')
   call assert_equal(['first', 124, 'abc', 'xx', v:true, v:false, v:null, {'a': 1, 'b': 2, 'c': 3}], l)
 
   lockvar 1 l
-  call assert_fails('lua l:add("x")', '[string "vim chunk"]:1: list is locked')
-  call assert_fails('lua l:insert(2)', '[string "vim chunk"]:1: list is locked')
-  call assert_fails('lua l[9] = 1', '[string "vim chunk"]:1: list is locked')
+  call assert_fails('lua l:add("x")', '[string "mnv chunk"]:1: list is locked')
+  call assert_fails('lua l:insert(2)', '[string "mnv chunk"]:1: list is locked')
+  call assert_fails('lua l[9] = 1', '[string "mnv chunk"]:1: list is locked')
 
   unlockvar l
   let l = [1, 2]
-  lua ll = vim.eval('l')
+  lua ll = mnv.eval('l')
   let x = luaeval("ll[3]")
   call assert_equal(v:null, x)
   if s:lua_543
@@ -480,17 +480,17 @@ func Test_lua_list()
 endfunc
 
 func Test_lua_list_table()
-  " See :help lua-vim
+  " See :help lua-mnv
   " Non-numeric keys should not be used to initialize the list
   " so say = 'hi' should be ignored.
   lua t = {3.14, 'hello', false, true, say = 'hi'}
-  call assert_equal([3.14, 'hello', v:false, v:true], luaeval('vim.list(t)'))
+  call assert_equal([3.14, 'hello', v:false, v:true], luaeval('mnv.list(t)'))
   lua t = nil
 
-  call assert_fails('lua vim.list(1)', '[string "vim chunk"]:1: table expected, got number')
-  call assert_fails('lua vim.list("x")', '[string "vim chunk"]:1: table expected, got string')
-  call assert_fails('lua vim.list(print)', '[string "vim chunk"]:1: table expected, got function')
-  call assert_fails('lua vim.list(true)', '[string "vim chunk"]:1: table expected, got boolean')
+  call assert_fails('lua mnv.list(1)', '[string "mnv chunk"]:1: table expected, got number')
+  call assert_fails('lua mnv.list("x")', '[string "mnv chunk"]:1: table expected, got string')
+  call assert_fails('lua mnv.list(print)', '[string "mnv chunk"]:1: table expected, got function')
+  call assert_fails('lua mnv.list(true)', '[string "mnv chunk"]:1: table expected, got boolean')
 endfunc
 
 func Test_lua_list_table_insert_remove()
@@ -499,7 +499,7 @@ func Test_lua_list_table_insert_remove()
   endif
 
   let l = [1, 2]
-  lua t = vim.eval('l')
+  lua t = mnv.eval('l')
   lua table.insert(t, 10)
   lua t[#t + 1] = 20
   lua table.insert(t, 2, 30)
@@ -517,7 +517,7 @@ endfunc
 
 " Test l() i.e. iterator on list
 func Test_lua_list_iter()
-  lua l = vim.list():add('foo'):add('bar')
+  lua l = mnv.list():add('foo'):add('bar')
   lua str = ''
   lua for v in l() do str = str .. v end
   call assert_equal('foobar', luaeval('str'))
@@ -526,7 +526,7 @@ func Test_lua_list_iter()
 endfunc
 
 func Test_lua_recursive_list()
-  lua l = vim.list():add(1):add(2)
+  lua l = mnv.list():add(1):add(2)
   lua l = l:add(l)
 
   call assert_equal(1, luaeval('l[1]'))
@@ -550,16 +550,16 @@ func Test_lua_recursive_list()
 endfunc
 
 func Test_lua_dict()
-  call assert_equal({}, luaeval('vim.dict()'))
+  call assert_equal({}, luaeval('mnv.dict()'))
 
   let d = {}
-  lua d = vim.eval('d')
+  lua d = mnv.eval('d')
   lua d[0] = 123
   lua d[1] = "abc"
   lua d[2] = true
   lua d[3] = false
-  lua d[4] = vim.eval("[1, 2, 3]")
-  lua d[5] = vim.eval("{'a':1, 'b':2, 'c':3}")
+  lua d[4] = mnv.eval("[1, 2, 3]")
+  lua d[5] = mnv.eval("{'a':1, 'b':2, 'c':3}")
   call assert_equal({'0':123, '1':'abc', '2':v:true, '3':v:false, '4': [1, 2, 3], '5': {'a':1, 'b':2, 'c':3}}, d)
   call assert_equal(6, luaeval('#d'))
   call assert_match('^dict: \%(0x\)\?\x\+$', luaeval('tostring(d)'))
@@ -572,26 +572,26 @@ func Test_lua_dict()
   call assert_equal({'0':124, '1':'abc', '2':v:true, '3':v:false, '5': {'a':1, 'b':2, 'c':3}}, d)
 
   lockvar 1 d
-  call assert_fails('lua d[6] = 1', '[string "vim chunk"]:1: dict is locked')
+  call assert_fails('lua d[6] = 1', '[string "mnv chunk"]:1: dict is locked')
   unlockvar d
 
   " Error case
   lua d = {}
   lua d[''] = 10
-  call assert_fails("let t = luaeval('vim.dict(d)')",
+  call assert_fails("let t = luaeval('mnv.dict(d)')",
         \ s:lua_53_or_later
         \ ? '[string "luaeval"]:1: table has empty key'
         \ : 'table has empty key')
   let d = {}
-  lua x = vim.eval('d')
-  call assert_fails("lua x[''] = 10", '[string "vim chunk"]:1: empty key')
+  lua x = mnv.eval('d')
+  call assert_fails("lua x[''] = 10", '[string "mnv chunk"]:1: empty key')
   lua x['a'] = nil
   call assert_equal({}, d)
 
   " cannot assign funcrefs in the global scope
-  lua x = vim.eval('g:')
-  call assert_fails("lua x['min'] = vim.funcref('max')",
-        \ '[string "vim chunk"]:1: cannot assign funcref to builtin scope')
+  lua x = mnv.eval('g:')
+  call assert_fails("lua x['min'] = mnv.funcref('max')",
+        \ '[string "mnv chunk"]:1: cannot assign funcref to builtin scope')
 
   lua d = nil
 endfunc
@@ -599,27 +599,27 @@ endfunc
 func Test_lua_dict_table()
   lua t = {key1 = 'x', key2 = 3.14, key3 = true, key4 = false}
   call assert_equal({'key1': 'x', 'key2': 3.14, 'key3': v:true, 'key4': v:false},
-        \           luaeval('vim.dict(t)'))
+        \           luaeval('mnv.dict(t)'))
 
-  " Same example as in :help lua-vim.
+  " Same example as in :help lua-mnv.
   lua t = {math.pi, false, say = 'hi'}
   " FIXME: commented out as it currently does not work as documented:
   " Expected {'say': 'hi'}
   " but got {'1': 3.141593, '2': v:false, 'say': 'hi'}
   " Is the documentation or the code wrong?
-  "call assert_equal({'say' : 'hi'}, luaeval('vim.dict(t)'))
+  "call assert_equal({'say' : 'hi'}, luaeval('mnv.dict(t)'))
   lua t = nil
 
-  call assert_fails('lua vim.dict(1)', '[string "vim chunk"]:1: table expected, got number')
-  call assert_fails('lua vim.dict("x")', '[string "vim chunk"]:1: table expected, got string')
-  call assert_fails('lua vim.dict(print)', '[string "vim chunk"]:1: table expected, got function')
-  call assert_fails('lua vim.dict(true)', '[string "vim chunk"]:1: table expected, got boolean')
+  call assert_fails('lua mnv.dict(1)', '[string "mnv chunk"]:1: table expected, got number')
+  call assert_fails('lua mnv.dict("x")', '[string "mnv chunk"]:1: table expected, got string')
+  call assert_fails('lua mnv.dict(print)', '[string "mnv chunk"]:1: table expected, got function')
+  call assert_fails('lua mnv.dict(true)', '[string "mnv chunk"]:1: table expected, got boolean')
 endfunc
 
 " Test d() i.e. iterator on dictionary
 func Test_lua_dict_iter()
   let d = {'a': 1, 'b':2}
-  lua d = vim.eval('d')
+  lua d = mnv.eval('d')
   lua str = ''
   lua for k,v in d() do str = str .. k ..':' .. v .. ',' end
   call assert_equal('a:1,b:2,', luaeval('str'))
@@ -628,12 +628,12 @@ func Test_lua_dict_iter()
 endfunc
 
 func Test_lua_blob()
-  call assert_equal(0z, luaeval('vim.blob("")'))
-  call assert_equal(0z31326162, luaeval('vim.blob("12ab")'))
-  call assert_equal(0z00010203, luaeval('vim.blob("\000\001\002\003")'))
-  call assert_equal(0z8081FEFF, luaeval('vim.blob("\128\129\254\255")'))
+  call assert_equal(0z, luaeval('mnv.blob("")'))
+  call assert_equal(0z31326162, luaeval('mnv.blob("12ab")'))
+  call assert_equal(0z00010203, luaeval('mnv.blob("\000\001\002\003")'))
+  call assert_equal(0z8081FEFF, luaeval('mnv.blob("\128\129\254\255")'))
 
-  lua b = vim.blob("\000\000\000\000")
+  lua b = mnv.blob("\000\000\000\000")
   call assert_equal(0z00000000, luaeval('b'))
   call assert_equal(4, luaeval('#b'))
   lua b[0], b[1], b[2], b[3] = 1, 32, 256, 0xff
@@ -641,17 +641,17 @@ func Test_lua_blob()
   lua b[4] = string.byte("z", 1)
   call assert_equal(0z012000ff.7a, luaeval('b'))
   call assert_equal(5, luaeval('#b'))
-  call assert_fails('lua b[#b+1] = 0x80', '[string "vim chunk"]:1: index out of range')
+  call assert_fails('lua b[#b+1] = 0x80', '[string "mnv chunk"]:1: index out of range')
   lua b:add("12ab")
   call assert_equal(0z012000ff.7a313261.62, luaeval('b'))
   call assert_equal(9, luaeval('#b'))
-  call assert_fails('lua b:add(nil)', '[string "vim chunk"]:1: string expected, got nil')
-  call assert_fails('lua b:add(true)', '[string "vim chunk"]:1: string expected, got boolean')
-  call assert_fails('lua b:add({})', '[string "vim chunk"]:1: string expected, got table')
+  call assert_fails('lua b:add(nil)', '[string "mnv chunk"]:1: string expected, got nil')
+  call assert_fails('lua b:add(true)', '[string "mnv chunk"]:1: string expected, got boolean')
+  call assert_fails('lua b:add({})', '[string "mnv chunk"]:1: string expected, got table')
   lua b = nil
 
   let b = 0z0102
-  lua lb = vim.eval('b')
+  lua lb = mnv.eval('b')
   let n = luaeval('lb[1]')
   call assert_equal(2, n)
   let n = luaeval('lb[6]')
@@ -668,23 +668,23 @@ func Test_lua_blob()
   call assert_equal(v:null, y)
 
   lockvar b
-  call assert_fails('lua lb[1] = 2', '[string "vim chunk"]:1: blob is locked')
-  call assert_fails('lua lb:add("12")', '[string "vim chunk"]:1: blob is locked')
+  call assert_fails('lua lb[1] = 2', '[string "mnv chunk"]:1: blob is locked')
+  call assert_fails('lua lb:add("12")', '[string "mnv chunk"]:1: blob is locked')
 
   " Error cases
   lua t = {}
-  call assert_fails('lua b = vim.blob(t)',
-        \ '[string "vim chunk"]:1: string expected, got table')
+  call assert_fails('lua b = mnv.blob(t)',
+        \ '[string "mnv chunk"]:1: string expected, got table')
 endfunc
 
-def Vim9Test(Callback: func())
+def MNV9Test(Callback: func())
   Callback()
 enddef
 
-func Test_call_lua_func_from_vim9_func()
-  " this only tests that Vim doesn't crash
+func Test_call_lua_func_from_mnv9_func()
+  " this only tests that MNV doesn't crash
   lua << EOF
-vim.fn.Vim9Test(function () print('Hello') end)
+mnv.fn.MNV9Test(function () print('Hello') end)
 EOF
 endfunc
 
@@ -693,22 +693,22 @@ func Test_lua_funcref()
     return a:x
   endfunction
   let R = function('I')
-  lua i1 = vim.funcref"I"
-  lua i2 = vim.eval"R"
+  lua i1 = mnv.funcref"I"
+  lua i2 = mnv.eval"R"
   lua msg = "funcref|test|" .. (#i2(i1) == #i1(i2) and "OK" or "FAIL")
-  lua msg = vim.funcref"tr"(msg, "|", " ")
+  lua msg = mnv.funcref"tr"(msg, "|", " ")
   call assert_equal("funcref test OK", luaeval('msg'))
 
   " Error cases
-  call assert_fails('lua f1 = vim.funcref("")',
-        \ '[string "vim chunk"]:1: invalid function name: ')
-  call assert_fails('lua f1 = vim.funcref("10")',
-        \ '[string "vim chunk"]:1: invalid function name: 10')
+  call assert_fails('lua f1 = mnv.funcref("")',
+        \ '[string "mnv chunk"]:1: invalid function name: ')
+  call assert_fails('lua f1 = mnv.funcref("10")',
+        \ '[string "mnv chunk"]:1: invalid function name: 10')
   let fname = test_null_string()
-  call assert_fails('lua f1 = vim.funcref(fname)',
-        \ "[string \"vim chunk\"]:1: bad argument #1 to 'funcref' (string expected, got nil)")
-  call assert_fails('lua vim.funcref("abc")()',
-        \ ['E117:', '\[string "vim chunk"]:1: cannot call funcref'])
+  call assert_fails('lua f1 = mnv.funcref(fname)',
+        \ "[string \"mnv chunk\"]:1: bad argument #1 to 'funcref' (string expected, got nil)")
+  call assert_fails('lua mnv.funcref("abc")()',
+        \ ['E117:', '\[string "mnv chunk"]:1: cannot call funcref'])
 
   " dict funcref
   function Mylen() dict
@@ -716,41 +716,41 @@ func Test_lua_funcref()
   endfunction
   let l = [0, 1, 2, 3]
   let mydict = {'data': l}
-  lua d = vim.eval"mydict"
-  lua d.len = vim.funcref"Mylen" -- assign d as 'self'
-  lua res = (d.len() == vim.funcref"len"(vim.eval"l")) and "OK" or "FAIL"
+  lua d = mnv.eval"mydict"
+  lua d.len = mnv.funcref"Mylen" -- assign d as 'self'
+  lua res = (d.len() == mnv.funcref"len"(mnv.eval"l")) and "OK" or "FAIL"
   call assert_equal("OK", luaeval('res'))
   call assert_equal(function('Mylen', {'data': l, 'len': function('Mylen')}), mydict.len)
 
   lua i1, i2, msg, d, res = nil
 endfunc
 
-" Test vim.type()
+" Test mnv.type()
 func Test_lua_type()
   " The following values are identical to Lua's type function.
-  call assert_equal('string',   luaeval('vim.type("foo")'))
-  call assert_equal('number',   luaeval('vim.type(1)'))
-  call assert_equal('number',   luaeval('vim.type(1.2)'))
-  call assert_equal('function', luaeval('vim.type(print)'))
-  call assert_equal('table',    luaeval('vim.type({})'))
-  call assert_equal('boolean',  luaeval('vim.type(true)'))
-  call assert_equal('boolean',  luaeval('vim.type(false)'))
-  call assert_equal('nil',      luaeval('vim.type(nil)'))
-
-  " The following values are specific to Vim.
-  call assert_equal('window',   luaeval('vim.type(vim.window())'))
-  call assert_equal('buffer',   luaeval('vim.type(vim.buffer())'))
-  call assert_equal('list',     luaeval('vim.type(vim.list())'))
-  call assert_equal('dict',     luaeval('vim.type(vim.dict())'))
-  call assert_equal('funcref',  luaeval('vim.type(vim.funcref("Test_type"))'))
+  call assert_equal('string',   luaeval('mnv.type("foo")'))
+  call assert_equal('number',   luaeval('mnv.type(1)'))
+  call assert_equal('number',   luaeval('mnv.type(1.2)'))
+  call assert_equal('function', luaeval('mnv.type(print)'))
+  call assert_equal('table',    luaeval('mnv.type({})'))
+  call assert_equal('boolean',  luaeval('mnv.type(true)'))
+  call assert_equal('boolean',  luaeval('mnv.type(false)'))
+  call assert_equal('nil',      luaeval('mnv.type(nil)'))
+
+  " The following values are specific to MNV.
+  call assert_equal('window',   luaeval('mnv.type(mnv.window())'))
+  call assert_equal('buffer',   luaeval('mnv.type(mnv.buffer())'))
+  call assert_equal('list',     luaeval('mnv.type(mnv.list())'))
+  call assert_equal('dict',     luaeval('mnv.type(mnv.dict())'))
+  call assert_equal('funcref',  luaeval('mnv.type(mnv.funcref("Test_type"))'))
 endfunc
 
-" Test vim.open()
+" Test mnv.open()
 func Test_lua_open()
   call assert_notmatch('XOpen', execute('ls'))
 
   " Open a buffer XOpen1, but do not jump to it.
-  lua b = vim.open('XOpen1')
+  lua b = mnv.open('XOpen1')
   call assert_equal('XOpen1', luaeval('b.name'))
   call assert_equal('', bufname('%'))
 
@@ -758,7 +758,7 @@ func Test_lua_open()
   call assert_notequal('XOpen2', bufname('%'))
 
   " Open a buffer XOpen2 and jump to it.
-  lua b = vim.open('XOpen2')()
+  lua b = mnv.open('XOpen2')()
   call assert_equal('XOpen2', luaeval('b.name'))
   call assert_equal('XOpen2', bufname('%'))
 
@@ -771,49 +771,49 @@ func Test_update_package_paths()
   call assert_equal("hello from lua", luaeval("require('testluaplugin').hello()"))
 endfunc
 
-func Vim_func_call_lua_callback(Concat, Cb)
-  let l:message = a:Concat("hello", "vim")
+func MNV_func_call_lua_callback(Concat, Cb)
+  let l:message = a:Concat("hello", "mnv")
   call a:Cb(l:message)
 endfunc
 
-func Test_pass_lua_callback_to_vim_from_lua()
-  lua pass_lua_callback_to_vim_from_lua_result = ""
-  call assert_equal("", luaeval("pass_lua_callback_to_vim_from_lua_result"))
+func Test_pass_lua_callback_to_mnv_from_lua()
+  lua pass_lua_callback_to_mnv_from_lua_result = ""
+  call assert_equal("", luaeval("pass_lua_callback_to_mnv_from_lua_result"))
   lua <<EOF
-  vim.funcref('Vim_func_call_lua_callback')(
+  mnv.funcref('MNV_func_call_lua_callback')(
     function(greeting, message)
       return greeting .. " " .. message
     end,
     function(message)
-      pass_lua_callback_to_vim_from_lua_result = message
+      pass_lua_callback_to_mnv_from_lua_result = message
     end)
 EOF
-  call assert_equal("hello vim", luaeval("pass_lua_callback_to_vim_from_lua_result"))
+  call assert_equal("hello mnv", luaeval("pass_lua_callback_to_mnv_from_lua_result"))
 endfunc
 
-func Vim_func_call_metatable_lua_callback(Greet)
+func MNV_func_call_metatable_lua_callback(Greet)
   return a:Greet("world")
 endfunc
 
-func Test_pass_lua_metatable_callback_to_vim_from_lua()
-  let result = luaeval("vim.funcref('Vim_func_call_metatable_lua_callback')(setmetatable({ space = ' '}, { __call = function(tbl, msg) return 'hello' .. tbl.space .. msg  end }) )")
+func Test_pass_lua_metatable_callback_to_mnv_from_lua()
+  let result = luaeval("mnv.funcref('MNV_func_call_metatable_lua_callback')(setmetatable({ space = ' '}, { __call = function(tbl, msg) return 'hello' .. tbl.space .. msg  end }) )")
   call assert_equal("hello world", result)
 endfunc
 
-" Test vim.line()
+" Test mnv.line()
 func Test_lua_line()
   new
   call setline(1, ['first line', 'second line'])
   1
-  call assert_equal('first line', luaeval('vim.line()'))
+  call assert_equal('first line', luaeval('mnv.line()'))
   2
-  call assert_equal('second line', luaeval('vim.line()'))
+  call assert_equal('second line', luaeval('mnv.line()'))
   bwipe!
 endfunc
 
-" Test vim.beep()
+" Test mnv.beep()
 func Test_lua_beep()
-  call assert_beeps('lua vim.beep()')
+  call assert_beeps('lua mnv.beep()')
 endfunc
 
 " Test errors in luaeval()
@@ -892,7 +892,7 @@ func Test_lua_string_with_newline()
   let x = execute('lua print("Hello\nWorld", 2)')
   call assert_equal("\nHello\nWorld 2", x)
   new
-  lua k = vim.buffer(vim.eval('bufnr()'))
+  lua k = mnv.buffer(mnv.eval('bufnr()'))
   lua k:insert("Hello\0World", 0)
   call assert_equal(["Hello\nWorld", ''], getline(1, '$'))
   close!
@@ -904,7 +904,7 @@ func Test_lua_set_cursor()
   call setline(1, ['first line', 'second line'])
   normal gg
   lua << trim EOF
-    w = vim.window()
+    w = mnv.window()
     w.line = 1
     w.col = 5
   EOF
@@ -918,27 +918,27 @@ endfunc
 " Test for various heredoc syntax
 func Test_lua_heredoc()
   lua << END
-vim.command('let s = "A"')
+mnv.command('let s = "A"')
 END
   lua <<
-vim.command('let s ..= "B"')
+mnv.command('let s ..= "B"')
 .
   lua << trim END
-    vim.command('let s ..= "C"')
+    mnv.command('let s ..= "C"')
   END
   lua << trim
-    vim.command('let s ..= "D"')
+    mnv.command('let s ..= "D"')
   .
   lua << trim eof
-    vim.command('let s ..= "E"')
+    mnv.command('let s ..= "E"')
   eof
   lua << trimm
-vim.command('let s ..= "F"')
+mnv.command('let s ..= "F"')
 trimm
   call assert_equal('ABCDEF', s)
 endfunc
 
-" Test for adding, accessing and removing global variables using the vim.g
+" Test for adding, accessing and removing global variables using the mnv.g
 " Lua table
 func Test_lua_global_var_table()
   " Access global variables with different types of values
@@ -947,26 +947,26 @@ func Test_lua_global_var_table()
   let g:Var3 = ['a', 'b']
   let g:Var4 = #{x: 'edit', y: 'run'}
   let g:Var5 = function('min')
-  call assert_equal(10, luaeval('vim.g.Var1'))
-  call assert_equal('Hello', luaeval('vim.g.Var2'))
-  call assert_equal(['a', 'b'], luaeval('vim.g.Var3'))
-  call assert_equal(#{x: 'edit', y: 'run'}, luaeval('vim.g.Var4'))
-  call assert_equal(2, luaeval('vim.g.Var5')([5, 9, 2]))
+  call assert_equal(10, luaeval('mnv.g.Var1'))
+  call assert_equal('Hello', luaeval('mnv.g.Var2'))
+  call assert_equal(['a', 'b'], luaeval('mnv.g.Var3'))
+  call assert_equal(#{x: 'edit', y: 'run'}, luaeval('mnv.g.Var4'))
+  call assert_equal(2, luaeval('mnv.g.Var5')([5, 9, 2]))
 
   " Access list of dictionaries and dictionary of lists
   let g:Var1 = [#{a: 10}, #{b: 20}]
   let g:Var2 = #{p: [5, 6], q: [1.1, 2.2]}
-  call assert_equal([#{a: 10}, #{b: 20}], luaeval('vim.g.Var1'))
-  call assert_equal(#{p: [5, 6], q: [1.1, 2.2]}, luaeval('vim.g.Var2'))
+  call assert_equal([#{a: 10}, #{b: 20}], luaeval('mnv.g.Var1'))
+  call assert_equal(#{p: [5, 6], q: [1.1, 2.2]}, luaeval('mnv.g.Var2'))
 
   " Create new global variables with different types of values
   unlet g:Var1 g:Var2 g:Var3 g:Var4 g:Var5
   lua << trim END
-    vim.g.Var1 = 34
-    vim.g.Var2 = 'World'
-    vim.g.Var3 = vim.list({'#', '$'})
-    vim.g.Var4 = vim.dict({model='honda', year=2020})
-    vim.g.Var5 = vim.funcref('max')
+    mnv.g.Var1 = 34
+    mnv.g.Var2 = 'World'
+    mnv.g.Var3 = mnv.list({'#', '$'})
+    mnv.g.Var4 = mnv.dict({model='honda', year=2020})
+    mnv.g.Var5 = mnv.funcref('max')
   END
   call assert_equal(34, g:Var1)
   call assert_equal('World', g:Var2)
@@ -977,20 +977,20 @@ func Test_lua_global_var_table()
   " Create list of dictionaries and dictionary of lists
   unlet g:Var1 g:Var2
   lua << trim END
-    vim.g.Var1 = vim.list({vim.dict({a=10}), vim.dict({b=20})})
-    vim.g.Var2 = vim.dict({p=vim.list({5, 6}), q=vim.list({1.1, 2.2})})
+    mnv.g.Var1 = mnv.list({mnv.dict({a=10}), mnv.dict({b=20})})
+    mnv.g.Var2 = mnv.dict({p=mnv.list({5, 6}), q=mnv.list({1.1, 2.2})})
   END
-  call assert_equal([#{a: 10}, #{b: 20}], luaeval('vim.g.Var1'))
-  call assert_equal(#{p: [5, 6], q: [1.1, 2.2]}, luaeval('vim.g.Var2'))
+  call assert_equal([#{a: 10}, #{b: 20}], luaeval('mnv.g.Var1'))
+  call assert_equal(#{p: [5, 6], q: [1.1, 2.2]}, luaeval('mnv.g.Var2'))
 
   " Modify a global variable with a list value or a dictionary value
   let g:Var1 = [10, 20]
   let g:Var2 = #{one: 'mercury', two: 'mars'}
   lua << trim END
-    vim.g.Var1[2] = nil
-    vim.g.Var1[3] = 15
-    vim.g.Var2['two'] = nil
-    vim.g.Var2['three'] = 'earth'
+    mnv.g.Var1[2] = nil
+    mnv.g.Var1[3] = 15
+    mnv.g.Var2['two'] = nil
+    mnv.g.Var2['three'] = 'earth'
   END
   call assert_equal([10, 15], g:Var1)
   call assert_equal(#{one: 'mercury', three: 'earth'}, g:Var2)
@@ -1002,11 +1002,11 @@ func Test_lua_global_var_table()
   let g:Var4 = #{x: 'edit', y: 'run'}
   let g:Var5 = function('min')
   lua << trim END
-    vim.g.Var1 = nil
-    vim.g.Var2 = nil
-    vim.g.Var3 = nil
-    vim.g.Var4 = nil
-    vim.g.Var5 = nil
+    mnv.g.Var1 = nil
+    mnv.g.Var2 = nil
+    mnv.g.Var3 = nil
+    mnv.g.Var4 = nil
+    mnv.g.Var5 = nil
   END
   call assert_false(exists('g:Var1'))
   call assert_false(exists('g:Var2'))
@@ -1017,52 +1017,52 @@ func Test_lua_global_var_table()
   " Try to modify and remove a locked global variable
   let g:Var1 = 10
   lockvar g:Var1
-  call assert_fails('lua vim.g.Var1 = 20', 'variable is locked')
-  call assert_fails('lua vim.g.Var1 = nil', 'variable is locked')
+  call assert_fails('lua mnv.g.Var1 = 20', 'variable is locked')
+  call assert_fails('lua mnv.g.Var1 = nil', 'variable is locked')
   unlockvar g:Var1
   let g:Var2 = [7, 14]
   lockvar 0 g:Var2
-  lua vim.g.Var2[2] = nil
-  lua vim.g.Var2[3] = 21
-  call assert_fails('lua vim.g.Var2 = nil', 'variable is locked')
+  lua mnv.g.Var2[2] = nil
+  lua mnv.g.Var2[3] = 21
+  call assert_fails('lua mnv.g.Var2 = nil', 'variable is locked')
   call assert_equal([7, 21], g:Var2)
   lockvar 1 g:Var2
-  call assert_fails('lua vim.g.Var2[2] = nil', 'list is locked')
-  call assert_fails('lua vim.g.Var2[3] = 21', 'list is locked')
+  call assert_fails('lua mnv.g.Var2[2] = nil', 'list is locked')
+  call assert_fails('lua mnv.g.Var2[3] = 21', 'list is locked')
   unlockvar g:Var2
 
   let g:TestFunc = function('len')
-  call assert_fails('lua vim.g.func = vim.g.TestFunc', ['E704:', 'Couldn''t add to dictionary'])
+  call assert_fails('lua mnv.g.func = mnv.g.TestFunc', ['E704:', 'Couldn''t add to dictionary'])
   unlet g:TestFunc
 
   " Attempt to access a non-existing global variable
-  call assert_equal(v:null, luaeval('vim.g.NonExistingVar'))
-  lua vim.g.NonExisting = nil
+  call assert_equal(v:null, luaeval('mnv.g.NonExistingVar'))
+  lua mnv.g.NonExisting = nil
 
   unlet! g:Var1 g:Var2 g:Var3 g:Var4 g:Var5
 endfunc
 
-" Test for accessing and modifying predefined vim variables using the vim.v
+" Test for accessing and modifying predefined mnv variables using the mnv.v
 " Lua table
 func Test_lua_predefined_var_table()
-  call assert_equal(v:progpath, luaeval('vim.v.progpath'))
+  call assert_equal(v:progpath, luaeval('mnv.v.progpath'))
   let v:errmsg = 'SomeError'
-  call assert_equal('SomeError', luaeval('vim.v.errmsg'))
-  lua vim.v.errmsg = 'OtherError'
+  call assert_equal('SomeError', luaeval('mnv.v.errmsg'))
+  lua mnv.v.errmsg = 'OtherError'
   call assert_equal('OtherError', v:errmsg)
-  lua vim.v.errmsg = 42
+  lua mnv.v.errmsg = 42
   call assert_equal('42', v:errmsg)
-  call assert_fails('lua vim.v.errmsg = nil', 'variable is fixed')
+  call assert_fails('lua mnv.v.errmsg = nil', 'variable is fixed')
   let v:oldfiles = ['one', 'two']
-  call assert_equal(['one', 'two'], luaeval('vim.v.oldfiles'))
-  lua vim.v.oldfiles = vim.list({})
+  call assert_equal(['one', 'two'], luaeval('mnv.v.oldfiles'))
+  lua mnv.v.oldfiles = mnv.list({})
   call assert_equal([], v:oldfiles)
-  call assert_fails('lua vim.v.oldfiles = "a"',
+  call assert_fails('lua mnv.v.oldfiles = "a"',
         \ 'Setting v:oldfiles to value with wrong type')
   call assert_equal([], v:oldfiles)
-  call assert_equal(v:null, luaeval('vim.v.null'))
-  call assert_fails('lua vim.v.argv[1] = nil', 'list is locked')
-  call assert_fails('lua vim.v.newvar = 1', 'Dictionary is locked')
+  call assert_equal(v:null, luaeval('mnv.v.null'))
+  call assert_fails('lua mnv.v.argv[1] = nil', 'list is locked')
+  call assert_fails('lua mnv.v.newvar = 1', 'Dictionary is locked')
 
   new
   call setline(1, ' foo foo foo')
@@ -1071,11 +1071,11 @@ func Test_lua_predefined_var_table()
   call assert_equal(1, v:searchforward)
   normal! n
   call assert_equal([0, 1, 6, 0, 6], getcurpos())
-  lua vim.v.searchforward = 0
+  lua mnv.v.searchforward = 0
   call assert_equal(0, v:searchforward)
   normal! n
   call assert_equal([0, 1, 2, 0, 2], getcurpos())
-  lua vim.v.searchforward = 1
+  lua mnv.v.searchforward = 1
   call assert_equal(1, v:searchforward)
   normal! n
   call assert_equal([0, 1, 6, 0, 6], getcurpos())
@@ -1083,7 +1083,7 @@ func Test_lua_predefined_var_table()
 endfunc
 
 " Test for adding, accessing and modifying window-local variables using the
-" vim.w Lua table
+" mnv.w Lua table
 func Test_lua_window_var_table()
   " Access window variables with different types of values
   new
@@ -1093,39 +1093,39 @@ func Test_lua_window_var_table()
   let w:wvar4 = 0zdeadbeef
   let w:wvar5 = ['a', 'b']
   let w:wvar6 = #{action: 'run'}
-  call assert_equal(10, luaeval('vim.w.wvar1'))
-  call assert_equal('edit', luaeval('vim.w.wvar2'))
-  call assert_equal(3.14, luaeval('vim.w.wvar3'))
-  call assert_equal(0zdeadbeef, luaeval('vim.w.wvar4'))
-  call assert_equal(['a', 'b'], luaeval('vim.w.wvar5'))
-  call assert_equal(#{action: 'run'}, luaeval('vim.w.wvar6'))
-  call assert_equal(v:null, luaeval('vim.w.NonExisting'))
+  call assert_equal(10, luaeval('mnv.w.wvar1'))
+  call assert_equal('edit', luaeval('mnv.w.wvar2'))
+  call assert_equal(3.14, luaeval('mnv.w.wvar3'))
+  call assert_equal(0zdeadbeef, luaeval('mnv.w.wvar4'))
+  call assert_equal(['a', 'b'], luaeval('mnv.w.wvar5'))
+  call assert_equal(#{action: 'run'}, luaeval('mnv.w.wvar6'))
+  call assert_equal(v:null, luaeval('mnv.w.NonExisting'))
 
   " modify a window variable
-  lua vim.w.wvar2 = 'paste'
+  lua mnv.w.wvar2 = 'paste'
   call assert_equal('paste', w:wvar2)
 
   " change the type stored in a variable
   let w:wvar2 = [1, 2]
-  lua vim.w.wvar2 = vim.dict({a=10, b=20})
+  lua mnv.w.wvar2 = mnv.dict({a=10, b=20})
   call assert_equal(#{a: 10, b: 20}, w:wvar2)
 
   " create a new window variable
-  lua vim.w.wvar7 = vim.dict({a=vim.list({1, 2}), b=20})
+  lua mnv.w.wvar7 = mnv.dict({a=mnv.list({1, 2}), b=20})
   call assert_equal(#{a: [1, 2], b: 20}, w:wvar7)
 
   " delete a window variable
-  lua vim.w.wvar2 = nil
+  lua mnv.w.wvar2 = nil
   call assert_false(exists('w:wvar2'))
 
   new
-  call assert_equal(v:null, luaeval('vim.w.wvar1'))
-  call assert_equal(v:null, luaeval('vim.w.wvar2'))
+  call assert_equal(v:null, luaeval('mnv.w.wvar1'))
+  call assert_equal(v:null, luaeval('mnv.w.wvar2'))
   %bw!
 endfunc
 
 " Test for adding, accessing and modifying buffer-local variables using the
-" vim.b Lua table
+" mnv.b Lua table
 func Test_lua_buffer_var_table()
   " Access buffer variables with different types of values
   let b:bvar1 = 10
@@ -1134,39 +1134,39 @@ func Test_lua_buffer_var_table()
   let b:bvar4 = 0zdeadbeef
   let b:bvar5 = ['a', 'b']
   let b:bvar6 = #{action: 'run'}
-  call assert_equal(10, luaeval('vim.b.bvar1'))
-  call assert_equal('edit', luaeval('vim.b.bvar2'))
-  call assert_equal(3.14, luaeval('vim.b.bvar3'))
-  call assert_equal(0zdeadbeef, luaeval('vim.b.bvar4'))
-  call assert_equal(['a', 'b'], luaeval('vim.b.bvar5'))
-  call assert_equal(#{action: 'run'}, luaeval('vim.b.bvar6'))
-  call assert_equal(v:null, luaeval('vim.b.NonExisting'))
+  call assert_equal(10, luaeval('mnv.b.bvar1'))
+  call assert_equal('edit', luaeval('mnv.b.bvar2'))
+  call assert_equal(3.14, luaeval('mnv.b.bvar3'))
+  call assert_equal(0zdeadbeef, luaeval('mnv.b.bvar4'))
+  call assert_equal(['a', 'b'], luaeval('mnv.b.bvar5'))
+  call assert_equal(#{action: 'run'}, luaeval('mnv.b.bvar6'))
+  call assert_equal(v:null, luaeval('mnv.b.NonExisting'))
 
   " modify a buffer variable
-  lua vim.b.bvar2 = 'paste'
+  lua mnv.b.bvar2 = 'paste'
   call assert_equal('paste', b:bvar2)
 
   " change the type stored in a variable
   let b:bvar2 = [1, 2]
-  lua vim.b.bvar2 = vim.dict({a=10, b=20})
+  lua mnv.b.bvar2 = mnv.dict({a=10, b=20})
   call assert_equal(#{a: 10, b: 20}, b:bvar2)
 
   " create a new buffer variable
-  lua vim.b.bvar7 = vim.dict({a=vim.list({1, 2}), b=20})
+  lua mnv.b.bvar7 = mnv.dict({a=mnv.list({1, 2}), b=20})
   call assert_equal(#{a: [1, 2], b: 20}, b:bvar7)
 
   " delete a buffer variable
-  lua vim.b.bvar2 = nil
+  lua mnv.b.bvar2 = nil
   call assert_false(exists('b:bvar2'))
 
   new
-  call assert_equal(v:null, luaeval('vim.b.bvar1'))
-  call assert_equal(v:null, luaeval('vim.b.bvar2'))
+  call assert_equal(v:null, luaeval('mnv.b.bvar1'))
+  call assert_equal(v:null, luaeval('mnv.b.bvar2'))
   %bw!
 endfunc
 
 " Test for adding, accessing and modifying tabpage-local variables using the
-" vim.t Lua table
+" mnv.t Lua table
 func Test_lua_tabpage_var_table()
   " Access tabpage variables with different types of values
   let t:tvar1 = 10
@@ -1175,50 +1175,50 @@ func Test_lua_tabpage_var_table()
   let t:tvar4 = 0zdeadbeef
   let t:tvar5 = ['a', 'b']
   let t:tvar6 = #{action: 'run'}
-  call assert_equal(10, luaeval('vim.t.tvar1'))
-  call assert_equal('edit', luaeval('vim.t.tvar2'))
-  call assert_equal(3.14, luaeval('vim.t.tvar3'))
-  call assert_equal(0zdeadbeef, luaeval('vim.t.tvar4'))
-  call assert_equal(['a', 'b'], luaeval('vim.t.tvar5'))
-  call assert_equal(#{action: 'run'}, luaeval('vim.t.tvar6'))
-  call assert_equal(v:null, luaeval('vim.t.NonExisting'))
+  call assert_equal(10, luaeval('mnv.t.tvar1'))
+  call assert_equal('edit', luaeval('mnv.t.tvar2'))
+  call assert_equal(3.14, luaeval('mnv.t.tvar3'))
+  call assert_equal(0zdeadbeef, luaeval('mnv.t.tvar4'))
+  call assert_equal(['a', 'b'], luaeval('mnv.t.tvar5'))
+  call assert_equal(#{action: 'run'}, luaeval('mnv.t.tvar6'))
+  call assert_equal(v:null, luaeval('mnv.t.NonExisting'))
 
   " modify a tabpage variable
-  lua vim.t.tvar2 = 'paste'
+  lua mnv.t.tvar2 = 'paste'
   call assert_equal('paste', t:tvar2)
 
   " change the type stored in a variable
   let t:tvar2 = [1, 2]
-  lua vim.t.tvar2 = vim.dict({a=10, b=20})
+  lua mnv.t.tvar2 = mnv.dict({a=10, b=20})
   call assert_equal(#{a: 10, b: 20}, t:tvar2)
 
   " create a new tabpage variable
-  lua vim.t.tvar7 = vim.dict({a=vim.list({1, 2}), b=20})
+  lua mnv.t.tvar7 = mnv.dict({a=mnv.list({1, 2}), b=20})
   call assert_equal(#{a: [1, 2], b: 20}, t:tvar7)
 
   " delete a tabpage variable
-  lua vim.t.tvar2 = nil
+  lua mnv.t.tvar2 = nil
   call assert_false(exists('t:tvar2'))
 
   tabnew
-  call assert_equal(v:null, luaeval('vim.t.tvar1'))
-  call assert_equal(v:null, luaeval('vim.t.tvar2'))
+  call assert_equal(v:null, luaeval('mnv.t.tvar1'))
+  call assert_equal(v:null, luaeval('mnv.t.tvar2'))
   %bw!
 endfunc
 
-" Test for vim.version()
-func Test_lua_vim_version()
+" Test for mnv.version()
+func Test_lua_mnv_version()
   lua << trim END
-    vimver = vim.version()
-    vimver_n = vimver.major * 100 + vimver.minor
+    mnvver = mnv.version()
+    mnvver_n = mnvver.major * 100 + mnvver.minor
   END
-  call assert_equal(v:version, luaeval('vimver_n'))
+  call assert_equal(v:version, luaeval('mnvver_n'))
 endfunc
 
-" Test for running multiple commands using vim.command()
+" Test for running multiple commands using mnv.command()
 func Test_lua_multiple_commands()
   lua << trim END
-    vim.command([[
+    mnv.command([[
         let Var1 = []
         for i in range(3)
           let Var1 += [#{name: 'x'}]
@@ -1239,9 +1239,9 @@ func Test_lua_multiple_commands()
 endfunc
 
 func Test_lua_debug()
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
-  let buf = RunVimInTerminal('', {'rows': 10})
+  let buf = RunMNVInTerminal('', {'rows': 10})
   call term_sendkeys(buf, ":lua debug.debug()\n")
   call WaitForAssert({-> assert_equal('lua_debug> ', term_getline(buf, 10))})
 
@@ -1268,14 +1268,14 @@ func Test_lua_debug()
   call term_sendkeys(buf, "\n")
   call WaitForAssert({-> assert_match(' All$', term_getline(buf, 10))})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
-" Test for a crash when a Lua funcref is invoked with parameters from Vim
+" Test for a crash when a Lua funcref is invoked with parameters from MNV
 func Test_lua_funcref_with_params()
   let Lua_funcref = luaeval('function(d) local s = "in Lua callback" end')
   call Lua_funcref({'a' : 'b'})
   call assert_true(v:true)
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_makeencoding.vim b/uvim/src/testdir/test_makeencoding.mnv
index 40bad97fbf..e375c911d8 100644
--- a/uvim/src/testdir/test_makeencoding.vim
+++ b/uvim/src/testdir/test_makeencoding.mnv
@@ -114,4 +114,4 @@ func Test_longline_conversion()
   set makeencoding&
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_map_functions.vim b/uvim/src/testdir/test_map_functions.mnv
index 2ce660bf29..a43dc7f214 100644
--- a/uvim/src/testdir/test_map_functions.vim
+++ b/uvim/src/testdir/test_map_functions.mnv
@@ -117,7 +117,7 @@ func Test_maparg()
   unlet d
 endfunc
 
-def Test_vim9_maparg()
+def Test_mnv9_maparg()
   nmap { w
   var one: string = maparg('{')
   assert_equal('w', one)
@@ -535,7 +535,7 @@ func Test_map_restore_negative_sid()
     qall!
   [CODE]
 
-  if RunVim([], after, '--clean --cmd "nmap ,n <Nop>"')
+  if RunMNV([], after, '--clean --cmd "nmap ,n <Nop>"')
     call assert_equal([], readfile('Xresult'))
   endif
   call delete('Xresult')
@@ -648,4 +648,4 @@ def Test_maplist()
 enddef
 
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_mapping.vim b/uvim/src/testdir/test_mapping.mnv
index 01f2d1f944..61da1e44e2 100644
--- a/uvim/src/testdir/test_mapping.vim
+++ b/uvim/src/testdir/test_mapping.mnv
@@ -1,14 +1,14 @@
 " Tests for mappings and abbreviations
 
-source util/screendump.vim
-import './util/vim9.vim' as v9
+source util/screendump.mnv
+import './util/mnv9.mnv' as v9
 
 func Test_abbreviation()
   new
   " abbreviation with 0x80 should work
-  inoreab чкпр   vim
+  inoreab чкпр   mnv
   call feedkeys("Goчкпр \<Esc>", "xt")
-  call assert_equal('vim ', getline('$'))
+  call assert_equal('mnv ', getline('$'))
   iunab чкпр
   bwipe!
 endfunc
@@ -311,7 +311,7 @@ func Test_map_timeout()
   endfunc
   set timeout timeoutlen=200
   let timer = timer_start(300, 'ExitInsert')
-  " After the 'b' Vim waits for another character to see if it matches 'bb'.
+  " After the 'b' MNV waits for another character to see if it matches 'bb'.
   " When it times out it is expanded to "aaa", but there is no wait for
   " "aaaa".  Can't check that reliably though.
   call feedkeys("b", "xt!")
@@ -447,10 +447,10 @@ func Test_motionforce_omap()
 endfunc
 
 func Test_error_in_map_expr()
-  " Unlike CheckRunVimInTerminal this does work in a win32 console
+  " Unlike CheckRunMNVInTerminal this does work in a win32 console
   CheckFeature terminal
   if has('win32') && has('gui_running')
-    throw 'Skipped: cannot run Vim in a terminal window'
+    throw 'Skipped: cannot run MNV in a terminal window'
   endif
 
   let lines =<< trim [CODE]
@@ -461,13 +461,13 @@ func Test_error_in_map_expr()
   nmap <expr> ! Func()
   set updatetime=50
   [CODE]
-  call writefile(lines, 'Xtest.vim', 'D')
+  call writefile(lines, 'Xtest.mnv', 'D')
 
-  let buf = term_start(GetVimCommandCleanTerm() .. ' -S Xtest.vim', {'term_rows': 8})
+  let buf = term_start(GetMNVCommandCleanTerm() .. ' -S Xtest.mnv', {'term_rows': 8})
   let job = term_getjob(buf)
   call WaitForAssert({-> assert_notequal('', term_getline(buf, 8))})
 
-  " GC must not run during map-expr processing, which can make Vim crash.
+  " GC must not run during map-expr processing, which can make MNV crash.
   call term_sendkeys(buf, '!')
   call TermWait(buf, 50)
   call term_sendkeys(buf, "\<CR>")
@@ -537,7 +537,7 @@ func Test_list_mappings()
 
   let index = indexof(lines, 'v:val =~ "Last set"')
   call assert_equal(1, index)
-  call assert_match("\tLast set from .*/test_mapping.vim line \\d\\+$",
+  call assert_match("\tLast set from .*/test_mapping.mnv line \\d\\+$",
         \ lines[index])
 
   " character with K_SPECIAL byte in rhs
@@ -624,12 +624,12 @@ func Test_expr_map_restore_cursor()
       set stl=%{Status()}
   END
   call writefile(lines, 'XtestExprMap', 'D')
-  let buf = RunVimInTerminal('-S XtestExprMap', #{rows: 10})
+  let buf = RunMNVInTerminal('-S XtestExprMap', #{rows: 10})
   call term_sendkeys(buf, GetEscCodeWithModifier('C', 'B'))
   call VerifyScreenDump(buf, 'Test_map_expr_1', {})
 
   " clean up
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_map_listing()
@@ -639,12 +639,12 @@ func Test_map_listing()
       nmap a b
   END
   call writefile(lines, 'XtestMapList', 'D')
-  let buf = RunVimInTerminal('-S XtestMapList', #{rows: 6})
+  let buf = RunMNVInTerminal('-S XtestMapList', #{rows: 6})
   call term_sendkeys(buf, ":                      nmap a\<CR>")
   call VerifyScreenDump(buf, 'Test_map_list_1', {})
 
   " clean up
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_expr_map_error()
@@ -662,7 +662,7 @@ func Test_expr_map_error()
       call test_override('ui_delay', 10)
   END
   call writefile(lines, 'XtestExprMap', 'D')
-  let buf = RunVimInTerminal('-S XtestExprMap', #{rows: 10})
+  let buf = RunMNVInTerminal('-S XtestExprMap', #{rows: 10})
   call term_sendkeys(buf, "\<F2>")
   call TermWait(buf)
   call term_sendkeys(buf, "\<CR>")
@@ -674,7 +674,7 @@ func Test_expr_map_error()
   call VerifyScreenDump(buf, 'Test_map_expr_4', {})
 
   " clean up
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 " Test for mapping errors
@@ -863,8 +863,8 @@ func Test_expr_abbr()
   bwipe!
 endfunc
 
-" Test for storing mappings in different modes in a vimrc file
-func Test_mkvimrc_mapmodes()
+" Test for storing mappings in different modes in a mnvrc file
+func Test_mkmnvrc_mapmodes()
   map a1 /a1
   nmap a2 /a2
   vmap a3 /a3
@@ -924,8 +924,8 @@ func Test_mkvimrc_mapmodes()
   cabbr a26 A26
   iabbr a27 A27
 
-  mkvimrc! Xvimrc
-  let l = readfile('Xvimrc')
+  mkmnvrc! Xmnvrc
+  let l = readfile('Xmnvrc')
   call assert_equal(['map a1 /a1'], filter(copy(l), 'v:val =~ " a1 "'))
   call assert_equal(['nmap a2 /a2'], filter(copy(l), 'v:val =~ " a2 "'))
   call assert_equal(['vmap a3 /a3'], filter(copy(l), 'v:val =~ " a3 "'))
@@ -964,7 +964,7 @@ func Test_mkvimrc_mapmodes()
   call assert_equal(['abbr a25 A25'], filter(copy(l), 'v:val =~ " a25 "'))
   call assert_equal(['cabbr a26 A26'], filter(copy(l), 'v:val =~ " a26 "'))
   call assert_equal(['iabbr a27 A27'], filter(copy(l), 'v:val =~ " a27 "'))
-  call delete('Xvimrc')
+  call delete('Xmnvrc')
 
   mapclear
   nmapclear
@@ -1107,7 +1107,7 @@ func Test_map_cmdkey()
   call assert_equal('"xxx', @:)
 
   " terminal mode
-  if CanRunVimInTerminal()
+  if CanRunMNVInTerminal()
     tnoremap <F3> <Cmd>let m = mode(1)<CR>
     let buf = Run_shell_in_terminal({})
     call feedkeys("\<F3>", 'xt')
@@ -1258,7 +1258,7 @@ func Test_map_cmdkey_normal_cmd()
   let caught_err = 0
   try
     exe "normal ,w"
-  catch /Vim(echoerr):Err/
+  catch /MNV(echoerr):Err/
     let caught_err = 1
   endtry
   call assert_equal(1, caught_err)
@@ -1422,7 +1422,7 @@ func Test_map_cmdkey_insert_mode()
   call assert_equal(['indeed some short little 2 lines', 'of test text'], getline(1, '$'))
 
   " Note when entering visual mode from InsertEnter autocmd, an async event,
-  " or a <Cmd> mapping, vim ends up in undocumented "INSERT VISUAL" mode.
+  " or a <Cmd> mapping, mnv ends up in undocumented "INSERT VISUAL" mode.
   call feedkeys("i\<F7>stuff ", 'xt')
   call assert_equal(['indeed some short little 2 lines', 'of stuff test text'], getline(1, '$'))
   call assert_equal(['v', 1, 3, 2, 9], [mode(1), line('v'), col('v'), line('.'), col('.')])
@@ -1439,12 +1439,12 @@ func Test_map_cmdkey_insert_mode()
 
   " :startinsert does nothing
   call setline(1, 'foo bar')
-  call feedkeys("ggi\<F8>vim", 'xt')
-  call assert_equal('vimfoo bar', getline(1))
+  call feedkeys("ggi\<F8>mnv", 'xt')
+  call assert_equal('mnvfoo bar', getline(1))
 
   " :stopinsert works
   call feedkeys("ggi\<F9>Abc", 'xt')
-  call assert_equal('vimfoo barbc', getline(1))
+  call assert_equal('mnvfoo barbc', getline(1))
 
   call s:cleanupMaps()
   %bw!
@@ -1549,7 +1549,7 @@ endfunc
 
 func Test_map_script_cmd_restore()
   let lines =<< trim END
-      vim9script
+      mnv9script
       nnoremap <F3> <ScriptCmd>eval 1 + 2<CR>
   END
   call v9.CheckScriptSuccess(lines)
@@ -1562,7 +1562,7 @@ endfunc
 
 func Test_map_script_cmd_finds_func()
   let lines =<< trim END
-      vim9script
+      mnv9script
       onoremap <F3> <ScriptCmd>Func()<CR>
       def Func()
         g:func_called = 'yes'
@@ -1578,7 +1578,7 @@ endfunc
 
 func Test_map_script_cmd_survives_unmap()
   let lines =<< trim END
-      vim9script
+      mnv9script
       var n = 123
       nnoremap <F4> <ScriptCmd><CR>
       autocmd CmdlineEnter * silent! nunmap <F4>
@@ -1596,23 +1596,23 @@ endfunc
 func Test_map_script_cmd_redo()
   call mkdir('Xmapcmd', 'R')
   let lines =<< trim END
-      vim9script
-      import autoload './script.vim'
+      mnv9script
+      import autoload './script.mnv'
       onoremap <F3> <ScriptCmd>script.Func()<CR>
   END
-  call writefile(lines, 'Xmapcmd/plugin.vim')
+  call writefile(lines, 'Xmapcmd/plugin.mnv')
 
   let lines =<< trim END
-      vim9script
+      mnv9script
       export def Func()
         normal! V
       enddef
   END
-  call writefile(lines, 'Xmapcmd/script.vim')
+  call writefile(lines, 'Xmapcmd/script.mnv')
   new
   call setline(1, ['one', 'two', 'three', 'four', 'five'])
   nnoremap j j
-  source Xmapcmd/plugin.vim
+  source Xmapcmd/plugin.mnv
   call feedkeys("d\<F3>j.j.", 'xt')
   call assert_equal(['two', 'four'], getline(1, '$'))
 
@@ -1847,7 +1847,7 @@ endfunc
 " Testing for mapping after an <Nop> mapping is triggered on timeout.
 " Test for what patch 8.1.0052 fixes.
 func Test_map_after_timed_out_nop()
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   let lines =<< trim END
     set timeout timeoutlen=400
@@ -1855,7 +1855,7 @@ func Test_map_after_timed_out_nop()
     inoremap a <Nop>
   END
   call writefile(lines, 'Xtest_map_after_timed_out_nop', 'D')
-  let buf = RunVimInTerminal('-S Xtest_map_after_timed_out_nop', #{rows: 6})
+  let buf = RunMNVInTerminal('-S Xtest_map_after_timed_out_nop', #{rows: 6})
 
   " Enter Insert mode
   call term_sendkeys(buf, 'i')
@@ -1870,12 +1870,12 @@ func Test_map_after_timed_out_nop()
   call WaitForAssert({-> assert_equal("TEST", term_getline(buf, 1))})
 
   " clean up
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 " Test 'showcmd' behavior with a partial mapping
 func Test_showcmd_part_map()
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   let lines =<< trim END
     set notimeout showcmd
@@ -1889,7 +1889,7 @@ func Test_showcmd_part_map()
     nnoremap <C-W>a <Ignore>
   END
   call writefile(lines, 'Xtest_showcmd_part_map', 'D')
-  let buf = RunVimInTerminal('-S Xtest_showcmd_part_map', #{rows: 6})
+  let buf = RunMNVInTerminal('-S Xtest_showcmd_part_map', #{rows: 6})
 
   call term_sendkeys(buf, ":set noruler | echo\<CR>")
   call WaitForAssert({-> assert_equal('', term_getline(buf, 6))})
@@ -1913,7 +1913,7 @@ func Test_showcmd_part_map()
   call term_sendkeys(buf, 'a')
   call WaitForAssert({-> assert_equal('', trim(term_getline(buf, 6)))})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_using_past_typeahead()
@@ -1926,7 +1926,7 @@ func Test_using_past_typeahead()
 endfunc
 
 func Test_mapclear_while_listing()
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   let lines =<< trim END
       set nocompatible
@@ -1937,7 +1937,7 @@ func Test_mapclear_while_listing()
       au CmdlineLeave : call timer_start(0, {-> execute('mapclear')})
   END
   call writefile(lines, 'Xmapclear', 'D')
-  let buf = RunVimInTerminal('-S Xmapclear', {'rows': 10})
+  let buf = RunMNVInTerminal('-S Xmapclear', {'rows': 10})
 
   " this was using freed memory
   call term_sendkeys(buf, ":map\<CR>")
@@ -1946,8 +1946,8 @@ func Test_mapclear_while_listing()
   call TermWait(buf, 50)
   call term_sendkeys(buf, "\<CR>")
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_marks.vim b/uvim/src/testdir/test_marks.mnv
index ed09221449..198a9d3132 100644
--- a/uvim/src/testdir/test_marks.vim
+++ b/uvim/src/testdir/test_marks.mnv
@@ -5,7 +5,7 @@ func Test_Restore_DelMark()
   enew!
   call append(0, ["	textline A", "	textline B", "	textline C"])
   normal! 2gg
-  set nocp viminfo+=nviminfo
+  set nocp mnvinfo+=nmnvinfo
   exe "normal! i\<C-G>u\<Esc>"
   exe "normal! maddu\<C-R>u"
   let pos = getpos("'a")
@@ -323,4 +323,4 @@ func Test_jump_mark_autocmd()
 endfunc
 
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_match.vim b/uvim/src/testdir/test_match.mnv
index 5d598eb233..f96f3ec1ec 100644
--- a/uvim/src/testdir/test_match.vim
+++ b/uvim/src/testdir/test_match.mnv
@@ -1,7 +1,7 @@
 " Test for :match, :2match, :3match, clearmatches(), getmatches(), matchadd(),
 " matchaddpos(), matcharg(), matchdelete(), and setmatches().
 
-source util/screendump.vim
+source util/screendump.mnv
 
 function Test_match()
   highlight MyGroup1 term=bold ctermbg=red guibg=red
@@ -59,7 +59,7 @@ function Test_match()
   let m3 = matchadd("MyGroup3", "XXX", 60, 17)
   match MyGroup1 /COFFEE/
   2match MyGroup2 /HUMPPA/
-  3match MyGroup3 /VIM/
+  3match MyGroup3 /MNV/
   call clearmatches()
   call assert_equal([], getmatches())
 
@@ -71,7 +71,7 @@ function Test_match()
   let m3 = matchadd("MyGroup3", "XXX", 60, 17)
   match MyGroup1 /COFFEE/
   2match MyGroup2 /HUMPPA/
-  3match MyGroup3 /VIM/
+  3match MyGroup3 /MNV/
   let ml = getmatches()
   call clearmatches()
   call setmatches(ml)
@@ -227,10 +227,10 @@ func Test_matchaddpos_dump()
       call matchaddpos('Search', range(1, 12)->map({i, v -> [v, v]}))
   END
   call writefile(lines, 'Xmatchaddpos', 'D')
-  let buf = RunVimInTerminal('-S Xmatchaddpos', #{rows: 14})
+  let buf = RunMNVInTerminal('-S Xmatchaddpos', #{rows: 14})
   call VerifyScreenDump(buf, 'Test_matchaddpos_1', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_matchaddpos_otherwin()
@@ -316,13 +316,13 @@ endfunc
 
 func OtherWindowCommon()
   let lines =<< trim END
-    call setline(1, 'Hello Vim world')
+    call setline(1, 'Hello MNV world')
     let mid = matchadd('Error', 'world', 1)
     let winid = win_getid()
     new
   END
   call writefile(lines, 'XscriptMatchCommon')
-  let buf = RunVimInTerminal('-S XscriptMatchCommon', #{rows: 12})
+  let buf = RunMNVInTerminal('-S XscriptMatchCommon', #{rows: 12})
   call TermWait(buf)
   return buf
 endfunc
@@ -334,7 +334,7 @@ func Test_matchdelete_other_window()
   call term_sendkeys(buf, ":call matchdelete(mid, winid)\<CR>")
   call VerifyScreenDump(buf, 'Test_matchdelete_1', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
   call delete('XscriptMatchCommon')
 endfunc
 
@@ -345,30 +345,30 @@ endfunc
 
 func Test_matchclear_other_window()
   CheckScreendump
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
   let buf = OtherWindowCommon()
   call term_sendkeys(buf, ":call clearmatches(winid)\<CR>")
   call VerifyScreenDump(buf, 'Test_matchclear_1', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
   call delete('XscriptMatchCommon')
 endfunc
 
 func Test_matchadd_other_window()
   CheckScreendump
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
   let buf = OtherWindowCommon()
   call term_sendkeys(buf, ":call matchadd('Search', 'Hello', 1, -1, #{window: winid})\<CR>")
   call term_sendkeys(buf, ":\<CR>")
   call VerifyScreenDump(buf, 'Test_matchadd_1', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
   call delete('XscriptMatchCommon')
 endfunc
 
 func Test_match_in_linebreak()
   CheckScreendump
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   let lines =<< trim END
     set breakindent linebreak breakat+=]
@@ -376,15 +376,15 @@ func Test_match_in_linebreak()
     call matchaddpos('ErrorMsg', [[1, 51]])
   END
   call writefile(lines, 'XscriptMatchLinebreak', 'D')
-  let buf = RunVimInTerminal('-S XscriptMatchLinebreak', #{rows: 10})
+  let buf = RunMNVInTerminal('-S XscriptMatchLinebreak', #{rows: 10})
   call VerifyScreenDump(buf, 'Test_match_linebreak', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_match_with_incsearch()
   CheckScreendump
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   let lines =<< trim END
     set incsearch
@@ -392,14 +392,14 @@ func Test_match_with_incsearch()
     call matchaddpos('ErrorMsg', [3])
   END
   call writefile(lines, 'XmatchWithIncsearch', 'D')
-  let buf = RunVimInTerminal('-S XmatchWithIncsearch', #{rows: 6})
+  let buf = RunMNVInTerminal('-S XmatchWithIncsearch', #{rows: 6})
   call VerifyScreenDump(buf, 'Test_match_with_incsearch_1', {})
 
   call term_sendkeys(buf, ":s/0")
   call VerifyScreenDump(buf, 'Test_match_with_incsearch_2', {})
 
   call term_sendkeys(buf, "\<CR>")
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 " Test for deleting matches outside of the screen redraw top/bottom lines
@@ -424,7 +424,7 @@ endfunc
 
 func Test_match_tab_with_linebreak()
   CheckScreendump
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   let lines =<< trim END
     set linebreak
@@ -432,10 +432,10 @@ func Test_match_tab_with_linebreak()
     call matchadd('ErrorMsg', '\t')
   END
   call writefile(lines, 'XscriptMatchTabLinebreak', 'D')
-  let buf = RunVimInTerminal('-S XscriptMatchTabLinebreak', #{rows: 10})
+  let buf = RunMNVInTerminal('-S XscriptMatchTabLinebreak', #{rows: 10})
   call VerifyScreenDump(buf, 'Test_match_tab_linebreak', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_matchadd_conceal.vim b/uvim/src/testdir/test_matchadd_conceal.mnv
index b6917113b4..5153297411 100644
--- a/uvim/src/testdir/test_matchadd_conceal.vim
+++ b/uvim/src/testdir/test_matchadd_conceal.mnv
@@ -377,7 +377,7 @@ func Test_interaction_matchadd_syntax()
 endfunc
 
 func Test_cursor_column_in_concealed_line_after_window_scroll()
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   " Test for issue #5012 fix.
   " For a concealed line with cursor, there should be no window's cursor
@@ -393,7 +393,7 @@ func Test_cursor_column_in_concealed_line_after_window_scroll()
     "==expr==
   END
   call writefile(lines, 'Xcolesearch', 'D')
-  let buf = RunVimInTerminal('Xcolesearch', {})
+  let buf = RunMNVInTerminal('Xcolesearch', {})
   call TermWait(buf, 50)
 
   " Jump to something that is beyond the bottom of the window,
@@ -411,11 +411,11 @@ func Test_cursor_column_in_concealed_line_after_window_scroll()
   " parts of the current line?
   call assert_equal(2, term_getcursor(buf)[1])
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_cursor_column_in_concealed_line_after_leftcol_change()
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   " Test for issue #5214 fix.
   let lines =<< trim END
@@ -424,7 +424,7 @@ func Test_cursor_column_in_concealed_line_after_leftcol_change()
     set nowrap ss=0 cole=3 cocu=n
   END
   call writefile(lines, 'Xcurs-columns', 'D')
-  let buf = RunVimInTerminal('-S Xcurs-columns', {})
+  let buf = RunMNVInTerminal('-S Xcurs-columns', {})
 
   " Go to the end of the line (3 columns beyond the end of the screen).
   " Horizontal scroll would center the cursor in the screen line, but conceal
@@ -438,7 +438,7 @@ func Test_cursor_column_in_concealed_line_after_leftcol_change()
   " BugFix check: Is the window's cursor column properly updated for conceal?
   call assert_equal(1, term_getcursor(buf)[1])
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_matchadd_conceal_utf8.vim b/uvim/src/testdir/test_matchadd_conceal_utf8.mnv
index bc8a97c40f..62262c51de 100644
--- a/uvim/src/testdir/test_matchadd_conceal_utf8.vim
+++ b/uvim/src/testdir/test_matchadd_conceal_utf8.mnv
@@ -41,4 +41,4 @@ func Test_match_using_multibyte_conceal_char()
   quit!
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_matchfuzzy.vim b/uvim/src/testdir/test_matchfuzzy.mnv
index eb4c8c6567..a9b67c874e 100644
--- a/uvim/src/testdir/test_matchfuzzy.vim
+++ b/uvim/src/testdir/test_matchfuzzy.mnv
@@ -38,11 +38,11 @@ func Test_matchfuzzy()
   " total non-matching letter(s) penalty
   call assert_equal(['one', 'onex', 'onexx'], ['onexx', 'one', 'onex']->matchfuzzy('one'))
   " prefer complete matches over separator matches
-  call assert_equal(['.vim/vimrc', '.vim/vimrc_colors', '.vim/v_i_m_r_c'], ['.vim/vimrc', '.vim/vimrc_colors', '.vim/v_i_m_r_c']->matchfuzzy('vimrc'))
+  call assert_equal(['.mnv/mnvrc', '.mnv/mnvrc_colors', '.mnv/v_i_m_r_c'], ['.mnv/mnvrc', '.mnv/mnvrc_colors', '.mnv/v_i_m_r_c']->matchfuzzy('mnvrc'))
   " gap penalty
   call assert_equal(['xxayybxxxx', 'xxayyybxxx', 'xxayyyybxx'], ['xxayyyybxx', 'xxayyybxxx', 'xxayybxxxx']->matchfuzzy('ab'))
   " path separator vs word separator
-  call assert_equal(['color/setup.vim', 'color setup.vim', 'color_setup.vim', 'colorsetup.vim', 'color\\setup.vim'], matchfuzzy(['colorsetup.vim', 'color setup.vim', 'color/setup.vim', 'color_setup.vim', 'color\\setup.vim'], 'setup.vim'))
+  call assert_equal(['color/setup.mnv', 'color setup.mnv', 'color_setup.mnv', 'colorsetup.mnv', 'color\\setup.mnv'], matchfuzzy(['colorsetup.mnv', 'color setup.mnv', 'color/setup.mnv', 'color_setup.mnv', 'color\\setup.mnv'], 'setup.mnv'))
 
   " match multiple words (separated by space)
   call assert_equal(['foo bar baz'], ['foo bar baz', 'foo', 'foo bar', 'baz bar']->matchfuzzy('baz foo'))
@@ -289,17 +289,17 @@ endfunc
 
 " This was using uninitialized memory
 func Test_matchfuzzy_initialized()
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   " This can take a very long time (esp. when using valgrind).  Run in a
-  " separate Vim instance and kill it after two seconds.  We only check for
+  " separate MNV instance and kill it after two seconds.  We only check for
   " memory errors.
   let lines =<< trim END
-      lvimgrep [ss [fg*
+      lmnvgrep [ss [fg*
   END
   call writefile(lines, 'XTest_matchfuzzy', 'D')
 
-  let buf = RunVimInTerminal('-u NONE -X -Z', {})
+  let buf = RunMNVInTerminal('-u NONE -X -Z', {})
   call term_sendkeys(buf, ":source XTest_matchfuzzy\n")
   " Use term_wait directly rather than the TermWait wrapper; otherwise,
   " retries become very slow.
@@ -309,9 +309,9 @@ func Test_matchfuzzy_initialized()
   if job_status(job) == "run"
     call job_stop(job, "int")
     " The search might or might not have been completed. If the search is
-    " finished and Vim receives a SIGINT, then that will trigger a message
-    " next time Vim is active:
-    "   Type  :qa  and press <Enter> to exit Vim
+    " finished and MNV receives a SIGINT, then that will trigger a message
+    " next time MNV is active:
+    "   Type  :qa  and press <Enter> to exit MNV
     " If we do not send something here to trigger displaying the message, before
     " TermWait(), then the exit sequence sent afterward does not work.
     call term_sendkeys(buf, "\<C-O>")
@@ -319,7 +319,7 @@ func Test_matchfuzzy_initialized()
   endif
 
   " clean up
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_memory_usage.vim b/uvim/src/testdir/test_memory_usage.mnv
index 66c27a1f7e..687b94cbcb 100644
--- a/uvim/src/testdir/test_memory_usage.vim
+++ b/uvim/src/testdir/test_memory_usage.mnv
@@ -55,10 +55,10 @@ func s:monitor_memory_usage(pid) abort
   return {'last': get(proc.hist, -1), 'max': proc.max}
 endfunc
 
-let s:term_vim = {}
+let s:term_mnv = {}
 
-func s:term_vim.start(...) abort
-  let self.buf = term_start([GetVimProg()] + a:000)
+func s:term_mnv.start(...) abort
+  let self.buf = term_start([GetMNVProg()] + a:000)
   let self.job = term_getjob(self.buf)
   call WaitFor({-> job_status(self.job) ==# 'run'})
   let self.pid = job_info(self.job).process
@@ -67,20 +67,20 @@ func s:term_vim.start(...) abort
   let g:test_is_flaky = 1
 endfunc
 
-func s:term_vim.stop() abort
+func s:term_mnv.stop() abort
   call term_sendkeys(self.buf, ":qall!\<CR>")
   call WaitFor({-> job_status(self.job) ==# 'dead'})
   exe self.buf . 'bwipe!'
 endfunc
 
-func s:vim_new() abort
-  return copy(s:term_vim)
+func s:mnv_new() abort
+  return copy(s:term_mnv)
 endfunc
 
 func Test_memory_func_capture_vargs()
   " Case: if a local variable captures a:000, funccall object will be free
   " just after it finishes.
-  let testfile = 'Xtest.vim'
+  let testfile = 'Xtest.mnv'
   let lines =<< trim END
         func s:f(...)
           let x = a:000
@@ -91,13 +91,13 @@ func Test_memory_func_capture_vargs()
   END
   call writefile(lines, testfile, 'D')
 
-  let vim = s:vim_new()
-  call vim.start('--clean', '-c', 'set noswapfile', testfile)
-  let before = s:monitor_memory_usage(vim.pid).last
+  let mnv = s:mnv_new()
+  call mnv.start('--clean', '-c', 'set noswapfile', testfile)
+  let before = s:monitor_memory_usage(mnv.pid).last
 
-  call term_sendkeys(vim.buf, ":so %\<CR>")
-  call WaitFor({-> term_getcursor(vim.buf)[0] == 1})
-  let after = s:monitor_memory_usage(vim.pid)
+  call term_sendkeys(mnv.buf, ":so %\<CR>")
+  call WaitFor({-> term_getcursor(mnv.buf)[0] == 1})
+  let after = s:monitor_memory_usage(mnv.pid)
 
   " Estimate the limit of max usage as 2x initial usage.
   " The lower limit can fluctuate a bit, use 97%.
@@ -110,14 +110,14 @@ func Test_memory_func_capture_vargs()
   let upper = after.last * 105 / 100
   call assert_inrange(lower, upper, after.max)
 
-  call vim.stop()
+  call mnv.stop()
 endfunc
 
 func Test_memory_func_capture_lvars()
   " Case: if a local variable captures l: dict, funccall object will not be
   " free until garbage collector runs, but after that memory usage doesn't
-  " increase so much even when rerun Xtest.vim since system memory caches.
-  let testfile = 'Xtest.vim'
+  " increase so much even when rerun Xtest.mnv since system memory caches.
+  let testfile = 'Xtest.mnv'
   let lines =<< trim END
         func s:f()
           let x = l:
@@ -128,19 +128,19 @@ func Test_memory_func_capture_lvars()
   END
   call writefile(lines, testfile, 'D')
 
-  let vim = s:vim_new()
-  call vim.start('--clean', '-c', 'set noswapfile', testfile)
-  let before = s:monitor_memory_usage(vim.pid).last
+  let mnv = s:mnv_new()
+  call mnv.start('--clean', '-c', 'set noswapfile', testfile)
+  let before = s:monitor_memory_usage(mnv.pid).last
 
-  call term_sendkeys(vim.buf, ":so %\<CR>")
-  call WaitFor({-> term_getcursor(vim.buf)[0] == 1})
-  let after = s:monitor_memory_usage(vim.pid)
+  call term_sendkeys(mnv.buf, ":so %\<CR>")
+  call WaitFor({-> term_getcursor(mnv.buf)[0] == 1})
+  let after = s:monitor_memory_usage(mnv.pid)
 
-  " Rerun Xtest.vim.
+  " Rerun Xtest.mnv.
   for _ in range(3)
-    call term_sendkeys(vim.buf, ":so %\<CR>")
-    call WaitFor({-> term_getcursor(vim.buf)[0] == 1})
-    let last = s:monitor_memory_usage(vim.pid).last
+    call term_sendkeys(mnv.buf, ":so %\<CR>")
+    call WaitFor({-> term_getcursor(mnv.buf)[0] == 1})
+    let last = s:monitor_memory_usage(mnv.pid).last
   endfor
 
   " The usage may be a bit less than the last value, use 80%.
@@ -156,7 +156,7 @@ func Test_memory_func_capture_lvars()
   let upper = (after.max + (after.last - before)) * multiplier / 10
   call assert_inrange(lower, upper, last)
 
-  call vim.stop()
+  call mnv.stop()
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_menu.vim b/uvim/src/testdir/test_menu.mnv
index 24c053ab43..ba5d3a9d03 100644
--- a/uvim/src/testdir/test_menu.vim
+++ b/uvim/src/testdir/test_menu.mnv
@@ -2,34 +2,34 @@
 
 CheckFeature menu
 
-source util/screendump.vim
+source util/screendump.mnv
 
 func Test_load_menu()
   try
-    source $VIMRUNTIME/menu.vim
+    source $MNVRUNTIME/menu.mnv
   catch
     call assert_report('error while loading menus: ' . v:exception)
   endtry
   call assert_match('browse confirm w', execute(':menu File.Save'))
 
   let v:errmsg = ''
-  doautocmd LoadBufferMenu VimEnter
+  doautocmd LoadBufferMenu MNVEnter
   call assert_equal('', v:errmsg)
 
-  source $VIMRUNTIME/delmenu.vim
+  source $MNVRUNTIME/delmenu.mnv
   call assert_equal('', v:errmsg)
 endfunc
 
 func Test_buffer_menu_special_buffers()
   " Load in runtime menus
   try
-    source $VIMRUNTIME/menu.vim
+    source $MNVRUNTIME/menu.mnv
   catch
     call assert_report('error while loading menus: ' . v:exception)
   endtry
 
   let v:errmsg = ''
-  doautocmd LoadBufferMenu VimEnter
+  doautocmd LoadBufferMenu MNVEnter
   call assert_equal('', v:errmsg)
 
   let orig_buffer_menus = execute("nmenu Buffers")
@@ -58,23 +58,23 @@ func Test_buffer_menu_special_buffers()
   endif
 
   " Remove menus to clean up
-  source $VIMRUNTIME/delmenu.vim
+  source $MNVRUNTIME/delmenu.mnv
   call assert_equal('', v:errmsg)
 endfunc
 
 func Test_translate_menu()
   CheckFeature multi_lang
-  if !filereadable($VIMRUNTIME . '/lang/menu_de_de.latin1.vim')
+  if !filereadable($MNVRUNTIME . '/lang/menu_de_de.latin1.mnv')
     throw 'Skipped: translated menu not found'
   endif
 
   " First delete any English menus.
-  source $VIMRUNTIME/delmenu.vim
+  source $MNVRUNTIME/delmenu.mnv
   set langmenu=de_de
-  source $VIMRUNTIME/menu.vim
+  source $MNVRUNTIME/menu.mnv
   call assert_match('browse confirm w', execute(':menu Datei.Speichern'))
 
-  source $VIMRUNTIME/delmenu.vim
+  source $MNVRUNTIME/delmenu.mnv
 endfunc
 
 func Test_menu_commands()
@@ -611,7 +611,7 @@ func Test_only_modifier()
 endfunc
 
 func Test_unmenu_while_listing_menus()
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   let lines =<< trim END
       set nocompatible
@@ -622,7 +622,7 @@ func Test_unmenu_while_listing_menus()
       au CmdlineLeave : call timer_start(0, {-> execute('unmenu *')})
   END
   call writefile(lines, 'Xmenuclear', 'D')
-  let buf = RunVimInTerminal('-S Xmenuclear', {'rows': 10})
+  let buf = RunMNVInTerminal('-S Xmenuclear', {'rows': 10})
 
   " this was using freed memory
   call term_sendkeys(buf, ":menu\<CR>")
@@ -631,13 +631,13 @@ func Test_unmenu_while_listing_menus()
   call TermWait(buf, 50)
   call term_sendkeys(buf, "\<CR>")
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 " Test for opening a menu drawn in the cmdline area
 func Test_popupmenu_cmdline()
   CheckScreendump
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   let lines =<< trim END
     set mousemodel=popup
@@ -647,13 +647,13 @@ func Test_popupmenu_cmdline()
     call setline(1, repeat(['abcde'], 5))
   END
   call writefile(lines, 'Xpopupcmdline', 'D')
-  let buf = RunVimInTerminal('-S Xpopupcmdline', {'rows': 4})
+  let buf = RunMNVInTerminal('-S Xpopupcmdline', {'rows': 4})
 
   " cmdline area should be cleared when popupmenu that covered it is closed
   call term_sendkeys(buf, "\<RightMouse>\<RightRelease>\<Esc>")
   call VerifyScreenDump(buf, 'Test_popupmenu_cmdline_1', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_messages.vim b/uvim/src/testdir/test_messages.mnv
index 5fa84e9542..39db7d713f 100644
--- a/uvim/src/testdir/test_messages.vim
+++ b/uvim/src/testdir/test_messages.mnv
@@ -1,6 +1,6 @@
 " Tests for :messages, :echomsg, :echoerr
 
-source util/screendump.vim
+source util/screendump.mnv
 
 func Test_messages()
   let oldmore = &more
@@ -91,7 +91,7 @@ func Test_mode_message_at_leaving_insert_by_ctrl_c()
   CheckNotGui
 
   " Set custom statusline built by user-defined function.
-  let testfile = 'Xtest.vim'
+  let testfile = 'Xtest.mnv'
   let lines =<< trim END
         func StatusLine() abort
           return ""
@@ -102,7 +102,7 @@ func Test_mode_message_at_leaving_insert_by_ctrl_c()
   call writefile(lines, testfile, 'D')
 
   let rows = 10
-  let buf = term_start([GetVimProg(), '--clean', '-S', testfile], {'term_rows': rows})
+  let buf = term_start([GetMNVProg(), '--clean', '-S', testfile], {'term_rows': rows})
   call TermWait(buf, 100)
   call assert_equal('run', job_status(term_getjob(buf)))
 
@@ -122,7 +122,7 @@ func Test_mode_message_at_leaving_insert_with_esc_mapped()
   CheckNotGui
 
   " Set custom statusline built by user-defined function.
-  let testfile = 'Xtest.vim'
+  let testfile = 'Xtest.mnv'
   let lines =<< trim END
         set laststatus=2
         inoremap <Esc> <Esc>00
@@ -130,7 +130,7 @@ func Test_mode_message_at_leaving_insert_with_esc_mapped()
   call writefile(lines, testfile, 'D')
 
   let rows = 10
-  let buf = term_start([GetVimProg(), '--clean', '-S', testfile], {'term_rows': rows})
+  let buf = term_start([GetMNVProg(), '--clean', '-S', testfile], {'term_rows': rows})
   call WaitForAssert({-> assert_match('0,0-1\s*All$', term_getline(buf, rows - 1))})
   call assert_equal('run', job_status(term_getjob(buf)))
 
@@ -173,7 +173,7 @@ func Test_echospace()
 endfunc
 
 func Test_warning_scroll()
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
   let lines =<< trim END
       call test_override('ui_delay', 50)
       set noruler
@@ -181,7 +181,7 @@ func Test_warning_scroll()
       undo
   END
   call writefile(lines, 'XTestWarningScroll', 'D')
-  let buf = RunVimInTerminal('', #{rows: 8})
+  let buf = RunMNVInTerminal('', #{rows: 8})
 
   " When the warning comes from a script, messages are scrolled so that the
   " stacktrace is visible.
@@ -201,14 +201,14 @@ func Test_warning_scroll()
   call WaitForAssert({-> assert_equal('Already at oldest change', term_getline(buf, 8))})
 
   " clean up
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 " Test more-prompt (see :help more-prompt).
 func Test_message_more()
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
-  let buf = RunVimInTerminal('', {'rows': 6})
+  let buf = RunMNVInTerminal('', {'rows': 6})
   let chan = buf->term_getjob()->job_getchannel()
   call term_sendkeys(buf, ":call setline(1, range(1, 100))\n")
 
@@ -337,12 +337,12 @@ func Test_message_more()
   call term_wait(buf)
   call WaitForAssert({-> assert_equal('Hello ', term_getline(buf, 5))})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_message_more_recording()
-  CheckRunVimInTerminal
-  let buf = RunVimInTerminal('', {'rows': 6})
+  CheckRunMNVInTerminal
+  let buf = RunMNVInTerminal('', {'rows': 6})
   call term_sendkeys(buf, ":call setline(1, range(1, 100))\n")
   call term_sendkeys(buf, ":%p\n")
   call WaitForAssert({-> assert_equal('-- More --', term_getline(buf, 6))})
@@ -356,13 +356,13 @@ func Test_message_more_recording()
   call term_sendkeys(buf, 'k')
   call WaitForAssert({-> assert_equal(4, term_getcursor(buf)[0])})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 " Test more-prompt scrollback
 func Test_message_more_scrollback()
   CheckScreendump
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   let lines =<< trim END
       set t_ut=
@@ -372,7 +372,7 @@ func Test_message_more_scrollback()
       endfor
   END
   call writefile(lines, 'XmoreScrollback', 'D')
-  let buf = RunVimInTerminal('-S XmoreScrollback', {'rows': 10})
+  let buf = RunMNVInTerminal('-S XmoreScrollback', {'rows': 10})
   call VerifyScreenDump(buf, 'Test_more_scrollback_1', {})
 
   call term_sendkeys(buf, 'f')
@@ -387,12 +387,12 @@ func Test_message_more_scrollback()
 
   call term_sendkeys(buf, 'q')
   call TermWait(buf)
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_message_not_cleared_after_mode()
   CheckScreendump
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   let lines =<< trim END
       nmap <silent> gx :call DebugSilent('normal')<CR>
@@ -406,7 +406,7 @@ func Test_message_not_cleared_after_mode()
       call setline(1, ['one', 'NoSuchFile', 'three'])
   END
   call writefile(lines, 'XmessageMode', 'D')
-  let buf = RunVimInTerminal('-S XmessageMode', {'rows': 10})
+  let buf = RunMNVInTerminal('-S XmessageMode', {'rows': 10})
 
   call term_sendkeys(buf, 'gx')
   call TermWait(buf)
@@ -423,12 +423,12 @@ func Test_message_not_cleared_after_mode()
   call TermWait(buf)
   call VerifyScreenDump(buf, 'Test_message_not_cleared_after_mode_3', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_mode_cleared_after_silent_message()
   CheckScreendump
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   let lines =<< trim END
     edit XsilentMessageMode.txt
@@ -436,7 +436,7 @@ func Test_mode_cleared_after_silent_message()
     autocmd TextChanged * silent update
   END
   call writefile(lines, 'XsilentMessageMode', 'D')
-  let buf = RunVimInTerminal('-S XsilentMessageMode', {'rows': 10})
+  let buf = RunMNVInTerminal('-S XsilentMessageMode', {'rows': 10})
 
   call term_sendkeys(buf, 'v')
   call TermWait(buf)
@@ -446,18 +446,18 @@ func Test_mode_cleared_after_silent_message()
   call TermWait(buf)
   call VerifyScreenDump(buf, 'Test_mode_cleared_after_silent_message_2', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
   call delete('XsilentMessageMode.txt')
 endfunc
 
 " Test verbose message before echo command
 func Test_echo_verbose_system()
   CheckScreendump
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
   CheckUnix    " needs the "seq" command
   CheckNotMac  " the macos TMPDIR is too long for snapshot testing
 
-  let buf = RunVimInTerminal('', {'rows': 10})
+  let buf = RunMNVInTerminal('', {'rows': 10})
   call term_sendkeys(buf, ":4 verbose echo system('seq 20')\<CR>")
   " Note that the screendump is filtered to remove the name of the temp file
   call VerifyScreenDump(buf, 'Test_verbose_system_1', {})
@@ -483,13 +483,13 @@ func Test_echo_verbose_system()
 
   call term_sendkeys(buf, 'q')
   call TermWait(buf)
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 
 func Test_ask_yesno()
-  CheckRunVimInTerminal
-  let buf = RunVimInTerminal('', {'rows': 6})
+  CheckRunMNVInTerminal
+  let buf = RunMNVInTerminal('', {'rows': 6})
   call term_sendkeys(buf, ":call setline(1, range(1, 2))\n")
 
   call term_sendkeys(buf, ":2,1s/^/n/\n")
@@ -511,7 +511,7 @@ func Test_ask_yesno()
   call WaitForAssert({-> assert_equal('y1', term_getline(buf, 1))})
   call WaitForAssert({-> assert_equal('y2', term_getline(buf, 2))})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_null()
@@ -542,13 +542,13 @@ func Test_quit_long_message()
     echom range(9999)->join("\x01")
   END
   call writefile(content, 'Xtest_quit_message', 'D')
-  let buf = RunVimInTerminal('-S Xtest_quit_message', #{rows: 10, wait_for_ruler: 0})
+  let buf = RunMNVInTerminal('-S Xtest_quit_message', #{rows: 10, wait_for_ruler: 0})
   call WaitForAssert({-> assert_match('^-- More --', term_getline(buf, 10))})
   call term_sendkeys(buf, "q")
   call VerifyScreenDump(buf, 'Test_quit_long_message', {})
 
   " clean up
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 " this was missing a terminating NUL
@@ -561,7 +561,7 @@ endfunc
 " Test that fileinfo is shown properly when 'cmdheight' has just decreased
 " due to switching tabpage and 'shortmess' doesn't contain 'o' or 'O'.
 func Test_fileinfo_tabpage_cmdheight()
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   let content =<< trim END
     set shortmess-=o
@@ -574,11 +574,11 @@ func Test_fileinfo_tabpage_cmdheight()
   END
 
   call writefile(content, 'Xtest_fileinfo_tabpage_cmdheight', 'D')
-  let buf = RunVimInTerminal('-S Xtest_fileinfo_tabpage_cmdheight', #{rows: 6})
+  let buf = RunMNVInTerminal('-S Xtest_fileinfo_tabpage_cmdheight', #{rows: 6})
   call WaitForAssert({-> assert_match('^"Xfileinfo.txt" \[New\]', term_getline(buf, 6))})
 
   " clean up
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 " Message output was previously overwritten by the fileinfo display, shown
@@ -601,7 +601,7 @@ func Test_fileinfo_after_echo()
   END
 
   call writefile(content, 'Xtest_fileinfo_after_echo', 'D')
-  let buf = RunVimInTerminal('-S Xtest_fileinfo_after_echo', #{rows: 6})
+  let buf = RunMNVInTerminal('-S Xtest_fileinfo_after_echo', #{rows: 6})
   call term_sendkeys(buf, ":set updatetime=50\<CR>")
   call term_sendkeys(buf, "0$")
   call VerifyScreenDump(buf, 'Test_fileinfo_after_echo', {})
@@ -609,7 +609,7 @@ func Test_fileinfo_after_echo()
   call term_sendkeys(buf, ":q\<CR>")
 
   " clean up
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
   call delete('b.txt')
 endfunc
 
@@ -655,7 +655,7 @@ func Test_echowindow()
       enddef
   END
   call writefile(lines, 'XtestEchowindow', 'D')
-  let buf = RunVimInTerminal('-S XtestEchowindow', #{rows: 8})
+  let buf = RunMNVInTerminal('-S XtestEchowindow', #{rows: 8})
   call VerifyScreenDump(buf, 'Test_echowindow_1', {})
 
   call term_sendkeys(buf, ":call ShowMessage('second line')\<CR>")
@@ -698,7 +698,7 @@ func Test_echowindow()
   call VerifyScreenDump(buf, 'Test_echowindow_11', {})
 
   " clean up
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 " messages window should not be used while evaluating the :echowin argument
@@ -713,11 +713,11 @@ func Test_echowin_eval()
       echowindow ShowMessage()
   END
   call writefile(lines, 'XtestEchowindow', 'D')
-  let buf = RunVimInTerminal('-S XtestEchowindow', #{rows: 8})
+  let buf = RunMNVInTerminal('-S XtestEchowindow', #{rows: 8})
   call VerifyScreenDump(buf, 'Test_echowin_eval', {})
 
   " clean up
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 " messages window should not be used for showing the mode
@@ -725,7 +725,7 @@ func Test_echowin_showmode()
   CheckScreendump
 
   let lines =<< trim END
-      vim9script
+      mnv9script
       setline(1, ['one', 'two'])
       timer_start(100, (_) => {
            echowin 'echo window'
@@ -733,11 +733,11 @@ func Test_echowin_showmode()
       normal V
   END
   call writefile(lines, 'XtestEchowinMode', 'D')
-  let buf = RunVimInTerminal('-S XtestEchowinMode', #{rows: 8})
+  let buf = RunMNVInTerminal('-S XtestEchowinMode', #{rows: 8})
   call VerifyScreenDump(buf, 'Test_echowin_showmode', {})
 
   " clean up
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_messagesopt_history()
@@ -767,9 +767,9 @@ func Test_messagesopt_history()
 endfunc
 
 func Test_messagesopt_wait()
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
-  let buf = RunVimInTerminal('', {'rows': 6, 'cols': 45})
+  let buf = RunMNVInTerminal('', {'rows': 6, 'cols': 45})
   call term_sendkeys(buf, ":set cmdheight=1\n")
 
   " Check hit-enter prompt
@@ -783,7 +783,7 @@ func Test_messagesopt_wait()
   call WaitForAssert({-> assert_equal('                           0,0-1         All', term_getline(buf, 6))})
 
   " clean up
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 " Check that using a long 'formatprg' doesn't cause a hit-enter prompt or
@@ -800,7 +800,7 @@ func Test_long_formatprg_no_hit_enter()
     normal 10Gzt
   END
   call writefile(lines, 'XtestLongFormatprg', 'D')
-  let buf = RunVimInTerminal('-S XtestLongFormatprg', #{rows: 10})
+  let buf = RunMNVInTerminal('-S XtestLongFormatprg', #{rows: 10})
   call VerifyScreenDump(buf, 'Test_long_formatprg_no_hit_enter_1', {})
   call term_sendkeys(buf, 'gq2j')
   call VerifyScreenDump(buf, 'Test_long_formatprg_no_hit_enter_2', {})
@@ -808,12 +808,12 @@ func Test_long_formatprg_no_hit_enter()
   call VerifyScreenDump(buf, 'Test_long_formatprg_no_hit_enter_3', {})
 
   " clean up
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 " Test that fileinfo is shown after deleting the last listed buffer with :bd
 func Test_fileinfo_after_last_bd()
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   let content =<< trim END
     set shortmess-=F
@@ -822,7 +822,7 @@ func Test_fileinfo_after_last_bd()
   END
 
   call writefile(content, 'Xtest_fileinfo_last_bd', 'D')
-  let buf = RunVimInTerminal('-S Xtest_fileinfo_last_bd', #{rows: 10})
+  let buf = RunMNVInTerminal('-S Xtest_fileinfo_last_bd', #{rows: 10})
   call WaitForAssert({-> assert_match('^"yyy" \[New\]', term_getline(buf, 10))})
 
   call term_sendkeys(buf, ":bd\<CR>")
@@ -832,7 +832,7 @@ func Test_fileinfo_after_last_bd()
   call WaitForAssert({-> assert_match('^\"\[No Name\]\" --No lines in buffer--', term_getline(buf, 10))})
 
   " clean up
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_method.vim b/uvim/src/testdir/test_method.mnv
index 7413ed28d0..3149ee35e3 100644
--- a/uvim/src/testdir/test_method.vim
+++ b/uvim/src/testdir/test_method.mnv
@@ -177,4 +177,4 @@ func Test_method_args()
   endif
 endfunc
 
-" vim: ts=8 sw=2 sts=2 expandtab tw=80 fdm=marker
+" mnv: ts=8 sw=2 sts=2 expandtab tw=80 fdm=marker
diff --git a/uvim/src/testdir/test_mksession.vim b/uvim/src/testdir/test_mksession.mnv
index 9dbd0094e2..1da730f955 100644
--- a/uvim/src/testdir/test_mksession.vim
+++ b/uvim/src/testdir/test_mksession.mnv
@@ -75,9 +75,9 @@ func Test_mksession()
     \   '    four leadinG spaces',
     \   'two		consecutive tabs',
     \   'two	tabs	in one line',
-    \   'one ä multibyteCharacter',
-    \   'aä Ä  two multiByte characters',
-    \   'Aäöü  three mulTibyte characters',
+    \   'one � multibyteCharacter',
+    \   'a� �  two multiByte characters',
+    \   'A���  three mulTibyte characters',
     \   'short line',
     \ ])
   let tmpfile = 'Xtemp'
@@ -234,7 +234,7 @@ func Test_mksession_rtp()
   " Make a real long (invalid) runtimepath value,
   " that should exceed PATH_MAX (hopefully)
   let newrtp=&rtp.',~'.repeat('/foobar', 1000)
-  let newrtp.=",".expand("$HOME")."/.vim"
+  let newrtp.=",".expand("$HOME")."/.mnv"
   let &rtp=newrtp
 
   " determine expected value
@@ -726,7 +726,7 @@ func Test_mkview_loadview_with_viewdir()
   call assert_equal('Xviewdir/' .
         \           substitute(
         \             substitute(
-        \               expand('%:p'), '/', '=+', 'g'), ':', '=-', 'g') . '=1.vim',
+        \               expand('%:p'), '/', '=+', 'g'), ':', '=-', 'g') . '=1.mnv',
         \           glob('Xviewdir/*'))
   call assert_equal(1, &number)
   call assert_match('\*:mkview\*$', getline('.'))
@@ -1040,7 +1040,7 @@ endfunc
 
 " Test for mksession with window position
 func Test_mksession_winpos()
-  " Only applicable in GUI Vim
+  " Only applicable in GUI MNV
   CheckGui
 
   set sessionoptions+=winpos
@@ -1119,7 +1119,7 @@ func Test_mksession_shortmess()
   set sessionoptions&
 endfunc
 
-" Test that when Vim loading session has 'A' in 'shortmess' it does not
+" Test that when MNV loading session has 'A' in 'shortmess' it does not
 " complain about an existing swapfile.
 func Test_mksession_shortmess_with_A()
   edit Xtestfile
@@ -1182,7 +1182,7 @@ func s:ClearMappings()
   tmapclear
 endfunc
 
-func Test_mkvimrc()
+func Test_mkmnvrc()
   let entries = [
         \ ['', 'nothing', '<Nop>'],
         \ ['n', 'normal', 'NORMAL<Up>'],
@@ -1199,14 +1199,14 @@ func Test_mkvimrc()
     exe entry[0] .. 'map ' .. entry[1] .. ' ' .. entry[2]
   endfor
 
-  mkvimrc Xtestvimrc
+  mkmnvrc Xtestmnvrc
 
   call s:ClearMappings()
   for entry in entries
     call assert_equal('', maparg(entry[1], entry[0]))
   endfor
 
-  source Xtestvimrc
+  source Xtestmnvrc
 
   for entry in entries
     call assert_equal(entry[2], maparg(entry[1], entry[0]))
@@ -1215,18 +1215,18 @@ func Test_mkvimrc()
   call s:ClearMappings()
 
   " the 'pastetoggle', 'wildchar' and 'wildcharm' option values should be
-  " stored as key names in the vimrc file
+  " stored as key names in the mnvrc file
   set pastetoggle=<F5>
   set wildchar=<F6>
   set wildcharm=<F7>
-  call assert_fails('mkvimrc Xtestvimrc', 'E189: "Xtestvimrc" exists')
-  mkvimrc! Xtestvimrc
-  call assert_notequal(-1, index(readfile('Xtestvimrc'), 'set pastetoggle=<F5>'))
-  call assert_notequal(-1, index(readfile('Xtestvimrc'), 'set wildchar=<F6>'))
-  call assert_notequal(-1, index(readfile('Xtestvimrc'), 'set wildcharm=<F7>'))
+  call assert_fails('mkmnvrc Xtestmnvrc', 'E189: "Xtestmnvrc" exists')
+  mkmnvrc! Xtestmnvrc
+  call assert_notequal(-1, index(readfile('Xtestmnvrc'), 'set pastetoggle=<F5>'))
+  call assert_notequal(-1, index(readfile('Xtestmnvrc'), 'set wildchar=<F6>'))
+  call assert_notequal(-1, index(readfile('Xtestmnvrc'), 'set wildcharm=<F7>'))
   set pastetoggle& wildchar& wildcharm&
 
-  call delete('Xtestvimrc')
+  call delete('Xtestmnvrc')
 endfunc
 
 func Test_scrolloff()
@@ -1318,17 +1318,17 @@ endfunc
 func Test_mkview_default_home()
   if has('win32')
     " use escape() to handle backslash path separators
-    call assert_match('^' .. escape($ORIGHOME, '\') .. '/vimfiles', &viewdir)
+    call assert_match('^' .. escape($ORIGHOME, '\') .. '/mnvfiles', &viewdir)
   elseif has('unix')
     call assert_match(
-          \ '^' .. $ORIGHOME .. '/.vim\|' ..
-          \ '^' .. $XDG_CONFIG_HOME .. '/vim'
+          \ '^' .. $ORIGHOME .. '/.mnv\|' ..
+          \ '^' .. $XDG_CONFIG_HOME .. '/mnv'
           \ , &viewdir)
   elseif has('amiga')
-    call assert_match('^home:vimfiles', &viewdir)
+    call assert_match('^home:mnvfiles', &viewdir)
   elseif has('mac')
-    call assert_match('^' .. $VIM .. '/vimfiles', &viewdir)
+    call assert_match('^' .. $MNV .. '/mnvfiles', &viewdir)
   endif
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_mksession_utf8.vim b/uvim/src/testdir/test_mksession_utf8.mnv
index d467dc20c6..639ef829b4 100644
--- a/uvim/src/testdir/test_mksession_utf8.vim
+++ b/uvim/src/testdir/test_mksession_utf8.mnv
@@ -120,7 +120,7 @@ func Test_session_multibyte_mappings()
     exe entry[0] .. 'map ' .. entry[1] .. ' ' .. entry[2]
   endfor
 
-  mkvimrc Xtestvimrc
+  mkmnvrc Xtestmnvrc
 
   nmapclear
 
@@ -128,7 +128,7 @@ func Test_session_multibyte_mappings()
     call assert_equal('', maparg(entry[1], entry[0]))
   endfor
 
-  source Xtestvimrc
+  source Xtestmnvrc
 
   for entry in entries
     call assert_equal(entry[2], maparg(entry[1], entry[0]))
@@ -136,7 +136,7 @@ func Test_session_multibyte_mappings()
 
   nmapclear
 
-  call delete('Xtestvimrc')
+  call delete('Xtestmnvrc')
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_vim9_assign.vim b/uvim/src/testdir/test_mnv9_assign.mnv
index 5043fad23f..52840ff440 100644
--- a/uvim/src/testdir/test_vim9_assign.vim
+++ b/uvim/src/testdir/test_mnv9_assign.mnv
@@ -1,6 +1,6 @@
-" Test Vim9 assignments
+" Test MNV9 assignments
 
-import './util/vim9.vim' as v9
+import './util/mnv9.mnv' as v9
 
 let s:appendToMe = 'xxx'
 let s:addToMe = 111
@@ -31,7 +31,7 @@ def Test_assignment_bool()
   assert_equal(true, bool7)
 
   var lines =<< trim END
-    vim9script
+    mnv9script
     def GetFlag(): bool
       var flag: bool = 1
       return flag
@@ -92,7 +92,7 @@ def Test_assignment()
     var job1: job
     assert_equal('fail', job_status(job1))
 
-    # calling job_start() is in test_vim9_fails.vim, it causes leak reports
+    # calling job_start() is in test_mnv9_fails.mnv, it causes leak reports
   endif
   var float1: float = 3.4
   var Funky1: func
@@ -114,7 +114,7 @@ def Test_assignment()
   $ENVVAR = ''
 
   var lines =<< trim END
-    vim9script
+    mnv9script
     $ENVVAR = 'barfoo'
     assert_equal('barfoo', $ENVVAR)
     $ENVVAR = ''
@@ -209,7 +209,7 @@ def Test_assignment()
   v9.CheckDefAndScriptSuccess(lines)
 
   v9.CheckDefFailure(['&t_TI = 123'], 'E1012:')
-  v9.CheckScriptFailure(['vim9script', '&t_TI = 123'], 'E928:')
+  v9.CheckScriptFailure(['mnv9script', '&t_TI = 123'], 'E928:')
 
   v9.CheckDefFailure(['var s:var = 123'], 'E1101:')
   v9.CheckDefFailure(['var s:var: number'], 'E1101:')
@@ -217,7 +217,7 @@ def Test_assignment()
   v9.CheckDefAndScriptFailure(['var $VAR: number'], ['E1016:', 'E475:'])
 
   lines =<< trim END
-    vim9script
+    mnv9script
     def SomeFunc()
       s:var = 123
     enddef
@@ -333,7 +333,7 @@ def Test_reserved_name()
   endfor
 
   var lines =<< trim END
-      vim9script
+      mnv9script
       def Foo(super: bool)
 	echo 'something'
       enddef
@@ -422,7 +422,7 @@ enddef
 
 def Test_assign_keep_type()
   var lines =<< trim END
-      vim9script
+      mnv9script
       var l: list<number> = [123]
       l = [123]
       l->add('string')
@@ -532,7 +532,7 @@ def Test_assign_unpack()
       [v1, v2] = [1, 2]
   END
   v9.CheckDefFailure(lines, 'E1089:', 1)
-  v9.CheckScriptFailure(['vim9script'] + lines, 'E1089:', 2)
+  v9.CheckScriptFailure(['mnv9script'] + lines, 'E1089:', 2)
 
   lines =<< trim END
       var v1: number
@@ -785,7 +785,7 @@ def Test_extend_list()
 
   # appending to uninitialized list from a function works
   lines =<< trim END
-      vim9script
+      mnv9script
       var list: list<string>
       def Func()
         list += ['a', 'b']
@@ -795,7 +795,7 @@ def Test_extend_list()
   END
   v9.CheckScriptSuccess(lines)
   lines =<< trim END
-      vim9script
+      mnv9script
       var list: list<string>
       def Func()
         extend(list, ['x', 'b'])
@@ -807,7 +807,7 @@ def Test_extend_list()
 
   # initialized to null, with type, does not default to empty list
   lines =<< trim END
-      vim9script
+      mnv9script
       var l: list<string> = test_null_list()
       extend(l, ['x'])
   END
@@ -815,7 +815,7 @@ def Test_extend_list()
 
   # initialized to null, without type, does not default to empty list
   lines =<< trim END
-      vim9script
+      mnv9script
       var l = null_list
       extend(l, ['x'])
   END
@@ -823,7 +823,7 @@ def Test_extend_list()
 
   # assigned null, does not default to empty list
   lines =<< trim END
-      vim9script
+      mnv9script
       var l: list<string>
       l = null_list
       extend(l, ['x'])
@@ -831,7 +831,7 @@ def Test_extend_list()
   v9.CheckScriptFailure(lines, 'E1134:', 4)
 
   lines =<< trim END
-      vim9script
+      mnv9script
       extend(test_null_list(), ['x'])
   END
   v9.CheckScriptFailure(lines, 'E1134:', 2)
@@ -854,7 +854,7 @@ def Test_extend_list()
   unlet g:myList
 
   lines =<< trim END
-      vim9script
+      mnv9script
       var lds = [1, 2, 3]
       def Func()
           echo lds->extend(['x'])
@@ -866,7 +866,7 @@ enddef
 
 def Test_extend_dict()
   var lines =<< trim END
-      vim9script
+      mnv9script
       var d: dict<number>
       extend(d, {a: 1})
       assert_equal({a: 1}, d)
@@ -878,14 +878,14 @@ def Test_extend_dict()
   v9.CheckScriptSuccess(lines)
 
   lines =<< trim END
-      vim9script
+      mnv9script
       var d: dict<string> = test_null_dict()
       extend(d, {a: 'x'})
   END
   v9.CheckScriptFailure(lines, 'E1133:', 3)
 
   lines =<< trim END
-      vim9script
+      mnv9script
       extend(test_null_dict(), {a: 'x'})
   END
   v9.CheckScriptFailure(lines, 'E1133:', 2)
@@ -916,9 +916,9 @@ def Test_single_letter_vars()
   assert_equal(123, w)
 enddef
 
-def Test_vim9_single_char_vars()
+def Test_mnv9_single_char_vars()
   var lines =<< trim END
-      vim9script
+      mnv9script
 
       # single character variable declarations work
       var a: string
@@ -1067,7 +1067,7 @@ def Test_assignment_partial()
   v9.CheckDefAndScriptSuccess(lines)
 
   lines =<< trim END
-      vim9script
+      mnv9script
       def Func(b: bool)
       enddef
       var Ref: func = function(Func, [true])
@@ -1077,7 +1077,7 @@ def Test_assignment_partial()
   v9.CheckScriptSuccess(lines)
 
   lines =<< trim END
-      vim9script
+      mnv9script
 
       var nres: any
       var sres: any
@@ -1095,7 +1095,7 @@ def Test_assignment_partial()
   v9.CheckScriptSuccess(lines)
 
   lines =<< trim END
-      vim9script
+      mnv9script
 
       def Func(nr: number, s = '')
       enddef
@@ -1124,7 +1124,7 @@ def Test_assignment_partial()
       }
     assert_equal('func(...list<string>): list<any>', typename(Fn4))
   END
-  v9.CheckSourceSuccess(['vim9script'] + lines)
+  v9.CheckSourceSuccess(['mnv9script'] + lines)
   v9.CheckSourceSuccess(['def Xfunc()'] + lines + ['enddef', 'defcompile'])
 enddef
 
@@ -1137,9 +1137,9 @@ def Test_assignment_list_any_index()
   assert_equal([2, 5], l)
 enddef
 
-def Test_assignment_list_vim9script()
+def Test_assignment_list_mnv9script()
   var lines =<< trim END
-    vim9script
+    mnv9script
     var v1: number
     var v2: number
     var v3: number
@@ -1238,7 +1238,7 @@ def Test_assignment_dict()
 
   # assignment to script-local dict
   lines =<< trim END
-    vim9script
+    mnv9script
     var test: dict<any> = {}
     def FillDict(): dict<any>
       test['a'] = 43
@@ -1249,7 +1249,7 @@ def Test_assignment_dict()
   v9.CheckScriptSuccess(lines)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     var test: dict<any>
     def FillDict(): dict<any>
       test['a'] = 43
@@ -1262,7 +1262,7 @@ def Test_assignment_dict()
 
   # assignment to global dict
   lines =<< trim END
-    vim9script
+    mnv9script
     g:test = {}
     def FillDict(): dict<any>
       g:test['a'] = 43
@@ -1274,7 +1274,7 @@ def Test_assignment_dict()
 
   # assignment to buffer dict
   lines =<< trim END
-    vim9script
+    mnv9script
     b:test = {}
     def FillDict(): dict<any>
       b:test['a'] = 43
@@ -1388,7 +1388,7 @@ enddef
 
 def Test_script_var_default()
   var lines =<< trim END
-      vim9script
+      mnv9script
       var l: list<number>
       var li = [1, 2]
       var bl: blob
@@ -1462,7 +1462,7 @@ def Test_assignment_var_list()
   assert_equal('buf', b:bufvar)
 
   lines =<< trim END
-      vim9script
+      mnv9script
       var scriptvar = 'init'
       [g:globalvar, scriptvar, w:winvar] = ['global', 'script', 'win']
       assert_equal('global', g:globalvar)
@@ -1481,9 +1481,9 @@ def Test_assignment_empty_list()
   v9.CheckDefAndScriptSuccess(lines)
 enddef
 
-def Test_assignment_vim9script()
+def Test_assignment_mnv9script()
   var lines =<< trim END
-    vim9script
+    mnv9script
     def Func(): list<number>
       return [1, 2]
     enddef
@@ -1532,7 +1532,7 @@ def Test_assignment_vim9script()
   v9.CheckScriptSuccess(lines)
 
   lines =<< trim END
-      vim9script
+      mnv9script
       var n: number
       def Func()
         n = 'string'
@@ -1552,14 +1552,14 @@ def Test_assignment_failure()
   v9.CheckDefFailure(['var name =234'], 'E1004:')
   v9.CheckDefFailure(['var name= 234'], 'E1004:')
 
-  v9.CheckScriptFailure(['vim9script', 'var name=234'], 'E1004:')
-  v9.CheckScriptFailure(['vim9script', 'var name=234'], "before and after '='")
-  v9.CheckScriptFailure(['vim9script', 'var name =234'], 'E1004:')
-  v9.CheckScriptFailure(['vim9script', 'var name= 234'], 'E1004:')
-  v9.CheckScriptFailure(['vim9script', 'var name = 234', 'name+=234'], 'E1004:')
-  v9.CheckScriptFailure(['vim9script', 'var name = 234', 'name+=234'], "before and after '+='")
-  v9.CheckScriptFailure(['vim9script', 'var name = "x"', 'name..="y"'], 'E1004:')
-  v9.CheckScriptFailure(['vim9script', 'var name = "x"', 'name..="y"'], "before and after '..='")
+  v9.CheckScriptFailure(['mnv9script', 'var name=234'], 'E1004:')
+  v9.CheckScriptFailure(['mnv9script', 'var name=234'], "before and after '='")
+  v9.CheckScriptFailure(['mnv9script', 'var name =234'], 'E1004:')
+  v9.CheckScriptFailure(['mnv9script', 'var name= 234'], 'E1004:')
+  v9.CheckScriptFailure(['mnv9script', 'var name = 234', 'name+=234'], 'E1004:')
+  v9.CheckScriptFailure(['mnv9script', 'var name = 234', 'name+=234'], "before and after '+='")
+  v9.CheckScriptFailure(['mnv9script', 'var name = "x"', 'name..="y"'], 'E1004:')
+  v9.CheckScriptFailure(['mnv9script', 'var name = "x"', 'name..="y"'], "before and after '..='")
 
   v9.CheckDefFailure(['var true = 1'], 'E1034:')
   v9.CheckDefFailure(['var false = 1'], 'E1034:')
@@ -1587,10 +1587,10 @@ def Test_assignment_failure()
   v9.CheckDefFailure(['var somevar'], "E1022:")
   v9.CheckDefFailure(['var &tabstop = 4'], 'E1052:')
   v9.CheckDefFailure(['&g:option = 5'], 'E113:')
-  v9.CheckScriptFailure(['vim9script', 'var &tabstop = 4'], 'E1052:')
+  v9.CheckScriptFailure(['mnv9script', 'var &tabstop = 4'], 'E1052:')
 
   v9.CheckDefFailure(['var $VAR = 5'], 'E1016: Cannot declare an environment variable:')
-  v9.CheckScriptFailure(['vim9script', 'var $ENV = "xxx"'], 'E1016:')
+  v9.CheckScriptFailure(['mnv9script', 'var $ENV = "xxx"'], 'E1016:')
 
   # read-only registers
   v9.CheckDefAndScriptFailure(['var @. = 5'], ['E354:', 'E1066:'], 1)
@@ -1605,7 +1605,7 @@ def Test_assignment_failure()
 
   v9.CheckDefFailure(['var @a = 5'], 'E1066:')
   v9.CheckDefFailure(['var @/ = "x"'], 'E1066:')
-  v9.CheckScriptFailure(['vim9script', 'var @a = "abc"'], 'E1066:')
+  v9.CheckScriptFailure(['mnv9script', 'var @a = "abc"'], 'E1066:')
 
   v9.CheckDefFailure(['var g:var = 5'], 'E1016: Cannot declare a global variable:')
   v9.CheckDefFailure(['var w:var = 5'], 'E1016: Cannot declare a window variable:')
@@ -1614,11 +1614,11 @@ def Test_assignment_failure()
 
   v9.CheckDefFailure(['var anr = 4', 'anr ..= "text"'], 'E1019:')
   v9.CheckDefFailure(['var xnr += 4'], 'E1020:', 1)
-  v9.CheckScriptFailure(['vim9script', 'var xnr += 4'], 'E1020:')
+  v9.CheckScriptFailure(['mnv9script', 'var xnr += 4'], 'E1020:')
   v9.CheckDefFailure(["var xnr = xnr + 1"], 'E1001:', 1)
-  v9.CheckScriptFailure(['vim9script', 'var xnr = xnr + 4'], 'E121:')
+  v9.CheckScriptFailure(['mnv9script', 'var xnr = xnr + 4'], 'E121:')
 
-  v9.CheckScriptFailure(['vim9script', 'def Func()', 'var dummy = notfound', 'enddef', 'defcompile'], 'E1001:')
+  v9.CheckScriptFailure(['mnv9script', 'def Func()', 'var dummy = notfound', 'enddef', 'defcompile'], 'E1001:')
 
   v9.CheckDefFailure(['var name: list<string> = [123]'], 'expected list<string> but got list<number>')
   v9.CheckDefFailure(['var name: list<number> = ["xx"]'], 'expected list<number> but got list<string>')
@@ -1644,22 +1644,22 @@ def Test_assignment_failure()
   v9.CheckDefFailure(['g:foo: number = 123'],
                   'E1016: Cannot declare a global variable: g:foo')
 
-  v9.CheckScriptFailure(['vim9script', 'w:foo: number = 123'],
+  v9.CheckScriptFailure(['mnv9script', 'w:foo: number = 123'],
                   'E1304: Cannot use type with this variable: w:foo:')
-  v9.CheckScriptFailure(['vim9script', 't:foo: number = 123'],
+  v9.CheckScriptFailure(['mnv9script', 't:foo: number = 123'],
                   'E1304: Cannot use type with this variable: t:foo:')
-  v9.CheckScriptFailure(['vim9script', 'b:foo: number = 123'],
+  v9.CheckScriptFailure(['mnv9script', 'b:foo: number = 123'],
                   'E1304: Cannot use type with this variable: b:foo:')
-  v9.CheckScriptFailure(['vim9script', 'g:foo: number = 123'],
+  v9.CheckScriptFailure(['mnv9script', 'g:foo: number = 123'],
                   'E1304: Cannot use type with this variable: g:foo:')
 
-  v9.CheckScriptFailure(['vim9script', 'const w:FOO: number = 123'],
+  v9.CheckScriptFailure(['mnv9script', 'const w:FOO: number = 123'],
                   'E1304: Cannot use type with this variable: w:FOO:')
-  v9.CheckScriptFailure(['vim9script', 'const t:FOO: number = 123'],
+  v9.CheckScriptFailure(['mnv9script', 'const t:FOO: number = 123'],
                   'E1304: Cannot use type with this variable: t:FOO:')
-  v9.CheckScriptFailure(['vim9script', 'const b:FOO: number = 123'],
+  v9.CheckScriptFailure(['mnv9script', 'const b:FOO: number = 123'],
                   'E1304: Cannot use type with this variable: b:FOO:')
-  v9.CheckScriptFailure(['vim9script', 'const g:FOO: number = 123'],
+  v9.CheckScriptFailure(['mnv9script', 'const g:FOO: number = 123'],
                   'E1304: Cannot use type with this variable: g:FOO:')
 enddef
 
@@ -1747,7 +1747,7 @@ enddef
 
 def Test_assign_dict_unknown_type()
   var lines =<< trim END
-      vim9script
+      mnv9script
       var mylist = []
       mylist += [{one: 'one'}]
       def Func()
@@ -1759,7 +1759,7 @@ def Test_assign_dict_unknown_type()
   v9.CheckScriptSuccess(lines)
 
   lines =<< trim END
-      vim9script
+      mnv9script
       var mylist = [[]]
       mylist[0] += [{one: 'one'}]
       def Func()
@@ -1866,7 +1866,7 @@ enddef
 def Test_assign_lambda()
   # check if assign a lambda to a variable which type is func or any.
   var lines =<< trim END
-      vim9script
+      mnv9script
       var FuncRef = () => 123
       assert_equal(123, FuncRef())
       var FuncRef_Func: func = () => 123
@@ -1893,7 +1893,7 @@ enddef
 def Test_assign_funcref_args()
   # unspecified arguments match everything, including varargs
   var lines =<< trim END
-    vim9script
+    mnv9script
 
     var FuncUnknown: func: number
 
@@ -1913,7 +1913,7 @@ def Test_assign_funcref_args()
 
   # varargs must match
   lines =<< trim END
-    vim9script
+    mnv9script
     var FuncAnyVA: func(...any): number
     FuncAnyVA = (v): number => v
   END
@@ -1921,7 +1921,7 @@ def Test_assign_funcref_args()
 
   # varargs must match
   lines =<< trim END
-    vim9script
+    mnv9script
     var FuncAnyVA: func(...any): number
     FuncAnyVA = (v1, v2): number => v1 + v2
   END
@@ -1929,7 +1929,7 @@ def Test_assign_funcref_args()
 
   # varargs must match
   lines =<< trim END
-    vim9script
+    mnv9script
     var FuncAnyVA: func(...any): number
     FuncAnyVA = (v1: list<any>): number => 3
   END
@@ -1938,7 +1938,7 @@ enddef
 
 def Test_assign_funcref_arg_any()
   var lines =<< trim END
-    vim9script
+    mnv9script
     var FuncAnyVA: func(any): number
     FuncAnyVA = (v): number => v
   END
@@ -2010,9 +2010,9 @@ def Test_heredoc()
   END
   v9.CheckDefAndScriptSuccess(lines)
 
-  # assign heredoc to curly braces name in legacy function in Vim9 script
+  # assign heredoc to curly braces name in legacy function in MNV9 script
   lines =<< trim END
-      vim9script
+      mnv9script
       func Func()
         let foo_3_bar = ['']
         let foo_{1 + 2}_bar[ : ] =<< trim TEXT
@@ -2026,7 +2026,7 @@ def Test_heredoc()
 
   # commented out heredoc assignment without space after '#'
   lines =<< trim END
-      vim9script
+      mnv9script
       def Func()
         #x =<< trim [CODE]
         #[CODE]
@@ -2037,7 +2037,7 @@ def Test_heredoc()
 
   # heredoc start should not be recognized in string
   lines =<< trim END
-      vim9script
+      mnv9script
       def Func()
         new
         @" = 'bar'
@@ -2110,7 +2110,7 @@ enddef
 
 def Test_var_func_call()
   var lines =<< trim END
-    vim9script
+    mnv9script
     func GetValue()
       if exists('g:count')
         let g:count += 1
@@ -2133,13 +2133,13 @@ enddef
 
 def Test_var_missing_type()
   var lines =<< trim END
-    vim9script
+    mnv9script
     var name = g:unknown
   END
   v9.CheckScriptFailure(lines, 'E121:')
 
   lines =<< trim END
-    vim9script
+    mnv9script
     var nr: number = 123
     var name = nr
   END
@@ -2148,7 +2148,7 @@ enddef
 
 def Test_var_declaration()
   var lines =<< trim END
-    vim9script
+    mnv9script
     var name: string
     g:var_uninit = name
     name = 'text'
@@ -2233,13 +2233,13 @@ enddef
 
 def Test_var_declaration_fails()
   var lines =<< trim END
-    vim9script
+    mnv9script
     final var: string
   END
   v9.CheckScriptFailure(lines, 'E1125:')
 
   lines =<< trim END
-    vim9script
+    mnv9script
     const g:constvar = 'string'
     g:constvar = 'xx'
   END
@@ -2247,7 +2247,7 @@ def Test_var_declaration_fails()
   unlet g:constvar
 
   lines =<< trim END
-    vim9script
+    mnv9script
     var name = 'one'
     lockvar name
     def SetLocked()
@@ -2268,7 +2268,7 @@ def Test_var_declaration_fails()
   v9.CheckScriptFailure(lines, 'E741: Value is locked: s:legacy', 1)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     def SetGlobalConst()
       const g:globConst = 123
     enddef
@@ -2279,7 +2279,7 @@ def Test_var_declaration_fails()
   unlet g:globConst
 
   lines =<< trim END
-    vim9script
+    mnv9script
     const cdict: dict<string> = {}
     def Change()
       cdict.foo = 'foo'
@@ -2289,7 +2289,7 @@ def Test_var_declaration_fails()
   v9.CheckScriptFailure(lines, 'E46:')
 
   lines =<< trim END
-    vim9script
+    mnv9script
     final w:finalvar = [9]
     w:finalvar = [8]
   END
@@ -2297,13 +2297,13 @@ def Test_var_declaration_fails()
   unlet w:finalvar
 
   lines =<< trim END
-    vim9script
+    mnv9script
     const var: string
   END
   v9.CheckScriptFailure(lines, 'E1021:')
 
   lines =<< trim END
-    vim9script
+    mnv9script
     var 9var: string
   END
   v9.CheckScriptFailure(lines, 'E488:')
@@ -2354,7 +2354,7 @@ def Test_var_declaration_void_type()
 
   # Using void as the type of a function argument
   lines =<< trim END
-    vim9script
+    mnv9script
     def Foo(x: void)
     enddef
     defcompile
@@ -2393,7 +2393,7 @@ def Test_var_declaration_void_type()
 
   # Using void as the type of an object member variable
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
       var x: void = 1
     endclass
@@ -2410,7 +2410,7 @@ def Test_var_declaration_void_type()
 
   # Using void as the type of a generic parameter
   lines =<< trim END
-    vim9script
+    mnv9script
     def Fn<T, U>()
     enddef
     Fn<void, void>()
@@ -2419,7 +2419,7 @@ def Test_var_declaration_void_type()
 
   # Using void as the type of a parameter in a function type
   lines =<< trim END
-    vim9script
+    mnv9script
     def Foo()
     enddef
     var Fn: func(void): void = Foo
@@ -2428,7 +2428,7 @@ def Test_var_declaration_void_type()
 
   # Using void in a type alias
   lines =<< trim END
-    vim9script
+    mnv9script
     type MyType = void
     var x: MyType
   END
@@ -2438,7 +2438,7 @@ enddef
 def Test_var_declaration_inferred()
   # check that type is set on the list so that extend() fails
   var lines =<< trim END
-      vim9script
+      mnv9script
       def GetList(): list<number>
         var l = [1, 2, 3]
         return l
@@ -2448,7 +2448,7 @@ def Test_var_declaration_inferred()
   v9.CheckScriptFailure(lines, 'E1013:', 6)
 
   lines =<< trim END
-      vim9script
+      mnv9script
       def GetNr(): number
         return 5
       enddef
@@ -2520,14 +2520,14 @@ enddef
 
 def Test_var_type_check()
   var lines =<< trim END
-    vim9script
+    mnv9script
     var name: string
     name = 1234
   END
   v9.CheckScriptFailure(lines, 'E1012:')
 
   lines =<< trim END
-    vim9script
+    mnv9script
     var name:string
   END
   v9.CheckScriptFailure(lines, 'E1069:')
@@ -2535,27 +2535,27 @@ def Test_var_type_check()
   v9.CheckDefAndScriptFailure(['var n:number = 42'], 'E1069:')
 
   lines =<< trim END
-    vim9script
+    mnv9script
     var name: asdf
   END
   v9.CheckScriptFailure(lines, 'E1010:')
 
   lines =<< trim END
-    vim9script
+    mnv9script
     var l: list<number>
     l = []
   END
   v9.CheckScriptSuccess(lines)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     var d: dict<number>
     d = {}
   END
   v9.CheckScriptSuccess(lines)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     var d = {a: 1, b: [2]}
     def Func(b: bool)
       var l: list<number> = b ? d.b : [3]
@@ -2566,7 +2566,7 @@ def Test_var_type_check()
 
   # Modifying a variable type using the legacy command at script level
   lines =<< trim END
-    vim9script
+    mnv9script
     var l: list<number> = [1, 2]
     legacy let s:l[0] = 'x'
   END
@@ -2574,7 +2574,7 @@ def Test_var_type_check()
 
   # try with dict type
   lines =<< trim END
-    vim9script
+    mnv9script
     var d: dict<number>
     legacy let s:d['a'] = 'x'
   END
@@ -2582,7 +2582,7 @@ def Test_var_type_check()
 
   # Modifying a variable type using the legacy command in a def function
   lines =<< trim END
-    vim9script
+    mnv9script
     var l: list<number> = [1, 2]
     def Fn()
       legacy let s:l[0] = 'x'
@@ -2593,7 +2593,7 @@ def Test_var_type_check()
 
   # try with dict type
   lines =<< trim END
-    vim9script
+    mnv9script
     var d: dict<string>
     def Fn()
       legacy let s:d['a'] = 10
@@ -2604,7 +2604,7 @@ def Test_var_type_check()
 
   # after the first error, the assignment should be aborted
   lines =<< trim END
-    vim9script
+    mnv9script
     var l: list<number> = [1, 2]
     legacy let [s:l[0], s:l[1]] = ['x', 1.0]
   END
@@ -2640,7 +2640,7 @@ def Test_unlet()
   assert_false(exists('g:somevar'))
   unlet! g:somevar
 
-  # script-local variable cannot be removed in Vim9 script
+  # script-local variable cannot be removed in MNV9 script
   s:somevar = 'local'
   assert_true(exists('s:somevar'))
   v9.CheckDefExecFailure(['unlet s:somevar'], 'E1081:', 1)
@@ -2738,7 +2738,7 @@ def Test_unlet()
 
   # command recognized as assignment when skipping, should not give an error
   v9.CheckScriptSuccess([
-    'vim9script',
+    'mnv9script',
     'for i in []',
     "  put =''",
     'endfor'])
@@ -2800,17 +2800,17 @@ def Test_unlet()
   assert_false(exists('g:someDict'))
 
   v9.CheckScriptFailure([
-   'vim9script',
+   'mnv9script',
    'var svar = 123',
    'unlet svar',
    ], 'E1081:')
   v9.CheckScriptFailure([
-   'vim9script',
+   'mnv9script',
    'var svar = 123',
    'unlet s:svar',
    ], 'E1268:')
   v9.CheckScriptFailure([
-   'vim9script',
+   'mnv9script',
    'var svar = 123',
    'def Func()',
    '  unlet svar',
@@ -2818,7 +2818,7 @@ def Test_unlet()
    'defcompile',
    ], 'E1081:')
   v9.CheckScriptSuccess([
-   'vim9script',
+   'mnv9script',
    'var svar = 123',
    'func Func()',
    '  unlet s:svar',
@@ -2826,15 +2826,15 @@ def Test_unlet()
    'Func()',
    ])
   v9.CheckScriptFailure([
-   'vim9script',
+   'mnv9script',
    'var svar = 123',
    'def Func()',
-   '  vim9cmd unlet s:svar',
+   '  mnv9cmd unlet s:svar',
    'enddef',
    'defcompile',
    ], 'E1081:')
   v9.CheckScriptFailure([
-   'vim9script',
+   'mnv9script',
    'var svar = 123',
    'def Func()',
    '  unlet s:svar',
@@ -2843,7 +2843,7 @@ def Test_unlet()
    ], 'E1081:')
 
   v9.CheckScriptFailure([
-   'vim9script',
+   'mnv9script',
    'def Delcount(dict: dict<any>)',
    '  unlet dict.count',
    'enddef',
@@ -2851,17 +2851,17 @@ def Test_unlet()
    ], 'E742:')
 
   v9.CheckScriptFailure([
-   'vim9script',
+   'mnv9script',
    'def DelChangedtick(dict: dict<any>)',
    '  unlet dict.changedtick',
    'enddef',
    'DelChangedtick(b:)',
    ], 'E795:')
 
-  writefile(['vim9script', 'export var svar = 1234'], 'XunletExport.vim', 'D')
+  writefile(['mnv9script', 'export var svar = 1234'], 'XunletExport.mnv', 'D')
   var lines =<< trim END
-    vim9script
-    import './XunletExport.vim' as exp
+    mnv9script
+    import './XunletExport.mnv' as exp
     def UnletSvar()
       unlet exp.svar
     enddef
@@ -2871,16 +2871,16 @@ def Test_unlet()
 
   # unlet imported item at script level
   lines =<< trim END
-    vim9script
-    import './XunletExport.vim' as exp
+    mnv9script
+    import './XunletExport.mnv' as exp
     unlet exp.svar
   END
   v9.CheckScriptFailure(lines, 'E1260:', 3)
 
   # unlet imported item in legacy function
   lines =<< trim END
-    vim9script
-    import './XunletExport.vim' as exp
+    mnv9script
+    import './XunletExport.mnv' as exp
     function F()
       unlet exp.svar
     endfunction
@@ -2897,21 +2897,21 @@ enddef
 
 def Test_expr_error_no_assign()
   var lines =<< trim END
-      vim9script
+      mnv9script
       var x = invalid
       echo x
   END
   v9.CheckScriptFailureList(lines, ['E121:', 'E121:'])
 
   lines =<< trim END
-      vim9script
+      mnv9script
       var x = 1 / 0
       echo x
   END
   v9.CheckScriptFailure(lines, 'E1154:')
 
   lines =<< trim END
-      vim9script
+      mnv9script
       var x = 1 % 0
       echo x
   END
@@ -2977,14 +2977,14 @@ def Test_script_funcref_case()
   v9.CheckDefAndScriptFailure(lines, 'E704:')
 
   lines =<< trim END
-      vim9script
+      mnv9script
       var Len = (s: string): number => len(s) + 2
       assert_equal(6, Len('asdf'))
   END
   v9.CheckScriptSuccess(lines)
 
   lines =<< trim END
-      vim9script
+      mnv9script
       var len = (s: string): number => len(s) + 1
   END
   v9.CheckScriptFailure(lines, 'E704:')
@@ -2992,7 +2992,7 @@ enddef
 
 def Test_script_funcref_runtime_type_check()
   var lines =<< trim END
-      vim9script
+      mnv9script
       def FuncWithNumberArg(n: number)
       enddef
       def Test()
@@ -3042,7 +3042,7 @@ enddef
 def Test_abort_after_error()
   # should abort after strpart() fails, not give another type error
   var lines =<< trim END
-      vim9script
+      mnv9script
       var x: string
       x = strpart(1, 2)
   END
@@ -3053,7 +3053,7 @@ enddef
 
 def Test_using_s_var_in_function()
   var lines =<< trim END
-      vim9script
+      mnv9script
       var scriptlevel = 123
       def SomeFunc()
         echo s:scriptlevel
@@ -3073,7 +3073,7 @@ def Test_using_s_var_in_function()
   v9.CheckScriptSuccess(lines)
 
   lines =<< trim END
-      vim9script
+      mnv9script
       var scriptlevel = 123
       def SomeFunc()
         s:scriptlevel = 456
@@ -3098,7 +3098,7 @@ enddef
 def Test_type_specification_in_assignment()
   # specify type for an existing script local variable without "var"
   var lines =<< trim END
-    vim9script
+    mnv9script
     var n: number = 10
     n: number = 20
   END
@@ -3106,14 +3106,14 @@ def Test_type_specification_in_assignment()
 
   # specify type for a non-existing script local variable without "var"
   lines =<< trim END
-    vim9script
+    mnv9script
     MyVar: string = 'abc'
   END
   v9.CheckSourceFailure(lines, "E492: Not an editor command: MyVar: string = 'abc'", 2)
 
   # specify type for an existing def local variable without "var"
   lines =<< trim END
-    vim9script
+    mnv9script
     def Foo()
       var n: number = 10
       n: number = 20
@@ -3124,7 +3124,7 @@ def Test_type_specification_in_assignment()
 
   # specify type for a non-existing def local variable without "var"
   lines =<< trim END
-    vim9script
+    mnv9script
     def Foo()
       MyVar: string = 'abc'
     enddef
@@ -3135,7 +3135,7 @@ enddef
 
 let g:someVar = 'X'
 
-" Test for heredoc with Vim expressions.
+" Test for heredoc with MNV expressions.
 " This messes up highlighting, keep it near the end.
 def Test_heredoc_expr()
   var lines =<< trim CODE
@@ -3273,7 +3273,7 @@ enddef
 " Test for assigning to a multi-dimensional list item.
 def Test_list_item_assign()
   var lines =<< trim END
-    vim9script
+    mnv9script
 
     def Foo()
       var l: list<list<string>> = [['x', 'x', 'x'], ['y', 'y', 'y']]
@@ -3287,7 +3287,7 @@ def Test_list_item_assign()
   v9.CheckSourceSuccess(lines)
 
   lines =<< trim END
-    vim9script
+    mnv9script
 
     var l: list<list<string>> = [['x', 'x', 'x'], ['y', 'y', 'y']]
     var z: number = 1
@@ -3303,7 +3303,7 @@ def Test_dict_item_assign()
   # This used to fail with the error "E1105: Cannot convert list to string"
   # (Github issue #13485)
   var lines =<< trim END
-    vim9script
+    mnv9script
     def F()
       var d: dict<dict<number>> = {a: {b: 0}}
 
@@ -3316,9 +3316,9 @@ def Test_dict_item_assign()
   END
   v9.CheckSourceSuccess(lines)
 
-  # This used to crash Vim
+  # This used to crash MNV
   lines =<< trim END
-    vim9script
+    mnv9script
     def F()
       var d: dict<dict<number>> = {a: {b: 0}}
       d['a']['b'] += 1
@@ -3330,7 +3330,7 @@ def Test_dict_item_assign()
 
   # Assignment at script level
   lines =<< trim END
-    vim9script
+    mnv9script
     var d: dict<dict<number>> = {a: {b: 0}}
 
     for group in keys(d)
@@ -3343,7 +3343,7 @@ enddef
 
 def Test_class_assign()
   var lines =<< trim END
-    vim9script
+    mnv9script
     class C
     endclass
     class D
@@ -3357,7 +3357,7 @@ enddef
 " in assignments with a different type
 def Test_type_check()
   var lines =<< trim END
-    vim9script
+    mnv9script
     class A
     endclass
     type T = number
@@ -3436,7 +3436,7 @@ def Test_type_check()
 
   if has('channel')
     lines =<< trim END
-      vim9script
+      mnv9script
       var N: number = 1
       var S: string = 'abc'
       var j: job = test_null_job()
@@ -3460,7 +3460,7 @@ def Test_type_check()
   endif
 
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
     endclass
 
@@ -3472,7 +3472,7 @@ def Test_type_check()
   v9.CheckScriptFailure(lines, 'E1405: Class "A" cannot be used as a value')
 
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
     endclass
 
@@ -3501,7 +3501,7 @@ enddef
 " Test for checking the argument type of a def function
 def Test_func_argtype_check()
   var lines =<< trim END
-    vim9script
+    mnv9script
 
     # Passing different types as argument to a function expecting a number
     def IntArg(n: number)
@@ -3566,7 +3566,7 @@ def Test_func_argtype_check()
   # Calling a function expecting a number type with different argument types
   # from another function
   var pre_lines =<< trim END
-    vim9script
+    mnv9script
     class A
     endclass
     def IntArg(n: number)
@@ -3600,7 +3600,7 @@ enddef
 " Test for checking the return type of a def function
 def Test_func_rettype_check()
   var lines =<< trim END
-    vim9script
+    mnv9script
     def Fn(): dict<number>
       return 10
     enddef
@@ -3609,7 +3609,7 @@ def Test_func_rettype_check()
   v9.CheckSourceFailure(lines, 'E1012: Type mismatch; expected dict<number> but got number', 1)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     def Fn(): list<number>
       return 10
     enddef
@@ -3618,7 +3618,7 @@ def Test_func_rettype_check()
   v9.CheckSourceFailure(lines, 'E1012: Type mismatch; expected list<number> but got number', 1)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     def Fn(): blob
       return 10
     enddef
@@ -3627,7 +3627,7 @@ def Test_func_rettype_check()
   v9.CheckSourceFailure(lines, 'E1012: Type mismatch; expected blob but got number', 1)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     def Fn(): func
       return 10
     enddef
@@ -3636,7 +3636,7 @@ def Test_func_rettype_check()
   v9.CheckSourceFailure(lines, 'E1012: Type mismatch; expected func(...): unknown but got number', 1)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     def Fn(): job
       return 10
     enddef
@@ -3645,7 +3645,7 @@ def Test_func_rettype_check()
   v9.CheckSourceFailure(lines, 'E1012: Type mismatch; expected job but got number', 1)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     def Fn(): channel
       return 10
     enddef
@@ -3654,7 +3654,7 @@ def Test_func_rettype_check()
   v9.CheckSourceFailure(lines, 'E1012: Type mismatch; expected channel but got number', 1)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
     endclass
     def Fn(): A
@@ -3677,7 +3677,7 @@ def Test_assign_to_any()
                           ["'dict<number>'", '{a: 1}'],
                         ]
     var lines =<< trim eval END
-      vim9script
+      mnv9script
       var x: any = {val}
       assert_equal({typestr}, typename(x))
       x = [{{a: 1}}, {{b: 2}}]
@@ -3693,7 +3693,7 @@ enddef
 
 def Test_assign_type_to_list_dict()
   var lines =<< trim END
-    vim9script
+    mnv9script
     class C
     endclass
 
@@ -3702,7 +3702,7 @@ def Test_assign_type_to_list_dict()
   v9.CheckScriptFailure(lines, 'E1405: Class "C" cannot be used as a value')
 
   lines =<< trim END
-    vim9script
+    mnv9script
     class C
     endclass
     type T = C
@@ -3715,7 +3715,7 @@ def Test_assign_type_to_list_dict()
   v9.CheckScriptFailure(lines, 'E1405: Class "C" cannot be used as a value')
 
   lines =<< trim END
-    vim9script
+    mnv9script
     type T = number
 
     def F()
@@ -3726,7 +3726,7 @@ def Test_assign_type_to_list_dict()
   v9.CheckScriptFailure(lines, 'E1407: Cannot use a Typealias as a variable or value')
 
   lines =<< trim END
-    vim9script
+    mnv9script
     class C
     endclass
 
@@ -3735,7 +3735,7 @@ def Test_assign_type_to_list_dict()
   v9.CheckScriptFailure(lines, 'E1405: Class "C" cannot be used as a value')
 
   lines =<< trim END
-    vim9script
+    mnv9script
     class C
     endclass
 
@@ -3747,7 +3747,7 @@ def Test_assign_type_to_list_dict()
   v9.CheckScriptFailure(lines, 'E1405: Class "C" cannot be used as a value')
 
   lines =<< trim END
-    vim9script
+    mnv9script
     type T = number
 
     def F()
@@ -3758,7 +3758,7 @@ def Test_assign_type_to_list_dict()
   v9.CheckScriptFailure(lines, 'E1407: Cannot use a Typealias as a variable or value')
 
   lines =<< trim END
-    vim9script
+    mnv9script
     class C
     endclass
 
@@ -3770,7 +3770,7 @@ def Test_assign_type_to_list_dict()
   v9.CheckScriptFailure(lines, 'E1405: Class "C" cannot be used as a value')
 
   lines =<< trim END
-    vim9script
+    mnv9script
     type T = number
 
     def F()
@@ -3784,7 +3784,7 @@ enddef
 " Test for modifying a final variable using a compound operator
 def Test_final_var_modification_with_compound_op()
   var lines =<< trim END
-    vim9script
+    mnv9script
 
     final i: number = 1000
     assert_fails('i += 2', 'E46: Cannot change read-only variable "i"')
@@ -3811,7 +3811,7 @@ enddef
 " Test for modifying a final variable with a List value
 def Test_final_var_with_list_value()
   var lines =<< trim END
-    vim9script
+    mnv9script
 
     final listA: list<string> = []
     var listB = listA
@@ -3842,15 +3842,15 @@ enddef
 " Test for modifying a final variable with a List value using "+=" from a legacy
 " function.
 func Test_final_var_with_list_value_legacy()
-  vim9cmd final g:TestVar = ['a']
-  vim9cmd g:TestVar += ['b']
+  mnv9cmd final g:TestVar = ['a']
+  mnv9cmd g:TestVar += ['b']
   call assert_equal(['a', 'b'], g:TestVar)
 endfunc
 
 " Test for modifying a final variable with a Blob value
 def Test_final_var_with_blob_value()
   var lines =<< trim END
-    vim9script
+    mnv9script
 
     final blobA: blob = 0z10
     var blobB = blobA
@@ -3881,7 +3881,7 @@ enddef
 " Test for overwriting a script-local function using the s: dictionary
 def Test_override_script_local_func()
   var lines =<< trim END
-    vim9script
+    mnv9script
     def MyFunc()
     enddef
     var d: dict<any> = s:
@@ -3900,7 +3900,7 @@ def Test_nested_type_check()
   v9.CheckSourceDefExecAndScriptFailure(lines, 'E1012: Type mismatch; expected number but got string')
 
   lines =<< trim END
-    vim9script
+    mnv9script
     var d = {a: [10], b: [20]}
     var l = d->items()
     l[0][1][0] = 30
@@ -3909,7 +3909,7 @@ def Test_nested_type_check()
   v9.CheckScriptSuccess(lines)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     def Foo()
       var d = {a: [10], b: [20]}
       var l = d->items()
@@ -3922,7 +3922,7 @@ def Test_nested_type_check()
 
   # Test for modifying a List item added using add() with a different type.
   lines =<< trim END
-    vim9script
+    mnv9script
 
     var l: list<list<any>> = [['a']]
     var v = [[10]]
@@ -3932,4 +3932,4 @@ def Test_nested_type_check()
   v9.CheckScriptFailure(lines, 'E1012: Type mismatch; expected list<number> but got list<dict<number>>', 6)
 enddef
 
-" vim: ts=8 sw=2 sts=2 expandtab tw=80 fdm=marker
+" mnv: ts=8 sw=2 sts=2 expandtab tw=80 fdm=marker
diff --git a/uvim/src/testdir/test_vim9_builtin.vim b/uvim/src/testdir/test_mnv9_builtin.mnv
index 4cc5656289..69a0f80171 100644
--- a/uvim/src/testdir/test_vim9_builtin.vim
+++ b/uvim/src/testdir/test_mnv9_builtin.mnv
@@ -1,8 +1,8 @@
-" Test using builtin functions in the Vim9 script language.
+" Test using builtin functions in the MNV9 script language.
 
-source util/screendump.vim
-source util/socketserver.vim
-import './util/vim9.vim' as v9
+source util/screendump.mnv
+source util/socketserver.mnv
+import './util/mnv9.mnv' as v9
 
 " Test for passing too many or too few arguments to builtin functions
 func Test_internalfunc_arg_error()
@@ -83,7 +83,7 @@ def Test_add()
   assert_equal(0z1234, add(0z12, 0x34))
 
   var lines =<< trim END
-    vim9script
+    mnv9script
     g:thelist = [1]
     lockvar g:thelist
     def TryChange()
@@ -122,7 +122,7 @@ def Test_add_blob()
 
   # Getting variable with NULL blob fails
   lines =<< trim END
-      vim9script
+      mnv9script
       var b: blob = test_null_blob()
       add(b, 123)
   END
@@ -153,7 +153,7 @@ def Test_add_list()
 
   # Getting an uninitialized variable allocates a new list at script level
   lines =<< trim END
-      vim9script
+      mnv9script
       var l: list<number>
       add(l, 123)
   END
@@ -161,21 +161,21 @@ def Test_add_list()
 
   # Adding to a variable set to a NULL list fails
   lines =<< trim END
-      vim9script
+      mnv9script
       var l: list<number> = test_null_list()
       add(l, 123)
   END
   v9.CheckSourceScriptFailure(lines, 'E1130:', 3)
 
   lines =<< trim END
-      vim9script
+      mnv9script
       var l: list<string> = ['a']
       l->add(123)
   END
   v9.CheckSourceScriptFailure(lines, 'E1012: Type mismatch; expected string but got number', 3)
 
   lines =<< trim END
-      vim9script
+      mnv9script
       var l: list<string>
       l->add(123)
   END
@@ -487,7 +487,7 @@ def Test_call_call()
   l->assert_equal([1, 2, 3])
 
   var lines =<< trim END
-      vim9script
+      mnv9script
       def Outer()
         def g:Inner()
           g:done = 'Inner'
@@ -510,7 +510,7 @@ enddef
 def Test_call_imports()
   # Use call with an imported function
   var lines =<< trim END
-    vim9script
+    mnv9script
 
     export const foo = 'foo'
 
@@ -525,7 +525,7 @@ def Test_call_imports()
   END
   writefile(lines, 'Test_call_imports_importme', 'D')
   lines =<< trim END
-    vim9script
+    mnv9script
     import './Test_call_imports_importme' as i_imp
 
     var l = [12]
@@ -545,7 +545,7 @@ def Test_call_imports()
 
   # A few error cases
   lines =<< trim END
-    vim9script
+    mnv9script
     import './Test_call_imports_importme' as i_imp
     const Imported = i_imp.Imported
     const foo = i_imp.foo
@@ -1191,7 +1191,7 @@ def Test_extend_arg_types()
   v9.CheckSourceDefFailure(['extend({a: 1}, 42)'], 'E1013: Argument 2: type mismatch, expected dict<any> but got number')
   v9.CheckSourceDefFailure(['extend({a: 1}, {b: 2}, 1)'], 'E1013: Argument 3: type mismatch, expected string but got number')
 
-  v9.CheckSourceScriptFailure(['vim9script', 'var l = [1]', 'extend(l, ["b", 1])'], 'E1013: Argument 2: type mismatch, expected list<number> but got list<any> in extend()')
+  v9.CheckSourceScriptFailure(['mnv9script', 'var l = [1]', 'extend(l, ["b", 1])'], 'E1013: Argument 2: type mismatch, expected list<number> but got list<any> in extend()')
 enddef
 
 func g:ExtendDict(d)
@@ -1216,7 +1216,7 @@ def Test_extend_dict_item_type()
        g:ExtendDict(d)
   END
   v9.CheckSourceDefExecFailure(lines, 'E1012: Type mismatch; expected number but got string', 0)
-  v9.CheckSourceScriptFailure(['vim9script'] + lines, 'E1012:', 1)
+  v9.CheckSourceScriptFailure(['mnv9script'] + lines, 'E1012:', 1)
 
   lines =<< trim END
        var d: dict<bool>
@@ -1247,7 +1247,7 @@ def Test_extend_list_item_type()
        g:ExtendList(l)
   END
   v9.CheckSourceDefExecFailure(lines, 'E1012: Type mismatch; expected number but got string', 0)
-  v9.CheckSourceScriptFailure(['vim9script'] + lines, 'E1012:', 1)
+  v9.CheckSourceScriptFailure(['mnv9script'] + lines, 'E1012:', 1)
 
   lines =<< trim END
        var l: list<bool>
@@ -1267,7 +1267,7 @@ enddef
 
 def Test_extend_with_error_function()
   var lines =<< trim END
-      vim9script
+      mnv9script
       def F()
         {
           var m = 10
@@ -1375,7 +1375,7 @@ def Test_finddir()
 enddef
 
 def Test_findfile()
-  findfile('runtest.vim', '**', -1)->assert_equal(['runtest.vim'])
+  findfile('runtest.mnv', '**', -1)->assert_equal(['runtest.mnv'])
   var lines =<< trim END
       var l: list<string> = findfile('nothing', '*;', -1)
   END
@@ -1526,7 +1526,7 @@ def Test_filter()
   assert_equal([1], GetFiltered())
 
   var lines =<< trim END
-      vim9script
+      mnv9script
       def Func(): list<string>
         var MatchWord: func: bool = (_, v) => true
         var l = ['xxx']
@@ -1694,7 +1694,7 @@ def Test_funcref()
   v9.CheckSourceDefAndScriptFailure(['funcref("reverse", [2], [1])'], ['E1013: Argument 3: type mismatch, expected dict<any> but got list<number>', 'E1206: Dictionary required for argument 3'])
 
   var lines =<< trim END
-      vim9script
+      mnv9script
       def UseBool(b: bool)
       enddef
       def GetRefOk()
@@ -1711,7 +1711,7 @@ def Test_funcref()
   v9.CheckSourceScriptSuccess(lines)
 
   lines =<< trim END
-      vim9script
+      mnv9script
       def UseBool(b: bool)
       enddef
       def GetRefBad()
@@ -1730,7 +1730,7 @@ def Test_function()
   v9.CheckSourceDefAndScriptFailure(['function("reverse", [2], [1])'], ['E1013: Argument 3: type mismatch, expected dict<any> but got list<number>', 'E1206: Dictionary required for argument 3'])
 
   var lines =<< trim END
-      vim9script
+      mnv9script
       def UseBool(b: bool)
       enddef
       def GetRefOk()
@@ -1747,7 +1747,7 @@ def Test_function()
   v9.CheckSourceScriptSuccess(lines)
 
   lines =<< trim END
-      vim9script
+      mnv9script
       def UseBool(b: bool)
       enddef
       def GetRefBad()
@@ -1780,7 +1780,7 @@ def Test_get()
   F->get('args')->assert_equal([[5, 8, 6]])
 
   var lines =<< trim END
-      vim9script
+      mnv9script
       def DoThat(): number
         var Getqflist: func = function('getqflist', [{id: 42}])
         return Getqflist()->get('id', 77)
@@ -1876,7 +1876,7 @@ def Test_getcharstr()
 enddef
 
 def Test_getcompletion()
-  set wildignore=*.vim,*~
+  set wildignore=*.mnv,*~
   var l = getcompletion('run', 'file', true)
   l->assert_equal([])
   set wildignore&
@@ -2089,7 +2089,7 @@ def Test_getscriptinfo()
   v9.CheckSourceDefAndScriptFailure(['getscriptinfo("x")'], ['E1013: Argument 1: type mismatch, expected dict<any> but got string', 'E1206: Dictionary required for argument 1'])
 
   var lines1 =<< trim END
-    vim9script
+    mnv9script
     g:loaded_script_id = expand("<SID>")
     var XscriptVar = [1, {v: 2}]
     func XgetScriptVar()
@@ -2170,7 +2170,7 @@ def Test_getwinvar()
 enddef
 
 def Test_glob()
-  glob('runtest.vim', true, true, true)->assert_equal(['runtest.vim'])
+  glob('runtest.mnv', true, true, true)->assert_equal(['runtest.mnv'])
   v9.CheckSourceDefAndScriptFailure(['glob(1)'], ['E1013: Argument 1: type mismatch, expected string but got number', 'E1174: String required for argument 1'])
   v9.CheckSourceDefAndScriptFailure(['glob("a", 2)'], ['E1013: Argument 2: type mismatch, expected bool but got number', 'E1212: Bool required for argument 2'])
   v9.CheckSourceDefAndScriptFailure(['glob("a", 1, "b")'], ['E1013: Argument 3: type mismatch, expected bool but got string', 'E1212: Bool required for argument 3'])
@@ -2184,7 +2184,7 @@ def Test_glob2regpat()
 enddef
 
 def Test_globpath()
-  globpath('.', 'runtest.vim', true, true, true)->assert_equal(['./runtest.vim'])
+  globpath('.', 'runtest.mnv', true, true, true)->assert_equal(['./runtest.mnv'])
   v9.CheckSourceDefAndScriptFailure(['globpath(1, "b")'], ['E1013: Argument 1: type mismatch, expected string but got number', 'E1174: String required for argument 1'])
   v9.CheckSourceDefAndScriptFailure(['globpath("a", 2)'], ['E1013: Argument 2: type mismatch, expected string but got number', 'E1174: String required for argument 2'])
   v9.CheckSourceDefAndScriptFailure(['globpath("a", "b", "c")'], ['E1013: Argument 3: type mismatch, expected bool but got string', 'E1212: Bool required for argument 3'])
@@ -2413,7 +2413,7 @@ enddef
 
 def Test_instanceof()
   var lines =<< trim END
-    vim9script
+    mnv9script
     class Foo
     endclass
     instanceof('hello', Foo)
@@ -2421,7 +2421,7 @@ def Test_instanceof()
   v9.CheckSourceScriptFailure(lines, 'E616: Object required for argument 1')
 
   lines =<< trim END
-    vim9script
+    mnv9script
     class Foo
     endclass
     instanceof(Foo.new(), 123)
@@ -2429,7 +2429,7 @@ def Test_instanceof()
   v9.CheckSourceScriptFailure(lines, 'E693: Class or class typealias required for argument 2')
 
   lines =<< trim END
-    vim9script
+    mnv9script
     class Foo
     endclass
     def Bar()
@@ -2440,7 +2440,7 @@ def Test_instanceof()
   v9.CheckSourceScriptFailure(lines, 'E1013: Argument 1: type mismatch, expected object<any> but got string')
 
   lines =<< trim END
-    vim9script
+    mnv9script
     class Foo
     endclass
     def Bar()
@@ -2451,7 +2451,7 @@ def Test_instanceof()
   v9.CheckSourceScriptFailure(lines, 'E693: Class or class typealias required for argument 2')
 
   lines =<< trim END
-    vim9script
+    mnv9script
     class Foo
     endclass
     instanceof(Foo.new(), [{}])
@@ -2459,7 +2459,7 @@ def Test_instanceof()
   v9.CheckSourceScriptFailure(lines, 'E693: Class or class typealias required for argument 2')
 
   lines =<< trim END
-    vim9script
+    mnv9script
     class Foo
     endclass
     def Bar()
@@ -2528,7 +2528,7 @@ def Test_job_info()
   endif
 enddef
 
-" Test_job_info_return_type() is in test_vim9_fails.vim
+" Test_job_info_return_type() is in test_mnv9_fails.mnv
 
 def Test_job_setoptions()
   if !has('job')
@@ -2720,7 +2720,7 @@ def Test_map_failure()
   CheckFeature job
 
   var lines =<< trim END
-      vim9script
+      mnv9script
       writefile([], 'Xtmpfile')
       silent e Xtmpfile
       var d = {[bufnr('%')]: {a: 0}}
@@ -3846,7 +3846,7 @@ def Test_searchpair()
   assert_equal(['x', 'x'], searchpairpos('', '', '')->map((_, _) => 'x'))
 
   var lines =<< trim END
-      vim9script
+      mnv9script
       setline(1, '()')
       normal gg
       func RetList()
@@ -4003,8 +4003,8 @@ def Test_set_get_bufline()
 enddef
 
 def Test_setbufvar()
-  setbufvar(bufnr('%'), '&syntax', 'vim')
-  &syntax->assert_equal('vim')
+  setbufvar(bufnr('%'), '&syntax', 'mnv')
+  &syntax->assert_equal('mnv')
   setbufvar(bufnr('%'), '&ts', 16)
   &ts->assert_equal(16)
   setbufvar(bufnr('%'), '&ai', true)
@@ -4334,7 +4334,7 @@ def Test_sort_argument()
   v9.CheckSourceDefAndScriptSuccess(lines)
 
   lines =<< trim END
-      vim9script
+      mnv9script
       def SortedList(): list<number>
         var Lambda: func: number = (a, b): number => a - b
         var l = [3, 2, 1]
@@ -4358,7 +4358,7 @@ def Test_sort_compare_func_fails()
   v9.CheckSourceDefAndScriptFailure(['sort([1], "", [1])'], ['E1013: Argument 3: type mismatch, expected dict<any> but got list<number>', 'E1206: Dictionary required for argument 3'])
 
   var lines =<< trim END
-    vim9script
+    mnv9script
     echo ['a', 'b', 'c']->sort((a: number, b: number) => 0)
   END
   writefile(lines, 'Xbadsort', 'D')
@@ -4590,9 +4590,9 @@ def Test_substitute()
 
   # check for using null_string as argument to substitute()
   lines =<< trim END
-    assert_equal('Vim', 'Vimp'->substitute('p', '', null_string))
-    assert_equal('Vim', 'Vimp'->substitute('p', null_string, null_string))
-    assert_equal('Vimp', 'Vimp'->substitute(null_string, null_string, null_string))
+    assert_equal('MNV', 'MNVp'->substitute('p', '', null_string))
+    assert_equal('MNV', 'MNVp'->substitute('p', null_string, null_string))
+    assert_equal('MNVp', 'MNVp'->substitute(null_string, null_string, null_string))
     assert_equal('', substitute(null_string, null_string, null_string, null_string))
   END
   v9.CheckSourceDefAndScriptSuccess(lines)
@@ -4602,9 +4602,9 @@ def Test_substitute()
     const Subst_Fn: func = (a: string, b: string, c: string, d: string): string => {
       return a->substitute(b, c, d)
     }
-    assert_equal('Vim', Subst_Fn('Vimp', 'p', '', null_string))
-    assert_equal('Vim', Subst_Fn('Vimp', 'p', null_string, null_string))
-    assert_equal('Vimp', Subst_Fn('Vimp', null_string, null_string, null_string))
+    assert_equal('MNV', Subst_Fn('MNVp', 'p', '', null_string))
+    assert_equal('MNV', Subst_Fn('MNVp', 'p', null_string, null_string))
+    assert_equal('MNVp', Subst_Fn('MNVp', null_string, null_string, null_string))
     assert_equal('', Subst_Fn(null_string, null_string, null_string, null_string))
   END
   v9.CheckSourceDefAndScriptSuccess(lines)
@@ -4701,7 +4701,7 @@ def Test_taglist()
 enddef
 
 def Test_term_dumpload()
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
   v9.CheckSourceDefAndScriptFailure(['term_dumpload({"a": 10})'], ['E1013: Argument 1: type mismatch, expected string but got dict<number>', 'E1174: String required for argument 1'])
   v9.CheckSourceDefAndScriptFailure(['term_dumpload({"a": 10}, "b")'], ['E1013: Argument 1: type mismatch, expected string but got dict<number>', 'E1174: String required for argument 1'])
   v9.CheckSourceDefAndScriptFailure(['term_dumpload("a", ["b"])'], ['E1013: Argument 2: type mismatch, expected dict<any> but got list<string>', 'E1206: Dictionary required for argument 2'])
@@ -4709,7 +4709,7 @@ def Test_term_dumpload()
 enddef
 
 def Test_term_dumpdiff()
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
   v9.CheckSourceDefAndScriptFailure(['term_dumpdiff(1, "b")'], ['E1013: Argument 1: type mismatch, expected string but got number', 'E1174: String required for argument 1'])
   v9.CheckSourceDefAndScriptFailure(['term_dumpdiff("a", 2)'], ['E1013: Argument 2: type mismatch, expected string but got number', 'E1174: String required for argument 2'])
   v9.CheckSourceDefAndScriptFailure(['term_dumpdiff("a", "b", [1])'], ['E1013: Argument 3: type mismatch, expected dict<any> but got list<number>', 'E1206: Dictionary required for argument 3'])
@@ -4717,63 +4717,63 @@ def Test_term_dumpdiff()
 enddef
 
 def Test_term_dumpwrite()
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
   v9.CheckSourceDefAndScriptFailure(['term_dumpwrite(true, "b")'], ['E1013: Argument 1: type mismatch, expected string but got bool', 'E1220: String or Number required for argument 1'])
   v9.CheckSourceDefAndScriptFailure(['term_dumpwrite(1, 2)'], ['E1013: Argument 2: type mismatch, expected string but got number', 'E1174: String required for argument 2'])
   v9.CheckSourceDefAndScriptFailure(['term_dumpwrite("a", "b", [1])'], ['E1013: Argument 3: type mismatch, expected dict<any> but got list<number>', 'E1206: Dictionary required for argument 3'])
 enddef
 
 def Test_term_getaltscreen()
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
   v9.CheckSourceDefAndScriptFailure(['term_getaltscreen(true)'], ['E1013: Argument 1: type mismatch, expected string but got bool', 'E1220: String or Number required for argument 1'])
 enddef
 
 def Test_term_getansicolors()
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
   CheckFeature termguicolors
   v9.CheckSourceDefAndScriptFailure(['term_getansicolors(["a"])'], ['E1013: Argument 1: type mismatch, expected string but got list<string>', 'E1220: String or Number required for argument 1'])
 enddef
 
 def Test_term_getattr()
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
   v9.CheckSourceDefAndScriptFailure(['term_getattr("x", "a")'], ['E1013: Argument 1: type mismatch, expected number but got string', 'E1210: Number required for argument 1'])
   v9.CheckSourceDefAndScriptFailure(['term_getattr(1, 2)'], ['E1013: Argument 2: type mismatch, expected string but got number', 'E1174: String required for argument 2'])
 enddef
 
 def Test_term_getcursor()
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
   v9.CheckSourceDefAndScriptFailure(['term_getcursor({"a": 10})'], ['E1013: Argument 1: type mismatch, expected string but got dict<number>', 'E1220: String or Number required for argument 1'])
 enddef
 
 def Test_term_getjob()
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
   v9.CheckSourceDefAndScriptFailure(['term_getjob(0z10)'], ['E1013: Argument 1: type mismatch, expected string but got blob', 'E1220: String or Number required for argument 1'])
   v9.CheckSourceDefAndScriptSuccess(['assert_true(term_getjob(0) == null_job)'])
 enddef
 
 def Test_term_getline()
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
   v9.CheckSourceDefAndScriptFailure(['term_getline(1.1, 1)'], ['E1013: Argument 1: type mismatch, expected string but got float', 'E1220: String or Number required for argument 1'])
   v9.CheckSourceDefAndScriptFailure(['term_getline(1, 1.1)'], ['E1013: Argument 2: type mismatch, expected string but got float', 'E1220: String or Number required for argument 2'])
 enddef
 
 def Test_term_getscrolled()
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
   v9.CheckSourceDefAndScriptFailure(['term_getscrolled(1.1)'], ['E1013: Argument 1: type mismatch, expected string but got float', 'E1220: String or Number required for argument 1'])
 enddef
 
 def Test_term_getsize()
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
   v9.CheckSourceDefAndScriptFailure(['term_getsize(1.1)'], ['E1013: Argument 1: type mismatch, expected string but got float', 'E1220: String or Number required for argument 1'])
 enddef
 
 def Test_term_getstatus()
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
   v9.CheckSourceDefAndScriptFailure(['term_getstatus(1.1)'], ['E1013: Argument 1: type mismatch, expected string but got float', 'E1220: String or Number required for argument 1'])
 enddef
 
 def Test_term_gettitle()
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
   v9.CheckSourceDefAndScriptFailure(['term_gettitle(1.1)'], ['E1013: Argument 1: type mismatch, expected string but got float', 'E1220: String or Number required for argument 1'])
 enddef
 
@@ -4793,19 +4793,19 @@ def Test_term_gettty()
 enddef
 
 def Test_term_scrape()
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
   v9.CheckSourceDefAndScriptFailure(['term_scrape(1.1, 1)'], ['E1013: Argument 1: type mismatch, expected string but got float', 'E1220: String or Number required for argument 1'])
   v9.CheckSourceDefAndScriptFailure(['term_scrape(1, 1.1)'], ['E1013: Argument 2: type mismatch, expected string but got float', 'E1220: String or Number required for argument 2'])
 enddef
 
 def Test_term_sendkeys()
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
   v9.CheckSourceDefAndScriptFailure(['term_sendkeys([], "p")'], ['E1013: Argument 1: type mismatch, expected string but got list<any>', 'E1220: String or Number required for argument 1'])
   v9.CheckSourceDefAndScriptFailure(['term_sendkeys(1, [])'], ['E1013: Argument 2: type mismatch, expected string but got list<any>', 'E1174: String required for argument 2'])
 enddef
 
 def Test_term_setansicolors()
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   if has('termguicolors') || has('gui')
     v9.CheckSourceDefAndScriptFailure(['term_setansicolors([], "p")'], ['E1013: Argument 1: type mismatch, expected string but got list<any>', 'E1220: String or Number required for argument 1'])
@@ -4816,25 +4816,25 @@ def Test_term_setansicolors()
 enddef
 
 def Test_term_setapi()
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
   v9.CheckSourceDefAndScriptFailure(['term_setapi([], "p")'], ['E1013: Argument 1: type mismatch, expected string but got list<any>', 'E1220: String or Number required for argument 1'])
   v9.CheckSourceDefAndScriptFailure(['term_setapi(1, [])'], ['E1013: Argument 2: type mismatch, expected string but got list<any>', 'E1174: String required for argument 2'])
 enddef
 
 def Test_term_setkill()
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
   v9.CheckSourceDefAndScriptFailure(['term_setkill([], "p")'], ['E1013: Argument 1: type mismatch, expected string but got list<any>', 'E1220: String or Number required for argument 1'])
   v9.CheckSourceDefAndScriptFailure(['term_setkill(1, [])'], ['E1013: Argument 2: type mismatch, expected string but got list<any>', 'E1174: String required for argument 2'])
 enddef
 
 def Test_term_setrestore()
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
   v9.CheckSourceDefAndScriptFailure(['term_setrestore([], "p")'], ['E1013: Argument 1: type mismatch, expected string but got list<any>', 'E1220: String or Number required for argument 1'])
   v9.CheckSourceDefAndScriptFailure(['term_setrestore(1, [])'], ['E1013: Argument 2: type mismatch, expected string but got list<any>', 'E1174: String required for argument 2'])
 enddef
 
 def Test_term_setsize()
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
   v9.CheckSourceDefAndScriptFailure(['term_setsize(1.1, 2, 3)'], ['E1013: Argument 1: type mismatch, expected string but got float', 'E1220: String or Number required for argument 1'])
   v9.CheckSourceDefAndScriptFailure(['term_setsize(1, "2", 3)'], ['E1013: Argument 2: type mismatch, expected number but got string', 'E1210: Number required for argument 2'])
   v9.CheckSourceDefAndScriptFailure(['term_setsize(1, 2, "3")'], ['E1013: Argument 3: type mismatch, expected number but got string', 'E1210: Number required for argument 3'])
@@ -4857,7 +4857,7 @@ def Test_term_start()
 enddef
 
 def Test_term_wait()
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
   v9.CheckSourceDefAndScriptFailure(['term_wait(0z10, 1)'], ['E1013: Argument 1: type mismatch, expected string but got blob', 'E1220: String or Number required for argument 1'])
   v9.CheckSourceDefAndScriptFailure(['term_wait(1, "a")'], ['E1013: Argument 2: type mismatch, expected number but got string', 'E1210: Number required for argument 2'])
 enddef
@@ -5038,7 +5038,7 @@ def Test_values()
 
   # the return type of values() is list<member>
   var lines =<< trim END
-      vim9script
+      mnv9script
 
       class Foo
         var val: number
@@ -5150,7 +5150,7 @@ func Test_win_gotoid_in_mapping()
         endfunc
     END
     call writefile(lines, 'Xgotoscript', 'D')
-    let buf = RunVimInTerminal('-S Xgotoscript', #{rows: 15, wait_for_ruler: 0})
+    let buf = RunMNVInTerminal('-S Xgotoscript', #{rows: 15, wait_for_ruler: 0})
     " wait longer here, since we didn't wait for the ruler
     call VerifyScreenDump(buf, 'Test_win_gotoid_1', #{wait: 3000})
     call term_sendkeys(buf, "3Gvl")
@@ -5159,7 +5159,7 @@ func Test_win_gotoid_in_mapping()
     call term_sendkeys(buf, ":call Click()\<CR>")
     call VerifyScreenDump(buf, 'Test_win_gotoid_3', {})
 
-    call StopVimInTerminal(buf)
+    call StopMNVInTerminal(buf)
   endif
 endfunc
 
@@ -5247,7 +5247,7 @@ enddef
 def Test_passing_type_to_builtin()
   # type, typename, string, instanceof are allowed type argument
   var lines =<< trim END
-    vim9script
+    mnv9script
     class C
     endclass
     type T = number
@@ -5264,9 +5264,9 @@ def Test_passing_type_to_builtin()
   v9.CheckSourceScriptSuccess(lines)
 
   # check argument to add at script level
-  # Note: add() is special cased in compile_call in vim9expr
+  # Note: add() is special cased in compile_call in mnv9expr
   lines =<< trim END
-    vim9script
+    mnv9script
     class C
     endclass
     add([], C)
@@ -5275,7 +5275,7 @@ def Test_passing_type_to_builtin()
 
   # check argument to add in :def
   lines =<< trim END
-    vim9script
+    mnv9script
     class C
     endclass
     def F()
@@ -5287,7 +5287,7 @@ def Test_passing_type_to_builtin()
 
   # check member call argument to add at script level
   lines =<< trim END
-    vim9script
+    mnv9script
     class C
     endclass
     []->add(C)
@@ -5296,7 +5296,7 @@ def Test_passing_type_to_builtin()
 
   # check member call argument to add in :def
   lines =<< trim END
-    vim9script
+    mnv9script
     class C
     endclass
     def F()
@@ -5309,7 +5309,7 @@ def Test_passing_type_to_builtin()
   # Try "empty()" builtin
   # check argument to empty at script level
   lines =<< trim END
-    vim9script
+    mnv9script
     class C
     endclass
     empty(C)
@@ -5318,7 +5318,7 @@ def Test_passing_type_to_builtin()
 
   # check argument to empty in :def
   lines =<< trim END
-    vim9script
+    mnv9script
     class C
     endclass
     def F()
@@ -5330,7 +5330,7 @@ def Test_passing_type_to_builtin()
 
   # check member call argument to empty at script level
   lines =<< trim END
-    vim9script
+    mnv9script
     class C
     endclass
     C->empty()
@@ -5339,7 +5339,7 @@ def Test_passing_type_to_builtin()
 
   # check member call argument to empty in :def
   lines =<< trim END
-    vim9script
+    mnv9script
     class C
     endclass
     def F()
@@ -5352,7 +5352,7 @@ def Test_passing_type_to_builtin()
   # Try "abs()" builtin
   # check argument to abs at script level
   lines =<< trim END
-    vim9script
+    mnv9script
     class C
     endclass
     abs(C)
@@ -5361,7 +5361,7 @@ def Test_passing_type_to_builtin()
 
   # check argument to abs in :def
   lines =<< trim END
-    vim9script
+    mnv9script
     class C
     endclass
     def F()
@@ -5373,7 +5373,7 @@ def Test_passing_type_to_builtin()
 
   # check member call argument to abs at script level
   lines =<< trim END
-    vim9script
+    mnv9script
     class C
     endclass
     C->abs()
@@ -5382,7 +5382,7 @@ def Test_passing_type_to_builtin()
 
   # check member call argument to abs in :def
   lines =<< trim END
-    vim9script
+    mnv9script
     class C
     endclass
     def F()
@@ -5417,4 +5417,4 @@ def Test_getregion()
   v9.CheckSourceDefExecFailure(['getregionpos(getpos("a"), getpos("."))'], 'E1209:')
 enddef
 
-" vim: ts=8 sw=2 sts=2 expandtab tw=80 fdm=marker
+" mnv: ts=8 sw=2 sts=2 expandtab tw=80 fdm=marker
diff --git a/uvim/src/testdir/test_vim9_class.vim b/uvim/src/testdir/test_mnv9_class.mnv
index 5db6c65d12..de6c07fd74 100644
--- a/uvim/src/testdir/test_vim9_class.vim
+++ b/uvim/src/testdir/test_mnv9_class.mnv
@@ -1,18 +1,18 @@
-" Test Vim9 classes
+" Test MNV9 classes
 
-import './util/vim9.vim' as v9
+import './util/mnv9.mnv' as v9
 
 def Test_class_basic()
-  # Class supported only in "vim9script"
+  # Class supported only in "mnv9script"
   var lines =<< trim END
     class NotWorking
     endclass
   END
-  v9.CheckSourceFailure(lines, 'E1316: Class can only be defined in Vim9 script', 1)
+  v9.CheckSourceFailure(lines, 'E1316: Class can only be defined in MNV9 script', 1)
 
   # First character in a class name should be capitalized.
   lines =<< trim END
-    vim9script
+    mnv9script
     class notWorking
     endclass
   END
@@ -20,7 +20,7 @@ def Test_class_basic()
 
   # Only alphanumeric characters are supported in a class name
   lines =<< trim END
-    vim9script
+    mnv9script
     class Not@working
     endclass
   END
@@ -28,7 +28,7 @@ def Test_class_basic()
 
   # Unsupported keyword (instead of class)
   lines =<< trim END
-    vim9script
+    mnv9script
     abstract noclass Something
     endclass
   END
@@ -36,7 +36,7 @@ def Test_class_basic()
 
   # Only the complete word "class" should be recognized
   lines =<< trim END
-    vim9script
+    mnv9script
     abstract classy Something
     endclass
   END
@@ -44,7 +44,7 @@ def Test_class_basic()
 
   # The complete "endclass" should be specified.
   lines =<< trim END
-    vim9script
+    mnv9script
     class Something
     endcl
   END
@@ -52,7 +52,7 @@ def Test_class_basic()
 
   # Additional words after "endclass"
   lines =<< trim END
-    vim9script
+    mnv9script
     class Something
     endclass school's out
   END
@@ -60,7 +60,7 @@ def Test_class_basic()
 
   # Additional commands after "endclass"
   lines =<< trim END
-    vim9script
+    mnv9script
     class Something
     endclass | echo 'done'
   END
@@ -68,7 +68,7 @@ def Test_class_basic()
 
   # Additional command after "class name"
   lines =<< trim END
-    vim9script
+    mnv9script
     class Something | var x = 10
     endclass
   END
@@ -76,7 +76,7 @@ def Test_class_basic()
 
   # Additional command after "object variable"
   lines =<< trim END
-    vim9script
+    mnv9script
     class Something
       var l: list<number> = [] | var y = 10
     endclass
@@ -85,7 +85,7 @@ def Test_class_basic()
 
   # Additional command after "class variable"
   lines =<< trim END
-    vim9script
+    mnv9script
     class Something
       static var d = {a: 10} | var y = 10
     endclass
@@ -94,7 +94,7 @@ def Test_class_basic()
 
   # Additional command after "object method"
   lines =<< trim END
-    vim9script
+    mnv9script
     class Something
       def Foo() | var y = 10
       enddef
@@ -104,7 +104,7 @@ def Test_class_basic()
 
   # Comments are allowed after an inline block
   lines =<< trim END
-    vim9script
+    mnv9script
     class Foo
       static const bar = { # {{{
         baz: 'qux'
@@ -116,7 +116,7 @@ def Test_class_basic()
 
   # Try to define a class with the same name as an existing variable
   lines =<< trim END
-    vim9script
+    mnv9script
     var Something: list<number> = [1]
     class Thing
     endclass
@@ -132,7 +132,7 @@ def Test_class_basic()
 
   # Use old "this." prefixed member variable declaration syntax (without initialization)
   lines =<< trim END
-    vim9script
+    mnv9script
     class Something
       this.count: number
     endclass
@@ -141,7 +141,7 @@ def Test_class_basic()
 
   # Use old "this." prefixed member variable declaration syntax (with initialization)
   lines =<< trim END
-    vim9script
+    mnv9script
     class Something
       this.count: number = 42
     endclass
@@ -150,7 +150,7 @@ def Test_class_basic()
 
   # Use old "this." prefixed member variable declaration syntax (type inferred)
   lines =<< trim END
-    vim9script
+    mnv9script
     class Something
       this.count = 42
     endclass
@@ -159,7 +159,7 @@ def Test_class_basic()
 
   # Use "this" without any member variable name
   lines =<< trim END
-    vim9script
+    mnv9script
     class Something
       this
     endclass
@@ -168,7 +168,7 @@ def Test_class_basic()
 
   # Use "this." without any member variable name
   lines =<< trim END
-    vim9script
+    mnv9script
     class Something
       this.
     endclass
@@ -177,7 +177,7 @@ def Test_class_basic()
 
   # Space between "this" and ".<variable>"
   lines =<< trim END
-    vim9script
+    mnv9script
     class Something
       this .count
     endclass
@@ -186,7 +186,7 @@ def Test_class_basic()
 
   # Space between "this." and the member variable name
   lines =<< trim END
-    vim9script
+    mnv9script
     class Something
       this. count
     endclass
@@ -195,7 +195,7 @@ def Test_class_basic()
 
   # Use "that" instead of "this"
   lines =<< trim END
-    vim9script
+    mnv9script
     class Something
       var count: number
       that.count
@@ -205,7 +205,7 @@ def Test_class_basic()
 
   # Use "variable" instead of "var" for member variable declaration (without initialization)
   lines =<< trim END
-    vim9script
+    mnv9script
     class Something
       variable count: number
     endclass
@@ -214,7 +214,7 @@ def Test_class_basic()
 
   # Use "variable" instead of "var" for member variable declaration (with initialization)
   lines =<< trim END
-    vim9script
+    mnv9script
     class Something
       variable count: number = 42
     endclass
@@ -223,7 +223,7 @@ def Test_class_basic()
 
   # Use "variable" instead of "var" for member variable declaration (type inferred)
   lines =<< trim END
-    vim9script
+    mnv9script
     class Something
       variable count = 42
     endclass
@@ -232,7 +232,7 @@ def Test_class_basic()
 
   # Use a non-existing member variable in new()
   lines =<< trim END
-    vim9script
+    mnv9script
     class Something
       def new()
         this.state = 0
@@ -244,7 +244,7 @@ def Test_class_basic()
 
   # Space before ":" in a member variable declaration
   lines =<< trim END
-    vim9script
+    mnv9script
     class Something
       var count : number
     endclass
@@ -253,7 +253,7 @@ def Test_class_basic()
 
   # No space after ":" in a member variable declaration
   lines =<< trim END
-    vim9script
+    mnv9script
     class Something
       var count:number
     endclass
@@ -262,7 +262,7 @@ def Test_class_basic()
 
   # Missing ":var" in a "var" member variable declaration (without initialization)
   lines =<< trim END
-    vim9script
+    mnv9script
     class Something
       var: number
     endclass
@@ -271,7 +271,7 @@ def Test_class_basic()
 
   # Missing ":var" in a "var" member variable declaration (with initialization)
   lines =<< trim END
-    vim9script
+    mnv9script
     class Something
       var: number = 42
     endclass
@@ -280,7 +280,7 @@ def Test_class_basic()
 
   # Missing ":var" in a "var" member variable declaration (type inferred)
   lines =<< trim END
-    vim9script
+    mnv9script
     class Something
       var = 42
     endclass
@@ -289,7 +289,7 @@ def Test_class_basic()
 
   # Test for unsupported comment specifier
   lines =<< trim END
-    vim9script
+    mnv9script
     class Something
       # comment
       #{
@@ -299,7 +299,7 @@ def Test_class_basic()
 
   # Test for using class as a bool
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
     endclass
     if A
@@ -309,7 +309,7 @@ def Test_class_basic()
 
   # Test for using object as a bool
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
     endclass
     var a = A.new()
@@ -320,7 +320,7 @@ def Test_class_basic()
 
   # Test for using class as a float
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
     endclass
     sort([1.1, A], 'f')
@@ -329,7 +329,7 @@ def Test_class_basic()
 
   # Test for using object as a float
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
     endclass
     var a = A.new()
@@ -339,7 +339,7 @@ def Test_class_basic()
 
   # Test for using class as a string
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
     endclass
     :exe 'call ' .. A
@@ -348,7 +348,7 @@ def Test_class_basic()
 
   # Test for using object as a string
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
     endclass
     var a = A.new()
@@ -359,7 +359,7 @@ def Test_class_basic()
   # Test creating a class with member variables and methods, calling a object
   # method.  Check for using type() and typename() with a class and an object.
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class TextPosition
       var lnum: number
@@ -388,7 +388,7 @@ def Test_class_basic()
 
   # When referencing object methods, space cannot be used after a "."
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
       def Foo(): number
         return 10
@@ -401,7 +401,7 @@ def Test_class_basic()
 
   # Using an object without specifying a method or a member variable
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
       def Foo(): number
         return 10
@@ -414,7 +414,7 @@ def Test_class_basic()
 
   # Error when parsing the arguments of an object method.
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
       def Foo()
       enddef
@@ -426,7 +426,7 @@ def Test_class_basic()
 
   # Use a multi-line initialization for a member variable
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
       var y = {
         X: 1
@@ -441,7 +441,7 @@ enddef
 def Test_class_def_method()
   # Using the "public" keyword when defining an object method
   var lines =<< trim END
-    vim9script
+    mnv9script
     class A
       public def Foo()
       enddef
@@ -451,7 +451,7 @@ def Test_class_def_method()
 
   # Using the "public" keyword when defining a class method
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
       public static def Foo()
       enddef
@@ -461,7 +461,7 @@ def Test_class_def_method()
 
   # Using the "public" keyword when defining an object protected method
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
       public def _Foo()
       enddef
@@ -471,7 +471,7 @@ def Test_class_def_method()
 
   # Using the "public" keyword when defining a class protected method
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
       public static def _Foo()
       enddef
@@ -481,7 +481,7 @@ def Test_class_def_method()
 
   # Using a "def" keyword without an object method name
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
       def
       enddef
@@ -491,7 +491,7 @@ def Test_class_def_method()
 
   # Using a "def" keyword without a class method name
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
       static def
       enddef
@@ -503,7 +503,7 @@ enddef
 def Test_class_defined_twice()
   # class defined twice should fail
   var lines =<< trim END
-    vim9script
+    mnv9script
     class There
     endclass
     class There
@@ -513,19 +513,19 @@ def Test_class_defined_twice()
 
   # one class, reload same script twice is OK
   lines =<< trim END
-    vim9script
+    mnv9script
     class There
     endclass
   END
-  writefile(lines, 'XclassTwice.vim', 'D')
-  source XclassTwice.vim
-  source XclassTwice.vim
+  writefile(lines, 'XclassTwice.mnv', 'D')
+  source XclassTwice.mnv
+  source XclassTwice.mnv
 enddef
 
 def Test_returning_null_object()
   # this was causing an internal error
   var lines =<< trim END
-    vim9script
+    mnv9script
 
     class BufferList
       def Current(): any
@@ -547,21 +547,21 @@ def Test_using_null_class()
 
   # Test for using a null class as a value
   lines =<< trim END
-    vim9script
+    mnv9script
     echo empty(null_class)
   END
   v9.CheckSourceFailure(lines, 'E1405: Class "" cannot be used as a value', 2)
 
   # Test for using a null class with string()
   lines =<< trim END
-    vim9script
+    mnv9script
     assert_equal('class [unknown]', string(null_class))
   END
   v9.CheckSourceSuccess(lines)
 
   # Test for using a null class with type() and typename()
   lines =<< trim END
-    vim9script
+    mnv9script
     assert_equal(12, type(null_class))
     assert_equal('class<any>', typename(null_class))
   END
@@ -571,7 +571,7 @@ enddef
 def Test_object_not_set()
   # Use an uninitialized object in script context
   var lines =<< trim END
-    vim9script
+    mnv9script
 
     class State
       var value = 'xyz'
@@ -585,7 +585,7 @@ def Test_object_not_set()
 
   # Use an uninitialized object from a def function
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class Class
       var id: string
@@ -605,7 +605,7 @@ def Test_object_not_set()
   # Pass an uninitialized object variable to a "new" function and try to call an
   # object method.
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class Background
       var background = 'dark'
@@ -625,7 +625,7 @@ def Test_object_not_set()
   v9.CheckSourceFailure(lines, 'E1360: Using a null object', 1)
 
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class Class
       var id: string
@@ -645,7 +645,7 @@ def Test_object_not_set()
   # Reference a object variable through a null class object which is stored in a
   # variable of type "any".
   lines =<< trim END
-    vim9script
+    mnv9script
 
     def Z()
       var o: any = null_object
@@ -657,7 +657,7 @@ def Test_object_not_set()
 
   # Do "echom" of a null object variable.
   lines =<< trim END
-    vim9script
+    mnv9script
 
     def X()
       var x = null_object
@@ -667,9 +667,9 @@ def Test_object_not_set()
   END
   v9.CheckSourceFailure(lines, 'E1324: Using an Object as a String', 2)
 
-  # Use a null object variable that vim wants to force to number.
+  # Use a null object variable that mnv wants to force to number.
   lines =<< trim END
-    vim9script
+    mnv9script
 
     def X()
       var o = null_object
@@ -684,7 +684,7 @@ enddef
 " Null object assignment and comparison
 def Test_null_object_assign_compare()
   var lines =<< trim END
-    vim9script
+    mnv9script
 
     var nullo = null_object
     def F(): any
@@ -725,7 +725,7 @@ enddef
 " Test for object member initialization and disassembly
 def Test_class_member_initializer()
   var lines =<< trim END
-    vim9script
+    mnv9script
 
     class TextPosition
       var lnum: number = 1
@@ -761,7 +761,7 @@ enddef
 
 def Test_member_any_used_as_object()
   var lines =<< trim END
-    vim9script
+    mnv9script
 
     class Inner
       public var value: number = 0
@@ -784,7 +784,7 @@ def Test_member_any_used_as_object()
 
   # Try modifying a protected variable using an "any" object
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class Inner
       var _value: string = ''
@@ -806,7 +806,7 @@ def Test_member_any_used_as_object()
 
   # Try modifying a non-existing variable using an "any" object
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class Inner
       var value: string = ''
@@ -830,7 +830,7 @@ enddef
 " Nested assignment to a object variable which is of another class type
 def Test_assignment_nested_type()
   var lines =<< trim END
-    vim9script
+    mnv9script
 
     class Inner
       public var value: number = 0
@@ -862,7 +862,7 @@ def Test_assignment_nested_type()
 
   # Assignment where target item is read only in :def
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class Inner
       var value: number = 0
@@ -889,7 +889,7 @@ def Test_assignment_nested_type()
 
   # Assignment where target item is read only script level
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class Inner
       var value: number = 0
@@ -914,7 +914,7 @@ enddef
 def Test_assignment_with_operator()
   # Use "+=" to assign to a object variable
   var lines =<< trim END
-    vim9script
+    mnv9script
 
     class Foo
       public var x: number
@@ -940,7 +940,7 @@ enddef
 
 def Test_list_of_objects()
   var lines =<< trim END
-    vim9script
+    mnv9script
 
     class Foo
       def Add()
@@ -961,7 +961,7 @@ enddef
 
 def Test_expr_after_using_object()
   var lines =<< trim END
-    vim9script
+    mnv9script
 
     class Something
       var label: string = ''
@@ -980,7 +980,7 @@ enddef
 
 def Test_class_default_new()
   var lines =<< trim END
-    vim9script
+    mnv9script
 
     class TextPosition
       var lnum: number = 1
@@ -1006,7 +1006,7 @@ def Test_class_default_new()
   v9.CheckSourceSuccess(lines)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     class Person
       var name: string
       var age: number = 42
@@ -1029,7 +1029,7 @@ def Test_class_default_new()
   v9.CheckSourceSuccess(lines)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     class Person
       var name: string
       var age: number = 42
@@ -1046,7 +1046,7 @@ def Test_class_default_new()
   # Using a specific value to initialize an instance variable in the new()
   # method.
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
       var val: string
       def new(this.val = 'a')
@@ -1058,7 +1058,7 @@ enddef
 
 def Test_class_new_with_object_member()
   var lines =<< trim END
-    vim9script
+    mnv9script
 
     class C
       var str: string
@@ -1088,7 +1088,7 @@ def Test_class_new_with_object_member()
   v9.CheckSourceSuccess(lines)
 
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class C
       var str: string
@@ -1110,7 +1110,7 @@ def Test_class_new_with_object_member()
   v9.CheckSourceFailure(lines, 'E1013: Argument 1: type mismatch, expected string but got number', 2)
 
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class C
       var str: string
@@ -1132,7 +1132,7 @@ def Test_class_new_with_object_member()
   v9.CheckSourceFailure(lines, 'E1013: Argument 2: type mismatch, expected number but got string', 2)
 
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class C
       var str: string
@@ -1154,7 +1154,7 @@ def Test_class_new_with_object_member()
 
   # Try using "this." argument in a class method
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
       var val = 10
       static def Foo(this.val: number)
@@ -1165,7 +1165,7 @@ def Test_class_new_with_object_member()
 
   # Try using "this." argument in an object method
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
       var val = 10
       def Foo(this.val: number)
@@ -1177,7 +1177,7 @@ enddef
 
 def Test_class_object_member_inits()
   var lines =<< trim END
-    vim9script
+    mnv9script
     class TextPosition
       var lnum: number
       var col = 1
@@ -1192,7 +1192,7 @@ def Test_class_object_member_inits()
   v9.CheckSourceSuccess(lines)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     class TextPosition
       var lnum
       var col = 1
@@ -1203,7 +1203,7 @@ def Test_class_object_member_inits()
   # If the type is not specified for a member, then it should be set during
   # object creation and not when defining the class.
   lines =<< trim END
-    vim9script
+    mnv9script
 
     var init_count = 0
     def Init(): string
@@ -1225,7 +1225,7 @@ def Test_class_object_member_inits()
 
   # Test for initializing an object member with an unknown variable/type
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
        var value = init_val
     endclass
@@ -1235,7 +1235,7 @@ def Test_class_object_member_inits()
 
   # Test for initializing an object member with an special type
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
        var value: void
     endclass
@@ -1246,7 +1246,7 @@ enddef
 " Test for instance variable access
 def Test_instance_variable_access()
   var lines =<< trim END
-    vim9script
+    mnv9script
     class Triple
        var _one = 1
        var two = 2
@@ -1274,7 +1274,7 @@ def Test_instance_variable_access()
 
   # Test for a public member variable name beginning with an underscore
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
       public var _val = 10
     endclass
@@ -1282,7 +1282,7 @@ def Test_instance_variable_access()
   v9.CheckSourceFailure(lines, 'E1332: public variable name cannot start with underscore: public var _val = 10', 3)
 
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class MyCar
       var make: string
@@ -1318,7 +1318,7 @@ def Test_instance_variable_access()
   v9.CheckSourceSuccess(lines)
 
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class MyCar
       var make: string
@@ -1334,7 +1334,7 @@ def Test_instance_variable_access()
   v9.CheckSourceFailure(lines, 'E1041: Redefining script item: "c"', 12)
 
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class Foo
       var x: list<number> = []
@@ -1361,7 +1361,7 @@ def Test_instance_variable_access()
 
   # Test for "public" cannot be abbreviated
   lines =<< trim END
-    vim9script
+    mnv9script
     class Something
       pub var val = 1
     endclass
@@ -1370,7 +1370,7 @@ def Test_instance_variable_access()
 
   # Test for "public" keyword must be followed by "var" or "static".
   lines =<< trim END
-    vim9script
+    mnv9script
     class Something
       public val = 1
     endclass
@@ -1379,7 +1379,7 @@ def Test_instance_variable_access()
 
   # Modify a instance variable using the class name in the script context
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
       public var val = 1
     endclass
@@ -1389,7 +1389,7 @@ def Test_instance_variable_access()
 
   # Read a instance variable using the class name in the script context
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
       public var val = 1
     endclass
@@ -1399,7 +1399,7 @@ def Test_instance_variable_access()
 
   # Modify a instance variable using the class name in a def function
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
       public var val = 1
     endclass
@@ -1412,7 +1412,7 @@ def Test_instance_variable_access()
 
   # Read a instance variable using the class name in a def function
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
       public var val = 1
     endclass
@@ -1425,7 +1425,7 @@ def Test_instance_variable_access()
 
   # Access from child class extending a class:
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
       var ro_obj_var = 10
       public var rw_obj_var = 20
@@ -1454,7 +1454,7 @@ enddef
 def Test_class_variable_access()
   # Test for "static" cannot be abbreviated
   var lines =<< trim END
-    vim9script
+    mnv9script
     class Something
       stat var val = 1
     endclass
@@ -1463,7 +1463,7 @@ def Test_class_variable_access()
 
   # Test for "static" cannot be followed by "public".
   lines =<< trim END
-    vim9script
+    mnv9script
     class Something
       static public var val = 1
     endclass
@@ -1472,7 +1472,7 @@ def Test_class_variable_access()
 
   # A readonly class variable cannot be modified from a child class
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
       static var ro_class_var = 40
     endclass
@@ -1490,7 +1490,7 @@ def Test_class_variable_access()
 
   # A protected class variable cannot be accessed from a child class
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
       static var _priv_class_var = 60
     endclass
@@ -1508,7 +1508,7 @@ def Test_class_variable_access()
 
   # A protected class variable cannot be modified from a child class
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
       static var _priv_class_var = 60
     endclass
@@ -1526,7 +1526,7 @@ def Test_class_variable_access()
 
   # Access from child class extending a class and from script context
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
       static var ro_class_var = 10
       public static var rw_class_var = 20
@@ -1557,7 +1557,7 @@ enddef
 
 def Test_class_object_compare()
   var class_lines =<< trim END
-    vim9script
+    mnv9script
     class Item
       var nr = 0
       var name = 'xx'
@@ -1599,7 +1599,7 @@ enddef
 
 def Test_object_type()
   var lines =<< trim END
-    vim9script
+    mnv9script
 
     class One
       var one = 1
@@ -1621,7 +1621,7 @@ def Test_object_type()
   v9.CheckSourceSuccess(lines)
 
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class One
       var one = 1
@@ -1635,7 +1635,7 @@ def Test_object_type()
   v9.CheckSourceFailure(lines, 'E1012: Type mismatch; expected object<One> but got object<Two>', 10)
 
   lines =<< trim END
-    vim9script
+    mnv9script
 
     interface One
       def GetMember(): number
@@ -1653,7 +1653,7 @@ def Test_object_type()
   v9.CheckSourceSuccess(lines)
 
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class Num
       var n: number = 0
@@ -1676,7 +1676,7 @@ enddef
 def Test_class_member()
   # check access rules
   var lines =<< trim END
-    vim9script
+    mnv9script
     class TextPos
        var lnum = 1
        var col = 1
@@ -1716,7 +1716,7 @@ def Test_class_member()
 
   # example in the help
   lines =<< trim END
-    vim9script
+    mnv9script
     class OtherThing
       var size: number
       static var totalSize: number
@@ -1735,7 +1735,7 @@ def Test_class_member()
 
   # using static class member twice
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class HTML
       static var author: string = 'John Doe'
@@ -1752,7 +1752,7 @@ def Test_class_member()
 
   # access protected member in lambda
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class Foo
       var _x: number = 0
@@ -1770,7 +1770,7 @@ def Test_class_member()
 
   # access protected member in lambda body
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class Foo
       var _x: number = 6
@@ -1791,7 +1791,7 @@ def Test_class_member()
 
   # check shadowing
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class Some
       static var count = 0
@@ -1807,7 +1807,7 @@ def Test_class_member()
 
   # Use a local variable in a method with the same name as a class variable
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class Some
       static var count = 0
@@ -1824,7 +1824,7 @@ def Test_class_member()
 
   # Test for using an invalid type for a member variable
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
       var val: xxx
     endclass
@@ -1833,7 +1833,7 @@ def Test_class_member()
 
   # Test for setting a member on a null object
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
       public var val: string
     endclass
@@ -1848,7 +1848,7 @@ def Test_class_member()
 
   # Test for accessing a member on a null object
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
       var val: string
     endclass
@@ -1863,7 +1863,7 @@ def Test_class_member()
 
   # Test for setting a member on a null object, at script level
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
       public var val: string
     endclass
@@ -1875,7 +1875,7 @@ def Test_class_member()
 
   # Test for accessing a member on a null object, at script level
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
       var val: string
     endclass
@@ -1888,14 +1888,14 @@ def Test_class_member()
   # Test for no space before or after the '=' when initializing a member
   # variable
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
       var val: number= 10
     endclass
   END
   v9.CheckSourceFailure(lines, "E1004: White space required before and after '='", 3)
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
       var val: number =10
     endclass
@@ -1904,7 +1904,7 @@ def Test_class_member()
 
   # Space is not allowed before the object member variable name
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
       var n: number = 10
     endclass
@@ -1919,7 +1919,7 @@ def Test_class_member()
 
   # Access a non-existing member
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
     endclass
     var a = A.new()
@@ -1932,7 +1932,7 @@ enddef
 " not the class that did the reference (super class)
 def Test_defining_class_message()
   var lines =<< trim END
-    vim9script
+    mnv9script
 
     class Base
       var _v1: list<list<number>>
@@ -1946,7 +1946,7 @@ def Test_defining_class_message()
   END
   v9.CheckSourceFailure(lines, 'E1333: Cannot access protected variable "_v1" in class "Base"', 11)
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class Base
       var _v1: list<list<number>>
@@ -1963,7 +1963,7 @@ def Test_defining_class_message()
   END
   v9.CheckSourceFailure(lines, 'E1333: Cannot access protected variable "_v1" in class "Base"', 2)
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class Base
       var v1: list<list<number>>
@@ -1977,7 +1977,7 @@ def Test_defining_class_message()
   END
   v9.CheckSourceFailure(lines, 'E1335: Variable "v1" in class "Base" is not writable', 11)
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class Base
       var v1: list<list<number>>
@@ -1997,7 +1997,7 @@ def Test_defining_class_message()
   # of the class hierarchy.
   v9.CheckSourceFailure(lines, 'E1335: Variable "v1" in class "Base" is not writable', 2)
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class Base0
     endclass
@@ -2020,7 +2020,7 @@ def Test_defining_class_message()
   # Attempt to read a protected variable that is at the start
   # of the class hierarchy.
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class Base0
     endclass
@@ -2043,7 +2043,7 @@ enddef
 
 func Test_class_garbagecollect()
   let lines =<< trim END
-    vim9script
+    mnv9script
 
     class Point
       var p = [2, 3]
@@ -2058,7 +2058,7 @@ func Test_class_garbagecollect()
   call v9.CheckSourceSuccess(lines)
 
   let lines =<< trim END
-    vim9script
+    mnv9script
 
     interface View
     endinterface
@@ -2087,7 +2087,7 @@ endfunc
 
 def Test_class_method()
   var lines =<< trim END
-    vim9script
+    mnv9script
     class Value
       var value = 0
       static var objects = 0
@@ -2113,7 +2113,7 @@ def Test_class_method()
   # Test for cleaning up after a class definition failure when using class
   # functions.
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
       static def Foo()
       enddef
@@ -2125,7 +2125,7 @@ def Test_class_method()
   # Test for calling a class method from another class method without the class
   # name prefix.
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
       static var myList: list<number> = [1]
       static def Foo(n: number)
@@ -2148,7 +2148,7 @@ enddef
 
 def Test_class_defcompile()
   var lines =<< trim END
-    vim9script
+    mnv9script
 
     class C
       def Fo(i: number): string
@@ -2161,7 +2161,7 @@ def Test_class_defcompile()
   v9.CheckSourceFailure(lines, 'E1012: Type mismatch; expected string but got number', 1)
 
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class C
       static def Fc(): number
@@ -2174,7 +2174,7 @@ def Test_class_defcompile()
   v9.CheckSourceFailure(lines, 'E1012: Type mismatch; expected number but got string', 1)
 
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class C
       static def new()
@@ -2187,14 +2187,14 @@ def Test_class_defcompile()
 
   # Trying to compile a function using a non-existing class variable
   lines =<< trim END
-    vim9script
+    mnv9script
     defcompile x.Foo()
   END
   v9.CheckSourceFailure(lines, 'E475: Invalid argument: x.Foo()', 2)
 
   # Trying to compile a function using a variable which is not a class
   lines =<< trim END
-    vim9script
+    mnv9script
     var x: number
     defcompile x.Foo()
   END
@@ -2202,7 +2202,7 @@ def Test_class_defcompile()
 
   # Trying to compile a function without specifying the name
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
     endclass
     defcompile A.
@@ -2211,7 +2211,7 @@ def Test_class_defcompile()
 
   # Trying to compile a non-existing class object member function
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
     endclass
     var a = A.new()
@@ -2222,7 +2222,7 @@ enddef
 
 def Test_class_object_to_string()
   var lines =<< trim END
-    vim9script
+    mnv9script
     class TextPosition
       var lnum = 1
       var col = 22
@@ -2237,7 +2237,7 @@ def Test_class_object_to_string()
 
   # check string() with object nesting
   lines =<< trim END
-    vim9script
+    mnv9script
     class C
         var nest1: C
         var nest2: C
@@ -2252,7 +2252,7 @@ def Test_class_object_to_string()
     o1.Init(o1, o2)
     o2.Init(o2, o1)
 
-    # The following previously put's vim into an infinite loop.
+    # The following previously put's mnv into an infinite loop.
 
     var expect = "object of C {nest1: object of C {...}, nest2: object of C {nest1: object of C {...}, nest2: object of C {...}}}"
     assert_equal(expect, string(o1))
@@ -2260,7 +2260,7 @@ def Test_class_object_to_string()
   v9.CheckSourceSuccess(lines)
 
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class B
     endclass
@@ -2279,7 +2279,7 @@ enddef
 
 def Test_class_used_as_type()
   var lines =<< trim END
-    vim9script
+    mnv9script
 
     class Point
       var x = 0
@@ -2294,7 +2294,7 @@ def Test_class_used_as_type()
   v9.CheckSourceSuccess(lines)
 
   lines =<< trim END
-    vim9script
+    mnv9script
 
     interface HasX
       var x: number
@@ -2313,7 +2313,7 @@ def Test_class_used_as_type()
   v9.CheckSourceSuccess(lines)
 
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class Point
       var x = 0
@@ -2328,7 +2328,7 @@ enddef
 
 def Test_class_extends()
   var lines =<< trim END
-    vim9script
+    mnv9script
     class Base
       var one = 1
       def GetOne(): number
@@ -2350,7 +2350,7 @@ def Test_class_extends()
   v9.CheckSourceSuccess(lines)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     class Base
       var one = 1
     endclass
@@ -2364,7 +2364,7 @@ def Test_class_extends()
   v9.CheckSourceSuccess(lines)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     class Base
       var one = 1
     endclass
@@ -2375,7 +2375,7 @@ def Test_class_extends()
   v9.CheckSourceFailure(lines, 'E1352: Duplicate "extends"', 5)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     class Child extends BaseClass
       var two = 2
     endclass
@@ -2383,7 +2383,7 @@ def Test_class_extends()
   v9.CheckSourceFailure(lines, 'E1353: Class name not found: BaseClass', 4)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     var SomeVar = 99
     class Child extends SomeVar
       var two = 2
@@ -2392,7 +2392,7 @@ def Test_class_extends()
   v9.CheckSourceFailure(lines, 'E1354: Cannot extend SomeVar', 5)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     class Child
       var age: number
       def ToString(): number
@@ -2406,7 +2406,7 @@ def Test_class_extends()
   v9.CheckSourceFailure(lines, 'E1355: Duplicate function: ToString', 9)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     class Base
       var name: string
       static def ToString(): string
@@ -2427,7 +2427,7 @@ def Test_class_extends()
   v9.CheckSourceSuccess(lines)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     class Base
       var value = 1
       def new(init: number)
@@ -2445,7 +2445,7 @@ def Test_class_extends()
 
   # base class with more than one object member
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class Result
       var success: bool
@@ -2465,7 +2465,7 @@ def Test_class_extends()
 
   # class name after "extends" doesn't end in a space or NUL character
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
     endclass
     class B extends A"
@@ -2476,7 +2476,7 @@ enddef
 
 def Test_using_base_class()
   var lines =<< trim END
-    vim9script
+    mnv9script
 
     class BaseEE
       def Enter(): any
@@ -2518,7 +2518,7 @@ enddef
 def Test_super_dispatch()
   # See #15448 and #15463
   var lines =<< trim END
-    vim9script
+    mnv9script
 
     class A
       def String(): string
@@ -2540,7 +2540,7 @@ def Test_super_dispatch()
   v9.CheckSourceSuccess(lines)
 
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class A
       def F(): string
@@ -2583,7 +2583,7 @@ def Test_super_dispatch()
   v9.CheckSourceSuccess(lines)
 
   lines =<< trim END
-    vim9script
+    mnv9script
 
     var call_chain: list<string>
 
@@ -2650,9 +2650,9 @@ def Test_super_dispatch()
   v9.CheckSourceSuccess(lines)
 
   # problems with method dispatch: super -> abstract
-  # https://github.com/vim/vim/issues/15514
+  # https://github.com/Project-Tick/Project-Tick/issues/15514
   lines =<< trim END
-    vim9script
+    mnv9script
     abstract class B
       abstract def ToString(): string
     endclass
@@ -2674,7 +2674,7 @@ def Test_super_dispatch()
 
   # problems with method dispatch: super -> abstract -> concrete
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class A
       def ToString()
@@ -2703,7 +2703,7 @@ def Test_super_dispatch()
 
   # Invoking a super method and an interface method which have the same name.
   lines =<< trim END
-    vim9script
+    mnv9script
 
     interface I
       def ToString(): string
@@ -2733,7 +2733,7 @@ def Test_super_dispatch()
 
   # super and an abstract class with no abstract methods
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class A
       def ToString(): string
@@ -2769,7 +2769,7 @@ def Test_super_dispatch()
   # super and an abstract class with no abstract methods and the initial
   # implements clause
   lines =<< trim END
-    vim9script
+    mnv9script
 
     interface I
       def ToString(): string
@@ -2805,7 +2805,7 @@ def Test_super_dispatch()
 
   # Invoking a class method in the parent class using "super" should fail
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class A
       static def Fn(): string
@@ -2824,7 +2824,7 @@ def Test_super_dispatch()
 
   # Missing name after "super" keyword
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
     endclass
     class B extends A
@@ -2839,17 +2839,17 @@ enddef
 
 def Test_class_import()
   var lines =<< trim END
-    vim9script
+    mnv9script
     export class Animal
       var kind: string
       var name: string
     endclass
   END
-  writefile(lines, 'Xanimal.vim', 'D')
+  writefile(lines, 'Xanimal.mnv', 'D')
 
   lines =<< trim END
-    vim9script
-    import './Xanimal.vim' as animal
+    mnv9script
+    import './Xanimal.mnv' as animal
 
     var a: animal.Animal
     a = animal.Animal.new('fish', 'Eric')
@@ -2866,7 +2866,7 @@ enddef
 " Test for importing a class into a legacy script and calling the class method
 def Test_class_method_from_legacy_script()
   var lines =<< trim END
-    vim9script
+    mnv9script
     export class A
       static var name: string = 'a'
       static def SetName(n: string)
@@ -2874,13 +2874,13 @@ def Test_class_method_from_legacy_script()
       enddef
     endclass
   END
-  writefile(lines, 'Xvim9export.vim', 'D')
+  writefile(lines, 'Xmnv9export.mnv', 'D')
 
   lines =<< trim END
-    import './Xvim9export.vim' as vim9
+    import './Xmnv9export.mnv' as mnv9
 
-    call s:vim9.A.SetName('b')
-    call assert_equal('b', s:vim9.A.name)
+    call s:mnv9.A.SetName('b')
+    call assert_equal('b', s:mnv9.A.name)
   END
   v9.CheckScriptSuccess(lines)
 enddef
@@ -2888,18 +2888,18 @@ enddef
 " Test for extending an imported class
 def Test_extend_imported_class()
   var lines =<< trim END
-    vim9script
+    mnv9script
     export class Imp_C1
       def Fn1(): number
         return 5
       enddef
     endclass
   END
-  writefile(lines, 'Xextendimportclass.vim', 'D')
+  writefile(lines, 'Xextendimportclass.mnv', 'D')
 
   lines =<< trim END
-    vim9script
-    import './Xextendimportclass.vim' as XClass
+    mnv9script
+    import './Xextendimportclass.mnv' as XClass
 
     class A extends XClass.Imp_C1
     endclass
@@ -2911,7 +2911,7 @@ enddef
 
 def Test_abstract_class()
   var lines =<< trim END
-    vim9script
+    mnv9script
     abstract class Base
       var name: string
     endclass
@@ -2925,7 +2925,7 @@ def Test_abstract_class()
   v9.CheckSourceSuccess(lines)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     abstract class Base
       var name: string
     endclass
@@ -2941,11 +2941,11 @@ def Test_abstract_class()
       var name: string
     endclass
   END
-  v9.CheckSourceFailure(lines, 'E1316: Class can only be defined in Vim9 script', 1)
+  v9.CheckSourceFailure(lines, 'E1316: Class can only be defined in MNV9 script', 1)
 
   # Test for "abstract" cannot be abbreviated
   lines =<< trim END
-    vim9script
+    mnv9script
     abs class A
     endclass
   END
@@ -2953,7 +2953,7 @@ def Test_abstract_class()
 
   # Additional commands after "abstract class"
   lines =<< trim END
-    vim9script
+    mnv9script
     abstract class Something | var x = []
     endclass
   END
@@ -2961,7 +2961,7 @@ def Test_abstract_class()
 
   # Abstract class cannot have a "new" function
   lines =<< trim END
-    vim9script
+    mnv9script
     abstract class Base
       def new()
       enddef
@@ -2971,9 +2971,9 @@ def Test_abstract_class()
 
   # extending an abstract class with class methods and variables
   lines =<< trim END
-    vim9script
+    mnv9script
     abstract class A
-      static var s: string = 'vim'
+      static var s: string = 'mnv'
       static def Fn(): list<number>
         return [10]
       enddef
@@ -2981,7 +2981,7 @@ def Test_abstract_class()
     class B extends A
     endclass
     var b = B.new()
-    assert_equal('vim', A.s)
+    assert_equal('mnv', A.s)
     assert_equal([10], A.Fn())
   END
   v9.CheckScriptSuccess(lines)
@@ -2989,7 +2989,7 @@ enddef
 
 def Test_closure_in_class()
   var lines =<< trim END
-    vim9script
+    mnv9script
 
     class Foo
       var y: list<string> = ['B']
@@ -3008,7 +3008,7 @@ enddef
 def Test_construct_object_from_legacy()
   # Cannot directly invoke constructor from legacy
   var lines =<< trim END
-    vim9script
+    mnv9script
 
     var newCalled = false
 
@@ -3030,7 +3030,7 @@ def Test_construct_object_from_legacy()
   v9.CheckSourceSuccess(lines)
 
   lines =<< trim END
-    vim9script
+    mnv9script
 
     var newCalled = false
 
@@ -3052,7 +3052,7 @@ def Test_construct_object_from_legacy()
 
   # This also tests invoking "new()" with "call"
   lines =<< trim END
-    vim9script
+    mnv9script
 
     var createdObject: any
 
@@ -3082,7 +3082,7 @@ enddef
 
 def Test_defer_with_object()
   var lines =<< trim END
-    vim9script
+    mnv9script
 
     class CWithEE
       def Enter()
@@ -3110,7 +3110,7 @@ def Test_defer_with_object()
   unlet g:result
 
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class BaseWithEE
       def Enter()
@@ -3147,10 +3147,10 @@ def Test_defer_with_object()
   unlet g:result
 enddef
 
-" The following test used to crash Vim (Github issue #12676)
-def Test_extends_method_crashes_vim()
+" The following test used to crash MNV (Github issue #12676)
+def Test_extends_method_crashes_mnv()
   var lines =<< trim END
-    vim9script
+    mnv9script
 
     class Observer
     endclass
@@ -3189,7 +3189,7 @@ enddef
 " Test for calling a method in a class that is extended
 def Test_call_method_in_extended_class()
   var lines =<< trim END
-    vim9script
+    mnv9script
 
     var prop_init_called = false
     var prop_register_called = false
@@ -3223,7 +3223,7 @@ enddef
 
 def Test_instanceof()
   var lines =<< trim END
-    vim9script
+    mnv9script
 
     class Base1
     endclass
@@ -3287,7 +3287,7 @@ def Test_instanceof()
   v9.CheckSourceSuccess(lines)
 
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class Base1
     endclass
@@ -3296,7 +3296,7 @@ def Test_instanceof()
   v9.CheckSourceFailure(lines, 'E119: Not enough arguments for function: instanceof')
 
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class Base1
     endclass
@@ -3308,7 +3308,7 @@ def Test_instanceof()
   v9.CheckSourceFailure(lines, 'E119: Not enough arguments for function: instanceof')
 
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class Base1
     endclass
@@ -3322,7 +3322,7 @@ def Test_instanceof()
   v9.CheckSourceFailure(lines, 'E693: Class or class typealias required for argument 4', 10)
 
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class Base1
     endclass
@@ -3344,7 +3344,7 @@ enddef
 " message (Github issue #12524).
 def Test_call_method_in_parent_class()
   var lines =<< trim END
-    vim9script
+    mnv9script
 
     class Widget
       var _lnum: number = 1
@@ -3380,7 +3380,7 @@ enddef
 " Test for calling methods from three levels of classes
 def Test_multi_level_method_call()
   var lines =<< trim END
-    vim9script
+    mnv9script
 
     var A_func1: number = 0
     var A_func2: number = 0
@@ -3454,7 +3454,7 @@ enddef
 " Test for using members from three levels of classes
 def Test_multi_level_member_access()
   var lines =<< trim END
-    vim9script
+    mnv9script
 
     class A
       public var val1: number = 0
@@ -3497,7 +3497,7 @@ enddef
 " Test expansion of <stack> with class methods.
 def Test_stack_expansion_with_methods()
   var lines =<< trim END
-    vim9script
+    mnv9script
 
     class C
       def M1()
@@ -3522,7 +3522,7 @@ enddef
 def Test_new_return_type()
   # new() uses the default return type and there is no return statement
   var lines =<< trim END
-    vim9script
+    mnv9script
 
     class C
       var _bufnr: number
@@ -3552,7 +3552,7 @@ def Test_new_return_type()
 
   # new() uses the default return type and an empty 'return' statement
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class C
       var _bufnr: number
@@ -3583,7 +3583,7 @@ def Test_new_return_type()
 
   # new() uses "any" return type and returns "this"
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class C
       var _bufnr: number
@@ -3600,7 +3600,7 @@ def Test_new_return_type()
 
   # new() uses 'Dict' return type and returns a Dict
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class C
       var _state: dict<any>
@@ -3620,7 +3620,7 @@ enddef
 " Test for checking a member initialization type at run time.
 def Test_runtime_type_check_for_member_init()
   var lines =<< trim END
-    vim9script
+    mnv9script
 
     var retnum: bool = false
 
@@ -3647,7 +3647,7 @@ enddef
 " object.
 def Test_lockvar_object()
   var lines =<< trim END
-    vim9script
+    mnv9script
 
     class C
       var val: number
@@ -3693,7 +3693,7 @@ def Test_lockvar_object_variable()
 
   # read-only lockvar from object method
   var lines =<< trim END
-    vim9script
+    mnv9script
 
     class C
       var val1: number
@@ -3708,7 +3708,7 @@ def Test_lockvar_object_variable()
 
   # read-only lockvar from scriptlevel
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class C
       var val2: number
@@ -3720,7 +3720,7 @@ def Test_lockvar_object_variable()
 
   # read-only lockvar of scriptlevel variable from def
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class C
       var val3: number
@@ -3735,7 +3735,7 @@ def Test_lockvar_object_variable()
 
   # read-only lockvar of def argument variable
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class C
       var val4: number
@@ -3749,7 +3749,7 @@ def Test_lockvar_object_variable()
 
   # read-only lockvar from object method arg
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class C
       var val5: number
@@ -3764,7 +3764,7 @@ def Test_lockvar_object_variable()
 
   # read-only lockvar from class method arg
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class C
       var val6: number
@@ -3783,7 +3783,7 @@ def Test_lockvar_object_variable()
 
   # lockvar from object method
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class C
       public var val1: number
@@ -3798,7 +3798,7 @@ def Test_lockvar_object_variable()
 
   # lockvar from scriptlevel
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class C
       public var val2: number
@@ -3810,7 +3810,7 @@ def Test_lockvar_object_variable()
 
   # lockvar of scriptlevel variable from def
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class C
       public var val3: number
@@ -3825,7 +3825,7 @@ def Test_lockvar_object_variable()
 
   # lockvar of def argument variable
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class C
       public var val4: number
@@ -3839,7 +3839,7 @@ def Test_lockvar_object_variable()
 
   # lockvar from object method arg
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class C
       public var val5: number
@@ -3854,7 +3854,7 @@ def Test_lockvar_object_variable()
 
   # lockvar from class method arg
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class C
       public var val6: number
@@ -3873,7 +3873,7 @@ def Test_lockvar_class_variable()
 
   # lockvar bare static from object method
   var lines =<< trim END
-    vim9script
+    mnv9script
 
     class C
       public static var sval1: number
@@ -3888,7 +3888,7 @@ def Test_lockvar_class_variable()
 
   # lockvar C.static from object method
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class C
       public static var sval2: number
@@ -3903,7 +3903,7 @@ def Test_lockvar_class_variable()
 
   # lockvar bare static from class method
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class C
       public static var sval3: number
@@ -3917,7 +3917,7 @@ def Test_lockvar_class_variable()
 
   # lockvar C.static from class method
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class C
       public static var sval4: number
@@ -3931,7 +3931,7 @@ def Test_lockvar_class_variable()
 
   # lockvar C.static from script level
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class C
       public static var sval5: number
@@ -3942,7 +3942,7 @@ def Test_lockvar_class_variable()
 
   # lockvar o.static from script level
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class C
       public static var sval6: number
@@ -3957,7 +3957,7 @@ enddef
 def Test_lockvar_argument()
   # Lockvar a function arg
   var lines =<< trim END
-    vim9script
+    mnv9script
 
     def Lock(val: any)
         lockvar val
@@ -3973,7 +3973,7 @@ def Test_lockvar_argument()
   # Lockvar a function arg. Verify "sval" is interpreted as argument and not a
   # class member in "C". This tests lval_root_is_arg.
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class C
       public static var sval: list<number>
@@ -3990,7 +3990,7 @@ def Test_lockvar_argument()
 
   # Lock a class.
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class C
       public static var sval: list<number>
@@ -4006,7 +4006,7 @@ def Test_lockvar_argument()
 
   # Lock an object.
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class C
       public static var sval: list<number>
@@ -4022,7 +4022,7 @@ def Test_lockvar_argument()
 
   # In this case (unlike previous) "lockvar sval" is a class member.
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class C
       public static var sval: list<number>
@@ -4042,7 +4042,7 @@ enddef
 def Test_lockvar_this()
   # lockvar this
   var lines =<< trim END
-    vim9script
+    mnv9script
     class C
       def TLock()
         lockvar this
@@ -4055,7 +4055,7 @@ def Test_lockvar_this()
 
   # lockvar four   (four letter word, but not this)
   lines =<< trim END
-    vim9script
+    mnv9script
     class C
       def TLock4()
         var four: number
@@ -4069,7 +4069,7 @@ def Test_lockvar_this()
 
   # lockvar this5; "this" + one char, 5 letter word, starting with "this"
   lines =<< trim END
-    vim9script
+    mnv9script
     class C
       def TLock5()
         var this5: number
@@ -4086,7 +4086,7 @@ enddef
 def Test_lockvar_general()
   # lockvar an object and a class. It does nothing
   var lines =<< trim END
-    vim9script
+    mnv9script
     class C
     endclass
     var o = C.new()
@@ -4097,7 +4097,7 @@ def Test_lockvar_general()
 
   # Lock a list element that's nested in an object variable from a :def
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class C
       public var val: list<list<number>> = [ [1], [2], [3] ]
@@ -4123,7 +4123,7 @@ def Test_lockvar_general()
 
   # Lock a list element that's nested in an object variable from scriptlevel
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class C
       public var val: list<list<number>> = [ [1], [2], [3] ]
@@ -4146,7 +4146,7 @@ def Test_lockvar_general()
 
   # lock a script level variable from an object method
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class C
       def Lock()
@@ -4163,7 +4163,7 @@ def Test_lockvar_general()
   # lock a list element referenced by a protected object variable
   # in an object fetched via a script level list
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class C
       var _v1: list<list<number>>
@@ -4187,7 +4187,7 @@ def Test_lockvar_general()
   # Note that the locking code is in a class has a protected variable of
   # the same name.
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class C2
       var _v1: list<list<number>>
@@ -4217,7 +4217,7 @@ def Test_lockvar_islocked()
   # Lock item of variable's value (a list item)
   # variable is at index 1 within class/object
   var lines =<< trim END
-    vim9script
+    mnv9script
 
     class C
       var o0: list<list<number>> = [ [0],  [1],  [2]]
@@ -4290,7 +4290,7 @@ def Test_lockvar_islocked()
   # Do islocked() from an object method
   # and then from a class method
   lines =<< trim END
-    vim9script
+    mnv9script
 
     var l0o0 = [  [0],   [1],   [2]]
     var l0o1 = [ [10],  [11],  [12]]
@@ -4424,7 +4424,7 @@ def Test_lockvar_islocked()
 
   # Check islocked class/object from various places.
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class C
       def Islocked(arg: string): number
@@ -4457,7 +4457,7 @@ enddef
 def Test_lockvar_islocked_notfound()
   # Try non-existent things
   var lines =<< trim END
-    vim9script
+    mnv9script
 
     class C
       def Islocked(arg: string): number
@@ -4475,14 +4475,14 @@ def Test_lockvar_islocked_notfound()
 
   # Something not found of the form "name1.name2" is an error
   lines =<< trim END
-    vim9script
+    mnv9script
 
     islocked("one.two")
   END
   v9.CheckSourceFailure(lines, 'E121: Undefined variable: one')
 
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class C
       var val = { key: "value" }
@@ -4496,7 +4496,7 @@ def Test_lockvar_islocked_notfound()
   v9.CheckSourceFailure(lines, 'E716: Key not present in Dictionary: "not_there"')
 
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class C
       def Islocked(arg: string): number
@@ -4510,7 +4510,7 @@ def Test_lockvar_islocked_notfound()
 
   # access a script variable through methods
   lines =<< trim END
-    vim9script
+    mnv9script
 
     var l = [1]
     class C
@@ -4535,7 +4535,7 @@ enddef
 def Test_protected_object_method()
   # Try calling a protected method using an object (at the script level)
   var lines =<< trim END
-    vim9script
+    mnv9script
 
     class A
       def _Foo(): number
@@ -4549,7 +4549,7 @@ def Test_protected_object_method()
 
   # Try calling a protected method using an object (from a def function)
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class A
       def _Foo(): number
@@ -4566,7 +4566,7 @@ def Test_protected_object_method()
 
   # Use a protected method from another object method (in script context)
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class A
       def _Foo(): number
@@ -4583,7 +4583,7 @@ def Test_protected_object_method()
 
   # Use a protected method from another object method (def function context)
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class A
       def _Foo(): number
@@ -4603,7 +4603,7 @@ def Test_protected_object_method()
 
   # Try calling a protected method without the "this" prefix
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class A
       def _Foo(): number
@@ -4620,7 +4620,7 @@ def Test_protected_object_method()
 
   # Try calling a protected method using the class name
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class A
       def _Foo(): number
@@ -4633,7 +4633,7 @@ def Test_protected_object_method()
 
   # Define two protected methods with the same name
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class A
       def _Foo()
@@ -4647,7 +4647,7 @@ def Test_protected_object_method()
 
   # Define a protected method and a object method with the same name
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class A
       def _Foo()
@@ -4661,7 +4661,7 @@ def Test_protected_object_method()
 
   # Define an object method and a protected method with the same name
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class A
       def Foo()
@@ -4675,7 +4675,7 @@ def Test_protected_object_method()
 
   # Call a public method and a protected method from a protected method
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class A
       def Foo(): number
@@ -4699,7 +4699,7 @@ def Test_protected_object_method()
 
   # Try calling a protected method from another class
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class A
       def _Foo(): number
@@ -4719,7 +4719,7 @@ def Test_protected_object_method()
 
   # Call a protected object method from a child class object method
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
       def _Foo(): number
         return 1234
@@ -4741,7 +4741,7 @@ def Test_protected_object_method()
 
   # Call a protected object method from a child class object
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
       def _Foo(): number
         return 1234
@@ -4762,7 +4762,7 @@ def Test_protected_object_method()
 
   # Using "_" prefix in a method name should fail outside of a class
   lines =<< trim END
-    vim9script
+    mnv9script
     def _Foo(): number
       return 1234
     enddef
@@ -4773,7 +4773,7 @@ def Test_protected_object_method()
   # Test for initializing a protected funcref instance variable to a protected
   # class method from another class
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class A
       static def _Internal(): string
@@ -4792,7 +4792,7 @@ enddef
 def Test_protected_class_method()
   # Try calling a class protected method (at the script level)
   var lines =<< trim END
-    vim9script
+    mnv9script
 
     class A
       static def _Foo(): number
@@ -4805,7 +4805,7 @@ def Test_protected_class_method()
 
   # Try calling a class protected method (from a def function)
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class A
       static def _Foo(): number
@@ -4821,7 +4821,7 @@ def Test_protected_class_method()
 
   # Try calling a class protected method using an object (at the script level)
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class A
       static def _Foo(): number
@@ -4835,7 +4835,7 @@ def Test_protected_class_method()
 
   # Try calling a class protected method using an object (from a def function)
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class A
       static def _Foo(): number
@@ -4852,7 +4852,7 @@ def Test_protected_class_method()
 
   # Use a class protected method from an object method
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class A
       static def _Foo(): number
@@ -4870,7 +4870,7 @@ def Test_protected_class_method()
   # Use a class protected method from another class protected method without the
   # class name prefix.
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class A
       static def _Foo1(): number
@@ -4890,7 +4890,7 @@ def Test_protected_class_method()
 
   # Declare a class method and a class protected method with the same name
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class A
       static def _Foo()
@@ -4904,7 +4904,7 @@ def Test_protected_class_method()
 
   # Try calling a class protected method from another class
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class A
       static def _Foo(): number
@@ -4923,7 +4923,7 @@ def Test_protected_class_method()
 
   # Call a protected class method from a child class object method
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
       static def _Foo(): number
         return 1234
@@ -4945,7 +4945,7 @@ def Test_protected_class_method()
 
   # Call a protected class method from a child class protected class method
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
       static def _Foo(): number
         return 1234
@@ -4966,7 +4966,7 @@ def Test_protected_class_method()
 
   # Call a protected class method from a child class object
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
       static def _Foo(): number
         return 1234
@@ -4988,7 +4988,7 @@ def Test_protected_class_method()
   # Test for initializing a protected funcref class variable to a protected
   # class method from another class
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class A
       static def _Internal(): string
@@ -5006,7 +5006,7 @@ enddef
 " argument.
 def Test_objmethod_funcarg()
   var lines =<< trim END
-    vim9script
+    mnv9script
 
     class C
       def Foo(): string
@@ -5028,7 +5028,7 @@ def Test_objmethod_funcarg()
   v9.CheckSourceSuccess(lines)
 
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class C
       static def Foo(): string
@@ -5052,7 +5052,7 @@ enddef
 def Test_static_inheritence()
   # subclasses get their own static copy
   var lines =<< trim END
-    vim9script
+    mnv9script
 
     class A
       static var _svar: number
@@ -5107,7 +5107,7 @@ enddef
 def Test_dup_member_variable()
   # Duplicate member variable
   var lines =<< trim END
-    vim9script
+    mnv9script
     class C
       var val = 10
       var val = 20
@@ -5117,7 +5117,7 @@ def Test_dup_member_variable()
 
   # Duplicate protected member variable
   lines =<< trim END
-    vim9script
+    mnv9script
     class C
       var _val = 10
       var _val = 20
@@ -5127,7 +5127,7 @@ def Test_dup_member_variable()
 
   # Duplicate public member variable
   lines =<< trim END
-    vim9script
+    mnv9script
     class C
       public var val = 10
       public var val = 20
@@ -5137,7 +5137,7 @@ def Test_dup_member_variable()
 
   # Duplicate protected member variable
   lines =<< trim END
-    vim9script
+    mnv9script
     class C
       var val = 10
       var _val = 20
@@ -5147,7 +5147,7 @@ def Test_dup_member_variable()
 
   # Duplicate public and protected member variable
   lines =<< trim END
-    vim9script
+    mnv9script
     class C
       var _val = 20
       public var val = 10
@@ -5157,7 +5157,7 @@ def Test_dup_member_variable()
 
   # Duplicate class member variable
   lines =<< trim END
-    vim9script
+    mnv9script
     class C
       static var s: string = "abc"
       static var _s: string = "def"
@@ -5167,7 +5167,7 @@ def Test_dup_member_variable()
 
   # Duplicate public and protected class member variable
   lines =<< trim END
-    vim9script
+    mnv9script
     class C
       public static var s: string = "abc"
       static var _s: string = "def"
@@ -5177,7 +5177,7 @@ def Test_dup_member_variable()
 
   # Duplicate class and object member variable
   lines =<< trim END
-    vim9script
+    mnv9script
     class C
       static var val = 10
       var val = 20
@@ -5192,7 +5192,7 @@ def Test_dup_member_variable()
 
   # Duplicate object member variable in a derived class
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
       var val = 10
     endclass
@@ -5206,7 +5206,7 @@ def Test_dup_member_variable()
 
   # Duplicate object protected member variable in a derived class
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
       var _val = 10
     endclass
@@ -5220,7 +5220,7 @@ def Test_dup_member_variable()
 
   # Duplicate object protected member variable in a derived class
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
       var val = 10
     endclass
@@ -5234,7 +5234,7 @@ def Test_dup_member_variable()
 
   # Duplicate object member variable in a derived class
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
       var _val = 10
     endclass
@@ -5248,7 +5248,7 @@ def Test_dup_member_variable()
 
   # Two member variables with a common prefix
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
       public static var svar2: number
       public static var svar: number
@@ -5261,7 +5261,7 @@ enddef
 def Test_protected_member_access_outside_class()
   # try to modify a protected instance variable from a def function
   var lines =<< trim END
-    vim9script
+    mnv9script
     class A
       var _val = 10
     endclass
@@ -5275,7 +5275,7 @@ def Test_protected_member_access_outside_class()
 
   # access a non-existing protected instance variable from a def function
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
       var _val = 10
     endclass
@@ -5289,7 +5289,7 @@ def Test_protected_member_access_outside_class()
 
   # try to read a protected class variable from a def function using an instance
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
       static var _val = 10
     endclass
@@ -5304,7 +5304,7 @@ def Test_protected_member_access_outside_class()
   # try to modify a protected class variable from a def function using an
   # instance
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
       static var _val = 10
     endclass
@@ -5318,7 +5318,7 @@ def Test_protected_member_access_outside_class()
 
   # try to read a protected class variable from a def function using the class
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
       static var _val = 10
     endclass
@@ -5331,7 +5331,7 @@ def Test_protected_member_access_outside_class()
 
   # try to modify a protected class variable from a def function using the class
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
       static var _val = 10
     endclass
@@ -5345,7 +5345,7 @@ def Test_protected_member_access_outside_class()
   # initialize a protected class variable using a protected class variable
   # from another class
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
       static var _aval = 10
     endclass
@@ -5358,7 +5358,7 @@ def Test_protected_member_access_outside_class()
   # initialize a protected instance variable using a protected class variable
   # from another class
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
       static var _aval = 10
     endclass
@@ -5373,7 +5373,7 @@ enddef
 " Test for trying to change a readonly member from a def function
 def Test_readonly_member_change_in_def_func()
   var lines =<< trim END
-    vim9script
+    mnv9script
     class A
       var val: number
     endclass
@@ -5389,7 +5389,7 @@ enddef
 " Test for reading and writing a class member from a def function
 def Test_modify_class_member_from_def_function()
   var lines =<< trim END
-    vim9script
+    mnv9script
     class A
       var var1: number = 10
       public static var var2: list<number> = [1, 2]
@@ -5413,7 +5413,7 @@ enddef
 " Test for accessing a class member variable using an object
 def Test_class_variable_access_using_object()
   var lines =<< trim END
-    vim9script
+    mnv9script
     class A
       public static var svar1: list<number> = [1]
       public static var svar2: list<number> = [2]
@@ -5436,7 +5436,7 @@ def Test_class_variable_access_using_object()
 
   # Cannot read from a class variable using an object in script context
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
       public var var1: number
       public static var svar2: list<number> = [1]
@@ -5449,7 +5449,7 @@ def Test_class_variable_access_using_object()
 
   # Cannot write to a class variable using an object in script context
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
       public var var1: number
       public static var svar2: list<number> = [1]
@@ -5462,7 +5462,7 @@ def Test_class_variable_access_using_object()
 
   # Cannot read from a class variable using an object in def method context
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
       public var var1: number
       public static var svar2: list<number> = [1]
@@ -5478,7 +5478,7 @@ def Test_class_variable_access_using_object()
 
   # Cannot write to a class variable using an object in def method context
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
       public var var1: number
       public static var svar2: list<number> = [1]
@@ -5497,7 +5497,7 @@ enddef
 def Test_abstract_method()
   # Use two abstract methods
   var lines =<< trim END
-    vim9script
+    mnv9script
     abstract class A
       def M1(): number
         return 10
@@ -5520,7 +5520,7 @@ def Test_abstract_method()
 
   # Don't define an abstract method
   lines =<< trim END
-    vim9script
+    mnv9script
     abstract class A
       abstract def Foo()
     endclass
@@ -5531,7 +5531,7 @@ def Test_abstract_method()
 
   # Use abstract method in a concrete class
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
       abstract def Foo()
     endclass
@@ -5542,7 +5542,7 @@ def Test_abstract_method()
 
   # Use abstract method in an interface
   lines =<< trim END
-    vim9script
+    mnv9script
     interface A
       abstract def Foo()
     endinterface
@@ -5555,7 +5555,7 @@ def Test_abstract_method()
 
   # Use abstract static method in an interface
   lines =<< trim END
-    vim9script
+    mnv9script
     interface A
       abstract static def Foo()
       enddef
@@ -5565,7 +5565,7 @@ def Test_abstract_method()
 
   # Use abstract static variable in an interface
   lines =<< trim END
-    vim9script
+    mnv9script
     interface A
       abstract static foo: number = 10
     endinterface
@@ -5574,7 +5574,7 @@ def Test_abstract_method()
 
   # Abbreviate the "abstract" keyword
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
       abs def Foo()
     endclass
@@ -5583,7 +5583,7 @@ def Test_abstract_method()
 
   # Use "abstract" with a member variable
   lines =<< trim END
-    vim9script
+    mnv9script
     abstract class A
       abstract this.val = 10
     endclass
@@ -5592,7 +5592,7 @@ def Test_abstract_method()
 
   # Use a static abstract method
   lines =<< trim END
-    vim9script
+    mnv9script
     abstract class A
       abstract static def Foo(): number
     endclass
@@ -5601,7 +5601,7 @@ def Test_abstract_method()
 
   # Type mismatch between abstract method and concrete method
   lines =<< trim END
-    vim9script
+    mnv9script
     abstract class A
       abstract def Foo(a: string, b: number): list<number>
     endclass
@@ -5615,7 +5615,7 @@ def Test_abstract_method()
 
   # Invoke an abstract method from a def function
   lines =<< trim END
-    vim9script
+    mnv9script
     abstract class A
       abstract def Foo(): list<number>
     endclass
@@ -5634,7 +5634,7 @@ def Test_abstract_method()
 
   # Use a static method in an abstract class
   lines =<< trim END
-    vim9script
+    mnv9script
     abstract class A
       static def Foo(): string
         return 'foo'
@@ -5646,7 +5646,7 @@ def Test_abstract_method()
 
     # Invoke method returning a value through the abstract class. See #15432.
   lines =<< trim END
-    vim9script
+    mnv9script
 
     abstract class A
         abstract def String(): string
@@ -5667,7 +5667,7 @@ def Test_abstract_method()
 
   # Invoke abstract method returning a value does not compile
   lines =<< trim END
-    vim9script
+    mnv9script
 
     abstract class A
       abstract def String(): string
@@ -5682,7 +5682,7 @@ enddef
 def Test_class_method_call_from_subclass()
   # class method call from a subclass
   var lines =<< trim END
-    vim9script
+    mnv9script
 
     class A
       static def Foo()
@@ -5707,7 +5707,7 @@ enddef
 def Test_class_method_call_using_object()
   # script context
   var lines =<< trim END
-    vim9script
+    mnv9script
     class A
       static def Foo(): list<string>
         return ['a', 'b']
@@ -5733,7 +5733,7 @@ def Test_class_method_call_using_object()
 
   # script context
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
       static def Foo(): string
         return 'foo'
@@ -5747,7 +5747,7 @@ def Test_class_method_call_using_object()
 
   # def function context
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
       static def Foo(): string
         return 'foo'
@@ -5765,7 +5765,7 @@ enddef
 
 def Test_class_variable()
   var lines =<< trim END
-    vim9script
+    mnv9script
 
     class A
       public static var val: number = 10
@@ -5800,7 +5800,7 @@ def Test_class_variable()
 
   # Modifying a parent class variable from a child class method
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class A
       static var val: number = 10
@@ -5817,7 +5817,7 @@ def Test_class_variable()
 
   # Reading a parent class variable from a child class method
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class A
       static var val: number = 10
@@ -5834,7 +5834,7 @@ def Test_class_variable()
 
   # Modifying a parent class variable from a child object method
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class A
       static var val: number = 10
@@ -5852,7 +5852,7 @@ def Test_class_variable()
 
   # Reading a parent class variable from a child object method
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class A
       static var val: number = 10
@@ -5870,7 +5870,7 @@ def Test_class_variable()
 
   # Modifying a class variable using an object at script level
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class A
       static var val: number = 10
@@ -5882,7 +5882,7 @@ def Test_class_variable()
 
   # Reading a class variable using an object at script level
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class A
       static var val: number = 10
@@ -5894,7 +5894,7 @@ def Test_class_variable()
 
   # Modifying a class variable using an object at function level
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class A
       static var val: number = 10
@@ -5910,7 +5910,7 @@ def Test_class_variable()
 
   # Reading a class variable using an object at function level
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class A
       static var val: number = 10
@@ -5925,7 +5925,7 @@ def Test_class_variable()
 
   # Use old implicit var declaration syntax (without initialization)
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class A
       static val: number
@@ -5935,7 +5935,7 @@ def Test_class_variable()
 
   # Use old implicit var declaration syntax (with initialization)
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class A
       static val: number = 10
@@ -5945,7 +5945,7 @@ def Test_class_variable()
 
   # Use old implicit var declaration syntax (type inferred)
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class A
       static val = 10
@@ -5955,7 +5955,7 @@ def Test_class_variable()
 
   # Missing ":var" in "var" class variable declaration (without initialization)
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class A
       static var: number
@@ -5965,7 +5965,7 @@ def Test_class_variable()
 
   # Missing ":var" in "var" class variable declaration (with initialization)
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class A
       static var: number = 10
@@ -5975,7 +5975,7 @@ def Test_class_variable()
 
   # Missing ":var" in "var" class variable declaration (type inferred)
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class A
       static var = 10
@@ -5989,7 +5989,7 @@ enddef
 def Test_dup_class_member()
   # duplicate class variable, class method and overridden object method
   var lines =<< trim END
-    vim9script
+    mnv9script
     class A
       static var sval = 100
       static def Check()
@@ -6031,7 +6031,7 @@ def Test_dup_class_member()
 
   # duplicate class variable and class method
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
       static var sval = 100
       static def Check()
@@ -6073,7 +6073,7 @@ enddef
 def Test_instance_method_call_using_class()
   # Invoke an object method using a class in script context
   var lines =<< trim END
-    vim9script
+    mnv9script
     class A
       def Foo()
         echo "foo"
@@ -6085,7 +6085,7 @@ def Test_instance_method_call_using_class()
 
   # Invoke an object method using a class in def function context
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
       def Foo()
         echo "foo"
@@ -6103,7 +6103,7 @@ enddef
 def Test_dup_classmethod_objmethod()
   # Duplicate instance method
   var lines =<< trim END
-    vim9script
+    mnv9script
     class A
       static def Foo()
       enddef
@@ -6115,7 +6115,7 @@ def Test_dup_classmethod_objmethod()
 
   # Duplicate protected instance method
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
       static def Foo()
       enddef
@@ -6127,7 +6127,7 @@ def Test_dup_classmethod_objmethod()
 
   # Duplicate class method
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
       def Foo()
       enddef
@@ -6139,7 +6139,7 @@ def Test_dup_classmethod_objmethod()
 
   # Duplicate protected class method
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
       def Foo()
       enddef
@@ -6151,7 +6151,7 @@ def Test_dup_classmethod_objmethod()
 
   # Duplicate protected class and object method
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
       def _Foo()
       enddef
@@ -6167,7 +6167,7 @@ enddef
 def Test_instance_method_access_level()
   # protected method in subclass
   var lines =<< trim END
-    vim9script
+    mnv9script
     class A
       def Foo()
       enddef
@@ -6183,7 +6183,7 @@ def Test_instance_method_access_level()
 
   # Public method in subclass
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
       def _Foo()
       enddef
@@ -6200,7 +6200,7 @@ enddef
 
 def Test_extend_empty_class()
   var lines =<< trim END
-    vim9script
+    mnv9script
     class A
     endclass
     class B extends A
@@ -6227,7 +6227,7 @@ enddef
 " Test for assigning to a member variable in a nested class
 def Test_nested_object_assignment()
   var lines =<< trim END
-    vim9script
+    mnv9script
 
     class A
       var value: number
@@ -6259,7 +6259,7 @@ enddef
 def Test_null_object_method_call()
   # Calling a object method using a null object in script context
   var lines =<< trim END
-    vim9script
+    mnv9script
 
     class C
       def Foo()
@@ -6274,7 +6274,7 @@ def Test_null_object_method_call()
 
   # Calling a object method using a null object in def function context
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class C
       def Foo()
@@ -6293,7 +6293,7 @@ def Test_null_object_method_call()
   # Calling a object method through another class method using a null object in
   # script context
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class C
       def Foo()
@@ -6314,7 +6314,7 @@ def Test_null_object_method_call()
   # Calling a object method through another class method using a null object in
   # def function context
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class C
       def Foo()
@@ -6338,7 +6338,7 @@ def Test_null_object_method_call()
   # Calling an object method defined in a class that is extended. This differs
   # from the previous by invoking ISN_METHODCALL instead of ISN_DCALL.
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class C0
       def F()
@@ -6358,7 +6358,7 @@ def Test_null_object_method_call()
 
   # Getting a function ref an object method.
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class C0
       def F()
@@ -6380,7 +6380,7 @@ enddef
 " Test for using a dict as an object member
 def Test_dict_object_member()
   var lines =<< trim END
-    vim9script
+    mnv9script
 
     class Context
       public var state: dict<number> = {}
@@ -6410,7 +6410,7 @@ enddef
 " freed object from a previous method call.
 def Test_freed_object_from_previous_method_call()
   var lines =<< trim END
-    vim9script
+    mnv9script
 
     class Context
     endclass
@@ -6440,7 +6440,7 @@ enddef
 def Test_duplicate_variable()
   # Object variable name is same as the class variable name
   var lines =<< trim END
-    vim9script
+    mnv9script
     class A
       public static var sval: number
       public var sval: number
@@ -6451,7 +6451,7 @@ def Test_duplicate_variable()
 
   # Duplicate variable name and calling a class method
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
       public static var sval: number
       public var sval: number
@@ -6468,7 +6468,7 @@ def Test_duplicate_variable()
 
   # Duplicate variable with an empty constructor
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
       public static var sval: number
       public var sval: number
@@ -6487,7 +6487,7 @@ def Test_reserved_varname()
                 'null_channel', 'null_job', 'super', 'this']
 
     var lines =<< trim eval END
-      vim9script
+      mnv9script
       class C
         public var {kword}: list<number> = [1, 2, 3]
       endclass
@@ -6496,7 +6496,7 @@ def Test_reserved_varname()
     v9.CheckSourceFailure(lines, $'E1034: Cannot use reserved name {kword}', 3)
 
     lines =<< trim eval END
-      vim9script
+      mnv9script
       class C
         public var {kword}: list<number> = [1, 2, 3]
         def new()
@@ -6507,7 +6507,7 @@ def Test_reserved_varname()
     v9.CheckSourceFailure(lines, $'E1034: Cannot use reserved name {kword}', 3)
 
     lines =<< trim eval END
-      vim9script
+      mnv9script
       class C
         public var {kword}: list<number> = [1, 2, 3]
         def new()
@@ -6524,7 +6524,7 @@ def Test_reserved_varname()
     # class variable name
     if kword != 'this'
       lines =<< trim eval END
-        vim9script
+        mnv9script
         class C
           public static var {kword}: list<number> = [1, 2, 3]
         endclass
@@ -6538,7 +6538,7 @@ enddef
 " method in an extended class.
 def Test_extended_obj_method_type_check()
   var lines =<< trim END
-    vim9script
+    mnv9script
 
     class A
     endclass
@@ -6562,7 +6562,7 @@ def Test_extended_obj_method_type_check()
   v9.CheckSourceFailure(lines, 'E1383: Method "Doit": type mismatch, expected func(object<B>): object<B> but got func(object<C>): object<B>', 20)
 
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class A
     endclass
@@ -6586,7 +6586,7 @@ def Test_extended_obj_method_type_check()
   v9.CheckSourceSuccess(lines)
 
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class A
     endclass
@@ -6610,7 +6610,7 @@ def Test_extended_obj_method_type_check()
   v9.CheckSourceFailure(lines, 'E1383: Method "Doit": type mismatch, expected func(object<B>): object<B> but got func(object<A>): object<B>', 20)
 
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class A
     endclass
@@ -6635,7 +6635,7 @@ def Test_extended_obj_method_type_check()
 
   # check varargs type mismatch
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class B
       def F(...xxx: list<any>)
@@ -6654,7 +6654,7 @@ func Test_class_variable_complex_type_check()
   " class variable with a specific type.  Try assigning a different type at
   " script level.
   let lines =<< trim END
-    vim9script
+    mnv9script
     def Foo(l: list<dict<blob>>): dict<list<blob>>
       return {}
     enddef
@@ -6669,7 +6669,7 @@ func Test_class_variable_complex_type_check()
   " class variable with a specific type.  Try assigning a different type at
   " class def method level.
   let lines =<< trim END
-    vim9script
+    mnv9script
     def Foo(l: list<dict<blob>>): dict<list<blob>>
       return {}
     enddef
@@ -6688,7 +6688,7 @@ func Test_class_variable_complex_type_check()
   " class variable with a specific type.  Try assigning a different type at
   " script def method level.
   let lines =<< trim END
-    vim9script
+    mnv9script
     def Foo(l: list<dict<blob>>): dict<list<blob>>
       return {}
     enddef
@@ -6706,7 +6706,7 @@ func Test_class_variable_complex_type_check()
   " class variable without any type.  Should be set to the initialization
   " expression type.  Try assigning a different type from script level.
   let lines =<< trim END
-    vim9script
+    mnv9script
     def Foo(l: list<dict<blob>>): dict<list<blob>>
       return {}
     enddef
@@ -6721,7 +6721,7 @@ func Test_class_variable_complex_type_check()
   " class variable without any type.  Should be set to the initialization
   " expression type.  Try assigning a different type at class def level.
   let lines =<< trim END
-    vim9script
+    mnv9script
     def Foo(l: list<dict<blob>>): dict<list<blob>>
       return {}
     enddef
@@ -6740,7 +6740,7 @@ func Test_class_variable_complex_type_check()
   " class variable without any type.  Should be set to the initialization
   " expression type.  Try assigning a different type at script def level.
   let lines =<< trim END
-    vim9script
+    mnv9script
     def Foo(l: list<dict<blob>>): dict<list<blob>>
       return {}
     enddef
@@ -6757,7 +6757,7 @@ func Test_class_variable_complex_type_check()
 
   " class variable with 'any" type.  Can be assigned different types.
   let lines =<< trim END
-    vim9script
+    mnv9script
     def Foo(l: list<dict<blob>>): dict<list<blob>>
       return {}
     enddef
@@ -6781,7 +6781,7 @@ func Test_class_variable_complex_type_check()
 
   " class variable with 'any" type.  Can be assigned different types.
   let lines =<< trim END
-    vim9script
+    mnv9script
     def Foo(l: list<dict<blob>>): dict<list<blob>>
       return {}
     enddef
@@ -6810,7 +6810,7 @@ func Test_class_variable_complex_type_check()
 
   " class variable with 'any" type.  Can be assigned different types.
   let lines =<< trim END
-    vim9script
+    mnv9script
     def Foo(l: list<dict<blob>>): dict<list<blob>>
       return {}
     enddef
@@ -6836,7 +6836,7 @@ func Test_class_variable_complex_type_check()
   call v9.CheckSourceSuccess(lines)
 
   let lines =<< trim END
-    vim9script
+    mnv9script
     class A
       public static var foo = [0z10, 0z20]
     endclass
@@ -6854,7 +6854,7 @@ func Test_object_variable_complex_type_check()
   " object variable with a specific type.  Try assigning a different type at
   " script level.
   let lines =<< trim END
-    vim9script
+    mnv9script
     def Foo(l: list<dict<blob>>): dict<list<blob>>
       return {}
     enddef
@@ -6870,7 +6870,7 @@ func Test_object_variable_complex_type_check()
   " object variable with a specific type.  Try assigning a different type at
   " object def method level.
   let lines =<< trim END
-    vim9script
+    mnv9script
     def Foo(l: list<dict<blob>>): dict<list<blob>>
       return {}
     enddef
@@ -6890,7 +6890,7 @@ func Test_object_variable_complex_type_check()
   " object variable with a specific type.  Try assigning a different type at
   " script def method level.
   let lines =<< trim END
-    vim9script
+    mnv9script
     def Foo(l: list<dict<blob>>): dict<list<blob>>
       return {}
     enddef
@@ -6910,7 +6910,7 @@ func Test_object_variable_complex_type_check()
   " object variable without any type.  Should be set to the initialization
   " expression type.  Try assigning a different type from script level.
   let lines =<< trim END
-    vim9script
+    mnv9script
     def Foo(l: list<dict<blob>>): dict<list<blob>>
       return {}
     enddef
@@ -6926,7 +6926,7 @@ func Test_object_variable_complex_type_check()
   " object variable without any type.  Should be set to the initialization
   " expression type.  Try assigning a different type at object def level.
   let lines =<< trim END
-    vim9script
+    mnv9script
     def Foo(l: list<dict<blob>>): dict<list<blob>>
       return {}
     enddef
@@ -6946,7 +6946,7 @@ func Test_object_variable_complex_type_check()
   " object variable without any type.  Should be set to the initialization
   " expression type.  Try assigning a different type at script def level.
   let lines =<< trim END
-    vim9script
+    mnv9script
     def Foo(l: list<dict<blob>>): dict<list<blob>>
       return {}
     enddef
@@ -6965,7 +6965,7 @@ func Test_object_variable_complex_type_check()
 
   " object variable with 'any" type.  Can be assigned different types.
   let lines =<< trim END
-    vim9script
+    mnv9script
     def Foo(l: list<dict<blob>>): dict<list<blob>>
       return {}
     enddef
@@ -6991,7 +6991,7 @@ func Test_object_variable_complex_type_check()
 
   " object variable with 'any" type.  Can be assigned different types.
   let lines =<< trim END
-    vim9script
+    mnv9script
     def Foo(l: list<dict<blob>>): dict<list<blob>>
       return {}
     enddef
@@ -7021,7 +7021,7 @@ func Test_object_variable_complex_type_check()
 
   " object variable with 'any" type.  Can be assigned different types.
   let lines =<< trim END
-    vim9script
+    mnv9script
     def Foo(l: list<dict<blob>>): dict<list<blob>>
       return {}
     enddef
@@ -7052,7 +7052,7 @@ endfunc
 " use-after-free error.
 def Test_recursive_object_method_call()
   var lines =<< trim END
-    vim9script
+    mnv9script
     class A
       var val: number = 0
       def Foo(): number
@@ -7072,7 +7072,7 @@ enddef
 " Test for recursively calling a class method.
 def Test_recursive_class_method_call()
   var lines =<< trim END
-    vim9script
+    mnv9script
     class A
       static var val: number = 0
       static def Foo(): number
@@ -7092,7 +7092,7 @@ enddef
 " funcref to make sure the invariant class type is used.
 def Test_funcref_argtype_returntype_check()
   var lines =<< trim END
-    vim9script
+    mnv9script
     class A
     endclass
     class B extends A
@@ -7107,7 +7107,7 @@ def Test_funcref_argtype_returntype_check()
   v9.CheckSourceFailure(lines, 'E1012: Type mismatch; expected func(object<A>): object<A> but got func(object<B>): object<B>', 11)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
     endclass
     class B extends A
@@ -7127,7 +7127,7 @@ enddef
 
 def Test_funcref_argtype_invariance_check()
   var lines =<< trim END
-    vim9script
+    mnv9script
 
     class A
     endclass
@@ -7143,7 +7143,7 @@ def Test_funcref_argtype_invariance_check()
   v9.CheckSourceSuccess(lines)
 
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class A
     endclass
@@ -7158,7 +7158,7 @@ def Test_funcref_argtype_invariance_check()
   v9.CheckSourceFailure(lines, 'E1012: Type mismatch; expected func(object<B>): number but got func(object<A>): number', 11)
 
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class A
     endclass
@@ -7177,7 +7177,7 @@ enddef
 def Test_op_and_assignment()
   # Using += with a class variable
   var lines =<< trim END
-    vim9script
+    mnv9script
     class A
       public static var val: list<number> = []
       static def Foo(): list<number>
@@ -7198,7 +7198,7 @@ def Test_op_and_assignment()
 
   # Using += with an object variable
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
       public var val: list<number> = []
       def Foo(): list<number>
@@ -7223,7 +7223,7 @@ enddef
 def Test_object_funcref()
   # Using object method funcref from a def function
   var lines =<< trim END
-    vim9script
+    mnv9script
     class A
       def Foo(): list<number>
         return [3, 2, 1]
@@ -7240,7 +7240,7 @@ def Test_object_funcref()
 
   # Using object method funcref at the script level
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
       def Foo(): dict<number>
         return {a: 1, b: 2}
@@ -7254,7 +7254,7 @@ def Test_object_funcref()
 
   # Using object method funcref at the script level
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
       var val: number
       def Foo(): number
@@ -7269,7 +7269,7 @@ def Test_object_funcref()
 
   # Using object method funcref from another object method
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
       def Foo(): list<number>
         return [3, 2, 1]
@@ -7286,7 +7286,7 @@ def Test_object_funcref()
 
   # Using function() to get a object method funcref
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
       def Foo(l: list<any>): list<any>
         return l
@@ -7301,7 +7301,7 @@ def Test_object_funcref()
   # Use an object method with a function returning a funcref and then call the
   # funcref.
   lines =<< trim END
-    vim9script
+    mnv9script
 
     def Map(F: func(number): number): func(number): number
       return (n: number) => F(n)
@@ -7320,7 +7320,7 @@ def Test_object_funcref()
 
   # Try using a protected object method funcref from a def function
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
       def _Foo()
       enddef
@@ -7335,7 +7335,7 @@ def Test_object_funcref()
 
   # Try using a protected object method funcref at the script level
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
       def _Foo()
       enddef
@@ -7347,7 +7347,7 @@ def Test_object_funcref()
 
   # Using a protected object method funcref from another object method
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
       def _Foo(): list<number>
         return [3, 2, 1]
@@ -7364,7 +7364,7 @@ def Test_object_funcref()
 
   # Using object method funcref using call()
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
       var val: number
       def Foo(): number
@@ -7387,7 +7387,7 @@ enddef
 def Test_class_funcref()
   # Using class method funcref in a def function
   var lines =<< trim END
-    vim9script
+    mnv9script
     class A
       static def Foo(): list<number>
         return [3, 2, 1]
@@ -7403,7 +7403,7 @@ def Test_class_funcref()
 
   # Using class method funcref at script level
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
       static def Foo(): dict<number>
         return {a: 1, b: 2}
@@ -7416,7 +7416,7 @@ def Test_class_funcref()
 
   # Using class method funcref at the script level
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
       public static var val: number
       static def Foo(): number
@@ -7431,7 +7431,7 @@ def Test_class_funcref()
 
   # Using function() to get a class method funcref
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
       static def Foo(l: list<any>): list<any>
         return l
@@ -7444,7 +7444,7 @@ def Test_class_funcref()
 
   # Using a class method funcref from another class method
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
       static def Foo(): list<number>
         return [3, 2, 1]
@@ -7461,7 +7461,7 @@ def Test_class_funcref()
   # Use a class method with a function returning a funcref and then call the
   # funcref.
   lines =<< trim END
-    vim9script
+    mnv9script
 
     def Map(F: func(number): number): func(number): number
       return (n: number) => F(n)
@@ -7479,7 +7479,7 @@ def Test_class_funcref()
 
   # Try using a protected class method funcref in a def function
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
       static def _Foo()
       enddef
@@ -7493,7 +7493,7 @@ def Test_class_funcref()
 
   # Try using a protected class method funcref at script level
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
       static def _Foo()
       enddef
@@ -7504,7 +7504,7 @@ def Test_class_funcref()
 
   # Using a protected class method funcref from another class method
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
       static def _Foo(): list<number>
         return [3, 2, 1]
@@ -7520,7 +7520,7 @@ def Test_class_funcref()
 
   # Using class method funcref using call()
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
       public static var val: number
       static def Foo(): number
@@ -7542,7 +7542,7 @@ enddef
 def Test_object_member_funcref()
   # Using a funcref object variable in an object method
   var lines =<< trim END
-    vim9script
+    mnv9script
     def Foo(n: number): number
       return n * 10
     enddef
@@ -7561,7 +7561,7 @@ def Test_object_member_funcref()
 
   # Using a funcref object variable in a def method
   lines =<< trim END
-    vim9script
+    mnv9script
     def Foo(n: number): number
       return n * 10
     enddef
@@ -7580,7 +7580,7 @@ def Test_object_member_funcref()
 
   # Using a funcref object variable at script level
   lines =<< trim END
-    vim9script
+    mnv9script
     def Foo(n: number): number
       return n * 10
     enddef
@@ -7597,7 +7597,7 @@ def Test_object_member_funcref()
   # Using a funcref object variable pointing to an object method in an object
   # method.
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
       var Cb: func(number): number = this.Foo
       def Foo(n: number): number
@@ -7616,7 +7616,7 @@ def Test_object_member_funcref()
   # Using a funcref object variable pointing to an object method in a def
   # method.
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
       var Cb: func(number): number = this.Foo
       def Foo(n: number): number
@@ -7635,7 +7635,7 @@ def Test_object_member_funcref()
   # Using a funcref object variable pointing to an object method at script
   # level.
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
       var Cb = this.Foo
       def Foo(n: number): number
@@ -7653,7 +7653,7 @@ enddef
 def Test_class_member_funcref()
   # Using a funcref class variable in a class method
   var lines =<< trim END
-    vim9script
+    mnv9script
     def Foo(n: number): number
       return n * 10
     enddef
@@ -7671,7 +7671,7 @@ def Test_class_member_funcref()
 
   # Using a funcref class variable in a def method
   lines =<< trim END
-    vim9script
+    mnv9script
     def Foo(n: number): number
       return n * 10
     enddef
@@ -7689,7 +7689,7 @@ def Test_class_member_funcref()
 
   # Using a funcref class variable at script level
   lines =<< trim END
-    vim9script
+    mnv9script
     def Foo(n: number): number
       return n * 10
     enddef
@@ -7705,7 +7705,7 @@ def Test_class_member_funcref()
   # Using a funcref class variable pointing to a class method in a class
   # method.
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
       static var Cb: func(number): number
       static def Foo(n: number): number
@@ -7726,7 +7726,7 @@ def Test_class_member_funcref()
 
   # Using a funcref class variable pointing to a class method in a def method.
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
       static var Cb: func(number): number
       static def Foo(n: number): number
@@ -7747,7 +7747,7 @@ def Test_class_member_funcref()
 
   # Using a funcref class variable pointing to a class method at script level.
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
       static var Cb: func(number): number
       static def Foo(n: number): number
@@ -7768,7 +7768,7 @@ enddef
 def Test_objmethod_popup_callback()
   # Use the popup from the script level
   var lines =<< trim END
-    vim9script
+    mnv9script
 
     class A
       var selection: number = -1
@@ -7804,7 +7804,7 @@ def Test_objmethod_popup_callback()
 
   # Use the popup from a def function
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class A
       var selection: number = -1
@@ -7846,7 +7846,7 @@ enddef
 def Test_classmethod_popup_callback()
   # Use the popup from the script level
   var lines =<< trim END
-    vim9script
+    mnv9script
 
     class A
       static var selection: number = -1
@@ -7881,7 +7881,7 @@ def Test_classmethod_popup_callback()
 
   # Use the popup from a def function
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class A
       static var selection: number = -1
@@ -7922,7 +7922,7 @@ enddef
 def Test_objmethod_timer_callback()
   # Use the timer callback from script level
   var lines =<< trim END
-    vim9script
+    mnv9script
 
     class A
       var timerTick: number = -1
@@ -7944,7 +7944,7 @@ def Test_objmethod_timer_callback()
 
   # Use the timer callback from a def function
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class A
       var timerTick: number = -1
@@ -7972,7 +7972,7 @@ enddef
 def Test_classmethod_timer_callback()
   # Use the timer callback from script level
   var lines =<< trim END
-    vim9script
+    mnv9script
 
     class A
       static var timerTick: number = -1
@@ -7993,7 +7993,7 @@ def Test_classmethod_timer_callback()
 
   # Use the timer callback from a def function
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class A
       static var timerTick: number = -1
@@ -8020,7 +8020,7 @@ enddef
 " operator.
 def Test_class_variable_as_operands()
   var lines =<< trim END
-    vim9script
+    mnv9script
     class Tests
       static var truthy: bool = true
       public static var TruthyFn: func
@@ -8124,7 +8124,7 @@ enddef
 " Test for checking the type of the key used to access an object dict member.
 def Test_dict_member_key_type_check()
   var lines =<< trim END
-    vim9script
+    mnv9script
 
     abstract class State
       var numbers: dict<string> = {0: 'nil', 1: 'unity'}
@@ -8209,7 +8209,7 @@ def Test_dict_member_key_type_check()
   v9.CheckSourceSuccess(lines)
 
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class A
       var numbers: dict<string> = {a: '1', b: '2'}
@@ -8229,7 +8229,7 @@ def Test_dict_member_key_type_check()
   v9.CheckSourceFailure(lines, 'E1012: Type mismatch; expected string but got dict<any>', 2)
 
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class A
       var numbers: dict<number> = {a: 1, b: 2}
@@ -8251,10 +8251,10 @@ def Test_dict_member_key_type_check()
 enddef
 
 def Test_compile_many_def_functions_in_funcref_instr()
-  # This used to crash Vim.  This is reproducible only when run on new instance
-  # of Vim.
+  # This used to crash MNV.  This is reproducible only when run on new instance
+  # of MNV.
   var lines =<< trim END
-    vim9script
+    mnv9script
 
     class A
       def new()
@@ -8413,7 +8413,7 @@ def Test_compile_many_def_functions_in_funcref_instr()
     A.new()
   END
   writefile(lines, 'Xscript', 'D')
-  g:RunVim([], [], '-u NONE -S Xscript -c qa')
+  g:RunMNV([], [], '-u NONE -S Xscript -c qa')
   assert_equal(0, v:shell_error)
 enddef
 
@@ -8421,7 +8421,7 @@ enddef
 def Test_final_class_object_variable()
   # Test for changing a final object variable from an object function
   var lines =<< trim END
-    vim9script
+    mnv9script
     class A
       final foo: string = "abc"
       def Foo()
@@ -8434,7 +8434,7 @@ def Test_final_class_object_variable()
 
   # Test for changing a final object variable from the 'new' function
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
       final s1: string
       final s2: string
@@ -8450,7 +8450,7 @@ def Test_final_class_object_variable()
 
   # Test for a final class variable
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
       static final s1: string = "abc"
     endclass
@@ -8460,7 +8460,7 @@ def Test_final_class_object_variable()
 
   # Test for changing a final class variable from a class function
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
       static final s1: string = "abc"
       static def Foo()
@@ -8473,7 +8473,7 @@ def Test_final_class_object_variable()
 
   # Test for changing a public final class variable at script level
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
       public static final s1: string = "abc"
     endclass
@@ -8484,7 +8484,7 @@ def Test_final_class_object_variable()
 
   # Test for changing a public final class variable from a class function
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
       public static final s1: string = "abc"
       static def Foo()
@@ -8497,7 +8497,7 @@ def Test_final_class_object_variable()
 
   # Test for changing a public final class variable from a function
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
       public static final s1: string = "abc"
     endclass
@@ -8510,7 +8510,7 @@ def Test_final_class_object_variable()
 
   # Test for using a final variable of composite type
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
       public final l: list<number>
       def new()
@@ -8531,7 +8531,7 @@ def Test_final_class_object_variable()
   # Test for changing a final variable of composite type from another object
   # function
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
       public final l: list<number> = [1, 2]
       def Foo()
@@ -8545,7 +8545,7 @@ def Test_final_class_object_variable()
 
   # Test for modifying a final variable of composite type at script level
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
       public final l: list<number> = [1, 2]
     endclass
@@ -8558,7 +8558,7 @@ def Test_final_class_object_variable()
 
   # Test for modifying a final variable of composite type from a function
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
       public final l: list<number> = [1, 2]
     endclass
@@ -8575,7 +8575,7 @@ def Test_final_class_object_variable()
   # Test for modifying a final variable of composite type from another object
   # function
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
       public final l: list<number> = [1, 2]
       def Foo()
@@ -8592,7 +8592,7 @@ def Test_final_class_object_variable()
   # Test for assigning a new value to a final variable of composite type at
   # script level
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
       public final l: list<number> = [1, 2]
     endclass
@@ -8604,7 +8604,7 @@ def Test_final_class_object_variable()
   # Test for assigning a new value to a final variable of composite type from
   # another object function
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
       public final l: list<number> = [1, 2]
       def Foo()
@@ -8619,7 +8619,7 @@ def Test_final_class_object_variable()
   # Test for assigning a new value to a final variable of composite type from
   # another function
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
       public final l: list<number> = [1, 2]
     endclass
@@ -8633,7 +8633,7 @@ def Test_final_class_object_variable()
 
   # Error case: Use 'final' with just a variable name
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
       final foo
     endclass
@@ -8643,7 +8643,7 @@ def Test_final_class_object_variable()
 
   # Error case: Use 'final' followed by 'public'
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
       final public foo: number
     endclass
@@ -8653,7 +8653,7 @@ def Test_final_class_object_variable()
 
   # Error case: Use 'final' followed by 'static'
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
       final static foo: number
     endclass
@@ -8663,7 +8663,7 @@ def Test_final_class_object_variable()
 
   # Error case: 'final' cannot be used in an interface
   lines =<< trim END
-    vim9script
+    mnv9script
     interface A
       final foo: number = 10
     endinterface
@@ -8672,7 +8672,7 @@ def Test_final_class_object_variable()
 
   # Error case: 'final' not supported for an object method
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
       final def Foo()
       enddef
@@ -8682,7 +8682,7 @@ def Test_final_class_object_variable()
 
   # Error case: 'final' not supported for a class method
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
       static final def Foo()
       enddef
@@ -8695,7 +8695,7 @@ enddef
 def Test_const_class_object_variable()
   # Test for changing a const object variable from an object function
   var lines =<< trim END
-    vim9script
+    mnv9script
     class A
       const foo: string = "abc"
       def Foo()
@@ -8708,7 +8708,7 @@ def Test_const_class_object_variable()
 
   # Test for changing a const object variable from the 'new' function
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
       const s1: string
       const s2: string
@@ -8725,7 +8725,7 @@ def Test_const_class_object_variable()
   # Test for changing a const object variable from an object method called from
   # the 'new' function
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
       const s1: string = 'abc'
       def new()
@@ -8741,7 +8741,7 @@ def Test_const_class_object_variable()
 
   # Test for a const class variable
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
       static const s1: string = "abc"
     endclass
@@ -8751,7 +8751,7 @@ def Test_const_class_object_variable()
 
   # Test for changing a const class variable from a class function
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
       static const s1: string = "abc"
       static def Foo()
@@ -8764,7 +8764,7 @@ def Test_const_class_object_variable()
 
   # Test for changing a public const class variable at script level
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
       public static const s1: string = "abc"
     endclass
@@ -8775,7 +8775,7 @@ def Test_const_class_object_variable()
 
   # Test for changing a public const class variable from a class function
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
       public static const s1: string = "abc"
       static def Foo()
@@ -8788,7 +8788,7 @@ def Test_const_class_object_variable()
 
   # Test for changing a public const class variable from a function
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
       public static const s1: string = "abc"
     endclass
@@ -8801,7 +8801,7 @@ def Test_const_class_object_variable()
 
   # Test for changing a const List item from an object function
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
       public const l: list<number>
       def new()
@@ -8819,7 +8819,7 @@ def Test_const_class_object_variable()
 
   # Test for adding a value to a const List from an object function
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
       public const l: list<number>
       def new()
@@ -8836,7 +8836,7 @@ def Test_const_class_object_variable()
 
   # Test for reassigning a const List from an object function
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
       public const l: list<number> = [1, 2]
       def Foo()
@@ -8850,7 +8850,7 @@ def Test_const_class_object_variable()
 
   # Test for changing a const List item at script level
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
       public const l: list<number> = [1, 2]
     endclass
@@ -8861,7 +8861,7 @@ def Test_const_class_object_variable()
 
   # Test for adding a value to a const List item at script level
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
       public const l: list<number> = [1, 2]
     endclass
@@ -8872,7 +8872,7 @@ def Test_const_class_object_variable()
 
   # Test for changing a const List item from a function
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
       public const l: list<number> = [1, 2]
     endclass
@@ -8886,7 +8886,7 @@ def Test_const_class_object_variable()
 
   # Test for adding a value to a const List item from a function
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
       public const l: list<number> = [1, 2]
     endclass
@@ -8900,7 +8900,7 @@ def Test_const_class_object_variable()
 
   # Test for changing a const List item from an object method
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
       public const l: list<number> = [1, 2]
       def Foo()
@@ -8914,7 +8914,7 @@ def Test_const_class_object_variable()
 
   # Test for adding a value to a const List item from an object method
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
       public const l: list<number> = [1, 2]
       def Foo()
@@ -8928,7 +8928,7 @@ def Test_const_class_object_variable()
 
   # Test for reassigning a const List object variable at script level
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
       public const l: list<number> = [1, 2]
     endclass
@@ -8939,7 +8939,7 @@ def Test_const_class_object_variable()
 
   # Test for reassigning a const List object variable from an object method
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
       public const l: list<number> = [1, 2]
       def Foo()
@@ -8953,7 +8953,7 @@ def Test_const_class_object_variable()
 
   # Test for reassigning a const List object variable from another function
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
       public const l: list<number> = [1, 2]
     endclass
@@ -8967,7 +8967,7 @@ def Test_const_class_object_variable()
 
   # Error case: Use 'const' with just a variable name
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
       const foo
     endclass
@@ -8977,7 +8977,7 @@ def Test_const_class_object_variable()
 
   # Error case: Use 'const' followed by 'public'
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
       const public foo: number
     endclass
@@ -8987,7 +8987,7 @@ def Test_const_class_object_variable()
 
   # Error case: Use 'const' followed by 'static'
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
       const static foo: number
     endclass
@@ -8997,7 +8997,7 @@ def Test_const_class_object_variable()
 
   # Error case: 'const' cannot be used in an interface
   lines =<< trim END
-    vim9script
+    mnv9script
     interface A
       const foo: number = 10
     endinterface
@@ -9006,7 +9006,7 @@ def Test_const_class_object_variable()
 
   # Error case: 'const' not supported for an object method
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
       const def Foo()
       enddef
@@ -9016,7 +9016,7 @@ def Test_const_class_object_variable()
 
   # Error case: 'const' not supported for a class method
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
       static const def Foo()
       enddef
@@ -9029,7 +9029,7 @@ enddef
 def Test_defcompile_class()
   # defcompile all the classes in the current script
   var lines =<< trim END
-    vim9script
+    mnv9script
     class A
       def Foo()
         var i = 10
@@ -9047,7 +9047,7 @@ def Test_defcompile_class()
 
   # defcompile a specific class
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
       def Foo()
         xxx
@@ -9064,7 +9064,7 @@ def Test_defcompile_class()
 
   # defcompile a non-class
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
       def Foo()
       enddef
@@ -9076,7 +9076,7 @@ def Test_defcompile_class()
 
   # defcompile a class twice
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
       def new()
       enddef
@@ -9089,18 +9089,18 @@ def Test_defcompile_class()
 
   # defcompile should not compile an imported class
   lines =<< trim END
-    vim9script
+    mnv9script
     export class A
       def Foo()
         xxx
       enddef
     endclass
   END
-  writefile(lines, 'Xdefcompileimport.vim', 'D')
+  writefile(lines, 'Xdefcompileimport.mnv', 'D')
   lines =<< trim END
-    vim9script
+    mnv9script
 
-    import './Xdefcompileimport.vim'
+    import './Xdefcompileimport.mnv'
     class B
     endclass
     defcompile
@@ -9111,7 +9111,7 @@ enddef
 " Test for cases common to all the object builtin methods
 def Test_object_builtin_method()
   var lines =<< trim END
-    vim9script
+    mnv9script
     class A
       def abc()
       enddef
@@ -9121,7 +9121,7 @@ def Test_object_builtin_method()
 
   for funcname in ["len", "string", "empty"]
     lines =<< trim eval END
-      vim9script
+      mnv9script
       class A
         static def {funcname}(): number
         enddef
@@ -9135,7 +9135,7 @@ enddef
 " This is a legacy function to use the test_garbagecollect_now() function.
 func Test_object_empty()
   let lines =<< trim END
-    vim9script
+    mnv9script
     class A
       def empty(): bool
         return true
@@ -9161,7 +9161,7 @@ func Test_object_empty()
 
   " empty() should return 1 without a builtin method
   let lines =<< trim END
-    vim9script
+    mnv9script
     class A
     endclass
 
@@ -9178,7 +9178,7 @@ func Test_object_empty()
 
   " Unsupported signature for the empty() method
   let lines =<< trim END
-    vim9script
+    mnv9script
     class A
       def empty()
       enddef
@@ -9188,7 +9188,7 @@ func Test_object_empty()
 
   " Error when calling the empty() method
   let lines =<< trim END
-    vim9script
+    mnv9script
     class A
       def empty(): bool
         throw "Failed to check emptiness"
@@ -9208,7 +9208,7 @@ func Test_object_empty()
 
   " call empty() using an object from a script
   let lines =<< trim END
-    vim9script
+    mnv9script
     class A
       def empty(): bool
         return true
@@ -9221,7 +9221,7 @@ func Test_object_empty()
 
   " call empty() using an object from a method
   let lines =<< trim END
-    vim9script
+    mnv9script
     class A
       def empty(): bool
         return true
@@ -9237,7 +9237,7 @@ func Test_object_empty()
 
   " call empty() using "this" from an object method
   let lines =<< trim END
-    vim9script
+    mnv9script
     class A
       def empty(): bool
         return true
@@ -9256,7 +9256,7 @@ func Test_object_empty()
 
   " Call empty() from a derived object
   let lines =<< trim END
-    vim9script
+    mnv9script
     class A
       def empty(): bool
         return false
@@ -9280,7 +9280,7 @@ func Test_object_empty()
 
   " Invoking empty method using an interface
   let lines =<< trim END
-    vim9script
+    mnv9script
     interface A
       def empty(): bool
     endinterface
@@ -9302,7 +9302,7 @@ endfunc
 " This is a legacy function to use the test_garbagecollect_now() function.
 func Test_object_length()
   let lines =<< trim END
-    vim9script
+    mnv9script
     class A
       var mylen: number = 0
       def new(n: number)
@@ -9332,7 +9332,7 @@ func Test_object_length()
 
   " len() should return 0 without a builtin method
   let lines =<< trim END
-    vim9script
+    mnv9script
     class A
     endclass
 
@@ -9349,7 +9349,7 @@ func Test_object_length()
 
   " Unsupported signature for the len() method
   let lines =<< trim END
-    vim9script
+    mnv9script
     class A
       def len()
       enddef
@@ -9359,7 +9359,7 @@ func Test_object_length()
 
   " Error when calling the len() method
   let lines =<< trim END
-    vim9script
+    mnv9script
     class A
       def len(): number
         throw "Failed to compute length"
@@ -9379,7 +9379,7 @@ func Test_object_length()
 
   " call len() using an object from a script
   let lines =<< trim END
-    vim9script
+    mnv9script
     class A
       def len(): number
         return 5
@@ -9392,7 +9392,7 @@ func Test_object_length()
 
   " call len() using an object from a method
   let lines =<< trim END
-    vim9script
+    mnv9script
     class A
       def len(): number
         return 5
@@ -9408,7 +9408,7 @@ func Test_object_length()
 
   " call len() using "this" from an object method
   let lines =<< trim END
-    vim9script
+    mnv9script
     class A
       def len(): number
         return 8
@@ -9427,7 +9427,7 @@ func Test_object_length()
 
   " Call len() from a derived object
   let lines =<< trim END
-    vim9script
+    mnv9script
     class A
       def len(): number
         return 10
@@ -9451,7 +9451,7 @@ func Test_object_length()
 
   " Invoking len method using an interface
   let lines =<< trim END
-    vim9script
+    mnv9script
     interface A
       def len(): number
     endinterface
@@ -9473,7 +9473,7 @@ endfunc
 " This is a legacy function to use the test_garbagecollect_now() function.
 func Test_object_string()
   let lines =<< trim END
-    vim9script
+    mnv9script
     class A
       var name: string
       def string(): string
@@ -9501,7 +9501,7 @@ func Test_object_string()
 
   " string() should return "object of A {}" without a builtin method
   let lines =<< trim END
-    vim9script
+    mnv9script
     class A
     endclass
 
@@ -9518,7 +9518,7 @@ func Test_object_string()
 
   " Unsupported signature for the string() method
   let lines =<< trim END
-    vim9script
+    mnv9script
     class A
       def string()
       enddef
@@ -9528,7 +9528,7 @@ func Test_object_string()
 
   " Error when calling the string() method
   let lines =<< trim END
-    vim9script
+    mnv9script
     class A
       def string(): string
         throw "Failed to get text"
@@ -9548,7 +9548,7 @@ func Test_object_string()
 
   " call string() using an object from a script
   let lines =<< trim END
-    vim9script
+    mnv9script
     class A
       def string(): string
         return 'A'
@@ -9561,7 +9561,7 @@ func Test_object_string()
 
   " call string() using an object from a method
   let lines =<< trim END
-    vim9script
+    mnv9script
     class A
       def string(): string
         return 'A'
@@ -9577,7 +9577,7 @@ func Test_object_string()
 
   " call string() using "this" from an object method
   let lines =<< trim END
-    vim9script
+    mnv9script
     class A
       def string(): string
         return 'A'
@@ -9596,7 +9596,7 @@ func Test_object_string()
 
   " Call string() from a derived object
   let lines =<< trim END
-    vim9script
+    mnv9script
     class A
       def string(): string
         return 'A'
@@ -9620,7 +9620,7 @@ func Test_object_string()
 
   " Invoking string method using an interface
   let lines =<< trim END
-    vim9script
+    mnv9script
     interface A
       def string(): string
     endinterface
@@ -9641,7 +9641,7 @@ endfunc
 " Test for using the string() builtin method with an object's method
 def Test_method_string()
   var lines =<< trim END
-    vim9script
+    mnv9script
     class A
       def F()
       enddef
@@ -9654,7 +9654,7 @@ enddef
 " Test for using a class in the class definition
 def Test_Ref_Class_Within_Same_Class()
   var lines =<< trim END
-    vim9script
+    mnv9script
     class A
       var n: number = 0
       def Equals(other: A): bool
@@ -9671,7 +9671,7 @@ def Test_Ref_Class_Within_Same_Class()
   v9.CheckScriptSuccess(lines)
 
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class Foo
       var num: number
@@ -9697,7 +9697,7 @@ def Test_Ref_Class_Within_Same_Class()
 
   # Test for trying to use a class to extend when defining the same class
   lines =<< trim END
-    vim9script
+    mnv9script
     class A extends A
     endclass
   END
@@ -9705,7 +9705,7 @@ def Test_Ref_Class_Within_Same_Class()
 
   # Test for trying to use a class to implement when defining the same class
   lines =<< trim END
-    vim9script
+    mnv9script
     class A implements A
     endclass
   END
@@ -9715,7 +9715,7 @@ enddef
 " Test for comparing a class referencing itself
 def Test_Object_Compare_With_Recursive_Class_Ref()
   var lines =<< trim END
-    vim9script
+    mnv9script
 
     class C
     public var nest: C
@@ -9730,7 +9730,7 @@ def Test_Object_Compare_With_Recursive_Class_Ref()
   v9.CheckScriptSuccess(lines)
 
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class C
         public var nest: C
@@ -9744,7 +9744,7 @@ def Test_Object_Compare_With_Recursive_Class_Ref()
   v9.CheckScriptSuccess(lines)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     class C
         var nest1: C
         var nest2: C
@@ -9767,12 +9767,12 @@ enddef
 
 " Test for comparing a class with nesting objects
 def Test_Object_Compare_With_Nesting_Objects()
-  # On a compare, after vim equal recurses 1000 times, not finding an unequal,
+  # On a compare, after mnv equal recurses 1000 times, not finding an unequal,
   # return the compare is equal.
   # Test that limit
 
   var lines =<< trim END
-    vim9script
+    mnv9script
     class C
       public var n: number
       public var nest: C
@@ -9866,7 +9866,7 @@ enddef
 def Test_compound_op_in_objmethod_lambda()
   # Test using the "+=" operator
   var lines =<< trim END
-    vim9script
+    mnv9script
     class A
       var n: number = 10
       def Foo()
@@ -9885,7 +9885,7 @@ def Test_compound_op_in_objmethod_lambda()
 
   # Test using the "..=" operator
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
       var s: string = "a"
       def Foo()
@@ -9907,7 +9907,7 @@ enddef
 " Test for using test_refcount() with a class and an object
 def Test_class_object_refcount()
   var lines =<< trim END
-    vim9script
+    mnv9script
     class A
     endclass
     var a: A = A.new()
@@ -9924,7 +9924,7 @@ enddef
 " call a lambda function in one object from another object
 def Test_lambda_invocation_across_classes()
   var lines =<< trim END
-    vim9script
+    mnv9script
     class A
       var s: string = "foo"
       def GetFn(): func
@@ -9953,7 +9953,7 @@ enddef
 " Test for using a class member which is an object of the current class
 def Test_current_class_object_class_member()
   var lines =<< trim END
-    vim9script
+    mnv9script
     class A
       public static var obj1: A = A.new(10)
       var n: number
@@ -9965,10 +9965,10 @@ def Test_current_class_object_class_member()
 enddef
 
 " Test for updating a base class variable from a base class method without the
-" class name.  This used to crash Vim (Github issue #14352).
+" class name.  This used to crash MNV (Github issue #14352).
 def Test_use_base_class_variable_from_base_class_method()
   var lines =<< trim END
-    vim9script
+    mnv9script
 
     class DictKeyClass
       static var _obj_id_count = 1
@@ -9996,7 +9996,7 @@ enddef
 def Test_protected_funcref()
   # protected funcref object variable
   var lines =<< trim END
-    vim9script
+    mnv9script
     class Test1
       const _Id: func(any): any = (v) => v
     endclass
@@ -10006,7 +10006,7 @@ def Test_protected_funcref()
 
   # protected funcref class variable
   lines =<< trim END
-    vim9script
+    mnv9script
     class Test2
       static const _Id: func(any): any = (v) => v
     endclass
@@ -10017,9 +10017,9 @@ enddef
 
 " Test for using lambda block in classes
 def Test_lambda_block_in_class()
-  # This used to crash Vim
+  # This used to crash MNV
   var lines =<< trim END
-    vim9script
+    mnv9script
     class IdClass1
       const Id: func(number): number = (num: number): number => {
         # Return a ID
@@ -10031,9 +10031,9 @@ def Test_lambda_block_in_class()
   END
   v9.CheckScriptSuccess(lines)
 
-  # This used to crash Vim
+  # This used to crash MNV
   lines =<< trim END
-    vim9script
+    mnv9script
     class IdClass2
       static const Id: func(number): number = (num: number): number => {
         # Return a ID
@@ -10049,7 +10049,7 @@ enddef
 def Test_abstract_method_defcompile()
   # Compile an abstract class with abstract object methods
   var lines =<< trim END
-    vim9script
+    mnv9script
     abstract class A
       abstract def Foo(): string
       abstract def Bar(): list<string>
@@ -10060,7 +10060,7 @@ def Test_abstract_method_defcompile()
 
   # Compile a concrete object method in an abstract class
   lines =<< trim END
-    vim9script
+    mnv9script
     abstract class A
       abstract def Foo(): string
       abstract def Bar(): list<string>
@@ -10074,7 +10074,7 @@ def Test_abstract_method_defcompile()
 
   # Compile a concrete class method in an abstract class
   lines =<< trim END
-    vim9script
+    mnv9script
     abstract class A
       abstract def Foo(): string
       abstract def Bar(): list<string>
@@ -10090,7 +10090,7 @@ enddef
 " Test for defining a class in a function
 def Test_class_definition_in_a_function()
   var lines =<< trim END
-    vim9script
+    mnv9script
     def Foo()
       class A
       endclass
@@ -10103,7 +10103,7 @@ enddef
 " Test for using [] with a class and an object
 def Test_class_object_index()
   var lines =<< trim END
-    vim9script
+    mnv9script
     class A
     endclass
     A[10] = 1
@@ -10111,7 +10111,7 @@ def Test_class_object_index()
   v9.CheckScriptFailure(lines, 'E689: Index not allowed after a class: A[10] = 1', 4)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
     endclass
     var a = A.new()
@@ -10123,7 +10123,7 @@ enddef
 def Test_class_member_init_typecheck()
   # Ensure the class member is assigned its declared type.
   var lines =<< trim END
-    vim9script
+    mnv9script
     class S
         static var l: list<string> = []
     endclass
@@ -10133,7 +10133,7 @@ def Test_class_member_init_typecheck()
 
   # Ensure the initializer value and the declared type match.
   lines =<< trim END
-    vim9script
+    mnv9script
     class S
         var l: list<string> = [1, 2, 3]
     endclass
@@ -10143,7 +10143,7 @@ def Test_class_member_init_typecheck()
 
   # Ensure the class member is assigned its declared type.
   lines =<< trim END
-    vim9script
+    mnv9script
     class S
         var l: list<string> = []
     endclass
@@ -10155,7 +10155,7 @@ enddef
 
 def Test_class_cast()
   var lines =<< trim END
-    vim9script
+    mnv9script
     class A
     endclass
     class B extends A
@@ -10173,7 +10173,7 @@ enddef
 " Test for using a variable of type "any" with an object
 def Test_any_obj_var_type()
   var lines =<< trim END
-    vim9script
+    mnv9script
     class A
       var name: string = "foobar"
       def Foo(): string
@@ -10193,7 +10193,7 @@ def Test_any_obj_var_type()
 
   # Try to set a non-existing variable
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
       var name: string = "foobar"
     endclass
@@ -10209,7 +10209,7 @@ def Test_any_obj_var_type()
 
   # Try to read a non-existing variable
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
       var name: string = "foobar"
     endclass
@@ -10225,7 +10225,7 @@ def Test_any_obj_var_type()
 
   # Try to invoke a non-existing method
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
       def Foo(): number
         return 10
@@ -10243,7 +10243,7 @@ def Test_any_obj_var_type()
 
   # Use an object which is a Dict value
   lines =<< trim END
-    vim9script
+    mnv9script
     class Foo
       def Bar(): number
         return 369
@@ -10265,7 +10265,7 @@ def Test_any_obj_var_type()
 
   # Nested data.  Object containing a Dict containing another Object.
   lines =<< trim END
-    vim9script
+    mnv9script
     class Context
       public var state: dict<any> = {}
     endclass
@@ -10290,7 +10290,7 @@ def Test_any_obj_var_type()
 
   # Accessing an object from a method inside the class using any type
   lines =<< trim END
-    vim9script
+    mnv9script
     class C
       def _G(): string
         return '_G'
@@ -10308,7 +10308,7 @@ def Test_any_obj_var_type()
   # Modifying an object protected variable from a method in another class using
   # any type
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class A
       var num = 10
@@ -10329,7 +10329,7 @@ def Test_any_obj_var_type()
   # Accessing a object protected variable from a method in another class using
   # any type
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class A
       var _num = 10
@@ -10349,7 +10349,7 @@ def Test_any_obj_var_type()
 
   # Accessing an object returned from an imported function and class
   lines =<< trim END
-    vim9script
+    mnv9script
     export class Foo
       public var name: string
     endclass
@@ -10359,12 +10359,12 @@ def Test_any_obj_var_type()
       return r
     enddef
   END
-  writefile(lines, 'Xanyvar1.vim', 'D')
+  writefile(lines, 'Xanyvar1.mnv', 'D')
 
   lines =<< trim END
-    vim9script
+    mnv9script
 
-    import './Xanyvar1.vim'
+    import './Xanyvar1.mnv'
 
     def GetName(): string
       var whatever = Xanyvar1.ReturnFooObject()
@@ -10377,7 +10377,7 @@ def Test_any_obj_var_type()
 
   # Try to modify a protected object variable using a variable of type "any"
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class Foo
       var n: number = 10
@@ -10392,7 +10392,7 @@ def Test_any_obj_var_type()
 
   # Try to read a protected object variable using a variable of type "any"
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class Foo
       var _n: number = 10
@@ -10409,7 +10409,7 @@ def Test_any_obj_var_type()
   # Read a protected object variable using a variable of type "any" in an object
   # method
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class Foo
       var _n: number = 10
@@ -10425,7 +10425,7 @@ def Test_any_obj_var_type()
 
   # Try to call a protected object method using a "any" type variable
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class Foo
       def _GetVal(): number
@@ -10444,7 +10444,7 @@ def Test_any_obj_var_type()
   # Call a protected object method using a "any" type variable from another
   # object method
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class Foo
       def _GetVal(): number
@@ -10462,7 +10462,7 @@ def Test_any_obj_var_type()
 
   # Method chaining
   lines =<< trim END
-    vim9script
+    mnv9script
 
     export class T
       var id: number = 268
@@ -10484,7 +10484,7 @@ def Test_any_obj_var_type()
 
   # Using a null object to access a member variable
   lines =<< trim END
-    vim9script
+    mnv9script
     def Fn(x: any): number
       return x.num
     enddef
@@ -10495,7 +10495,7 @@ def Test_any_obj_var_type()
 
   # Using a null object to invoke a method
   lines =<< trim END
-    vim9script
+    mnv9script
     def Fn(x: any)
       x.Foo()
     enddef
@@ -10506,7 +10506,7 @@ def Test_any_obj_var_type()
 
   # Try to change a const object variable using a "any" variable
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
       public const v1: number = 123
     endclass
@@ -10522,7 +10522,7 @@ def Test_any_obj_var_type()
 
   # Try to change a final object variable using a "any" variable
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
       public final v1: number = 123
     endclass
@@ -10538,7 +10538,7 @@ def Test_any_obj_var_type()
 
   # Assign a different type of value to an "any" type object variable
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
       public var v1: list<any> = [1, 2]
     endclass
@@ -10556,7 +10556,7 @@ enddef
 " Test for using an object method with mapnew()
 def Test_mapnew_with_instance_method()
   var lines =<< trim END
-    vim9script
+    mnv9script
 
     class Foo
       var str: string
@@ -10583,7 +10583,7 @@ def Test_mapnew_with_instance_method()
 
   # Error in the mapnew() function
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class Foo
       var str: string
@@ -10617,7 +10617,7 @@ enddef
 " Test for using an object method in a method call.
 def Test_use_object_method_in_a_method_call()
   var lines =<< trim END
-    vim9script
+    mnv9script
 
     class Foo
       def Cost(nums: list<number>): number
@@ -10637,7 +10637,7 @@ def Test_use_object_method_in_a_method_call()
 
   # Test for using a non-existing object method in string interpolation
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class Foo
       def Cost(nums: list<number>): number
@@ -10659,7 +10659,7 @@ enddef
 " Test for referencing an object variable which is not yet initialized
 def Test_uninitialized_object_var()
   var lines =<< trim END
-    vim9script
+    mnv9script
     class Foo
       const two: number = Foo.Two(this)
       const one: number = 1
@@ -10674,7 +10674,7 @@ def Test_uninitialized_object_var()
   v9.CheckSourceFailure(lines, "E1430: Uninitialized object variable 'one' referenced")
 
   lines =<< trim END
-    vim9script
+    mnv9script
     class Foo
       const one: number = Foo.One(this)
 
@@ -10688,7 +10688,7 @@ def Test_uninitialized_object_var()
   v9.CheckSourceSuccess(lines)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     class Foo
       const one: number = 1
       const two: number = Foo.Two(this)
@@ -10703,7 +10703,7 @@ def Test_uninitialized_object_var()
   v9.CheckSourceSuccess(lines)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     class Foo
       const Id: func(any): any = ((_) => (v) => v)(this)
 
@@ -10718,7 +10718,7 @@ def Test_uninitialized_object_var()
   v9.CheckSourceSuccess(lines)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     class Foo
       const Id: func(any): any = ((that) => (_) => that)(this)
 
@@ -10733,7 +10733,7 @@ def Test_uninitialized_object_var()
   v9.CheckSourceSuccess(lines)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     class Foo
       const Id: any = Foo.Id(this)
 
@@ -10748,7 +10748,7 @@ def Test_uninitialized_object_var()
   v9.CheckSourceFailure(lines, "E1430: Uninitialized object variable 'Id' referenced")
 
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class Foo
       var x: string = ''
@@ -10761,7 +10761,7 @@ def Test_uninitialized_object_var()
   v9.CheckSourceSuccess(lines)
 
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class Foo
       var x: string = this.x
@@ -10775,7 +10775,7 @@ enddef
 " Test for initializing member variables of compound type in the constructor
 def Test_constructor_init_compound_member_var()
   var lines =<< trim END
-    vim9script
+    mnv9script
 
     class Foo
       var v1: string = "aaa"
@@ -10803,7 +10803,7 @@ enddef
 " further extended
 def Test_abstract_method_across_hierarchy()
   var lines =<< trim END
-    vim9script
+    mnv9script
 
     abstract class A
       abstract def Foo(): string
@@ -10838,7 +10838,7 @@ def Test_abstract_method_across_hierarchy()
   v9.CheckSourceSuccess(lines)
 
   lines =<< trim END
-    vim9script
+    mnv9script
 
     abstract class A
       abstract def Foo(): string
@@ -10859,7 +10859,7 @@ def Test_abstract_method_across_hierarchy()
   v9.CheckSourceFailure(lines, 'E1373: Abstract method "Foo" is not implemented')
 
   lines =<< trim END
-    vim9script
+    mnv9script
 
     abstract class A
       abstract def M1(): string
@@ -10904,7 +10904,7 @@ def Test_abstract_method_across_hierarchy()
   v9.CheckSourceSuccess(lines)
 
   lines =<< trim END
-    vim9script
+    mnv9script
 
     abstract class A
       abstract def M1(): string
@@ -10955,7 +10955,7 @@ enddef
 " Test for using a protected new() method (singleton design pattern)
 def Test_protected_new_method()
   var lines =<< trim END
-    vim9script
+    mnv9script
     class A
       def _new()
       enddef
@@ -10965,7 +10965,7 @@ def Test_protected_new_method()
   v9.CheckSourceFailure(lines, 'E1325: Method "new" not found in class "A"', 6)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
       static var _instance: A
       static var handler: func = A._Internal
@@ -10992,7 +10992,7 @@ def Test_protected_new_method()
   v9.CheckSourceSuccess(lines)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     enum Test
       A,
       B,
@@ -11012,7 +11012,7 @@ enddef
 " Test for using 'super' in a closure function inside an object method
 def Test_super_in_closure()
   var lines =<< trim END
-    vim9script
+    mnv9script
 
     class A
       const _value: number
@@ -11037,7 +11037,7 @@ enddef
 " Test for using 'super' to access methods and variables
 def Test_super_keyword()
   var lines =<< trim END
-    vim9script
+    mnv9script
     class Base
       var name: string
       def ToString(): string
@@ -11058,7 +11058,7 @@ def Test_super_keyword()
   v9.CheckSourceSuccess(lines)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     class Child
       var age: number
       def ToString(): string
@@ -11071,7 +11071,7 @@ def Test_super_keyword()
   v9.CheckSourceFailure(lines, 'E1356: "super" must be followed by a dot', 1)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     class Base
       var name: string
       def ToString(): string
@@ -11088,7 +11088,7 @@ def Test_super_keyword()
   v9.CheckSourceFailure(lines, 'E1357: Using "super" not in a class method', 1)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     class Child
       var age: number
       def ToString(): string
@@ -11102,7 +11102,7 @@ def Test_super_keyword()
 
   # Using super, Child invokes Base method which has optional arg. #12471
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class Base
       var success: bool = false
@@ -11124,7 +11124,7 @@ def Test_super_keyword()
 
   # Using 'super' to access an object variable in the parent
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class A
       var foo: string = 'xxx'
@@ -11143,7 +11143,7 @@ def Test_super_keyword()
 
   # Using 'super' to access an static class variable in the parent should fail
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class A
       static var foo: string = 'xxx'
@@ -11161,7 +11161,7 @@ def Test_super_keyword()
 
   # Using super to access an overridden method in the parent class
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class A
       def Foo(): string
@@ -11187,7 +11187,7 @@ def Test_super_keyword()
   # Test for using super in a lambda function to invoke a base class method from
   # the new() method.
   lines =<< trim END
-    vim9script
+    mnv9script
 
     def G(F: func): string
       return F()
@@ -11217,7 +11217,7 @@ enddef
 " Test for using a list of objects
 def Test_method_call_from_list_of_objects()
   var lines =<< trim END
-    vim9script
+    mnv9script
 
     class A
       var n: list<number> = [100, 101]
@@ -11312,7 +11312,7 @@ def Test_method_call_from_list_of_objects()
   v9.CheckSourceSuccess(lines)
 
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class A
     endclass
@@ -11328,20 +11328,20 @@ def Test_method_call_from_list_of_objects()
     try
       Fn()
     catch
-      assert_exception('Vim(eval):E1012: Type mismatch; expected object<any> but got number')
+      assert_exception('MNV(eval):E1012: Type mismatch; expected object<any> but got number')
     endtry
 
     try
       objlist->add(10)
     catch
-      assert_exception('Vim(eval):E1012: Type mismatch; expected object<any> but got number')
+      assert_exception('MNV(eval):E1012: Type mismatch; expected object<any> but got number')
     endtry
   END
   v9.CheckSourceSuccess(lines)
 
   # Adding an enum to a List of objects should fail
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
     endclass
     class B
@@ -11358,13 +11358,13 @@ def Test_method_call_from_list_of_objects()
     try
       Fn()
     catch
-      assert_exception('Vim(eval):E1012: Type mismatch; expected object<any> but got enum<C>')
+      assert_exception('MNV(eval):E1012: Type mismatch; expected object<any> but got enum<C>')
     endtry
 
     try
       items->add(C.Green)
     catch
-      assert_exception('Vim(eval):E1012: Type mismatch; expected object<any> but got enum<C>')
+      assert_exception('MNV(eval):E1012: Type mismatch; expected object<any> but got enum<C>')
     endtry
 
     var items2 = [C.Red, C.Green]
@@ -11374,13 +11374,13 @@ def Test_method_call_from_list_of_objects()
     try
       Fn2()
     catch
-      assert_exception('Vim(eval):E1012: Type mismatch; expected enum<C> but got object<A>')
+      assert_exception('MNV(eval):E1012: Type mismatch; expected enum<C> but got object<A>')
     endtry
 
     try
       items2->add(B.new())
     catch
-      assert_exception('Vim(eval):E1012: Type mismatch; expected enum<C> but got object<B>')
+      assert_exception('MNV(eval):E1012: Type mismatch; expected enum<C> but got object<B>')
     endtry
   END
   v9.CheckSourceSuccess(lines)
@@ -11389,7 +11389,7 @@ enddef
 " Test for using a dict of objects
 def Test_dict_of_objects()
   var lines =<< trim END
-    vim9script
+    mnv9script
 
     class A
       var n: list<number> = [100, 101]
@@ -11468,7 +11468,7 @@ def Test_dict_of_objects()
   v9.CheckSourceSuccess(lines)
 
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class A
     endclass
@@ -11484,20 +11484,20 @@ def Test_dict_of_objects()
     try
       Fn()
     catch
-      assert_exception('Vim(eval):E1012: Type mismatch; expected object<any> but got number')
+      assert_exception('MNV(eval):E1012: Type mismatch; expected object<any> but got number')
     endtry
 
     try
       objdict['c'] = C.new()
     catch
-      assert_exception('Vim(eval):E1012: Type mismatch; expected object<any> but got number')
+      assert_exception('MNV(eval):E1012: Type mismatch; expected object<any> but got number')
     endtry
   END
   v9.CheckSourceSuccess(lines)
 
   # Adding an enum to a Dict of objects should fail
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
     endclass
     class B
@@ -11514,13 +11514,13 @@ def Test_dict_of_objects()
     try
       Fn()
     catch
-      assert_exception('Vim(eval):E1012: Type mismatch; expected object<any> but got enum<C>')
+      assert_exception('MNV(eval):E1012: Type mismatch; expected object<any> but got enum<C>')
     endtry
 
     try
       items['o_c'] = C.Green
     catch
-      assert_exception('Vim(var):E1012: Type mismatch; expected object<any> but got enum<C>')
+      assert_exception('MNV(var):E1012: Type mismatch; expected object<any> but got enum<C>')
     endtry
 
     var items2 = {red: C.Red, green: C.Green}
@@ -11530,13 +11530,13 @@ def Test_dict_of_objects()
     try
       Fn2()
     catch
-      assert_exception('Vim(eval):E1012: Type mismatch; expected enum<C> but got object<A>')
+      assert_exception('MNV(eval):E1012: Type mismatch; expected enum<C> but got object<A>')
     endtry
 
     try
       items2['o_a'] = B.new()
     catch
-      assert_exception('Vim(var):E1012: Type mismatch; expected enum<C> but got object<B>')
+      assert_exception('MNV(var):E1012: Type mismatch; expected enum<C> but got object<B>')
     endtry
   END
   v9.CheckSourceSuccess(lines)
@@ -11546,7 +11546,7 @@ enddef
 " object
 def Test_type_typename_funcs_with_object_variable()
   var lines =<< trim END
-    vim9script
+    mnv9script
 
     class A
     endclass
@@ -11579,7 +11579,7 @@ enddef
 def Test_object_any_type()
   # assigning different objects to variable of type object<any>
   var lines =<< trim END
-    vim9script
+    mnv9script
     class A
     endclass
     class B
@@ -11596,7 +11596,7 @@ def Test_object_any_type()
 
   # Use a list of object<any> variable
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
     endclass
     class B
@@ -11611,7 +11611,7 @@ def Test_object_any_type()
 
   # Using object<any> as a function argument type and the return type
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
     endclass
     class B
@@ -11652,7 +11652,7 @@ def Test_object_any_type()
 
   # Error if comparing object with non object when using COMPAREANY instruction
   lines =<< trim END
-    vim9script
+    mnv9script
 
     enum DirectiveType
         Unknown,
@@ -11677,7 +11677,7 @@ enddef
 " Test for object<{class}> type
 def Test_object_of_class_type()
   var lines =<< trim END
-    vim9script
+    mnv9script
     class A
     endclass
     var x: object<A>
@@ -11689,7 +11689,7 @@ def Test_object_of_class_type()
   v9.CheckSourceSuccess(lines)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
     endclass
     class B
@@ -11700,7 +11700,7 @@ def Test_object_of_class_type()
   v9.CheckSourceFailure(lines, 'E1012: Type mismatch; expected object<A> but got object<B>')
 
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
     endclass
     class B
@@ -11733,7 +11733,7 @@ def Test_object_of_class_type()
   v9.CheckSourceDefFailure(lines, 'E1009: Missing > after type: <any,any>')
 
   lines =<< trim END
-    vim9script
+    mnv9script
     var x: object<any,any>
   END
   v9.CheckSourceFailure(lines, 'E488: Trailing characters: ,any>')
@@ -11749,7 +11749,7 @@ enddef
 " Test for the object and class member type
 def Test_obj_class_member_type()
   var lines =<< trim END
-    vim9script
+    mnv9script
     class L
       var l: list<number>
     endclass
@@ -11760,7 +11760,7 @@ def Test_obj_class_member_type()
   v9.CheckSourceFailure(lines, 'E1012: Type mismatch; expected number but got string', 7)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     class T
       var t: list<tuple<string>>
     endclass
@@ -11771,7 +11771,7 @@ def Test_obj_class_member_type()
   v9.CheckSourceFailure(lines, 'E1012: Type mismatch; expected tuple<string> but got list<tuple<string, number, bool>>', 7)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     class D
       var d: dict<number>
     endclass
@@ -11782,7 +11782,7 @@ def Test_obj_class_member_type()
   v9.CheckSourceFailure(lines, 'E1013: Argument 2: type mismatch, expected dict<number> but got dict<string> in extend()', 7)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     class L
       public static var l: list<number>
     endclass
@@ -11793,7 +11793,7 @@ def Test_obj_class_member_type()
   v9.CheckSourceFailure(lines, 'E1012: Type mismatch; expected number but got string', 7)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     class T
       public static var t: list<tuple<string>>
     endclass
@@ -11804,7 +11804,7 @@ def Test_obj_class_member_type()
   v9.CheckSourceFailure(lines, 'E1012: Type mismatch; expected tuple<string> but got list<tuple<string, number, bool>>', 7)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     class D
       public static var d: dict<number>
     endclass
@@ -11819,7 +11819,7 @@ enddef
 " (self reference)
 func Test_class_selfref_gc()
   let lines =<< trim END
-    vim9script
+    mnv9script
     class Foo
       static var MyFoo = Foo.new()
       static var d = {a: [1, 2]}
@@ -11836,7 +11836,7 @@ endfunc
 " method.
 func Test_class_member_lambda()
   let lines =<< trim END
-    vim9script
+    mnv9script
     class A
       static var regular: string
       static var _protected: string
@@ -11869,4 +11869,4 @@ func Test_class_member_lambda()
   call v9.CheckSourceSuccess(lines)
 endfunc
 
-" vim: ts=8 sw=2 sts=2 expandtab tw=80 fdm=marker
+" mnv: ts=8 sw=2 sts=2 expandtab tw=80 fdm=marker
diff --git a/uvim/src/testdir/test_vim9_cmd.vim b/uvim/src/testdir/test_mnv9_cmd.mnv
index 1380440c40..9aef9c5ebd 100644
--- a/uvim/src/testdir/test_vim9_cmd.vim
+++ b/uvim/src/testdir/test_mnv9_cmd.mnv
@@ -1,28 +1,28 @@
 " Test commands that are not compiled in a :def function
 
-import './util/vim9.vim' as v9
+import './util/mnv9.mnv' as v9
 
-def Test_vim9cmd()
+def Test_mnv9cmd()
   var lines =<< trim END
-    vim9cmd var x = 123
+    mnv9cmd var x = 123
     let s:y = 'yes'
-    vim9c assert_equal(123, x)
-    vim9cm assert_equal('yes', y)
+    mnv9c assert_equal(123, x)
+    mnv9cm assert_equal('yes', y)
   END
   v9.CheckScriptSuccess(lines)
 
-  assert_fails('vim9cmd', 'E1164:')
+  assert_fails('mnv9cmd', 'E1164:')
   assert_fails('legacy', 'E1234:')
-  assert_fails('vim9cmd echo "con" . "cat"', 'E15:')
+  assert_fails('mnv9cmd echo "con" . "cat"', 'E15:')
 
   lines =<< trim END
       let str = 'con'
-      vim9cmd str .= 'cat'
+      mnv9cmd str .= 'cat'
   END
   v9.CheckScriptFailure(lines, 'E492:')
 
   lines =<< trim END
-      vim9script
+      mnv9script
       legacy echo "con" . "cat"
       legacy let str = 'con'
       legacy let str .= 'cat'
@@ -30,11 +30,11 @@ def Test_vim9cmd()
   v9.CheckScriptSuccess(lines)
 
   lines =<< trim END
-      vim9script
+      mnv9script
       def Foo()
         g:found_bar = "bar"
       enddef
-      nmap ,; :vim9cmd <SID>Foo()<CR>
+      nmap ,; :mnv9cmd <SID>Foo()<CR>
   END
   v9.CheckScriptSuccess(lines)
 
@@ -44,41 +44,41 @@ def Test_vim9cmd()
   unlet g:found_bar
 
   lines =<< trim END
-      vim9script
+      mnv9script
       legacy echo 1'000
   END
   v9.CheckScriptFailure(lines, 'E115:')
 
   lines =<< trim END
-      vim9script
+      mnv9script
       echo .10
   END
   v9.CheckScriptSuccess(lines)
   lines =<< trim END
-      vim9cmd echo .10
+      mnv9cmd echo .10
   END
   v9.CheckScriptSuccess(lines)
   lines =<< trim END
-      vim9script
+      mnv9script
       legacy echo .10
   END
   v9.CheckScriptFailure(lines, 'E15:')
 
   echo v:version
-  assert_fails('vim9cmd echo version', 'E121:')
+  assert_fails('mnv9cmd echo version', 'E121:')
   lines =<< trim END
-      vim9script
+      mnv9script
       echo version
   END
   v9.CheckScriptFailure(lines, 'E121:')
   lines =<< trim END
-      vim9script
+      mnv9script
       legacy echo version
   END
   v9.CheckScriptSuccess(lines)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     def Func()
         var d: dict<string>
         d.k .= ''
@@ -87,7 +87,7 @@ def Test_vim9cmd()
   END
   v9.CheckScriptFailure(lines, 'E985:')
   lines =<< trim END
-    vim9script
+    mnv9script
     def Func()
         var d: dict<string>
         d.k ,= ''
@@ -110,7 +110,7 @@ defcompile profile Test_defcompile_fails
 def Test_cmdmod_execute()
   # "legacy" applies not only to the "exe" argument but also to the commands
   var lines =<< trim END
-      vim9script
+      mnv9script
 
       b:undo = 'let g:undone = 1 | let g:undtwo = 2'
       legacy exe b:undo
@@ -119,10 +119,10 @@ def Test_cmdmod_execute()
   END
   v9.CheckScriptSuccess(lines)
 
-  # same for "vim9cmd" modifier
+  # same for "mnv9cmd" modifier
   lines =<< trim END
       let b:undo = 'g:undone = 11 | g:undtwo = 22'
-      vim9cmd exe b:undo
+      mnv9cmd exe b:undo
       call assert_equal(11, g:undone)
       call assert_equal(22, g:undtwo)
   END
@@ -133,18 +133,18 @@ def Test_cmdmod_execute()
 
   # "legacy" does not apply to a loaded script
   lines =<< trim END
-      vim9script
+      mnv9script
       export var exported = 'x'
   END
-  writefile(lines, 'Xvim9import.vim', 'D')
+  writefile(lines, 'Xmnv9import.mnv', 'D')
   lines =<< trim END
-      legacy exe "import './Xvim9import.vim'"
+      legacy exe "import './Xmnv9import.mnv'"
   END
   v9.CheckScriptSuccess(lines)
 
   # "legacy" does not apply to a called function
   lines =<< trim END
-      vim9script
+      mnv9script
 
       def g:TheFunc()
         if exists('something')
@@ -156,41 +156,41 @@ def Test_cmdmod_execute()
   v9.CheckScriptSuccess(lines)
   delfunc g:TheFunc
 
-  # vim9cmd execute(cmd) executes code in Vim9 script context
+  # mnv9cmd execute(cmd) executes code in MNV9 script context
   lines =<< trim END
-    vim9cmd execute("g:vim9executetest = 'bar'")
-    call assert_equal('bar', g:vim9executetest)
+    mnv9cmd execute("g:mnv9executetest = 'bar'")
+    call assert_equal('bar', g:mnv9executetest)
   END
   v9.CheckScriptSuccess(lines)
-  unlet g:vim9executetest
+  unlet g:mnv9executetest
 
   lines =<< trim END
-    vim9cmd execute(["g:vim9executetest1 = 'baz'", "g:vim9executetest2 = 'foo'"])
-    call assert_equal('baz', g:vim9executetest1)
-    call assert_equal('foo', g:vim9executetest2)
+    mnv9cmd execute(["g:mnv9executetest1 = 'baz'", "g:mnv9executetest2 = 'foo'"])
+    call assert_equal('baz', g:mnv9executetest1)
+    call assert_equal('foo', g:mnv9executetest2)
   END
   v9.CheckScriptSuccess(lines)
-  unlet g:vim9executetest1
-  unlet g:vim9executetest2
+  unlet g:mnv9executetest1
+  unlet g:mnv9executetest2
 
-  # legacy call execute(cmd) executes code in Vim script context
+  # legacy call execute(cmd) executes code in MNV script context
   lines =<< trim END
-    vim9script
-    legacy call execute("let g:vim9executetest = 'bar'")
-    assert_equal('bar', g:vim9executetest)
+    mnv9script
+    legacy call execute("let g:mnv9executetest = 'bar'")
+    assert_equal('bar', g:mnv9executetest)
   END
   v9.CheckScriptSuccess(lines)
-  unlet g:vim9executetest
+  unlet g:mnv9executetest
 
   lines =<< trim END
-    vim9script
-    legacy call execute(["let g:vim9executetest1 = 'baz'", "let g:vim9executetest2 = 'foo'"])
-    assert_equal('baz', g:vim9executetest1)
-    assert_equal('foo', g:vim9executetest2)
+    mnv9script
+    legacy call execute(["let g:mnv9executetest1 = 'baz'", "let g:mnv9executetest2 = 'foo'"])
+    assert_equal('baz', g:mnv9executetest1)
+    assert_equal('foo', g:mnv9executetest2)
   END
   v9.CheckScriptSuccess(lines)
-  unlet g:vim9executetest1
-  unlet g:vim9executetest2
+  unlet g:mnv9executetest1
+  unlet g:mnv9executetest2
 enddef
 
 def Test_edit_wildcards()
@@ -273,7 +273,7 @@ def Test_expand_alternate_file()
     assert_equal('Xtwofile', bufname())
     assert_fails('edit %%<3', 'E684:')
 
-    edit Xfileone.vim
+    edit Xfileone.mnv
     edit Xfiletwo
     edit %%:r
     assert_equal('Xfileone', bufname())
@@ -346,12 +346,12 @@ def Test_hardcopy_wildcards()
 enddef
 
 def Test_syn_include_wildcards()
-  writefile(['syn keyword Found found'], 'Xthemine.vim', 'D')
+  writefile(['syn keyword Found found'], 'Xthemine.mnv', 'D')
   var save_rtp = &rtp
   &rtp = '.'
 
   var fname = 'mine'
-  syn include @Group Xthe`=fname`.vim
+  syn include @Group Xthe`=fname`.mnv
   assert_match('Found.* contained found', execute('syn list Found'))
 
   &rtp = save_rtp
@@ -359,7 +359,7 @@ enddef
 
 def Test_echo_linebreak()
   var lines =<< trim END
-      vim9script
+      mnv9script
       redir @a
       echo 'one'
             .. 'two'
@@ -369,7 +369,7 @@ def Test_echo_linebreak()
   v9.CheckScriptSuccess(lines)
 
   lines =<< trim END
-      vim9script
+      mnv9script
       redir @a
       echo 11 +
             77
@@ -392,7 +392,7 @@ def Test_condition_types()
       endif
   END
   v9.CheckDefFailure(lines, 'E1012:', 1)
-  v9.CheckScriptFailure(['vim9script'] + lines, 'E745:', 2)
+  v9.CheckScriptFailure(['mnv9script'] + lines, 'E745:', 2)
 
   lines =<< trim END
       g:cond = 'text'
@@ -424,7 +424,7 @@ def Test_condition_types()
       endif
   END
   v9.CheckDefFailure(lines, 'E1012:', 3)
-  v9.CheckScriptFailure(['vim9script'] + lines, 'E745:', 4)
+  v9.CheckScriptFailure(['mnv9script'] + lines, 'E745:', 4)
 
   lines =<< trim END
       g:cond = 'text'
@@ -439,14 +439,14 @@ def Test_condition_types()
       endwhile
   END
   v9.CheckDefFailure(lines, 'E1012:', 1)
-  v9.CheckScriptFailure(['vim9script'] + lines, 'E1135:', 2)
+  v9.CheckScriptFailure(['mnv9script'] + lines, 'E1135:', 2)
 
   lines =<< trim END
       while [1]
       endwhile
   END
   v9.CheckDefFailure(lines, 'E1012:', 1)
-  v9.CheckScriptFailure(['vim9script'] + lines, 'E745:', 2)
+  v9.CheckScriptFailure(['mnv9script'] + lines, 'E745:', 2)
 
   lines =<< trim END
       g:cond = 'text'
@@ -458,7 +458,7 @@ enddef
 
 def Test_if_linebreak()
   var lines =<< trim END
-      vim9script
+      mnv9script
       if 1 &&
             true
             || 1
@@ -470,7 +470,7 @@ def Test_if_linebreak()
   unlet g:res
 
   lines =<< trim END
-      vim9script
+      mnv9script
       if 1 &&
             0
         g:res = 0
@@ -487,7 +487,7 @@ enddef
 
 def Test_while_linebreak()
   var lines =<< trim END
-      vim9script
+      mnv9script
       var nr = 0
       while nr <
               10 + 3
@@ -499,7 +499,7 @@ def Test_while_linebreak()
   v9.CheckScriptSuccess(lines)
 
   lines =<< trim END
-      vim9script
+      mnv9script
       var nr = 0
       while nr
             <
@@ -517,7 +517,7 @@ enddef
 
 def Test_for_linebreak()
   var lines =<< trim END
-      vim9script
+      mnv9script
       var nr = 0
       for x
             in
@@ -529,7 +529,7 @@ def Test_for_linebreak()
   v9.CheckScriptSuccess(lines)
 
   lines =<< trim END
-      vim9script
+      mnv9script
       var nr = 0
       for x
             in
@@ -552,7 +552,7 @@ enddef
 
 def Test_method_call_linebreak()
   var lines =<< trim END
-      vim9script
+      mnv9script
       var res = []
       func RetArg(
             arg
@@ -613,7 +613,7 @@ def Test_method_call_linebreak()
   bwipe!
 
   lines =<< trim END
-      vim9script
+      mnv9script
       def Foo(): string
           return '# some text'
       enddef
@@ -646,7 +646,7 @@ enddef
 
 def Test_method_and_user_command()
   var lines =<< trim END
-      vim9script
+      mnv9script
       def Cmd()
         g:didFunc = 1
       enddef
@@ -799,7 +799,7 @@ def Test_dict_member()
    assert_equal({data: [3, 2, 1]}, test)
 
   var lines =<< trim END
-      vim9script
+      mnv9script
       var test: dict<list<number>> = {data: [3, 1, 2]}
       test.data->sort()
       assert_equal({data: [1, 2, 3]}, test)
@@ -937,7 +937,7 @@ enddef
 
 func Test_command_modifier_confirm()
   CheckNotGui
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   " Test for saving all the modified buffers
   let lines =<< trim END
@@ -948,18 +948,18 @@ func Test_command_modifier_confirm()
   END
   call writefile(lines, 'Xconfirmscript', 'D')
   call writefile(['empty'], 'Xcmodfile')
-  let buf = RunVimInTerminal('-S Xconfirmscript', {'rows': 8})
+  let buf = RunMNVInTerminal('-S Xconfirmscript', {'rows': 8})
   call term_sendkeys(buf, ":call Getout()\n")
   call WaitForAssert({-> assert_match('(Y)es, \[N\]o: ', term_getline(buf, 8))}, 1000)
   call term_sendkeys(buf, "y")
   call WaitForAssert({-> assert_match('(Y)es, \[N\]o: ', term_getline(buf, 8))}, 1000)
   call term_sendkeys(buf, "\<CR>")
   call TermWait(buf)
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 
   call assert_equal(['changed'], readfile('Xcmodfile'))
   call delete('Xcmodfile')
-  call delete('.Xcmodfile.swp')  " in case Vim was killed
+  call delete('.Xcmodfile.swp')  " in case MNV was killed
 endfunc
 
 def Test_command_modifiers_keep()
@@ -995,7 +995,7 @@ def Test_command_modifiers_keep()
     DoTest(true, false, false)
     DoTest(false, true, true)
     DoTest(true, true, true)
-    set cpo&vim
+    set cpo&mnv
 
     new
     setline(1, ['one', 'two', 'three', 'four'])
@@ -1133,7 +1133,7 @@ def Test_modifier_silent_unsilent()
   assert_equal("\ncaught", execute(':1messages'))
 
   var lines =<< trim END
-      vim9script
+      mnv9script
       set history=11
       silent! while 0
         set history=22
@@ -1145,10 +1145,10 @@ def Test_modifier_silent_unsilent()
 enddef
 
 def Test_range_after_command_modifier()
-  v9.CheckScriptFailure(['vim9script', 'silent keepjump 1d _'], 'E1050: Colon required before a range: 1d _', 2)
+  v9.CheckScriptFailure(['mnv9script', 'silent keepjump 1d _'], 'E1050: Colon required before a range: 1d _', 2)
   new
   setline(1, 'xxx')
-  v9.CheckScriptSuccess(['vim9script', 'silent keepjump :1d _'])
+  v9.CheckScriptSuccess(['mnv9script', 'silent keepjump :1d _'])
   assert_equal('', getline(1))
   bwipe!
 
@@ -1177,7 +1177,7 @@ def Test_useless_command_modifier()
       silent endfor
   END
   v9.CheckDefFailure(lines, 'E1176:', 2)
-  v9.CheckScriptSuccess(['vim9script'] + lines)
+  v9.CheckScriptSuccess(['mnv9script'] + lines)
 
   lines =<< trim END
       while g:maybe
@@ -1185,7 +1185,7 @@ def Test_useless_command_modifier()
   END
   v9.CheckDefFailure(lines, 'E1176:', 2)
   g:maybe = false
-  v9.CheckScriptSuccess(['vim9script'] + lines)
+  v9.CheckScriptSuccess(['mnv9script'] + lines)
 
   lines =<< trim END
       silent try
@@ -1241,7 +1241,7 @@ def Test_eval_command()
   unlet g:val
 
   var lines =<< trim END
-    vim9script
+    mnv9script
     g:caught = 'no'
     try
       eval 123 || 0
@@ -1263,7 +1263,7 @@ def Test_map_command()
 
   # backslash before bar is not removed
   lines =<< trim END
-      vim9script
+      mnv9script
 
       def Init()
         noremap <buffer> <F5> <ScriptCmd>MyFunc('a') \| MyFunc('b')<CR>
@@ -1338,7 +1338,7 @@ enddef
 def Test_put_with_linebreak()
   new
   var lines =<< trim END
-    vim9script
+    mnv9script
     pu =split('abc', '\zs')
             ->join()
   END
@@ -1378,7 +1378,7 @@ enddef
 def Test_iput_with_linebreak()
   new
   var lines =<< trim END
-    vim9script
+    mnv9script
     ip =split('abc', '\zs')
             ->join()
   END
@@ -1413,7 +1413,7 @@ enddef
 
 def Test_f_args()
   var lines =<< trim END
-    vim9script
+    mnv9script
 
     func SaveCmdArgs(...)
       let g:args = a:000
@@ -1434,20 +1434,20 @@ def Test_user_command_comment()
   command -nargs=1 Comd echom <q-args>
 
   var lines =<< trim END
-      vim9script
+      mnv9script
       Comd # comment
   END
   v9.CheckScriptSuccess(lines)
 
   lines =<< trim END
-      vim9script
+      mnv9script
       Comd# comment
   END
   v9.CheckScriptFailure(lines, 'E1144:')
   delcommand Comd
 
   lines =<< trim END
-      vim9script
+      mnv9script
       command Foo echo 'Foo'
       Foo3Bar
   END
@@ -1458,7 +1458,7 @@ enddef
 
 def Test_star_command()
   var lines =<< trim END
-    vim9script
+    mnv9script
     @s = 'g:success = 8'
     set cpo+=*
     exe '*s'
@@ -1681,7 +1681,7 @@ def Test_lockvar()
   assert_true(caught)
 
   var lines =<< trim END
-      vim9script
+      mnv9script
       g:bl = 0z1122
       lockvar g:bl
       def Tryit()
@@ -1692,7 +1692,7 @@ def Test_lockvar()
   v9.CheckScriptFailure(lines, 'E741:', 1)
 
   lines =<< trim END
-      vim9script
+      mnv9script
       var theList = [1, 2, 3]
       def SetList()
         theList[1] = 22
@@ -1705,7 +1705,7 @@ def Test_lockvar()
   v9.CheckScriptFailure(lines, 'E1119:', 4)
 
   lines =<< trim END
-      vim9script
+      mnv9script
       var theList = [1, 2, 3]
       def AddToList()
         lockvar theList
@@ -1716,7 +1716,7 @@ def Test_lockvar()
   v9.CheckScriptFailure(lines, 'E741:', 2)
 
   lines =<< trim END
-      vim9script
+      mnv9script
       var theList = [1, 2, 3]
       def AddToList()
         lockvar theList
@@ -1769,14 +1769,14 @@ def Test_lockvar()
   v9.CheckDefFailure(lines, 'E1178:', 2)
 
   lines =<< trim END
-      vim9script
+      mnv9script
       var name = 'john'
       lockvar nameX
   END
   v9.CheckScriptFailure(lines, 'E1246:', 3)
 
   lines =<< trim END
-      vim9script
+      mnv9script
       var name = 'john'
       def LockIt()
         lockvar nameX
@@ -1786,14 +1786,14 @@ def Test_lockvar()
   v9.CheckScriptFailure(lines, 'E1246:', 1)
 
   lines =<< trim END
-      vim9script
+      mnv9script
       const name = 'john'
       unlockvar name
   END
   v9.CheckScriptFailure(lines, 'E46:', 3)
 
   lines =<< trim END
-      vim9script
+      mnv9script
       const name = 'john'
       def UnLockIt()
         unlockvar name
@@ -1854,7 +1854,7 @@ def Test_substitute_expr()
   # When calling a function the right instruction list needs to be restored.
   g:cond = true
   var lines =<< trim END
-      vim9script
+      mnv9script
       def Foo()
           Bar([])
       enddef
@@ -1962,7 +1962,7 @@ enddef
 
 def Test_echo_void()
   var lines =<< trim END
-      vim9script
+      mnv9script
       def NoReturn()
         echo 'nothing'
       enddef
@@ -1971,7 +1971,7 @@ def Test_echo_void()
   v9.CheckScriptFailure(lines, 'E1186:', 5)
 
   lines =<< trim END
-      vim9script
+      mnv9script
       def NoReturn()
         echo 'nothing'
       enddef
@@ -2087,9 +2087,9 @@ def Test_no_space_after_command()
 enddef
 
 def Test_lambda_crash()
-  # This used to crash Vim
+  # This used to crash MNV
   var lines =<< trim END
-    vim9 () => super      => {
+    mnv9 () => super      => {
   END
   v9.CheckScriptFailureList(lines, ["E1356:", "E1405:"])
 enddef
@@ -2128,4 +2128,4 @@ def Test_syntax_enable_clear()
 enddef
 
 
-" vim: ts=8 sw=2 sts=2 expandtab tw=80 fdm=marker
+" mnv: ts=8 sw=2 sts=2 expandtab tw=80 fdm=marker
diff --git a/uvim/src/testdir/test_vim9_disassemble.vim b/uvim/src/testdir/test_mnv9_disassemble.mnv
index 759226a417..e8e90c80d9 100644
--- a/uvim/src/testdir/test_vim9_disassemble.vim
+++ b/uvim/src/testdir/test_mnv9_disassemble.mnv
@@ -1,6 +1,6 @@
 " Test the :disassemble command, and compilation as a side effect
 
-import './util/vim9.vim' as v9
+import './util/mnv9.mnv' as v9
 
 func s:NotCompiled()
   echo "not"
@@ -64,7 +64,7 @@ def Test_disassemble_load()
         '\d\+ LOADV v:version\_s*' ..
         '\d\+ ECHO 1\_s*' ..
         'echo s:scriptvar\_s*' ..
-        '\d\+ LOADS s:scriptvar from .*test_vim9_disassemble.vim\_s*' ..
+        '\d\+ LOADS s:scriptvar from .*test_mnv9_disassemble.mnv\_s*' ..
         '\d\+ ECHO 1\_s*' ..
         'echo g:globalvar\_s*' ..
         '\d\+ LOADG g:globalvar\_s*' ..
@@ -351,13 +351,13 @@ def Test_disassemble_push()
   exe 'set rtp^=' .. getcwd() .. '/Xdisdir'
 
   var lines =<< trim END
-      vim9script
+      mnv9script
   END
-  writefile(lines, 'Xdisdir/autoload/autoscript.vim')
+  writefile(lines, 'Xdisdir/autoload/autoscript.mnv')
 
   lines =<< trim END
-      vim9script
-      import autoload 'autoscript.vim'
+      mnv9script
+      import autoload 'autoscript.mnv'
 
       def AutoloadFunc()
         &operatorfunc = autoscript.Opfunc
@@ -377,11 +377,11 @@ def Test_disassemble_push()
 enddef
 
 def Test_disassemble_import_autoload()
-  writefile(['vim9script'], 'XimportAL.vim', 'D')
+  writefile(['mnv9script'], 'XimportAL.mnv', 'D')
 
   var lines =<< trim END
-      vim9script
-      import autoload './XimportAL.vim'
+      mnv9script
+      import autoload './XimportAL.mnv'
 
       def AutoloadFunc()
         echo XimportAL.SomeFunc()
@@ -392,21 +392,21 @@ def Test_disassemble_import_autoload()
       var res = execute('disass AutoloadFunc')
       assert_match('<SNR>\d*_AutoloadFunc.*' ..
             'echo XimportAL.SomeFunc()\_s*' ..
-            '\d SOURCE .*/testdir/XimportAL.vim\_s*' ..
+            '\d SOURCE .*/testdir/XimportAL.mnv\_s*' ..
             '\d PUSHFUNC "<80><fd>R\d\+_SomeFunc"\_s*' ..
             '\d PCALL top (argc 0)\_s*' ..
             '\d PCALL end\_s*' ..
             '\d ECHO 1\_s*' ..
 
             'echo XimportAL.someVar\_s*' ..
-            '\d SOURCE .*/testdir/XimportAL.vim\_s*' ..
-            '\d LOADEXPORT s:someVar from .*/testdir/XimportAL.vim\_s*' ..
+            '\d SOURCE .*/testdir/XimportAL.mnv\_s*' ..
+            '\d LOADEXPORT s:someVar from .*/testdir/XimportAL.mnv\_s*' ..
             '\d ECHO 1\_s*' ..
 
             'XimportAL.someVar = "yes"\_s*' ..
             '\d\+ PUSHS "yes"\_s*' ..
-            '\d\+ SOURCE .*/testdir/XimportAL.vim\_s*' ..
-            '\d\+ STOREEXPORT someVar in .*/testdir/XimportAL.vim\_s*' ..
+            '\d\+ SOURCE .*/testdir/XimportAL.mnv\_s*' ..
+            '\d\+ STOREEXPORT someVar in .*/testdir/XimportAL.mnv\_s*' ..
 
             '\d\+ RETURN void',
             res)
@@ -417,15 +417,15 @@ enddef
 def Test_disassemble_import_autoload_autoload()
   mkdir('Xauto_auto/autoload', 'pR')
   var lines =<< trim END
-    vim9script
+    mnv9script
     export const val = 11
   END
-  writefile(lines, 'Xauto_auto/autoload/Xauto_vars_f1.vim')
+  writefile(lines, 'Xauto_auto/autoload/Xauto_vars_f1.mnv')
 
   lines =<< trim END
-    vim9script
+    mnv9script
 
-    import autoload './Xauto_auto/autoload/Xauto_vars_f1.vim' as f1
+    import autoload './Xauto_auto/autoload/Xauto_vars_f1.mnv' as f1
     def F()
         f1.val = 13
     enddef
@@ -434,8 +434,8 @@ def Test_disassemble_import_autoload_autoload()
     assert_match('<SNR>\d*_F.*' ..
       'f1.val = 13\_s*' ..
       '\d PUSHNR 13\_s*' ..
-      '\d SOURCE .*/Xauto_auto/autoload/Xauto_vars_f1.vim\_s*' ..
-      '\d STOREEXPORT val in .*/Xauto_auto/autoload/Xauto_vars_f1.vim\_s*' ..
+      '\d SOURCE .*/Xauto_auto/autoload/Xauto_vars_f1.mnv\_s*' ..
+      '\d STOREEXPORT val in .*/Xauto_auto/autoload/Xauto_vars_f1.mnv\_s*' ..
       '\d RETURN void',
       res)
   END
@@ -472,7 +472,7 @@ def Test_disassemble_store()
         'v:char = ''abc''.*' ..
         'STOREV v:char.*' ..
         's:scriptvar = ''sv''.*' ..
-        ' STORES s:scriptvar in .*test_vim9_disassemble.vim.*' ..
+        ' STORES s:scriptvar in .*test_mnv9_disassemble.mnv.*' ..
         'g:globalvar = ''gv''.*' ..
         ' STOREG g:globalvar.*' ..
         'g:auto#var = ''av''.*' ..
@@ -1822,7 +1822,7 @@ enddef
 def Test_disassemble_object_cast()
   # Downcasting.
   var lines =<< trim END
-      vim9script
+      mnv9script
       class A
       endclass
       class B extends A
@@ -1845,7 +1845,7 @@ def Test_disassemble_object_cast()
 
   # Upcasting.
   lines =<< trim END
-      vim9script
+      mnv9script
       class A
         var mylen: number
       endclass
@@ -1867,7 +1867,7 @@ def Test_disassemble_object_cast()
 
   # Casting, type is not statically known.
   lines =<< trim END
-      vim9script
+      mnv9script
       class A
       endclass
       class B extends A
@@ -2445,27 +2445,27 @@ def Test_disassemble_compare_const()
 enddef
 
 def s:Execute()
-  execute 'help vim9.txt'
-  var cmd = 'help vim9.txt'
+  execute 'help mnv9.txt'
+  var cmd = 'help mnv9.txt'
   execute cmd
-  var tag = 'vim9.txt'
+  var tag = 'mnv9.txt'
   execute 'help ' .. tag
 enddef
 
 def Test_disassemble_execute()
   var res = execute('disass s:Execute')
   assert_match('\<SNR>\d*_Execute\_s*' ..
-        "execute 'help vim9.txt'\\_s*" ..
-        '\d PUSHS "help vim9.txt"\_s*' ..
+        "execute 'help mnv9.txt'\\_s*" ..
+        '\d PUSHS "help mnv9.txt"\_s*' ..
         '\d EXECUTE 1\_s*' ..
-        "var cmd = 'help vim9.txt'\\_s*" ..
-        '\d PUSHS "help vim9.txt"\_s*' ..
+        "var cmd = 'help mnv9.txt'\\_s*" ..
+        '\d PUSHS "help mnv9.txt"\_s*' ..
         '\d STORE $0\_s*' ..
         'execute cmd\_s*' ..
         '\d LOAD $0\_s*' ..
         '\d EXECUTE 1\_s*' ..
-        "var tag = 'vim9.txt'\\_s*" ..
-        '\d PUSHS "vim9.txt"\_s*' ..
+        "var tag = 'mnv9.txt'\\_s*" ..
+        '\d PUSHS "mnv9.txt"\_s*' ..
         '\d STORE $1\_s*' ..
         "execute 'help ' .. tag\\_s*" ..
         '\d\+ PUSHS "help "\_s*' ..
@@ -2590,9 +2590,9 @@ def Test_display_func()
         res3)
 enddef
 
-def Test_vim9script_forward_func()
+def Test_mnv9script_forward_func()
   var lines =<< trim END
-    vim9script
+    mnv9script
     def FuncOne(): string
       return FuncTwo()
     enddef
@@ -3062,7 +3062,7 @@ enddef
 
 def Test_disassemble_after_reload()
   var lines =<< trim END
-      vim9script
+      mnv9script
       if exists('g:ThisFunc')
         finish
       endif
@@ -3076,17 +3076,17 @@ def Test_disassemble_after_reload()
         return 0
       enddef
   END
-  lines->writefile('Xreload.vim', 'D')
+  lines->writefile('Xreload.mnv', 'D')
 
-  source Xreload.vim
+  source Xreload.mnv
   g:ThisFunc()
   g:ThatFunc()
 
-  source Xreload.vim
+  source Xreload.mnv
   var res = execute('disass g:ThisFunc')
   assert_match('ThisFunc\_s*' ..
         'g:name = name\_s*' ..
-        '\d LOADSCRIPT \[deleted\] from .*/Xreload.vim\_s*' ..
+        '\d LOADSCRIPT \[deleted\] from .*/Xreload.mnv\_s*' ..
         '\d STOREG g:name\_s*' ..
         'return 0\_s*' ..
         '\d PUSHNR 0\_s*' ..
@@ -3097,7 +3097,7 @@ def Test_disassemble_after_reload()
   assert_match('ThatFunc\_s*' ..
         'name = g:name\_s*' ..
         '\d LOADG g:name\_s*' ..
-        '\d STORESCRIPT \[deleted\] in .*/Xreload.vim\_s*' ..
+        '\d STORESCRIPT \[deleted\] in .*/Xreload.mnv\_s*' ..
         'return 0\_s*' ..
         '\d PUSHNR 0\_s*' ..
         '\d RETURN\_s*',
@@ -3172,7 +3172,7 @@ enddef
 
 def Test_disassemble_class_function()
   var lines =<< trim END
-      vim9script
+      mnv9script
 
       class Cl
           static def Fc(): string
@@ -3190,7 +3190,7 @@ def Test_disassemble_class_function()
         g:instr)
 
   lines =<< trim END
-      vim9script
+      mnv9script
 
       class Cl
           def Fo(): string
@@ -3214,7 +3214,7 @@ enddef
 " variables.
 def Test_disassemble_interface_static_member()
   var lines =<< trim END
-    vim9script
+    mnv9script
     interface I
       var o_var: number
       var o_var2: number
@@ -3275,7 +3275,7 @@ enddef
 " Disassemble instructions for loading and storing class variables
 def Test_disassemble_class_variable()
   var lines =<< trim END
-    vim9script
+    mnv9script
 
     class A
       public static var val = 10
@@ -3302,7 +3302,7 @@ enddef
 " Disassemble instructions for METHODCALL
 def Test_disassemble_methodcall()
   var lines =<< trim END
-    vim9script
+    mnv9script
     interface A
       def Foo()
     endinterface
@@ -3325,7 +3325,7 @@ enddef
 " Disassemble instructions for ISN_JUMP_IF_ARG_NOT_SET
 def Test_disassemble_ifargnotset()
   var lines =<< trim END
-    vim9script
+    mnv9script
     class A
       var val: number = 10
     endclass
@@ -3350,7 +3350,7 @@ enddef
 " Disassemble instructions for ISN_COMPAREOBJECT
 def Test_disassemble_compare_class_object()
   var lines =<< trim END
-    vim9script
+    mnv9script
     class A
     endclass
     class B
@@ -3376,7 +3376,7 @@ enddef
 " Disassemble instructions for ISN_CHECKTYPE with a float|number
 def Test_checktype_float()
   var lines =<< trim END
-    vim9script
+    mnv9script
     def Foo()
       var f: float = 0.0
       var a: any
@@ -3403,7 +3403,7 @@ enddef
 " Disassemble instructions for ISN_FUNCREF with a class
 def Test_funcref_with_class()
   var lines =<< trim END
-    vim9script
+    mnv9script
     class A
       def Foo()
       enddef
@@ -3430,7 +3430,7 @@ enddef
 " Disassemble instructions for calls to a string() function in an object
 def Test_disassemble_object_string()
   var lines =<< trim END
-    vim9script
+    mnv9script
     class A
       def string(): string
         return 'A'
@@ -3461,7 +3461,7 @@ def Test_disassemble_object_string()
 
   # Use the default string() function for a class
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
     endclass
     def Bar()
@@ -3491,7 +3491,7 @@ enddef
 " Disassemble instructions for calls to a empty() function in an object
 def Test_disassemble_object_empty()
   var lines =<< trim END
-    vim9script
+    mnv9script
     class A
       def empty(): bool
         return true
@@ -3517,7 +3517,7 @@ def Test_disassemble_object_empty()
 
   # Use the default empty() function for a class
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
     endclass
     def Bar()
@@ -3542,7 +3542,7 @@ enddef
 " Disassemble instructions for calls to a len() function in an object
 def Test_disassemble_object_len()
   var lines =<< trim END
-    vim9script
+    mnv9script
     class A
       def len(): number
         return 10
@@ -3568,7 +3568,7 @@ def Test_disassemble_object_len()
 
   # Use the default len() function for a class
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
     endclass
     def Bar()
@@ -3593,7 +3593,7 @@ enddef
 " Disassemble instructions for using a compound operator in a closure
 def Test_disassemble_compound_op_in_closure()
   var lines =<< trim END
-    vim9script
+    mnv9script
     class A
       var foo: number = 1
       def Foo(): func
@@ -3624,7 +3624,7 @@ enddef
 
 def Test_disassemble_member_initializer()
   var lines =<< trim END
-    vim9script
+    mnv9script
     class A
       var l: list<string> = []
       var d: dict<string> = {}
@@ -3647,7 +3647,7 @@ enddef
 " Disassemble the code generated for accessing a interface member variable
 def Test_disassemble_interface_variable_access()
   var lines =<< trim END
-    vim9script
+    mnv9script
     interface IX
       var F: func(): string
     endinterface
@@ -3672,7 +3672,7 @@ enddef
 " Disassemble the code generated for accessing a script-local funcref
 def Test_disassemble_using_script_local_funcref()
   var lines =<< trim END
-    vim9script
+    mnv9script
     def Noop()
     enddef
     export var Setup = Noop
@@ -3695,16 +3695,16 @@ enddef
 " in an instance variable initialization expression
 def Test_disassemble_using_script_local_var_in_obj_init()
   var lines =<< trim END
-    vim9script
+    mnv9script
     const DEFAULT = 'default-obj_key'
     export class ObjKey
       const unique_object_id3 = DEFAULT
     endclass
   END
-  writefile(lines, 'Xscriptlocalobjinit.vim', 'D')
+  writefile(lines, 'Xscriptlocalobjinit.mnv', 'D')
   lines =<< trim END
-    vim9script
-    import './Xscriptlocalobjinit.vim' as obj_key
+    mnv9script
+    import './Xscriptlocalobjinit.mnv' as obj_key
 
     class C1 extends obj_key.ObjKey
     endclass
@@ -3713,8 +3713,8 @@ def Test_disassemble_using_script_local_var_in_obj_init()
   v9.CheckScriptSuccess(lines)
   assert_match('new\_s*' ..
     '0 NEW C1 size \d\+\_s*' ..
-    '1 SCRIPTCTX_SET .*/Xscriptlocalobjinit.vim\_s*' ..
-    '2 LOADSCRIPT DEFAULT-0 from .*/Xscriptlocalobjinit.vim\_s*' ..
+    '1 SCRIPTCTX_SET .*/Xscriptlocalobjinit.mnv\_s*' ..
+    '2 LOADSCRIPT DEFAULT-0 from .*/Xscriptlocalobjinit.mnv\_s*' ..
     '3 SCRIPTCTX_SET .*\_s*' ..
     '4 STORE_THIS 0', g:instr)
   unlet g:instr
@@ -3723,7 +3723,7 @@ enddef
 " Disassemble the code generated for indexing a tuple
 def Test_disassemble_tuple_indexing()
   var lines =<< trim END
-    vim9script
+    mnv9script
     def Fn(): tuple<...list<number>>
       var t = (5, 6, 7)
       var i = t[2]
@@ -3762,7 +3762,7 @@ enddef
 " Disassemble the code generated for assigning a tuple to a default value
 def Test_disassemble_tuple_default_value()
   var lines =<< trim END
-    vim9script
+    mnv9script
     def Fn()
       var t: tuple<number>
     enddef
@@ -3781,7 +3781,7 @@ enddef
 " Disassemble the code generated for comparing tuples
 def Test_disassemble_tuple_compare()
   var lines =<< trim END
-    vim9script
+    mnv9script
     def Fn()
       var t1 = (1, 2)
       var t2 = t1
@@ -3813,7 +3813,7 @@ enddef
 " Disassemble the code generated for concatenating tuples
 def Test_disassemble_tuple_concatenate()
   var lines =<< trim END
-    vim9script
+    mnv9script
     def Fn()
       var t1 = (1,) + (2,)
     enddef
@@ -3836,7 +3836,7 @@ enddef
 " Disassemble the code generated for a constant tuple
 def Test_disassemble_tuple_const()
   var lines =<< trim END
-    vim9script
+    mnv9script
     def Fn()
       const t = (1, 2, 3)
       var x = t[1 : 2]
@@ -3868,7 +3868,7 @@ enddef
 " assignment
 def Test_disassemble_assign_tuple_set_type()
   var lines =<< trim END
-    vim9script
+    mnv9script
     def Fn()
       var x = (1,)
     enddef
@@ -3884,7 +3884,7 @@ def Test_disassemble_assign_tuple_set_type()
     '4 RETURN void', g:instr)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     def Fn()
       var x = ()
     enddef
@@ -3904,7 +3904,7 @@ enddef
 def Test_disassemble_has_shortcircuit()
   # true && false condition check
   var lines =<< trim END
-    vim9script
+    mnv9script
     def Fn(): string
       if has('jumplist') && has('foobar')
         return 'present'
@@ -3924,7 +3924,7 @@ def Test_disassemble_has_shortcircuit()
 
   # false && true condition check
   lines =<< trim END
-    vim9script
+    mnv9script
     def Fn(): string
       if has('foobar') && has('jumplist')
         return 'present'
@@ -3944,7 +3944,7 @@ def Test_disassemble_has_shortcircuit()
 
   # false && false condition check
   lines =<< trim END
-    vim9script
+    mnv9script
     def Fn(): string
       if has('foobar') && has('foobaz')
         return 'present'
@@ -3964,7 +3964,7 @@ def Test_disassemble_has_shortcircuit()
 
   # true || false condition check
   lines =<< trim END
-    vim9script
+    mnv9script
     def Fn(): string
       if has('jumplist') || has('foobar')
         return 'present'
@@ -3986,7 +3986,7 @@ def Test_disassemble_has_shortcircuit()
 
   # false || true condition check
   lines =<< trim END
-    vim9script
+    mnv9script
     def Fn(): string
       if has('foobar') || has('jumplist')
         return 'present'
@@ -4008,7 +4008,7 @@ def Test_disassemble_has_shortcircuit()
 
   # false || false condition check
   lines =<< trim END
-    vim9script
+    mnv9script
     def Fn(): string
       if has('foobar') || has('foobaz')
         return 'present'
@@ -4030,7 +4030,7 @@ enddef
 " Disassemble the code generated for a loop with closure following another loop
 def Test_disassemble_loop_with_closure_after_loop()
   var lines =<< trim END
-    vim9script
+    mnv9script
     def Fn()
       for i in "a"
         var v1 = 0
@@ -4094,4 +4094,4 @@ def Test_disassemble_loop_with_closure_after_loop()
     '30 RETURN void', g:instr)
 enddef
 
-" vim: ts=8 sw=2 sts=2 expandtab tw=80 fdm=marker
+" mnv: ts=8 sw=2 sts=2 expandtab tw=80 fdm=marker
diff --git a/uvim/src/testdir/test_vim9_enum.vim b/uvim/src/testdir/test_mnv9_enum.mnv
index be4c8f6d5b..7a79f13459 100644
--- a/uvim/src/testdir/test_vim9_enum.vim
+++ b/uvim/src/testdir/test_mnv9_enum.mnv
@@ -1,19 +1,19 @@
-" Test Vim9 enums
+" Test MNV9 enums
 
-import './util/vim9.vim' as v9
+import './util/mnv9.mnv' as v9
 
 " Test for parsing an enum definition
 def Test_enum_parse()
-  # enum supported only in a Vim9 script
+  # enum supported only in a MNV9 script
   var lines =<< trim END
     enum Foo
     endenum
   END
-  v9.CheckSourceFailure(lines, 'E1414: Enum can only be defined in Vim9 script', 1)
+  v9.CheckSourceFailure(lines, 'E1414: Enum can only be defined in MNV9 script', 1)
 
   # First character in an enum name should be capitalized.
   lines =<< trim END
-    vim9script
+    mnv9script
     enum foo
     endenum
   END
@@ -21,7 +21,7 @@ def Test_enum_parse()
 
   # Only alphanumeric characters are supported in an enum name
   lines =<< trim END
-    vim9script
+    mnv9script
     enum Foo@bar
     endenum
   END
@@ -29,7 +29,7 @@ def Test_enum_parse()
 
   # Unsupported keyword (instead of enum)
   lines =<< trim END
-    vim9script
+    mnv9script
     noenum Something
     endenum
   END
@@ -37,7 +37,7 @@ def Test_enum_parse()
 
   # Only the complete word "enum" should be recognized
   lines =<< trim END
-    vim9script
+    mnv9script
     enums Something
     endenum
   END
@@ -45,7 +45,7 @@ def Test_enum_parse()
 
   # The complete "enum" should be specified.
   lines =<< trim END
-    vim9script
+    mnv9script
     enu Something
     endenum
   END
@@ -53,7 +53,7 @@ def Test_enum_parse()
 
   # The complete "endenum" should be specified.
   lines =<< trim END
-    vim9script
+    mnv9script
     enum Something
     enden
   END
@@ -61,7 +61,7 @@ def Test_enum_parse()
 
   # Only the complete word "endenum" should be recognized
   lines =<< trim END
-    vim9script
+    mnv9script
     enum Something
     endenums
   END
@@ -69,7 +69,7 @@ def Test_enum_parse()
 
   # all lower case should be used for "enum"
   lines =<< trim END
-    vim9script
+    mnv9script
     Enum Something
     endenum
   END
@@ -77,7 +77,7 @@ def Test_enum_parse()
 
   # all lower case should be used for "endenum"
   lines =<< trim END
-    vim9script
+    mnv9script
     enum Something
     Endenum
   END
@@ -85,7 +85,7 @@ def Test_enum_parse()
 
   # Additional words after "endenum"
   lines =<< trim END
-    vim9script
+    mnv9script
     enum Something
     endenum school's out
   END
@@ -93,7 +93,7 @@ def Test_enum_parse()
 
   # Additional commands after "endenum"
   lines =<< trim END
-    vim9script
+    mnv9script
     enum Something
     endenum | echo 'done'
   END
@@ -101,14 +101,14 @@ def Test_enum_parse()
 
   # Try to define enum in a single command
   lines =<< trim END
-    vim9script
+    mnv9script
     enum Something | endenum
   END
   v9.CheckSourceFailure(lines, 'E488: Trailing characters: | endenum', 2)
 
   # another command follows the enum name
   lines =<< trim END
-    vim9script
+    mnv9script
     enum Something | var x = 10
       Foo
     endenum
@@ -117,7 +117,7 @@ def Test_enum_parse()
 
   # Try to define an enum with the same name as an existing variable
   lines =<< trim END
-    vim9script
+    mnv9script
     var Something: list<number> = [1]
     enum Something
     endenum
@@ -126,7 +126,7 @@ def Test_enum_parse()
 
   # Unsupported special character following enum name
   lines =<< trim END
-    vim9script
+    mnv9script
     enum Foo
       first,
       second : 20
@@ -136,7 +136,7 @@ def Test_enum_parse()
 
   # Try initializing an enum item with a number
   lines =<< trim END
-    vim9script
+    mnv9script
     enum Foo
       first,
       second = 2
@@ -146,7 +146,7 @@ def Test_enum_parse()
 
   # Try initializing an enum item with a String
   lines =<< trim END
-    vim9script
+    mnv9script
     enum Foo
       first,
       second = 'second'
@@ -157,7 +157,7 @@ def Test_enum_parse()
 
   # Try initializing an enum item with a List
   lines =<< trim END
-    vim9script
+    mnv9script
     enum Foo
       first,
       second = []
@@ -167,7 +167,7 @@ def Test_enum_parse()
 
   # Use a colon after name
   lines =<< trim END
-    vim9script
+    mnv9script
     enum Foo
 
       # first
@@ -179,7 +179,7 @@ def Test_enum_parse()
 
   # Use a '=='
   lines =<< trim END
-    vim9script
+    mnv9script
     enum Foo
       first == 1
     endenum
@@ -189,7 +189,7 @@ def Test_enum_parse()
 
   # Missing comma after an enum item
   lines =<< trim END
-    vim9script
+    mnv9script
     enum Planet
       mercury
       venus
@@ -199,7 +199,7 @@ def Test_enum_parse()
 
   # Comma at the beginning of an item
   lines =<< trim END
-    vim9script
+    mnv9script
     enum Planet
       mercury
       ,venus
@@ -208,7 +208,7 @@ def Test_enum_parse()
   v9.CheckSourceFailure(lines, 'E1419: Not a valid command in an Enum: ,venus', 4)
   # Space before comma
   lines =<< trim END
-    vim9script
+    mnv9script
     enum Planet
       mercury ,
       venus
@@ -218,7 +218,7 @@ def Test_enum_parse()
 
   # No space after comma
   lines =<< trim END
-    vim9script
+    mnv9script
     enum Planet
       mercury,venus
     endenum
@@ -227,7 +227,7 @@ def Test_enum_parse()
 
   # no comma between items in the same line
   lines =<< trim END
-    vim9script
+    mnv9script
     enum Planet
       mercury venus earth
     endenum
@@ -237,7 +237,7 @@ def Test_enum_parse()
 
   # No space after an item and comment between items
   lines =<< trim END
-    vim9script
+    mnv9script
     enum Planet
       mercury
 
@@ -249,7 +249,7 @@ def Test_enum_parse()
 
   # Comma is supported for the last item
   lines =<< trim END
-    vim9script
+    mnv9script
     enum Planet
       mercury,
       venus,
@@ -262,7 +262,7 @@ def Test_enum_parse()
 
   # invalid enum value declaration
   lines =<< trim END
-    vim9script
+    mnv9script
     enum Fruit
       Apple,
       $%@
@@ -273,7 +273,7 @@ def Test_enum_parse()
 
   # Duplicate enum value
   lines =<< trim END
-    vim9script
+    mnv9script
     enum A
       Foo,
       Bar,
@@ -284,7 +284,7 @@ def Test_enum_parse()
 
   # Duplicate enum value in the same line
   lines =<< trim END
-    vim9script
+    mnv9script
     enum A
       Foo, Bar, Foo,
       Bar
@@ -294,7 +294,7 @@ def Test_enum_parse()
 
   # Try extending a class when defining an enum
   lines =<< trim END
-    vim9script
+    mnv9script
     class Foo
     endclass
     enum Bar extends Foo
@@ -304,7 +304,7 @@ def Test_enum_parse()
 
   # Try extending an enum
   lines =<< trim END
-    vim9script
+    mnv9script
     enum Foo
     endenum
     enum Bar extends Foo
@@ -314,7 +314,7 @@ def Test_enum_parse()
 
   # Try extending an enum using a class
   lines =<< trim END
-    vim9script
+    mnv9script
     enum Foo
     endenum
     class Bar extends Foo
@@ -324,7 +324,7 @@ def Test_enum_parse()
 
   # Try implementing an enum using a class
   lines =<< trim END
-    vim9script
+    mnv9script
     enum Foo
     endenum
     class Bar implements Foo
@@ -334,7 +334,7 @@ def Test_enum_parse()
 
   # abstract method is not supported in an enum
   lines =<< trim END
-    vim9script
+    mnv9script
     enum Foo
       Apple
       abstract def Bar()
@@ -344,7 +344,7 @@ def Test_enum_parse()
 
   # Define an enum without any enum values but only with an object variable
   lines =<< trim END
-    vim9script
+    mnv9script
     enum Foo
       final n: number = 10
     endenum
@@ -355,7 +355,7 @@ enddef
 def Test_basic_enum()
   # Declare a simple enum
   var lines =<< trim END
-    vim9script
+    mnv9script
     enum Foo
       apple,
       orange
@@ -369,7 +369,7 @@ def Test_basic_enum()
 
   # Multiple enums in a single line
   lines =<< trim END
-    vim9script
+    mnv9script
     enum Foo
       apple, orange
     endenum
@@ -380,7 +380,7 @@ def Test_basic_enum()
 
   # Comments and empty lines are supported between enum items
   lines =<< trim END
-    vim9script
+    mnv9script
     enum Foo
       # Apple
       apple,
@@ -399,7 +399,7 @@ def Test_basic_enum()
 
   # Try using a non-existing enum value
   lines =<< trim END
-    vim9script
+    mnv9script
     enum Foo
       apple,
       orange
@@ -410,7 +410,7 @@ def Test_basic_enum()
 
   # Enum function argument
   lines =<< trim END
-    vim9script
+    mnv9script
     enum Foo
       apple,
       orange
@@ -424,7 +424,7 @@ def Test_basic_enum()
 
   # Enum function argument
   lines =<< trim END
-    vim9script
+    mnv9script
     enum Foo
       apple,
       orange
@@ -438,7 +438,7 @@ def Test_basic_enum()
 
   # Returning an enum in a function returning number
   lines =<< trim END
-    vim9script
+    mnv9script
     enum Foo
       apple,
       orange
@@ -452,7 +452,7 @@ def Test_basic_enum()
 
   # Returning a number in a function returning enum
   lines =<< trim END
-    vim9script
+    mnv9script
     enum Foo
       apple,
       orange
@@ -466,7 +466,7 @@ def Test_basic_enum()
 
   # Use a List of enums
   lines =<< trim END
-    vim9script
+    mnv9script
     enum Planet
       Mercury,
       Venus,
@@ -483,7 +483,7 @@ def Test_basic_enum()
 
   # Try using an enum as a value
   lines =<< trim END
-    vim9script
+    mnv9script
     enum Fruit
       Apple,
       Orange
@@ -496,7 +496,7 @@ enddef
 " Test for type() and typename() of an enum
 def Test_enum_type()
   var lines =<< trim END
-    vim9script
+    mnv9script
     enum Fruit
       Apple,
       Orange
@@ -512,7 +512,7 @@ def Test_enum_type()
 
   # Assign an enum to a variable with any type
   lines =<< trim END
-    vim9script
+    mnv9script
     enum Fruit
       Apple,
       Orange
@@ -529,7 +529,7 @@ enddef
 def Test_enum_modify()
   # Try assigning an unsupported value to an enum
   var lines =<< trim END
-    vim9script
+    mnv9script
     enum Foo
       apple
     endenum
@@ -539,7 +539,7 @@ def Test_enum_modify()
 
   # Try assigning an unsupported value to an enum in a function
   lines =<< trim END
-    vim9script
+    mnv9script
     enum Foo
       apple
     endenum
@@ -552,7 +552,7 @@ def Test_enum_modify()
 
   # Try assigning a number to an enum
   lines =<< trim END
-    vim9script
+    mnv9script
     enum Foo
       apple,
       orange
@@ -563,7 +563,7 @@ def Test_enum_modify()
 
   # Try assigning a number to an enum in a function
   lines =<< trim END
-    vim9script
+    mnv9script
     enum Foo
       apple
     endenum
@@ -576,7 +576,7 @@ def Test_enum_modify()
 
   # Try assigning a number to an enum value
   lines =<< trim END
-    vim9script
+    mnv9script
     enum Foo
       apple
     endenum
@@ -586,7 +586,7 @@ def Test_enum_modify()
 
   # Try assigning a number to an enum value in a function
   lines =<< trim END
-    vim9script
+    mnv9script
     enum Foo
       apple
     endenum
@@ -599,7 +599,7 @@ def Test_enum_modify()
 
   # Try assigning one enum to another
   lines =<< trim END
-    vim9script
+    mnv9script
     enum Foo
     endenum
     enum Bar
@@ -610,7 +610,7 @@ def Test_enum_modify()
 
   # Try assigning one enum to another in a function
   lines =<< trim END
-    vim9script
+    mnv9script
     enum Foo
     endenum
     enum Bar
@@ -624,7 +624,7 @@ def Test_enum_modify()
 
   # Try assigning one enum item to another enum item
   lines =<< trim END
-    vim9script
+    mnv9script
     enum Foo
       Apple
     endenum
@@ -637,7 +637,7 @@ def Test_enum_modify()
 
   # Try assigning one enum item to another enum item in a function
   lines =<< trim END
-    vim9script
+    mnv9script
     enum Foo
       Apple
     endenum
@@ -655,7 +655,7 @@ enddef
 " Test for using enum in an expression
 def Test_enum_expr()
   var lines =<< trim END
-    vim9script
+    mnv9script
     enum Color
       Red, Blue, Green
     endenum
@@ -664,7 +664,7 @@ def Test_enum_expr()
   v9.CheckSourceFailure(lines, 'E1421: Enum "Color" cannot be used as a value', 5)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     enum Color
       Red, Blue, Green
     endenum
@@ -673,7 +673,7 @@ def Test_enum_expr()
   v9.CheckSourceFailure(lines, 'E1424: Using an Enum "Color" as a Number', 5)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     enum Color
       Red, Blue, Green
     endenum
@@ -682,7 +682,7 @@ def Test_enum_expr()
   v9.CheckSourceFailure(lines, 'E1421: Enum "Color" cannot be used as a value', 5)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     enum Color
       Red, Blue, Green
     endenum
@@ -694,7 +694,7 @@ enddef
 " Using an enum in a lambda function
 def Test_enum_lambda()
   var lines =<< trim END
-    vim9script
+    mnv9script
     enum Planet
       Mercury,
       Venus,
@@ -711,7 +711,7 @@ enddef
 " Comparison using enums
 def Test_enum_compare()
   var lines =<< trim END
-    vim9script
+    mnv9script
     enum Planet
       Mercury,
       Venus,
@@ -764,7 +764,7 @@ enddef
 " Test for using an enum as a default argument to a function
 def Test_enum_default_arg()
   var lines =<< trim END
-    vim9script
+    mnv9script
     enum Day
       Monday, Tuesday, Wednesday
     endenum
@@ -780,7 +780,7 @@ enddef
 " Test for enum garbage collection
 func Test_enum_garbagecollect()
   let lines =<< trim END
-    vim9script
+    mnv9script
     enum Car
       Honda, Ford, Tesla
     endenum
@@ -796,7 +796,7 @@ func Test_enum_garbagecollect()
 
   " garbage collection with a variable of type any
   let lines =<< trim END
-    vim9script
+    mnv9script
     enum Car
       Honda, Ford, Tesla
     endenum
@@ -809,7 +809,7 @@ func Test_enum_garbagecollect()
 
   " garbage collection with function arguments and return types
   let lines =<< trim END
-    vim9script
+    mnv9script
     enum Car
       Honda, Ford, Tesla
     endenum
@@ -829,7 +829,7 @@ endfunc
 " Test for the enum values class variable
 def Test_enum_values()
   var lines =<< trim END
-    vim9script
+    mnv9script
     enum Car
       Honda, Ford, Tesla
     endenum
@@ -839,7 +839,7 @@ def Test_enum_values()
   v9.CheckSourceSuccess(lines)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     enum Car
       Honda,
       Ford,
@@ -849,7 +849,7 @@ def Test_enum_values()
   v9.CheckSourceSuccess(lines)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     enum Car
       Honda, Ford,
     endenum
@@ -859,7 +859,7 @@ def Test_enum_values()
 
   # empty enum
   lines =<< trim END
-    vim9script
+    mnv9script
     enum Car
     endenum
     assert_equal([], Car.values)
@@ -868,7 +868,7 @@ def Test_enum_values()
 
   # single value
   lines =<< trim END
-    vim9script
+    mnv9script
     enum Car
       Honda
     endenum
@@ -877,7 +877,7 @@ def Test_enum_values()
   v9.CheckSourceSuccess(lines)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     enum A
       Red,
       Blue
@@ -891,7 +891,7 @@ def Test_enum_values()
 
   # Other class variables in an enum should not be added to 'values'
   lines =<< trim END
-    vim9script
+    mnv9script
     enum LogLevel
       Error, Warn
       static const x: number = 22
@@ -902,7 +902,7 @@ def Test_enum_values()
 
   # Other class variable of enum type should not be added to 'values'
   lines =<< trim END
-    vim9script
+    mnv9script
     enum LogLevel
       Error, Warn
       static const x: LogLevel = LogLevel.Warn
@@ -915,7 +915,7 @@ enddef
 " Test comments in enums
 def Test_enum_comments()
   var lines =<< trim END
-    vim9script
+    mnv9script
     enum Car  # cars
       # before enum
       Honda,  # honda
@@ -927,7 +927,7 @@ def Test_enum_comments()
   v9.CheckSourceSuccess(lines)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     enum Car   # cars
       # before enum
       Honda(), # honda
@@ -940,7 +940,7 @@ def Test_enum_comments()
 
   # Test for using an unsupported comment
   lines =<< trim END
-    vim9script
+    mnv9script
     enum Car
       Honda,
       Ford,
@@ -954,7 +954,7 @@ enddef
 " Test trailing whitespace after enum values
 def Test_enum_whitespace()
   var lines =<< trim END
-    vim9script
+    mnv9script
     enum Car
       Honda, 
       Ford   
@@ -964,7 +964,7 @@ def Test_enum_whitespace()
   v9.CheckSourceSuccess(lines)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     enum Car
       Honda(), 
       Ford()   
@@ -977,7 +977,7 @@ enddef
 " Test string() with enums
 def Test_enum_string()
   var lines =<< trim END
-    vim9script
+    mnv9script
     enum Car
       Honda,
       Ford
@@ -989,7 +989,7 @@ def Test_enum_string()
 
   # customized string function
   lines =<< trim END
-    vim9script
+    mnv9script
     enum Dir
       North,
       South
@@ -1007,18 +1007,18 @@ enddef
 " Test for importing an enum
 def Test_enum_import()
   var lines =<< trim END
-    vim9script
+    mnv9script
     export enum Star
       Gemini,
       Orion,
       Pisces
     endenum
   END
-  writefile(lines, 'Xenumexport.vim', 'D')
+  writefile(lines, 'Xenumexport.mnv', 'D')
 
   lines =<< trim END
-    vim9script
-    import './Xenumexport.vim' as mod
+    mnv9script
+    import './Xenumexport.mnv' as mod
 
     var s1: mod.Star = mod.Star.Orion
     assert_equal(true, s1 == mod.Star.Orion)
@@ -1043,7 +1043,7 @@ enddef
 " Test for using test_refcount() with enum
 def Test_enum_refcount()
   var lines =<< trim END
-    vim9script
+    mnv9script
     enum Foo
     endenum
     assert_equal(1, test_refcount(Foo))
@@ -1071,7 +1071,7 @@ def Test_enum_refcount()
   v9.CheckSourceSuccess(lines)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     enum Star
       Gemini,
       Orion,
@@ -1102,7 +1102,7 @@ enddef
 " Test for defining an enum with additional object variables and methods
 def Test_enum_enhanced()
   var lines =<< trim END
-    vim9script
+    mnv9script
     enum Vehicle
       car(4, 5, 400),
       bus(6, 50, 800),
@@ -1144,7 +1144,7 @@ enddef
 def Test_enum_name()
   # Check the names of enum values
   var lines =<< trim END
-    vim9script
+    mnv9script
     enum Planet
       Mercury,
       Venus,
@@ -1159,7 +1159,7 @@ def Test_enum_name()
 
   # Check the name of enum items in the constructor
   lines =<< trim END
-    vim9script
+    mnv9script
     enum Planet
       Mercury("Mercury"),
       Venus("Venus"),
@@ -1175,7 +1175,7 @@ def Test_enum_name()
 
   # Try assigning to the name of an enum
   lines =<< trim END
-    vim9script
+    mnv9script
     enum Fruit
       Apple
     endenum
@@ -1185,7 +1185,7 @@ def Test_enum_name()
 
   # Try assigning to the name of an enum in a function
   lines =<< trim END
-    vim9script
+    mnv9script
     enum Fruit
       Apple
     endenum
@@ -1198,7 +1198,7 @@ def Test_enum_name()
 
   # Try to overwrite an enum value name in the enum constructor
   lines =<< trim END
-    vim9script
+    mnv9script
     enum Planet
       Mercury,
       Venus
@@ -1212,7 +1212,7 @@ def Test_enum_name()
 
   # Try to declare an object variable named 'name'
   lines =<< trim END
-    vim9script
+    mnv9script
     enum Planet
       Mercury
       var name: string
@@ -1225,7 +1225,7 @@ enddef
 def Test_enum_ordinal()
   # Check the ordinal values of enum items
   var lines =<< trim END
-    vim9script
+    mnv9script
     enum Planet
       Mercury,
       Venus,
@@ -1240,7 +1240,7 @@ def Test_enum_ordinal()
 
   # Check the ordinal value of enum items in the constructor
   lines =<< trim END
-    vim9script
+    mnv9script
     enum Planet
       Mercury(0),
       Venus(1),
@@ -1256,7 +1256,7 @@ def Test_enum_ordinal()
 
   # Try assigning to the ordinal value of an enum
   lines =<< trim END
-    vim9script
+    mnv9script
     enum Fruit
       Apple
     endenum
@@ -1266,7 +1266,7 @@ def Test_enum_ordinal()
 
   # Try assigning to the ordinal value of an enum in a function
   lines =<< trim END
-    vim9script
+    mnv9script
     enum Fruit
       Apple
     endenum
@@ -1279,7 +1279,7 @@ def Test_enum_ordinal()
 
   # Try to overwrite an enum value ordinal in the enum constructor
   lines =<< trim END
-    vim9script
+    mnv9script
     enum Planet
       Mercury,
       Venus
@@ -1293,7 +1293,7 @@ def Test_enum_ordinal()
 
   # Try to declare an object variable named 'ordinal'
   lines =<< trim END
-    vim9script
+    mnv9script
     enum Planet
       Mercury
       var ordinal: number
@@ -1305,7 +1305,7 @@ enddef
 " Test for trying to create a new enum object using the constructor
 def Test_enum_invoke_constructor()
   var lines =<< trim END
-    vim9script
+    mnv9script
     enum Foo
     endenum
     var f: Foo = Foo.new()
@@ -1313,7 +1313,7 @@ def Test_enum_invoke_constructor()
   v9.CheckSourceFailure(lines, 'E1325: Method "new" not found in class "Foo"', 4)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     enum Fruit
       Apple,
       Orange
@@ -1323,7 +1323,7 @@ def Test_enum_invoke_constructor()
   v9.CheckSourceFailure(lines, 'E1325: Method "new" not found in class "Fruit"', 6)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     enum Fruit
       Apple,
       Orange
@@ -1335,7 +1335,7 @@ def Test_enum_invoke_constructor()
   v9.CheckSourceFailure(lines, 'E1325: Method "newFruit" not found in class "Fruit"', 8)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     enum Fruit
       Apple,
       Orange
@@ -1349,7 +1349,7 @@ def Test_enum_invoke_constructor()
 
   # error in the enum constructor
   lines =<< trim END
-    vim9script
+    mnv9script
     enum Planet
       earth
       def new()
@@ -1363,7 +1363,7 @@ enddef
 " Test for checking "this" in an enum constructor
 def Test_enum_this_in_constructor()
   var lines =<< trim END
-    vim9script
+    mnv9script
     enum A
       Red("enum A.Red {name: 'Red', ordinal: 0}"),
       Blue("enum A.Blue {name: 'Blue', ordinal: 1}"),
@@ -1381,7 +1381,7 @@ enddef
 " Test for using member variables in an enum object
 def Test_enum_object_variable()
   var lines =<< trim END
-    vim9script
+    mnv9script
     enum Planet
       Jupiter(95),
       Saturn(146)
@@ -1395,7 +1395,7 @@ def Test_enum_object_variable()
 
   # Use a final object variable
   lines =<< trim END
-    vim9script
+    mnv9script
     enum Planet
       Jupiter(95),
       Saturn(146)
@@ -1412,7 +1412,7 @@ def Test_enum_object_variable()
 
   # Use a const object variable
   lines =<< trim END
-    vim9script
+    mnv9script
     enum Planet
       Mars(false),
       Jupiter(true)
@@ -1429,7 +1429,7 @@ def Test_enum_object_variable()
 
   # Use a regular object variable
   lines =<< trim END
-    vim9script
+    mnv9script
     enum Fruit
       Apple,
       Orange
@@ -1443,7 +1443,7 @@ def Test_enum_object_variable()
 
   # Invoke the default constructor with an object variable
   lines =<< trim END
-    vim9script
+    mnv9script
     enum Fruit
       Apple('foo'),
       Orange('bar')
@@ -1458,7 +1458,7 @@ def Test_enum_object_variable()
   # Invoke the default constructor with an argument but without the object
   # variable
   lines =<< trim END
-    vim9script
+    mnv9script
     enum Fruit
       Apple,
       Orange('bar')
@@ -1470,7 +1470,7 @@ def Test_enum_object_variable()
   # Define a default constructor with an argument, but don't pass it in when
   # defining the enum value
   lines =<< trim END
-    vim9script
+    mnv9script
     enum Fruit
       Apple(5),
       Orange
@@ -1487,7 +1487,7 @@ enddef
 def Test_enum_custom_constructor()
   # space before "("
   var lines =<< trim END
-    vim9script
+    mnv9script
     enum Fruit
       Apple(10),
       Orange (20)
@@ -1501,7 +1501,7 @@ def Test_enum_custom_constructor()
 
   # no closing ")"
   lines =<< trim END
-    vim9script
+    mnv9script
     enum Fruit
       Apple(10),
       Orange (20
@@ -1515,7 +1515,7 @@ def Test_enum_custom_constructor()
 
   # Specify constructor arguments split across multiple lines
   lines =<< trim END
-    vim9script
+    mnv9script
     enum Fruit
       Apple(10,
             'foo'), Orange(20,
@@ -1541,7 +1541,7 @@ def Test_enum_custom_constructor()
 
   # specify multiple enums with constructor arguments in a single line
   lines =<< trim END
-    vim9script
+    mnv9script
     enum Fruit
       Apple(10, 'foo'), Orange(20, 'bar'), Pear(30, 'baz'), Mango(40, 'qux')
       const n: number
@@ -1559,7 +1559,7 @@ enddef
 " Test for using class variables in an enum class
 def Test_enum_class_variable()
   var lines =<< trim END
-    vim9script
+    mnv9script
     enum Fruit
       Apple,
       Orange
@@ -1574,7 +1574,7 @@ enddef
 " Test for converting a string to an enum value
 def Test_enum_eval()
   var lines =<< trim END
-    vim9script
+    mnv9script
     enum Color
       Red,
       Blue
@@ -1591,7 +1591,7 @@ enddef
 " Test for using "values" in an enum class variable
 def Test_use_enum_values_in_class_variable()
   var lines =<< trim END
-    vim9script
+    mnv9script
     enum Dir
       North, South
       static const dirs: list<Dir> = Dir.values
@@ -1603,9 +1603,9 @@ enddef
 
 " Test for using lambda block in enums
 def Test_lambda_block_in_enum()
-  # This used to crash Vim
+  # This used to crash MNV
   var lines =<< trim END
-    vim9script
+    mnv9script
     enum IdEnum1
       ID1
       const Id: func(number): number = (num: number): number => {
@@ -1617,9 +1617,9 @@ def Test_lambda_block_in_enum()
   END
   v9.CheckScriptSuccess(lines)
 
-  # This used to crash Vim
+  # This used to crash MNV
   lines =<< trim END
-    vim9script
+    mnv9script
     enum IdEnum2
       ID1
       static const Id: func(number): number = (num: number): number => {
@@ -1635,7 +1635,7 @@ enddef
 " Echo an enum
 def Test_enum_echo()
   var lines =<< trim END
-    vim9script
+    mnv9script
     enum Demo
       one('tahi'),
       two('rua'),
@@ -1650,7 +1650,7 @@ enddef
 " Test for garbage collecting an enum with a complex member variables.
 func Test_class_selfref_gc()
   let lines =<< trim END
-    vim9script
+    mnv9script
     enum Foo
       Red,
       Blue
@@ -1667,7 +1667,7 @@ endfunc
 " Test for defining an enum in a function
 def Test_enum_defined_in_function()
   var lines =<< trim END
-    vim9script
+    mnv9script
     def Fn()
       var x = 1
       enum Foo
@@ -1679,4 +1679,4 @@ def Test_enum_defined_in_function()
   v9.CheckScriptFailure(lines, 'E1435: Enum can only be used in a script', 2)
 enddef
 
-" vim: ts=8 sw=2 sts=2 expandtab tw=80 fdm=marker
+" mnv: ts=8 sw=2 sts=2 expandtab tw=80 fdm=marker
diff --git a/uvim/src/testdir/test_vim9_expr.vim b/uvim/src/testdir/test_mnv9_expr.mnv
index ab0b02a6d1..eb7e05e76b 100644
--- a/uvim/src/testdir/test_vim9_expr.vim
+++ b/uvim/src/testdir/test_mnv9_expr.mnv
@@ -1,6 +1,6 @@
-" Tests for Vim9 script expressions
+" Tests for MNV9 script expressions
 
-import './util/vim9.vim' as v9
+import './util/mnv9.mnv' as v9
 
 let g:cond = v:false
 def FuncOne(arg: number): string
@@ -69,7 +69,7 @@ def Test_expr1_ternary()
   v9.CheckDefAndScriptFailure(lines, ['E1001: Variable not found: FuncOne', 'E121: Undefined variable: FuncTwo'])
 enddef
 
-def Test_expr1_ternary_vimscript()
+def Test_expr1_ternary_mnvscript()
   # check line continuation
   var lines =<< trim END
       var name = 1
@@ -196,9 +196,9 @@ func Test_expr1_ternary_fails()
   call v9.CheckDefExecAndScriptFailure(["var x = {} ? 'one' : 'two'"], 'E728:', 1)
 
   call v9.CheckDefExecFailure(["var x = false ? "], 'E1097:', 3)
-  call v9.CheckScriptFailure(['vim9script', "var x = false ? "], 'E15:', 2)
+  call v9.CheckScriptFailure(['mnv9script', "var x = false ? "], 'E15:', 2)
   call v9.CheckDefExecFailure(["var x = false ? 'one' : "], 'E1097:', 3)
-  call v9.CheckScriptFailure(['vim9script', "var x = false ? 'one' : "], 'E15:', 2)
+  call v9.CheckScriptFailure(['mnv9script', "var x = false ? 'one' : "], 'E15:', 2)
 
   call v9.CheckDefExecAndScriptFailure(["var x = true ? xxx : 'foo'"], ['E1001:', 'E121:'], 1)
   call v9.CheckDefExecAndScriptFailure(["var x = false ? 'foo' : xxx"], ['E1001:', 'E121:'], 1)
@@ -233,7 +233,7 @@ def Test_expr1_falsy()
 
   # falsy operator with objects and enum values
   lines =<< trim END
-    vim9script
+    mnv9script
     class C
     endclass
 
@@ -265,7 +265,7 @@ def Test_expr1_falsy()
 
   # class cannot be used with the falsy operator
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
     endclass
     echo A ?? 'falsy'
@@ -273,7 +273,7 @@ def Test_expr1_falsy()
   v9.CheckSourceScriptFailure(lines, 'E1405: Class "A" cannot be used as a value')
 
   lines =<< trim END
-    vim9script
+    mnv9script
     class B
     endclass
     echo !B
@@ -283,7 +283,7 @@ def Test_expr1_falsy()
   # Expression evaluation should stop after using a class with the falsy
   # operator
   lines =<< trim END
-    vim9script
+    mnv9script
     class C
     endclass
     var output: string = 'pass'
@@ -299,7 +299,7 @@ def Test_expr1_falsy()
   # be aborted in a function
   g:falsy_output = 'pass'
   lines =<< trim END
-    vim9script
+    mnv9script
     class C
     endclass
     g:falsy_output = 'pass'
@@ -315,7 +315,7 @@ def Test_expr1_falsy()
   # When using a class with the "!" operator, expression evaluation should be
   # aborted
   lines =<< trim END
-    vim9script
+    mnv9script
     class C
     endclass
     var output: string = 'pass'
@@ -331,7 +331,7 @@ def Test_expr1_falsy()
   # aborted in a function
   g:falsy_output = 'pass'
   lines =<< trim END
-    vim9script
+    mnv9script
     class C
     endclass
     def Fn()
@@ -344,20 +344,20 @@ def Test_expr1_falsy()
   unlet g:falsy_output
 
   lines =<< trim END
-    vim9script
+    mnv9script
     echo null_class ?? 'falsy'
   END
   v9.CheckSourceScriptFailure(lines, 'E1405: Class "" cannot be used as a value')
 
   lines =<< trim END
-    vim9script
+    mnv9script
     echo !null_class
   END
   v9.CheckSourceScriptFailure(lines, 'E1405: Class "" cannot be used as a value')
 
   # enum cannot be used with the falsy operator
   lines =<< trim END
-    vim9script
+    mnv9script
     enum E1
     endenum
     echo E1 ?? 'falsy'
@@ -365,7 +365,7 @@ def Test_expr1_falsy()
   v9.CheckSourceScriptFailure(lines, 'E1421: Enum "E1" cannot be used as a value')
 
   lines =<< trim END
-    vim9script
+    mnv9script
     enum E2
     endenum
     echo !E2
@@ -375,7 +375,7 @@ def Test_expr1_falsy()
   # Expression evaluation should stop after using an enum with the falsy
   # operator
   lines =<< trim END
-    vim9script
+    mnv9script
     enum E
     endenum
     var output: string = 'pass'
@@ -391,7 +391,7 @@ def Test_expr1_falsy()
   # be aborted in a function
   g:falsy_output = 'pass'
   lines =<< trim END
-    vim9script
+    mnv9script
     enum E3
     endenum
     g:falsy_output = 'pass'
@@ -406,7 +406,7 @@ def Test_expr1_falsy()
 
   # Expression evaluation should stop after using an enum with the ! operator
   lines =<< trim END
-    vim9script
+    mnv9script
     enum E
     endenum
     var output: string = 'pass'
@@ -422,7 +422,7 @@ def Test_expr1_falsy()
   # aborted in a function
   g:falsy_output = 'pass'
   lines =<< trim END
-    vim9script
+    mnv9script
     enum E4
     endenum
     def Fn()
@@ -436,14 +436,14 @@ def Test_expr1_falsy()
 
   # typealias cannot be used with the falsy operator
   lines =<< trim END
-    vim9script
+    mnv9script
     type T1 = list<bool>
     echo T1 ?? 'falsy'
   END
   v9.CheckSourceScriptFailure(lines, 'E1403: Type alias "T1" cannot be used as a value')
 
   lines =<< trim END
-    vim9script
+    mnv9script
     type T2 = list<bool>
     echo !T2
   END
@@ -452,7 +452,7 @@ def Test_expr1_falsy()
   # Expression evaluation should stop after using a typealias with the falsy
   # operator
   lines =<< trim END
-    vim9script
+    mnv9script
     type T3 = dict<string>
     var output: string = 'pass'
     try
@@ -467,7 +467,7 @@ def Test_expr1_falsy()
   # should be aborted in a function
   g:falsy_output = 'pass'
   lines =<< trim END
-    vim9script
+    mnv9script
     type T3 = dict<job>
     g:falsy_output = 'pass'
     def Fn()
@@ -482,7 +482,7 @@ def Test_expr1_falsy()
   # Expression evaluation should stop after using a typealias with the !
   # operator
   lines =<< trim END
-    vim9script
+    mnv9script
     type T3 = dict<string>
     var output: string = 'pass'
     try
@@ -497,7 +497,7 @@ def Test_expr1_falsy()
   # be aborted in a function
   g:falsy_output = 'pass'
   lines =<< trim END
-    vim9script
+    mnv9script
     type T4 = list<number>
     def Fn()
       echo !T4 !! execute('g:falsy_output = "fail"')
@@ -619,7 +619,7 @@ def Test_expr2()
   v9.CheckDefAndScriptSuccess(lines)
 enddef
 
-def Test_expr2_vimscript()
+def Test_expr2_mnvscript()
   # check line continuation
   var lines =<< trim END
       var name = 0
@@ -678,7 +678,7 @@ def Test_expr2_fails()
   v9.CheckDefAndScriptFailure(["var x = 1|| 0"], msg, 1)
 
   v9.CheckDefFailure(["var x = false || "], 'E1097:', 3)
-  v9.CheckScriptFailure(['vim9script', "var x = false || "], 'E15:', 2)
+  v9.CheckScriptFailure(['mnv9script', "var x = false || "], 'E15:', 2)
 
   # script does not fail, the second expression is skipped
   v9.CheckDefFailure(["var x = 1 || xxx"], 'E1001:', 1)
@@ -697,7 +697,7 @@ def Test_expr2_fails()
   v9.CheckDefAndScriptFailure(["var x = $'{false || []}'"], ['E1012: Type mismatch; expected bool but got list<any>', 'E745:'], 1)
 
   var lines =<< trim END
-    vim9script
+    mnv9script
     echo false
       ||true
     # comment
@@ -762,7 +762,7 @@ def Test_expr3()
   v9.CheckDefAndScriptSuccess(lines)
 enddef
 
-def Test_expr3_vimscript()
+def Test_expr3_mnvscript()
   # check line continuation
   var lines =<< trim END
       var name = 0
@@ -982,7 +982,7 @@ def Test_expr4_equal()
 
   v9.CheckDefAndScriptFailure(["var x = 'a' == xxx"], ['E1001:', 'E121:'], 1)
   v9.CheckDefFailure(["var x = 'a' == "], 'E1097:', 3)
-  v9.CheckScriptFailure(['vim9script', "var x = 'a' == "], 'E15:', 2)
+  v9.CheckScriptFailure(['mnv9script', "var x = 'a' == "], 'E15:', 2)
 
   v9.CheckDefExecAndScriptFailure(['var items: any', 'eval 1 + 1', 'eval 2 + 2', 'if items == []', 'endif'], ['E691:', 'E1072:'], 4)
 
@@ -992,7 +992,7 @@ def Test_expr4_equal()
   v9.CheckDefExecAndScriptFailure(["var x: any = 'a'", 'echo x == 99'], ['E1030:', 'E1072:'], 2)
 
   lines =<< trim END
-      vim9script
+      mnv9script
       var n: any = 2
       def Compare()
         eval n == '3'
@@ -1005,7 +1005,7 @@ def Test_expr4_equal()
   assert_true(g:notReached)
 
   lines =<< trim END
-      vim9script
+      mnv9script
       var n: any = 2.2
       def Compare()
         eval n == '3'
@@ -1198,7 +1198,7 @@ def Test_expr4_compare_null()
 
   # variables declared at script level used in a :def function
   lines =<< trim END
-      vim9script
+      mnv9script
 
       var l_decl: list<number>
       var l_empty = []
@@ -1582,7 +1582,7 @@ def g:RetVoid()
   var x = 1
 enddef
 
-def Test_expr4_vim9script()
+def Test_expr4_mnv9script()
   # check line continuation
   var lines =<< trim END
       var name = 0
@@ -1766,7 +1766,7 @@ func Test_expr4_fails()
 endfunc
 
 " test bitwise left and right shift operators
-" The tests for this is in test_expr.vim (Test_bitwise_shift)
+" The tests for this is in test_expr.mnv (Test_bitwise_shift)
 " def Test_expr5()
 " enddef
 
@@ -1834,7 +1834,7 @@ def Test_expr6()
   v9.CheckDefAndScriptSuccess(lines)
 enddef
 
-def Test_expr6_vim9script()
+def Test_expr6_mnv9script()
   # check line continuation
   var lines =<< trim END
       var name = 11
@@ -1983,7 +1983,7 @@ def Test_expr6_vim9script()
   endfor
 enddef
 
-def Test_expr6_vim9script_channel()
+def Test_expr6_mnv9script_channel()
   if !has('channel')
     MissingFeature 'channel'
   else
@@ -2139,7 +2139,7 @@ def Test_expr7()
 
   v9.CheckDefAndScriptFailure(["var x = 6 * xxx"], ['E1001:', 'E121:'], 1)
   v9.CheckDefFailure(["var d = 6 * "], 'E1097:', 3)
-  v9.CheckScriptFailure(['vim9script', "var d = 6 * "], 'E15:', 2)
+  v9.CheckScriptFailure(['mnv9script', "var d = 6 * "], 'E15:', 2)
 
   v9.CheckDefAndScriptFailure(['echo 1 / 0'], 'E1154:', 1)
   v9.CheckDefAndScriptFailure(['echo 1 % 0'], 'E1154:', 1)
@@ -2167,7 +2167,7 @@ def Test_expr7()
   v9.CheckDefExecAndScriptFailure(lines, 'E1154:', 2)
 enddef
 
-def Test_expr7_vim9script()
+def Test_expr7_mnv9script()
   # check line continuation
   var lines =<< trim END
       var name = 11
@@ -2342,12 +2342,12 @@ def Test_expr8()
   v9.CheckDefAndScriptFailure(["var x = <nr>123"], 'E1010:', 1)
   v9.CheckDefFailure(["var x = <number>"], 'E1097:', 3)
   v9.CheckDefFailure(["var x = <number>string(1)"], 'E1012:', 1)
-  v9.CheckScriptFailure(['vim9script', "var x = <number>"], 'E15:', 2)
+  v9.CheckScriptFailure(['mnv9script', "var x = <number>"], 'E15:', 2)
   v9.CheckDefAndScriptFailure(["var x = <number >123"], 'E1068:', 1)
   v9.CheckDefAndScriptFailure(["var x = <number 123"], 'E1104:', 1)
 
   lines =<< trim END
-      vim9script
+      mnv9script
 
       def Sum(v: any): float
         var sum = 0.0
@@ -2361,7 +2361,7 @@ def Test_expr8()
   v9.CheckScriptSuccess(lines)
 
   lines =<< trim END
-      vim9script
+      mnv9script
 
       def Sum(v: any): float
         var sum = 0.0
@@ -2396,7 +2396,7 @@ def Test_expr9_number()
   v9.CheckDefAndScriptSuccess(lines)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     eval("10\n")
   END
   v9.CheckSourceScriptFailure(lines, "E488: Trailing characters: \n")
@@ -2487,7 +2487,7 @@ def Test_expr9_string()
   v9.CheckDefAndScriptSuccess(lines)
 enddef
 
-def Test_expr9_vimvar()
+def Test_expr9_mnvvar()
   v:errors = []
   var errs: list<string> = v:errors
   v9.CheckDefFailure(['var errs: list<number> = v:errors'], 'E1012:')
@@ -2505,7 +2505,7 @@ def Test_expr9_vimvar()
   v9.CheckDefFailure(['var colors: dict<number> = v:colornames'], 'E1012:')
 
   v9.CheckDefFailure(["var old: list<number> = v:oldfiles"], 'E1012: Type mismatch; expected list<number> but got list<string>', 1)
-  v9.CheckScriptFailure(['vim9script', 'v:oldfiles = ["foo"]', "var old: list<number> = v:oldfiles"], 'E1012: Type mismatch; expected list<number> but got list<string>', 3)
+  v9.CheckScriptFailure(['mnv9script', 'v:oldfiles = ["foo"]', "var old: list<number> = v:oldfiles"], 'E1012: Type mismatch; expected list<number> but got list<string>', 3)
   new
   exec "normal! afoo fo\<C-N>\<Esc>"
   v9.CheckDefExecAndScriptFailure(["var old: dict<number> = v:completed_item"], 'E1012: Type mismatch; expected dict<number> but got dict<string>', 1)
@@ -2598,9 +2598,9 @@ def Test_expr9_list()
 
   v9.CheckDefExecAndScriptFailure(["var x = g:list_mixed['xx']"], ['E1012:', 'E1030:'], 1)
   v9.CheckDefFailure(["var x = g:list_mixed["], 'E1097:', 3)
-  v9.CheckScriptFailure(['vim9script', "var x = g:list_mixed["], 'E15:', 2)
+  v9.CheckScriptFailure(['mnv9script', "var x = g:list_mixed["], 'E15:', 2)
   v9.CheckDefFailure(["var x = g:list_mixed[0"], 'E1097:', 3)
-  v9.CheckScriptFailure(['vim9script', "var x = g:list_mixed[0"], 'E111:', 2)
+  v9.CheckScriptFailure(['mnv9script', "var x = g:list_mixed[0"], 'E111:', 2)
   v9.CheckDefExecAndScriptFailure(["var x = g:list_empty[3]"], 'E684:', 1)
   v9.CheckDefExecAndScriptFailure(["var l: list<number> = [234, 'x']"], 'E1012:', 1)
   v9.CheckDefExecAndScriptFailure(["var l: list<number> = ['x', 234]"], 'E1012:', 1)
@@ -2627,7 +2627,7 @@ def Test_expr9_list()
   v9.CheckDefAndScriptFailure(lines + ['echo numbers[a :b]'], 'E1004:', 4)
 enddef
 
-def Test_expr9_list_vim9script()
+def Test_expr9_list_mnv9script()
   var lines =<< trim END
       var l = [
 		11,
@@ -2853,7 +2853,7 @@ def Test_expr9_lambda_block()
               return nr
   END
   v9.CheckDefFailure(lines, 'E1171:', 0)  # line nr is function start
-  v9.CheckScriptFailure(['vim9script'] + lines, 'E1171:', 2)
+  v9.CheckScriptFailure(['mnv9script'] + lines, 'E1171:', 2)
 
   lines =<< trim END
       var Func = (nr: number): int => {
@@ -2861,7 +2861,7 @@ def Test_expr9_lambda_block()
              nothing
   END
   v9.CheckDefFailure(lines, 'E1145: Missing heredoc end marker: ENDIT', 0)
-  v9.CheckScriptFailure(['vim9script'] + lines, 'E1145: Missing heredoc end marker: ENDIT', 2)
+  v9.CheckScriptFailure(['mnv9script'] + lines, 'E1145: Missing heredoc end marker: ENDIT', 2)
 enddef
 
 def NewLambdaWithComments(): func
@@ -2967,7 +2967,7 @@ def Test_expr9_new_lambda()
   v9.CheckDefAndScriptFailure(['var Fx = (a) => [0', ' 1]'], 'E696:', 2)
 enddef
 
-def Test_expr9_lambda_vim9script()
+def Test_expr9_lambda_mnv9script()
   var lines =<< trim END
       var v = 10->((a) =>
 	    a
@@ -2997,7 +2997,7 @@ def Test_expr9funcref()
   v9.CheckDefAndScriptSuccess(lines)
 
   lines =<< trim END
-      vim9script
+      mnv9script
       func g:GlobalFunc()
         return 'global'
       endfunc
@@ -3135,7 +3135,7 @@ def Test_expr9_dict()
   v9.CheckDefAndScriptFailure(["var x = {xxx}"], 'E720:', 1)
   v9.CheckDefAndScriptFailure(["var x = {xxx: 1", "var y = 2"], 'E722:', 2)
   v9.CheckDefFailure(["var x = {xxx: 1,"], 'E723:', 2)
-  v9.CheckScriptFailure(['vim9script', "var x = {xxx: 1,"], 'E723:', 2)
+  v9.CheckScriptFailure(['mnv9script', "var x = {xxx: 1,"], 'E723:', 2)
   v9.CheckDefAndScriptFailure(["var x = {['a']: xxx}"], ['E1001:', 'E121:'], 1)
   v9.CheckDefAndScriptFailure(["var x = {a: 1, a: 2}"], 'E721:', 1)
   g:key = 'x'
@@ -3154,11 +3154,11 @@ def Test_expr9_dict()
   v9.CheckDefAndScriptFailure(["var x = {[[1, 2]]: 0}"], ['E1105:', 'E730:'], 1)
 
   v9.CheckDefFailure(['var x = ({'], 'E723:', 2)
-  v9.CheckScriptFailure(['vim9script', 'var x = ({'], 'E723:', 2)
+  v9.CheckScriptFailure(['mnv9script', 'var x = ({'], 'E723:', 2)
   v9.CheckDefExecAndScriptFailure(['{}[getftype("file")]'], 'E716: Key not present in Dictionary: ""', 1)
 enddef
 
-def Test_expr9_dict_vim9script()
+def Test_expr9_dict_mnv9script()
   var lines =<< trim END
       var d = {
 		['one']:
@@ -3259,7 +3259,7 @@ def Test_expr9_dict_vim9script()
     var d = {'a':
   END
   v9.CheckDefFailure(lines, 'E723:', 2)
-  v9.CheckScriptFailure(['vim9script'] + lines, 'E15:', 2)
+  v9.CheckScriptFailure(['mnv9script'] + lines, 'E15:', 2)
 
   lines =<< trim END
     def Func()
@@ -3282,7 +3282,7 @@ def Test_expr9_dict_vim9script()
   endif
 
   lines =<< trim END
-      vim9script
+      mnv9script
       var x = 99
       assert_equal({x: 99}, s:)
   END
@@ -3291,7 +3291,7 @@ enddef
 
 def Test_expr9_dict_in_block()
   var lines =<< trim END
-      vim9script
+      mnv9script
       command MyCommand {
           echo {
               k: 0, }
@@ -3314,7 +3314,7 @@ enddef
 
 def Test_expr9_call_2bool()
   var lines =<< trim END
-      vim9script
+      mnv9script
 
       def BrokenCall(nr: number, mode: bool, use: string): void
         assert_equal(3, nr)
@@ -3456,7 +3456,7 @@ def Test_expr9_any_index_slice()
   v9.CheckDefAndScriptSuccess(lines)
 
   lines =<< trim END
-      vim9script
+      mnv9script
 
       def PosIdx(s: string): string
         return s[1]
@@ -3500,18 +3500,18 @@ enddef
 
 def Test_expr9_const_any_index_slice()
   var lines =<< trim END
-      vim9script
+      mnv9script
 
       export def V(): dict<any>
         return {a: [1, 43], b: 0}
       enddef
   END
-  writefile(lines, 'XexportDict.vim', 'D')
+  writefile(lines, 'XexportDict.mnv', 'D')
 
   lines =<< trim END
-      vim9script
+      mnv9script
 
-      import './XexportDict.vim' as x
+      import './XexportDict.mnv' as x
 
       def Test()
         const v = x.V()
@@ -3522,7 +3522,7 @@ def Test_expr9_const_any_index_slice()
   v9.CheckScriptSuccess(lines)
 enddef
 
-def Test_expr_member_vim9script()
+def Test_expr_member_mnv9script()
   var lines =<< trim END
       var d = {one:
 		'one',
@@ -3688,7 +3688,7 @@ enddef
 "   :let $TEST_SKIP_PAT = 'Test_expr9_namespace_loop_script'
 def Test_expr9_namespace_loop_script()
   var lines =<< trim END
-      vim9script
+      mnv9script
       # check using g: in a for loop more than DO_NOT_FREE_CNT times
       var exists = 0
       var exists_not = 0
@@ -3741,7 +3741,7 @@ def Test_expr9_parens()
 
   # this uses up the ppconst stack
   lines =<< eval trim END
-    vim9script
+    mnv9script
     def F()
       g:result = 1 + {repeat('(1 + ', 51)}1{repeat(')', 51)}
     enddef
@@ -3818,7 +3818,7 @@ def Test_expr9_legacy_script()
   assert_equal('ok', g:LegacyReturn())
 
   lines =<< trim END
-      vim9script
+      mnv9script
       def GetNumber(): number
           legacy return notexists
       enddef
@@ -3827,7 +3827,7 @@ def Test_expr9_legacy_script()
   v9.CheckScriptFailure(lines, 'E121: Undefined variable: notexists')
 
   lines =<< trim END
-      vim9script
+      mnv9script
       def GetNumber(): number
           legacy return range(3)->map('v:val + 1')
       enddef
@@ -3886,7 +3886,7 @@ def Test_expr9_autoload_var()
       let autofile#var = 'found'
   END
   mkdir('Xruntime/autoload', 'pR')
-  writefile(auto_lines, 'Xruntime/autoload/autofile.vim')
+  writefile(auto_lines, 'Xruntime/autoload/autofile.mnv')
   var save_rtp = &rtp
   &rtp = getcwd() .. '/Xruntime,' .. &rtp
 
@@ -3910,7 +3910,7 @@ def Test_expr9_call_autoload()
       enddef
   END
   mkdir('Xruntime/autoload', 'pR')
-  writefile(auto_lines, 'Xruntime/autoload/some.vim')
+  writefile(auto_lines, 'Xruntime/autoload/some.mnv')
   var save_rtp = &rtp
   &rtp = getcwd() .. '/Xruntime,' .. &rtp
   assert_equal('found', g:some#func())
@@ -4014,7 +4014,7 @@ enddef
 def Test_expr9_method_call_linebreak()
   # this was giving an error when skipping over the expression
   var lines =<< trim END
-      vim9script
+      mnv9script
       def Test()
         var a: dict<any> = {b: {}}
         a.b->extend({f1: 1,
@@ -4028,7 +4028,7 @@ def Test_expr9_method_call_linebreak()
 
   # this was skipping over the expression without an error
   lines =<< trim END
-      vim9script
+      mnv9script
       def Test(s: string): string
         return substitute(s, 'A', '\=toupper("x")', 'g')
                           ->tolower()
@@ -4040,16 +4040,16 @@ enddef
 
 def Test_expr9_method_call_import()
   var lines =<< trim END
-      vim9script
+      mnv9script
       export def Square(items: list<number>): list<number>
           return map(items, (_, i) => i * i)
       enddef
   END
-  call writefile(lines, 'Xsquare.vim', 'D')
+  call writefile(lines, 'Xsquare.mnv', 'D')
 
   lines =<< trim END
-      vim9script
-      import './Xsquare.vim'
+      mnv9script
+      import './Xsquare.mnv'
 
       def Test(): list<number>
         return range(5)
@@ -4062,8 +4062,8 @@ def Test_expr9_method_call_import()
   v9.CheckScriptSuccess(lines)
 
   lines =<< trim END
-      vim9script
-      import './Xsquare.vim'
+      mnv9script
+      import './Xsquare.mnv'
 
       echo range(5)->Xsquare.NoSuchFunc()
   END
@@ -4139,7 +4139,7 @@ enddef
 
 func Test_expr9_fails()
   call v9.CheckDefFailure(["var x = (12"], "E1097:", 3)
-  call v9.CheckScriptFailure(['vim9script', "var x = (12"], 'E110:', 2)
+  call v9.CheckScriptFailure(['mnv9script', "var x = (12"], 'E110:', 2)
 
   call v9.CheckDefAndScriptFailure(["var x = -'xx'"], "E1030:", 1)
   call v9.CheckDefAndScriptFailure(["var x = +'xx'"], "E1030:", 1)
@@ -4151,7 +4151,7 @@ func Test_expr9_fails()
   call v9.CheckDefAndScriptFailure(["var x = @<"], "E354:", 1)
 
   call v9.CheckDefFailure(["var x = [1, 2"], "E697:", 2)
-  call v9.CheckScriptFailure(['vim9script', "var x = [1, 2"], 'E696:', 2)
+  call v9.CheckScriptFailure(['mnv9script', "var x = [1, 2"], 'E696:', 2)
 
   call v9.CheckDefAndScriptFailure(["var x = [notfound]"], ["E1001:", 'E121:'], 1)
 
@@ -4178,13 +4178,13 @@ func Test_expr9_fails()
   call v9.CheckDefAndScriptFailure(["'yes'->", "Echo()"], ['E488: Trailing characters: ->', 'E260: Missing name after ->'], 1)
 
   call v9.CheckDefExecFailure(["[1, 2->len()"], 'E697:', 2)
-  call v9.CheckScriptFailure(['vim9script', "[1, 2->len()"], 'E696:', 2)
+  call v9.CheckScriptFailure(['mnv9script', "[1, 2->len()"], 'E696:', 2)
 
   call v9.CheckDefFailure(["{a: 1->len()"], 'E723:', 2)
-  call v9.CheckScriptFailure(['vim9script', "{a: 1->len()"], 'E722:', 2)
+  call v9.CheckScriptFailure(['mnv9script', "{a: 1->len()"], 'E722:', 2)
 
   call v9.CheckDefExecFailure(["{['a']: 1->len()"], 'E723:', 2)
-  call v9.CheckScriptFailure(['vim9script', "{['a']: 1->len()"], 'E722:', 2)
+  call v9.CheckScriptFailure(['mnv9script', "{['a']: 1->len()"], 'E722:', 2)
 
   call v9.CheckDefFailure(['echo #{}'], 'E1170:')
 endfunc
@@ -4296,7 +4296,7 @@ def Test_expr9_string_subscript()
       var d = 'asdf'[1 :
   END
   v9.CheckDefFailure(lines, 'E1097:', 3)
-  v9.CheckScriptFailure(['vim9script'] + lines, 'E15:', 2)
+  v9.CheckScriptFailure(['mnv9script'] + lines, 'E15:', 2)
 
   lines =<< trim END
       var d = 'asdf'[1 : xxx]
@@ -4307,7 +4307,7 @@ def Test_expr9_string_subscript()
       var d = 'asdf'[1 : 2
   END
   v9.CheckDefFailure(lines, 'E1097:', 3)
-  v9.CheckScriptFailure(['vim9script'] + lines, 'E111:', 2)
+  v9.CheckScriptFailure(['mnv9script'] + lines, 'E111:', 2)
 
   lines =<< trim END
       var d = 'asdf'[1 : 2
@@ -4481,10 +4481,10 @@ func Test_expr_fails()
   call v9.CheckDefAndScriptFailure(["var asdf = v:nosuch"], ['E1001:', 'E121:'], 1)
 
   call v9.CheckDefFailure(["echo len('asdf'"], 'E110:', 2)
-  call v9.CheckScriptFailure(['vim9script', "echo len('asdf'"], 'E116:', 2)
+  call v9.CheckScriptFailure(['mnv9script', "echo len('asdf'"], 'E116:', 2)
 
   call v9.CheckDefAndScriptFailure(["echo Func01234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789()"], ['E1011:', 'E117:'], 1)
   call v9.CheckDefAndScriptFailure(["echo doesnotexist()"], 'E117:', 1)
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_vim9_fails.vim b/uvim/src/testdir/test_mnv9_fails.mnv
index 62d6f97ba9..ef392f4c3c 100644
--- a/uvim/src/testdir/test_vim9_fails.vim
+++ b/uvim/src/testdir/test_mnv9_fails.mnv
@@ -1,4 +1,4 @@
-" Test for Vim9 script with failures, causing memory leaks to be reported.
+" Test for MNV9 script with failures, causing memory leaks to be reported.
 " The leaks happen after a fork() and can be ignored.
 
 def Test_assignment()
@@ -30,7 +30,7 @@ enddef
 " valgrind to report "possibly leaked memory".
 func Test_partial_call_fails()
   let lines =<< trim END
-      vim9script
+      mnv9script
 
       var l = ['a', 'b', 'c']
       def Iter(container: any): any
diff --git a/uvim/src/testdir/test_vim9_func.vim b/uvim/src/testdir/test_mnv9_func.mnv
index 343c2f777e..5866a93407 100644
--- a/uvim/src/testdir/test_vim9_func.vim
+++ b/uvim/src/testdir/test_mnv9_func.mnv
@@ -1,7 +1,7 @@
-" Test various aspects of the Vim9 script language.
+" Test various aspects of the MNV9 script language.
 
-import './util/vim9.vim' as v9
-source util/screendump.vim
+import './util/mnv9.mnv' as v9
+source util/screendump.mnv
 
 func Test_def_basic()
   def SomeFunc(): string
@@ -12,7 +12,7 @@ endfunc
 
 func Test_compiling_error()
   " use a terminal to see the whole error message
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   call TestCompilingError()
   call TestCompilingErrorInTry()
@@ -20,20 +20,20 @@ endfunc
 
 def TestCompilingError()
   var lines =<< trim END
-    vim9script
+    mnv9script
     def Fails()
       echo nothing
     enddef
     defcompile
   END
   writefile(lines, 'XTest_compile_error', 'D')
-  var buf = g:RunVimInTerminal('-S XTest_compile_error',
+  var buf = g:RunMNVInTerminal('-S XTest_compile_error',
               {rows: 10, wait_for_ruler: 0})
   g:WaitForAssert(() => assert_match('Error detected while compiling command line.*Fails.*Variable not found: nothing',
                      g:Term_getlines(buf, range(1, 9))))
 
   # clean up
-  g:StopVimInTerminal(buf)
+  g:StopMNVInTerminal(buf)
 enddef
 
 def TestCompilingErrorInTry()
@@ -41,16 +41,16 @@ def TestCompilingErrorInTry()
   mkdir(dir, 'pR')
 
   var lines =<< trim END
-      vim9script
+      mnv9script
       export def OnlyCompiled()
         g:runtime = 'yes'
         invalid
       enddef
   END
-  writefile(lines, dir .. '/script.vim')
+  writefile(lines, dir .. '/script.mnv')
 
   lines =<< trim END
-      vim9script
+      mnv9script
       todo
       try
         script#OnlyCompiled()
@@ -60,12 +60,12 @@ def TestCompilingErrorInTry()
   lines[1] = 'set rtp=' .. getcwd() .. '/Xcompdir'
   writefile(lines, 'XTest_compile_error', 'D')
 
-  var buf = g:RunVimInTerminal('-S XTest_compile_error', {rows: 10, wait_for_ruler: 0})
+  var buf = g:RunMNVInTerminal('-S XTest_compile_error', {rows: 10, wait_for_ruler: 0})
   g:WaitForAssert(() => assert_match('Error detected while compiling command line.*function script#OnlyCompiled.*Invalid command: invalid',
                      g:Term_getlines(buf, range(1, 9))))
 
   # clean up
-  g:StopVimInTerminal(buf)
+  g:StopMNVInTerminal(buf)
 enddef
 
 def Test_comment_error()
@@ -74,7 +74,7 @@ enddef
 
 def Test_compile_error_in_called_function()
   var lines =<< trim END
-      vim9script
+      mnv9script
       var n: number
       def Foo()
         &hls = n
@@ -90,7 +90,7 @@ enddef
 
 def Test_wrong_function_name()
   var lines =<< trim END
-      vim9script
+      mnv9script
       func _Foo()
         echo 'foo'
       endfunc
@@ -98,7 +98,7 @@ def Test_wrong_function_name()
   v9.CheckScriptFailure(lines, 'E1267:')
 
   lines =<< trim END
-      vim9script
+      mnv9script
       def _Foo()
         echo 'foo'
       enddef
@@ -106,7 +106,7 @@ def Test_wrong_function_name()
   v9.CheckScriptFailure(lines, 'E1267:')
 
   lines =<< trim END
-      vim9script
+      mnv9script
       var Object = {}
       function Object.Method()
       endfunction
@@ -114,7 +114,7 @@ def Test_wrong_function_name()
   v9.CheckScriptFailure(lines, 'E1182:')
 
   lines =<< trim END
-      vim9script
+      mnv9script
       var Object = {}
       def Object.Method()
       enddef
@@ -122,7 +122,7 @@ def Test_wrong_function_name()
   v9.CheckScriptFailure(lines, 'E1182:')
 
   lines =<< trim END
-      vim9script
+      mnv9script
       g:Object = {}
       function g:Object.Method()
       endfunction
@@ -163,7 +163,7 @@ def Test_wrong_function_name()
   delfunc g:Define
 
   lines =<< trim END
-    vim9script
+    mnv9script
     var F1_ref: func
     def Start()
       F1_ref()
@@ -214,7 +214,7 @@ enddef
 
 def Test_break_in_skipped_block()
   var lines =<< trim END
-      vim9script
+      mnv9script
 
       def FixStackFrame(): string
           for _ in [2]
@@ -242,13 +242,13 @@ def Test_autoload_name_mismatch()
   mkdir(dir, 'pR')
 
   var lines =<< trim END
-      vim9script
+      mnv9script
       export def NoFunction()
         # comment
         g:runtime = 'yes'
       enddef
   END
-  writefile(lines, dir .. '/script.vim')
+  writefile(lines, dir .. '/script.mnv')
 
   var save_rtp = &rtp
   exe 'set rtp=' .. getcwd() .. '/Xnamedir'
@@ -270,7 +270,7 @@ def Test_autoload_names()
       endfunc
       let foobar#var = 'no'
   END
-  writefile(lines, dir .. '/foobar.vim')
+  writefile(lines, dir .. '/foobar.mnv')
 
   var save_rtp = &rtp
   exe 'set rtp=' .. getcwd() .. '/Xandir'
@@ -297,7 +297,7 @@ def Test_autoload_error_in_script()
       endfunc
       let 0 = 1
   END
-  writefile(lines, dir .. '/scripterror.vim')
+  writefile(lines, dir .. '/scripterror.mnv')
 
   var save_rtp = &rtp
   exe 'set rtp=' .. getcwd() .. '/Xaedir'
@@ -322,7 +322,7 @@ def Test_autoload_error_in_script()
         let g:caught = v:exception
       endtry
   END
-  writefile(lines, dir .. '/scriptcaught.vim')
+  writefile(lines, dir .. '/scriptcaught.mnv')
 
   g:called_function = 'no'
   v9.CheckDefSuccess(['scriptcaught#function()'])
@@ -393,7 +393,7 @@ enddef
 
 def Test_missing_endfunc_enddef()
   var lines =<< trim END
-    vim9script
+    mnv9script
     def Test()
       echo 'test'
     endef
@@ -401,7 +401,7 @@ def Test_missing_endfunc_enddef()
   v9.CheckScriptFailure(lines, 'E1057:', 2)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     func Some()
       echo 'test'
     enfffunc
@@ -411,7 +411,7 @@ enddef
 
 def Test_white_space_before_paren()
   var lines =<< trim END
-    vim9script
+    mnv9script
     def Test ()
       echo 'test'
     enddef
@@ -419,7 +419,7 @@ def Test_white_space_before_paren()
   v9.CheckScriptFailure(lines, 'E1068:', 2)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     func Test ()
       echo 'test'
     endfunc
@@ -469,7 +469,7 @@ def Test_return_something()
   assert_fails('g:ReturnGlobal()', 'E1012: Type mismatch; expected number but got string', '', 1, 'ReturnGlobal')
 
   var lines =<< trim END
-      vim9script
+      mnv9script
 
       def Msg()
           echomsg 'in Msg()...'
@@ -485,7 +485,7 @@ enddef
 
 def Test_check_argument_type()
   var lines =<< trim END
-      vim9script
+      mnv9script
       def Val(a: number, b: number): number
         return 0
       enddef
@@ -499,7 +499,7 @@ def Test_check_argument_type()
   v9.CheckScriptFailure(lines, 'E1013: Argument 2: type mismatch, expected number but got bool', 2)
 
   lines =<< trim END
-      vim9script
+      mnv9script
 
       def Foobar(Fn: func(any, ?string): any)
       enddef
@@ -590,7 +590,7 @@ enddef
 
 def Test_return_bool()
   var lines =<< trim END
-      vim9script
+      mnv9script
       def MenuFilter(id: number, key: string): bool
         return popup_filter_menu(id, key)
       enddef
@@ -604,7 +604,7 @@ enddef
 
 def Test_return_void_comment_follows()
   var lines =<< trim END
-    vim9script
+    mnv9script
     def ReturnCommentFollows(): void
       return # Some comment
     enddef
@@ -629,7 +629,7 @@ enddef
 
 def Test_return_invalid()
   var lines =<< trim END
-    vim9script
+    mnv9script
     def Func(): invalid
       return xxx
     enddef
@@ -638,7 +638,7 @@ def Test_return_invalid()
   v9.CheckScriptFailure(lines, 'E1010:', 2)
 
   lines =<< trim END
-      vim9script
+      mnv9script
       def Test(Fun: func(number): number): list<number>
           return map([1, 2, 3], (_, i) => Fun(i))
       enddef
@@ -657,7 +657,7 @@ def Test_return_list_any()
   # This used to fail but now the actual list type is checked, and since it has
   # an item of type string it can be used as list<string>.
   var lines =<< trim END
-      vim9script
+      mnv9script
       def Func(): list<string>
         var l: list<any>
         l->add('string')
@@ -668,7 +668,7 @@ def Test_return_list_any()
   v9.CheckScriptSuccess(lines)
 
   lines =<< trim END
-      vim9script
+      mnv9script
       def Func(): list<string>
         var l: list<any>
         l += ['string']
@@ -681,7 +681,7 @@ enddef
 
 def Test_return_any_two_types()
   var lines =<< trim END
-      vim9script
+      mnv9script
 
       def G(Fn: func(string): any)
         g:result = Fn("hello")
@@ -720,7 +720,7 @@ enddef
 
 def Test_call_ufunc_failure()
   var lines =<< trim END
-      vim9script
+      mnv9script
       def Tryit()
         g:Global(1, 2, 3)
       enddef
@@ -740,7 +740,7 @@ def Test_call_ufunc_failure()
   delfunc g:Global
 
   lines =<< trim END
-      vim9script
+      mnv9script
 
       g:Ref = function('len')
       def Tryit()
@@ -821,7 +821,7 @@ def Test_call_default_args()
   v9.CheckDefFailure(['def Func(x: number = )', 'enddef'], 'E15:')
 
   lines =<< trim END
-      vim9script
+      mnv9script
       def Func(a = b == 0 ? 1 : 2, b = 0)
       enddef
       defcompile
@@ -830,7 +830,7 @@ def Test_call_default_args()
 
   # using script variable requires matching type or type cast when executed
   lines =<< trim END
-      vim9script
+      mnv9script
       var a: any
       def Func(arg: string = a)
         echo arg
@@ -842,7 +842,7 @@ def Test_call_default_args()
 
   # using global variable does not require type cast
   lines =<< trim END
-      vim9script
+      mnv9script
       def Func(arg: string = g:str)
         echo arg
       enddef
@@ -854,7 +854,7 @@ enddef
 
 def Test_using_vnone_default()
   var lines =<< trim END
-      vim9script
+      mnv9script
 
       def F(a: string = v:none)
          if a isnot v:none
@@ -866,19 +866,19 @@ def Test_using_vnone_default()
   v9.CheckScriptSuccess(lines)
 
   lines =<< trim END
-      vim9script
+      mnv9script
 
       export def Floats(x: float, y = 2.0, z = 5.0)
         g:result = printf("%.2f %.2f %.2f", x, y, z)
       enddef
   END
-  writefile(lines, 'Xlib.vim', 'D')
+  writefile(lines, 'Xlib.mnv', 'D')
 
   # test using a function reference in script-local variable
   lines =<< trim END
-      vim9script
+      mnv9script
 
-      import './Xlib.vim'
+      import './Xlib.mnv'
       const Floatfunc = Xlib.Floats
       Floatfunc(1.0, v:none, 3.0)
   END
@@ -888,9 +888,9 @@ def Test_using_vnone_default()
 
   # test calling the imported function
   lines =<< trim END
-      vim9script
+      mnv9script
 
-      import './Xlib.vim'
+      import './Xlib.mnv'
       Xlib.Floats(1.0, v:none, 3.0)
   END
   v9.CheckScriptSuccess(lines)
@@ -899,7 +899,7 @@ def Test_using_vnone_default()
 
   # TODO: this should give an error for using a missing argument
   # lines =<< trim END
-  #    vim9script
+  #    mnv9script
 
   #    def F(a: string = v:none)
   #       var b = a
@@ -911,7 +911,7 @@ enddef
 
 def Test_convert_number_to_float()
   var lines =<< trim END
-      vim9script
+      mnv9script
       def  Foo(a: float, b: float): float
          return a + b
       enddef
@@ -1015,7 +1015,7 @@ def Test_nested_function()
   v9.CheckDefFailure(lines, 'E1117: Cannot use ! with nested :function')
 
   lines =<< trim END
-      vim9script
+      mnv9script
       def Outer()
         def Inner()
           g:result = 'ok'
@@ -1030,7 +1030,7 @@ def Test_nested_function()
   unlet g:result
 
   lines =<< trim END
-      vim9script
+      mnv9script
       def Outer()
         def _Inner()
           echo 'bad'
@@ -1042,7 +1042,7 @@ def Test_nested_function()
   v9.CheckScriptFailure(lines, 'E1267:')
 
   lines =<< trim END
-      vim9script
+      mnv9script
       def Outer()
         def g:inner()
           echo 'bad'
@@ -1054,7 +1054,7 @@ def Test_nested_function()
   v9.CheckScriptFailure(lines, 'E1267:')
 
   lines =<< trim END
-      vim9script
+      mnv9script
       def g:_Func()
         echo 'bad'
       enddef
@@ -1062,7 +1062,7 @@ def Test_nested_function()
   v9.CheckScriptFailure(lines, 'E1267:')
 
   lines =<< trim END
-      vim9script
+      mnv9script
       def _Func()
         echo 'bad'
       enddef
@@ -1071,7 +1071,7 @@ def Test_nested_function()
 
   # nested function inside conditional
   lines =<< trim END
-      vim9script
+      mnv9script
       var thecount = 0
       if true
         def Test(): number
@@ -1090,7 +1090,7 @@ def Test_nested_function()
 
   # also works when "thecount" is inside the "if" block
   lines =<< trim END
-      vim9script
+      mnv9script
       if true
         var thecount = 0
         def Test(): number
@@ -1109,7 +1109,7 @@ def Test_nested_function()
 
   # nested function with recursive call
   lines =<< trim END
-      vim9script
+      mnv9script
 
       def MyFunc(): number
         def Fib(n: number): number
@@ -1127,7 +1127,7 @@ def Test_nested_function()
   v9.CheckScriptSuccess(lines)
 
   lines =<< trim END
-      vim9script
+      mnv9script
       def Outer()
         def Inner()
           echo 'hello'
@@ -1163,7 +1163,7 @@ endfunc
 
 def Test_nested_global_function()
   var lines =<< trim END
-      vim9script
+      mnv9script
       def Outer()
           def g:Inner(): string
               return 'inner'
@@ -1183,7 +1183,7 @@ def Test_nested_global_function()
   v9.CheckScriptSuccess(lines)
 
   lines =<< trim END
-      vim9script
+      mnv9script
       def Outer()
           func g:Inner()
             return 'inner'
@@ -1203,7 +1203,7 @@ def Test_nested_global_function()
   v9.CheckScriptSuccess(lines)
 
   lines =<< trim END
-      vim9script
+      mnv9script
       def Outer()
           def g:Inner(): string
               return 'inner'
@@ -1217,7 +1217,7 @@ def Test_nested_global_function()
   delfunc g:Inner
 
   lines =<< trim END
-      vim9script
+      mnv9script
       def Outer()
         def g:Inner()
           echo map([1, 2, 3], (_, v) => v + 1)
@@ -1230,7 +1230,7 @@ def Test_nested_global_function()
   delfunc g:Inner
 
   lines =<< trim END
-      vim9script
+      mnv9script
       def Func()
         echo 'script'
       enddef
@@ -1244,7 +1244,7 @@ def Test_nested_global_function()
   v9.CheckScriptFailure(lines, "E1073:", 1)
 
   lines =<< trim END
-      vim9script
+      mnv9script
       def Func()
         echo 'script'
       enddef
@@ -1282,7 +1282,7 @@ def Test_nested_def_list()
   assert_true(funcs->index('def DefListMatches()') >= 0)
 
   var lines =<< trim END
-    vim9script
+    mnv9script
     def Func()
       def +Func+
     enddef
@@ -1301,7 +1301,7 @@ enddef
 
 def Test_global_local_function()
   var lines =<< trim END
-      vim9script
+      mnv9script
       def g:Func(): string
           return 'global'
       enddef
@@ -1315,7 +1315,7 @@ def Test_global_local_function()
   v9.CheckScriptSuccess(lines)
 
   lines =<< trim END
-      vim9script
+      mnv9script
       def g:Funcy()
         echo 'funcy'
       enddef
@@ -1326,7 +1326,7 @@ enddef
 
 def Test_local_function_shadows_global()
   var lines =<< trim END
-      vim9script
+      mnv9script
       def g:Gfunc(): string
         return 'global'
       enddef
@@ -1341,7 +1341,7 @@ def Test_local_function_shadows_global()
   v9.CheckScriptSuccess(lines)
 
   lines =<< trim END
-      vim9script
+      mnv9script
       def g:Func(): string
         return 'global'
       enddef
@@ -1355,7 +1355,7 @@ def Test_local_function_shadows_global()
 
   # global function is not found with g: prefix
   lines =<< trim END
-      vim9script
+      mnv9script
       def g:Func(): string
         return 'global'
       enddef
@@ -1368,7 +1368,7 @@ def Test_local_function_shadows_global()
   delfunc g:Func
 
   lines =<< trim END
-      vim9script
+      mnv9script
       def g:Func(): string
         return 'global'
       enddef
@@ -1379,7 +1379,7 @@ def Test_local_function_shadows_global()
 
   # This does not shadow "i" which is visible only inside the for loop
   lines =<< trim END
-      vim9script
+      mnv9script
 
       def Foo(i: number)
         echo i
@@ -1404,7 +1404,7 @@ def Test_call_wrong_args()
   v9.CheckScriptFailure(['def Func(Ref: func(s: string))'], 'E475:')
 
   var lines =<< trim END
-    vim9script
+    mnv9script
     def Func(s: string)
       echo s
     enddef
@@ -1414,7 +1414,7 @@ def Test_call_wrong_args()
 
   # argument name declared earlier is found when declaring a function
   lines =<< trim END
-    vim9script
+    mnv9script
     var name = 'piet'
     def FuncOne(name: string)
       echo name
@@ -1424,7 +1424,7 @@ def Test_call_wrong_args()
 
   # same, inside the same block
   lines =<< trim END
-    vim9script
+    mnv9script
     if true
       var name = 'piet'
       def FuncOne(name: string)
@@ -1436,7 +1436,7 @@ def Test_call_wrong_args()
 
   # variable in other block is OK
   lines =<< trim END
-    vim9script
+    mnv9script
     if true
       var name = 'piet'
     endif
@@ -1448,7 +1448,7 @@ def Test_call_wrong_args()
 
   # with another variable in another block
   lines =<< trim END
-    vim9script
+    mnv9script
     if true
       var name = 'piet'
       # define a function so that the variable isn't cleared
@@ -1467,7 +1467,7 @@ def Test_call_wrong_args()
 
   # only variable in another block is OK
   lines =<< trim END
-    vim9script
+    mnv9script
     if true
       var name = 'piet'
       # define a function so that the variable isn't cleared
@@ -1485,7 +1485,7 @@ def Test_call_wrong_args()
 
   # argument name declared later is only found when compiling
   lines =<< trim END
-    vim9script
+    mnv9script
     def FuncOne(name: string)
       echo nr
     enddef
@@ -1495,7 +1495,7 @@ def Test_call_wrong_args()
   v9.CheckScriptFailure(lines + ['defcompile'], 'E1168:')
 
   lines =<< trim END
-    vim9script
+    mnv9script
     def FuncOne(nr: number)
       echo nr
     enddef
@@ -1516,7 +1516,7 @@ def Test_call_wrong_args()
   assert_true(didCatch)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     def FuncOne(nr: number)
       echo nr
     enddef
@@ -1539,7 +1539,7 @@ enddef
 
 def Test_call_funcref_wrong_args()
   var head =<< trim END
-      vim9script
+      mnv9script
       def Func3(a1: string, a2: number, a3: list<number>)
         echo a1 .. a2 .. a3[0]
       enddef
@@ -1556,7 +1556,7 @@ def Test_call_funcref_wrong_args()
   v9.CheckScriptFailure(head + ["funcMap['func']('str', 123, [1], 4)"] + tail, 'E118:')
 
   var lines =<< trim END
-      vim9script
+      mnv9script
       var Ref: func(number): any
       Ref = (j) => !j
       echo Ref(false)
@@ -1564,7 +1564,7 @@ def Test_call_funcref_wrong_args()
   v9.CheckScriptFailure(lines, 'E1013: Argument 1: type mismatch, expected number but got bool', 4)
 
   lines =<< trim END
-      vim9script
+      mnv9script
       var Ref: func(number): any
       Ref = (j) => !j
       call Ref(false)
@@ -1610,7 +1610,7 @@ def Test_call_lambda_args()
       echo map(l, (one) => one)
   END
   v9.CheckDefFailure(lines, 'E1167:')
-  v9.CheckScriptFailure(['vim9script'] + lines, 'E1168:')
+  v9.CheckScriptFailure(['mnv9script'] + lines, 'E1168:')
 
   lines =<< trim END
     var Ref: func(any, ?any): bool
@@ -1654,12 +1654,12 @@ def Test_call_lambda_args()
     echo 'aa'->((a) => a)('bb')
   END
   v9.CheckDefFailure(lines, 'E118: Too many arguments for function: ->((a) => a)(''bb'')', 1)
-  v9.CheckScriptFailure(['vim9script'] + lines, 'E118: Too many arguments for function: <lambda>', 2)
+  v9.CheckScriptFailure(['mnv9script'] + lines, 'E118: Too many arguments for function: <lambda>', 2)
 enddef
 
 def Test_lambda_line_nr()
   var lines =<< trim END
-      vim9script
+      mnv9script
       # comment
       # comment
       var id = timer_start(1'000, (_) => 0)
@@ -1764,7 +1764,7 @@ enddef
 
 def Test_pass_legacy_lambda_to_def_func()
   var lines =<< trim END
-      vim9script
+      mnv9script
       func Foo()
         eval s:Bar({x -> 0})
       endfunc
@@ -1775,7 +1775,7 @@ def Test_pass_legacy_lambda_to_def_func()
   v9.CheckScriptSuccess(lines)
 
   lines =<< trim END
-      vim9script
+      mnv9script
       def g:TestFunc(F: func)
       enddef
       legacy call g:TestFunc({-> 0})
@@ -1792,7 +1792,7 @@ enddef
 def Test_lambda_in_reduce_line_break()
   # this was using freed memory
   var lines =<< trim END
-      vim9script
+      mnv9script
       const result: dict<number> =
           ['Bob', 'Sam', 'Cat', 'Bob', 'Cat', 'Cat']
           ->reduce((acc, val) => {
@@ -1811,7 +1811,7 @@ enddef
 
 def Test_set_opfunc_to_lambda()
   var lines =<< trim END
-    vim9script
+    mnv9script
     nnoremap <expr> <F4> <SID>CountSpaces() .. '_'
     def CountSpaces(type = ''): string
       if type == ''
@@ -1833,7 +1833,7 @@ enddef
 
 def Test_set_opfunc_to_global_function()
   var lines =<< trim END
-    vim9script
+    mnv9script
     def g:CountSpaces(type = ''): string
       normal! '[V']y
       g:result = getreg('"')->count(' ')
@@ -1864,7 +1864,7 @@ enddef
 
 def Test_use_script_func_name_with_prefix()
   var lines =<< trim END
-      vim9script
+      mnv9script
       func g:Getit()
         return 'it'
       endfunc
@@ -1878,7 +1878,7 @@ def Test_lambda_type_allocated()
   # Check that unreferencing a partial using a lambda can use the variable type
   # after the lambda has been freed and does not leak memory.
   var lines =<< trim END
-    vim9script
+    mnv9script
 
     func MyomniFunc1(val, findstart, base)
       return a:findstart ? 0 : []
@@ -1895,7 +1895,7 @@ enddef
 
 def Test_define_lambda_in_execute()
   var lines =<< trim [CODE]
-      vim9script
+      mnv9script
 
       def BuildFuncMultiLine(): func
           var x =<< trim END
@@ -1945,7 +1945,7 @@ def Test_call_def_varargs()
       'E1013: Argument 3: type mismatch, expected string but got number')
 
   var lines =<< trim END
-      vim9script
+      mnv9script
       def Func(...l: list<string>)
         echo l
       enddef
@@ -1954,7 +1954,7 @@ def Test_call_def_varargs()
   v9.CheckScriptSuccess(lines)
 
   lines =<< trim END
-      vim9script
+      mnv9script
       def Func(...l: list<string>)
         echo l
       enddef
@@ -1963,7 +1963,7 @@ def Test_call_def_varargs()
   v9.CheckScriptSuccess(lines)
 
   lines =<< trim END
-      vim9script
+      mnv9script
       def Func(...l: list<any>)
         echo l
       enddef
@@ -1972,7 +1972,7 @@ def Test_call_def_varargs()
   v9.CheckScriptSuccess(lines)
 
   lines =<< trim END
-      vim9script
+      mnv9script
       def Func(...l: any)
         echo l
       enddef
@@ -1981,7 +1981,7 @@ def Test_call_def_varargs()
   v9.CheckScriptFailure(lines, 'E1180:', 2)
 
   lines =<< trim END
-      vim9script
+      mnv9script
       def Func(..._l: list<string>)
         echo _l
       enddef
@@ -1990,7 +1990,7 @@ def Test_call_def_varargs()
   v9.CheckScriptSuccess(lines)
 
   lines =<< trim END
-      vim9script
+      mnv9script
       def Func(...l: list<string>)
         echo l
       enddef
@@ -1999,7 +1999,7 @@ def Test_call_def_varargs()
   v9.CheckScriptFailure(lines, 'E1013: Argument 1: type mismatch')
 
   lines =<< trim END
-      vim9script
+      mnv9script
       def Func(...l: list<string>)
         echo l
       enddef
@@ -2008,7 +2008,7 @@ def Test_call_def_varargs()
   v9.CheckScriptFailure(lines, 'E1013: Argument 2: type mismatch')
 
   lines =<< trim END
-      vim9script
+      mnv9script
       def Func(...l: list<string>)
         echo l
       enddef
@@ -2017,7 +2017,7 @@ def Test_call_def_varargs()
   v9.CheckScriptFailure(lines, 'E1013: Argument 1: type mismatch')
 
   lines =<< trim END
-      vim9script
+      mnv9script
       def Func(  # some comment
                 ...l = []
                 )
@@ -2027,7 +2027,7 @@ def Test_call_def_varargs()
   v9.CheckScriptFailure(lines, 'E1160:')
 
   lines =<< trim END
-      vim9script
+      mnv9script
       def DoIt()
         g:Later('')
       enddef
@@ -2095,7 +2095,7 @@ enddef
 
 def Test_varargs_mismatch()
   var lines =<< trim END
-      vim9script
+      mnv9script
 
       def Map(Fn: func(...any): number): number
         return Fn('12')
@@ -2169,7 +2169,7 @@ def Test_call_funcref()
   assert_fails('g:NotAFunc()', 'E1085:', '', 3, 'Test_call_funcref')
 
   var lines =<< trim END
-    vim9script
+    mnv9script
     def RetNumber(): number
       return 123
     enddef
@@ -2179,7 +2179,7 @@ def Test_call_funcref()
   v9.CheckScriptSuccess(lines)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     def RetNumber(): number
       return 123
     enddef
@@ -2192,7 +2192,7 @@ def Test_call_funcref()
   v9.CheckScriptSuccess(lines)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     def UseNumber(nr: number)
       echo nr
     enddef
@@ -2202,7 +2202,7 @@ def Test_call_funcref()
   v9.CheckScriptSuccess(lines)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     def UseNumber(nr: number)
       echo nr
     enddef
@@ -2211,7 +2211,7 @@ def Test_call_funcref()
   v9.CheckScriptFailure(lines, 'E1012: Type mismatch; expected func(string) but got func(number)')
 
   lines =<< trim END
-    vim9script
+    mnv9script
     def EchoNr(nr = 34)
       g:echo = nr
     enddef
@@ -2224,7 +2224,7 @@ def Test_call_funcref()
   v9.CheckScriptSuccess(lines)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     def EchoList(...l: list<number>)
       g:echo = l
     enddef
@@ -2237,7 +2237,7 @@ def Test_call_funcref()
   v9.CheckScriptSuccess(lines)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     def OptAndVar(nr: number, opt = 12, ...l: list<number>): number
       g:optarg = opt
       g:listarg = l
@@ -2336,7 +2336,7 @@ enddef
 
 def Test_nested_function_with_nextcmd()
   var lines =<< trim END
-      vim9script
+      mnv9script
       # Define an outer function
       def FirstFunction()
         # Define an inner function
@@ -2356,7 +2356,7 @@ enddef
 
 def Test_nested_function_with_args_split()
   var lines =<< trim END
-      vim9script
+      mnv9script
       def FirstFunction()
         def SecondFunction(
         )
@@ -2371,7 +2371,7 @@ def Test_nested_function_with_args_split()
   v9.CheckScriptFailure(lines, 'E1173: Text found after enddef: BBBB')
 
   lines =<< trim END
-      vim9script
+      mnv9script
       def FirstFunction()
         func SecondFunction()
         endfunc|BBBB
@@ -2460,7 +2460,7 @@ def Test_return_type_wrong()
   delfunc! g:Func
 
   v9.CheckScriptFailure([
-        'vim9script',
+        'mnv9script',
         'def FuncB()',
         '  return 123',
         'enddef',
@@ -2481,17 +2481,17 @@ enddef
 
 def Test_white_space_before_comma()
   var lines =<< trim END
-    vim9script
+    mnv9script
     def Func(a: number , b: number)
     enddef
   END
   v9.CheckScriptFailure(lines, 'E1068:')
-  call assert_fails('vim9cmd echo stridx("a" .. "b" , "a")', 'E1068:')
+  call assert_fails('mnv9cmd echo stridx("a" .. "b" , "a")', 'E1068:')
 enddef
 
 def Test_white_space_after_comma()
   var lines =<< trim END
-    vim9script
+    mnv9script
     def Func(a: number,b: number)
     enddef
   END
@@ -2499,16 +2499,16 @@ def Test_white_space_after_comma()
 
   # OK in legacy function
   lines =<< trim END
-    vim9script
+    mnv9script
     func Func(a,b)
     endfunc
   END
   v9.CheckScriptSuccess(lines)
 enddef
 
-def Test_vim9script_call()
+def Test_mnv9script_call()
   var lines =<< trim END
-    vim9script
+    mnv9script
     var name = ''
     def MyFunc(arg: string)
        name = arg
@@ -2594,13 +2594,13 @@ def Test_vim9script_call()
         'morelines',
         name)
   END
-  writefile(lines, 'Xcall.vim', 'D')
-  source Xcall.vim
+  writefile(lines, 'Xcall.mnv', 'D')
+  source Xcall.mnv
 enddef
 
-def Test_vim9script_call_fail_decl()
+def Test_mnv9script_call_fail_decl()
   var lines =<< trim END
-    vim9script
+    mnv9script
     var name = ''
     def MyFunc(arg: string)
        var name = 123
@@ -2610,9 +2610,9 @@ def Test_vim9script_call_fail_decl()
   v9.CheckScriptFailure(lines, 'E1054:')
 enddef
 
-def Test_vim9script_call_fail_type()
+def Test_mnv9script_call_fail_type()
   var lines =<< trim END
-    vim9script
+    mnv9script
     def MyFunc(arg: string)
       echo arg
     enddef
@@ -2621,17 +2621,17 @@ def Test_vim9script_call_fail_type()
   v9.CheckScriptFailure(lines, 'E1013: Argument 1: type mismatch, expected string but got number')
 enddef
 
-def Test_vim9script_call_fail_const()
+def Test_mnv9script_call_fail_const()
   var lines =<< trim END
-    vim9script
+    mnv9script
     const var = ''
     def MyFunc(arg: string)
        var = 'asdf'
     enddef
     defcompile
   END
-  writefile(lines, 'Xcall_const.vim', 'D')
-  assert_fails('source Xcall_const.vim', 'E46:', '', 1, 'MyFunc')
+  writefile(lines, 'Xcall_const.mnv', 'D')
+  assert_fails('source Xcall_const.mnv', 'E46:', '', 1, 'MyFunc')
 
   lines =<< trim END
       const g:Aconst = 77
@@ -2658,7 +2658,7 @@ endfunc
 
 def Test_delfunc()
   var lines =<< trim END
-    vim9script
+    mnv9script
     def g:GoneSoon()
       echo 'hello'
     enddef
@@ -2686,7 +2686,7 @@ def Run_Test_free_dict_while_in_funcstack()
   # this was freeing the TermRun() default argument dictionary while it was
   # still referenced in a funcstack_T
   var lines =<< trim END
-      vim9script
+      mnv9script
 
       &updatetime = 400
       def TermRun(_ = {})
@@ -2730,16 +2730,16 @@ def Test_redef_failure()
   delfunc! Func2
 enddef
 
-def Test_vim9script_func()
+def Test_mnv9script_func()
   var lines =<< trim END
-    vim9script
+    mnv9script
     func Func(arg)
       echo a:arg
     endfunc
     Func('text')
   END
-  writefile(lines, 'XVim9Func', 'D')
-  so XVim9Func
+  writefile(lines, 'XMNV9Func', 'D')
+  so XMNV9Func
 enddef
 
 let s:funcResult = 0
diff --git a/uvim/src/testdir/test_vim9_generics.vim b/uvim/src/testdir/test_mnv9_generics.mnv
index 9aadd99cfd..86f5d7450e 100644
--- a/uvim/src/testdir/test_vim9_generics.vim
+++ b/uvim/src/testdir/test_mnv9_generics.mnv
@@ -1,11 +1,11 @@
-" Test Vim9 generic function
+" Test MNV9 generic function
 
-import './util/vim9.vim' as v9
+import './util/mnv9.mnv' as v9
 
 " Test for definint a generic function
 def Test_generic_func_definition()
   var lines =<< trim END
-    vim9script
+    mnv9script
     def Fn<A, B>(x: A, y: B): A
       return x
     enddef
@@ -14,7 +14,7 @@ def Test_generic_func_definition()
   v9.CheckSourceSuccess(lines)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     def Fn<t>()
     enddef
     defcompile
@@ -22,7 +22,7 @@ def Test_generic_func_definition()
   v9.CheckSourceFailure(lines, 'E1552: Type variable name must start with an uppercase letter: t>()', 2)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     def Fn<>()
     enddef
     defcompile
@@ -30,7 +30,7 @@ def Test_generic_func_definition()
   v9.CheckSourceFailure(lines, 'E1555: Empty type list specified for generic function', 2)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     def Fn<T, >()
     enddef
     defcompile
@@ -38,7 +38,7 @@ def Test_generic_func_definition()
   v9.CheckSourceFailure(lines, 'E1008: Missing <type> after  >()', 2)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     def Fn<,>()
     enddef
     defcompile
@@ -46,7 +46,7 @@ def Test_generic_func_definition()
   v9.CheckSourceFailure(lines, 'E1008: Missing <type> after <,>(', 2)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     def Fn<T()
     enddef
     defcompile
@@ -54,7 +54,7 @@ def Test_generic_func_definition()
   v9.CheckSourceFailure(lines, 'E1553: Missing comma after type in generic function: T()', 2)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     def Fn<T, ()
     enddef
     defcompile
@@ -63,7 +63,7 @@ def Test_generic_func_definition()
 
   # Use a multi-character generic type name
   lines =<< trim END
-    vim9script
+    mnv9script
     def Fn<MyType1, My_Type2>(a: MyType1, b: My_Type2): My_Type2
       var x: MyType1
       var y: My_Type2
@@ -75,7 +75,7 @@ def Test_generic_func_definition()
 
   # Use a generic type name starting with a lower case letter
   lines =<< trim END
-    vim9script
+    mnv9script
     def Fn<mytype>()
     enddef
     defcompile
@@ -84,7 +84,7 @@ def Test_generic_func_definition()
 
   # Use a non-alphanumeric character in the generic type name
   lines =<< trim END
-    vim9script
+    mnv9script
     def Fn<My-type>()
     enddef
     defcompile
@@ -93,7 +93,7 @@ def Test_generic_func_definition()
 
   # Use an existing type name as the generic type name
   lines =<< trim END
-    vim9script
+    mnv9script
     type FooBar = number
     def Fn<FooBar>()
     enddef
@@ -103,7 +103,7 @@ def Test_generic_func_definition()
 
   # Use a very long type name
   lines =<< trim END
-    vim9script
+    mnv9script
     def Fn<XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX>()
     enddef
     defcompile
@@ -112,7 +112,7 @@ def Test_generic_func_definition()
 
   # Use a function name as the generic type name
   lines =<< trim END
-    vim9script
+    mnv9script
     def MyFunc()
     enddef
     def Fn<MyFunc>()
@@ -125,7 +125,7 @@ enddef
 " Test for white space error when defining a generic function
 def Test_generic_func_definition_whitespace_error()
   var lines =<< trim END
-    vim9script
+    mnv9script
     def Fn <A>()
     enddef
     defcompile
@@ -133,7 +133,7 @@ def Test_generic_func_definition_whitespace_error()
   v9.CheckSourceFailure(lines, "E1068: No white space allowed before '<': <A>()", 2)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     def Fn<A> ()
     enddef
     defcompile
@@ -141,7 +141,7 @@ def Test_generic_func_definition_whitespace_error()
   v9.CheckSourceFailure(lines, "E1068: No white space allowed before '(':  (", 2)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     def Fn< A>()
     enddef
     defcompile
@@ -149,7 +149,7 @@ def Test_generic_func_definition_whitespace_error()
   v9.CheckSourceFailure(lines, "E1202: No white space allowed after '<': < A>()", 2)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     def Fn<A >()
     enddef
     defcompile
@@ -157,7 +157,7 @@ def Test_generic_func_definition_whitespace_error()
   v9.CheckSourceFailure(lines, "E1202: No white space allowed after 'A': A >()", 2)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     def Fn<A,>()
     enddef
     defcompile
@@ -165,7 +165,7 @@ def Test_generic_func_definition_whitespace_error()
   v9.CheckSourceFailure(lines, "E1069: White space required after ',': ,>()", 2)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     def Fn<A, >()
     enddef
     defcompile
@@ -173,7 +173,7 @@ def Test_generic_func_definition_whitespace_error()
   v9.CheckSourceFailure(lines, "E1008: Missing <type> after  >()", 2)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     def Fn<, A>()
     enddef
     defcompile
@@ -181,7 +181,7 @@ def Test_generic_func_definition_whitespace_error()
   v9.CheckSourceFailure(lines, "E1008: Missing <type> after <, A>()", 2)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     def Fn<,A>()
     enddef
     defcompile
@@ -189,7 +189,7 @@ def Test_generic_func_definition_whitespace_error()
   v9.CheckSourceFailure(lines, "E1008: Missing <type> after <,A>()", 2)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     def Fn< , A>()
     enddef
     defcompile
@@ -197,7 +197,7 @@ def Test_generic_func_definition_whitespace_error()
   v9.CheckSourceFailure(lines, "E1202: No white space allowed after '<': < , A>()", 2)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     def Fn<A,B>()
     enddef
     defcompile
@@ -205,7 +205,7 @@ def Test_generic_func_definition_whitespace_error()
   v9.CheckSourceFailure(lines, "E1069: White space required after ',': ,B>(", 2)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     def Fn<A , B>()
     enddef
     defcompile
@@ -213,7 +213,7 @@ def Test_generic_func_definition_whitespace_error()
   v9.CheckSourceFailure(lines, "E1202: No white space allowed after 'A': A , B>()", 2)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     def Fn<A, B >()
     enddef
     defcompile
@@ -221,7 +221,7 @@ def Test_generic_func_definition_whitespace_error()
   v9.CheckSourceFailure(lines, "E1202: No white space allowed after 'B': B >()", 2)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     def Fn<MyType , FooBar>()
     enddef
     defcompile
@@ -232,7 +232,7 @@ enddef
 " Test for invoking a generic function
 def Test_generic_func_invoke()
   var lines =<< trim END
-    vim9script
+    mnv9script
     def Fn<T>()
     enddef
     Fn<number, number>()
@@ -240,7 +240,7 @@ def Test_generic_func_invoke()
   v9.CheckSourceFailure(lines, 'E1556: Too many types specified for generic function', 4)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     def Fn<A, B>()
     enddef
     Fn<number>()
@@ -248,7 +248,7 @@ def Test_generic_func_invoke()
   v9.CheckSourceFailure(lines, 'E1557: Not enough types specified for generic function', 4)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     def Fn<A>()
     enddef
     Fn<>()
@@ -256,7 +256,7 @@ def Test_generic_func_invoke()
   v9.CheckSourceFailure(lines, "E1555: Empty type list specified for generic function '<>()'", 4)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     def Fn<A>()
     enddef
     Fn<>
@@ -264,7 +264,7 @@ def Test_generic_func_invoke()
   v9.CheckSourceFailure(lines, "E1555: Empty type list specified for generic function '<>'", 4)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     def Fn<A>()
     enddef
     Fn()
@@ -272,7 +272,7 @@ def Test_generic_func_invoke()
   v9.CheckSourceFailure(lines, 'E1559: Type arguments missing for generic function', 4)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     def Fn<A>()
     enddef
     Fn<
@@ -280,7 +280,7 @@ def Test_generic_func_invoke()
   v9.CheckSourceFailure(lines, "E1554: Missing '>' in generic function: <", 4)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     def Fn<A>()
     enddef
     Fn<()
@@ -288,7 +288,7 @@ def Test_generic_func_invoke()
   v9.CheckSourceFailure(lines, "E1008: Missing <type> after <", 4)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     def Fn<A>()
     enddef
     Fn<number>
@@ -296,7 +296,7 @@ def Test_generic_func_invoke()
   v9.CheckSourceFailure(lines, 'E492: Not an editor command: Fn<number>', 4)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     def Fn<A>()
     enddef
     Fn<number>(
@@ -304,7 +304,7 @@ def Test_generic_func_invoke()
   v9.CheckSourceFailure(lines, 'E116: Invalid arguments for function Fn<number>(', 4)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     def Fn<A>()
     enddef
     Fn <number>()
@@ -312,7 +312,7 @@ def Test_generic_func_invoke()
   v9.CheckSourceFailure(lines, 'E492: Not an editor command: Fn <number>()', 4)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     def Fn<T>()
     enddef
     Fn<number, >()
@@ -320,7 +320,7 @@ def Test_generic_func_invoke()
   v9.CheckSourceFailure(lines, 'E1008: Missing <type> after <number, >()', 4)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     def Fn<T, X>()
     enddef
     Fn<number, abc>()
@@ -328,7 +328,7 @@ def Test_generic_func_invoke()
   v9.CheckSourceFailure(lines, 'E1010: Type not recognized: abc', 4)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     def Fn<T>()
     enddef
     Fn<number string>()
@@ -337,7 +337,7 @@ def Test_generic_func_invoke()
 
   # Error when compiling a generic function
   lines =<< trim END
-    vim9script
+    mnv9script
     def Fn<A, B>()
       xxx
     enddef
@@ -349,7 +349,7 @@ enddef
 " Test for whitespace error when invoking a generic function
 def Test_generic_func_invoke_whitespace_error()
   var lines =<< trim END
-    vim9script
+    mnv9script
     def Fn<A>()
     enddef
     Fn< number>()
@@ -357,7 +357,7 @@ def Test_generic_func_invoke_whitespace_error()
   v9.CheckSourceFailure(lines, "E1202: No white space allowed after '<': < number>()", 4)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     def Fn<A>()
     enddef
     Fn<number >()
@@ -365,7 +365,7 @@ def Test_generic_func_invoke_whitespace_error()
   v9.CheckSourceFailure(lines, "E1202: No white space allowed after 'number': <number", 4)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     def Fn<A>()
     enddef
     Fn<number,>()
@@ -373,7 +373,7 @@ def Test_generic_func_invoke_whitespace_error()
   v9.CheckSourceFailure(lines, "E1069: White space required after ',': <number,>()", 4)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     def Fn<A>()
     enddef
     Fn<number, >()
@@ -381,7 +381,7 @@ def Test_generic_func_invoke_whitespace_error()
   v9.CheckSourceFailure(lines, "E1008: Missing <type> after <number, >()", 4)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     def Fn<A, B>()
     enddef
     Fn<number,string>()
@@ -389,7 +389,7 @@ def Test_generic_func_invoke_whitespace_error()
   v9.CheckSourceFailure(lines, "E1069: White space required after ',': <number,string>()", 4)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     def Fn<A>()
     enddef
     Fn<number> ()
@@ -399,7 +399,7 @@ enddef
 
 def Test_generic_func_typename()
   var lines =<< trim END
-    vim9script
+    mnv9script
 
     def Foo(a: list<string>, b: dict<number>): list<blob>
       return []
@@ -430,7 +430,7 @@ enddef
 
 def Test_generic_func_single_arg()
   var lines =<< trim END
-    vim9script
+    mnv9script
 
     def Fn<A>(x: A): number
       return len(x)
@@ -446,7 +446,7 @@ enddef
 " Test for using a generic type as the type of a function argument
 def Test_generic_func_arg_type()
   var lines =<< trim END
-    vim9script
+    mnv9script
 
     def F1<A>(x: list<A>): list<A>
       return x
@@ -465,7 +465,7 @@ enddef
 " Test for using a tuple type for a generic function argument
 def Test_generic_func_tuple_arg_type()
   var lines =<< trim END
-    vim9script
+    mnv9script
 
     def Fn<T>(x: tuple<T, T>): tuple<T, T>
       return x
@@ -476,7 +476,7 @@ def Test_generic_func_tuple_arg_type()
   v9.CheckSourceSuccess(lines)
 
   lines =<< trim END
-    vim9script
+    mnv9script
 
     def Fn<A, B>(x: tuple<A, ...list<B>>): tuple<A, ...list<B>>
       return x
@@ -489,7 +489,7 @@ enddef
 
 def Test_generic_func_ret_type()
   var lines =<< trim END
-    vim9script
+    mnv9script
 
     def Fn<A>(x: A): A
       return x
@@ -504,7 +504,7 @@ def Test_generic_func_ret_type()
 
   # Using the generic type as the member of the List return value
   lines =<< trim END
-    vim9script
+    mnv9script
 
     def Fn<A>(x: A): list<A>
       return [x]
@@ -517,7 +517,7 @@ def Test_generic_func_ret_type()
 
   # Using the generic type as the member of the Dict return value
   lines =<< trim END
-    vim9script
+    mnv9script
 
     def Fn<A>(x: A): dict<A>
       return {v: x}
@@ -532,7 +532,7 @@ enddef
 " Test for using a generic type as the type of the vararg variable
 def Test_generic_func_varargs()
   var lines =<< trim END
-    vim9script
+    mnv9script
 
     def Fn<A>(...x: list<list<A>>): list<list<A>>
       return x
@@ -547,7 +547,7 @@ enddef
 " Test for using func type as a generic function argument type
 def Test_generic_func_type_as_argument()
   var lines =<< trim END
-    vim9script
+    mnv9script
 
     def Fn<A, B, C>(Foo: func(A, B): C): string
         return typename(Foo)
@@ -569,7 +569,7 @@ enddef
 
 def Test_generic_nested_call()
   var lines =<< trim END
-    vim9script
+    mnv9script
 
     def Fn<A>(n: number, x: A): A
       if n
@@ -588,7 +588,7 @@ enddef
 
 def Test_generic_failure_in_def_function()
   var lines =<< trim END
-    vim9script
+    mnv9script
 
     def Fn<T>()
     enddef
@@ -601,7 +601,7 @@ def Test_generic_failure_in_def_function()
   v9.CheckSourceFailure(lines, 'E1010: Type not recognized: abc', 1)
 
   lines =<< trim END
-    vim9script
+    mnv9script
 
     def Foo()
       Fn<abc>()
@@ -611,7 +611,7 @@ def Test_generic_failure_in_def_function()
   v9.CheckSourceFailure(lines, 'E1010: Type not recognized: abc', 1)
 
   lines =<< trim END
-    vim9script
+    mnv9script
 
     def Fn<T>()
     enddef
@@ -624,7 +624,7 @@ def Test_generic_failure_in_def_function()
   v9.CheckSourceFailure(lines, 'E1556: Too many types specified for generic function', 1)
 
   lines =<< trim END
-    vim9script
+    mnv9script
 
     def Fn<A, B>()
     enddef
@@ -637,7 +637,7 @@ def Test_generic_failure_in_def_function()
   v9.CheckSourceFailure(lines, 'E1557: Not enough types specified for generic function', 1)
 
   lines =<< trim END
-    vim9script
+    mnv9script
 
     def Fn<T>()
     enddef
@@ -650,7 +650,7 @@ def Test_generic_failure_in_def_function()
   v9.CheckSourceFailure(lines, "E1555: Empty type list specified for generic function '<>()'", 1)
 
   lines =<< trim END
-    vim9script
+    mnv9script
 
     def Fn<A, B>(x: A, y: B)
     enddef
@@ -663,7 +663,7 @@ def Test_generic_failure_in_def_function()
   v9.CheckSourceFailure(lines, 'E1559: Type arguments missing for generic function', 1)
 
   lines =<< trim END
-    vim9script
+    mnv9script
 
     def Fn(x: number)
     enddef
@@ -676,7 +676,7 @@ def Test_generic_failure_in_def_function()
   v9.CheckSourceFailure(lines, 'E1560: Not a generic function', 1)
 
   lines =<< trim END
-    vim9script
+    mnv9script
 
     def Fn<A, B>(x: A, y: B)
     enddef
@@ -689,7 +689,7 @@ def Test_generic_failure_in_def_function()
   v9.CheckSourceFailure(lines, 'E119: Not enough arguments for function', 1)
 
   lines =<< trim END
-    vim9script
+    mnv9script
 
     def Fn<T>()
     enddef
@@ -702,7 +702,7 @@ def Test_generic_failure_in_def_function()
   v9.CheckSourceFailure(lines, 'E1008: Missing <type> after <number, >()', 1)
 
   lines =<< trim END
-    vim9script
+    mnv9script
 
     def Fn<T, X>()
     enddef
@@ -715,7 +715,7 @@ def Test_generic_failure_in_def_function()
   v9.CheckSourceFailure(lines, 'E1010: Type not recognized: abc', 1)
 
   lines =<< trim END
-    vim9script
+    mnv9script
 
     def Fn<T>()
     enddef
@@ -731,7 +731,7 @@ enddef
 " Test for using function() to get a generic funcref
 def Test_get_generic_funcref_using_function()
   var lines =<< trim END
-    vim9script
+    mnv9script
     def Fn<A>(x: A): A
       return x
     enddef
@@ -742,7 +742,7 @@ def Test_get_generic_funcref_using_function()
 
   # Get a generic funcref without specifying any type arguments
   lines =<< trim END
-    vim9script
+    mnv9script
     def Fn<A>()
     enddef
     var Fx = function(Fn)
@@ -752,7 +752,7 @@ def Test_get_generic_funcref_using_function()
 
   # Get a generic funcref specifying additional type arguments
   lines =<< trim END
-    vim9script
+    mnv9script
     def Fn<A>()
     enddef
     var Fx = function(Fn<number, string>)
@@ -761,7 +761,7 @@ def Test_get_generic_funcref_using_function()
 
   # Get a generic funcref specifying less type arguments
   lines =<< trim END
-    vim9script
+    mnv9script
     def Fn<A, B>()
     enddef
     var Fx = function(Fn<string>)
@@ -770,7 +770,7 @@ def Test_get_generic_funcref_using_function()
 
   # Get a generic funcref specifying non-existing type
   lines =<< trim END
-    vim9script
+    mnv9script
     def Fn<A>()
     enddef
     var Fx = function(Fn<foobar>)
@@ -779,7 +779,7 @@ def Test_get_generic_funcref_using_function()
 
   # Get a generic funcref specifying an empty type argument list
   lines =<< trim END
-    vim9script
+    mnv9script
     def Fn<A>()
     enddef
     var Fx = function(Fn<>)
@@ -788,7 +788,7 @@ def Test_get_generic_funcref_using_function()
 
   # Get a generic funcref specifying only the opening bracket after name
   lines =<< trim END
-    vim9script
+    mnv9script
     def Fn<A>()
     enddef
     var Fx = function(Fn<)
@@ -797,7 +797,7 @@ def Test_get_generic_funcref_using_function()
 
   # Get a generic funcref specifying only the opening bracket and type
   lines =<< trim END
-    vim9script
+    mnv9script
     def Fn<A>()
     enddef
     var Fx = function(Fn<number)
@@ -806,7 +806,7 @@ def Test_get_generic_funcref_using_function()
 
   # Get a generic funcref without specifying a type after comma
   lines =<< trim END
-    vim9script
+    mnv9script
     def Fn<A>()
     enddef
     var Fx = function(Fn<number,)
@@ -815,7 +815,7 @@ def Test_get_generic_funcref_using_function()
 
   # Get a funcref to a regular function as a generic function
   lines =<< trim END
-    vim9script
+    mnv9script
     def Fn()
     enddef
     var Fx = function(Fn<number>)
@@ -824,7 +824,7 @@ def Test_get_generic_funcref_using_function()
 
   # Call a generic funcref using a different argument type
   lines =<< trim END
-    vim9script
+    mnv9script
     def Fn<T>(t: T)
     enddef
     var Fx = function(Fn<string>)
@@ -834,7 +834,7 @@ def Test_get_generic_funcref_using_function()
 
   # Assign a generic funcref return value to a variable of different type
   lines =<< trim END
-    vim9script
+    mnv9script
     def Fn<T>(t: T): T
       return t
     enddef
@@ -845,7 +845,7 @@ def Test_get_generic_funcref_using_function()
 
   # Call a generic funcref specifying types
   lines =<< trim END
-    vim9script
+    mnv9script
     def Fn<T>()
     enddef
     var Fx = function(Fn<string>)
@@ -856,7 +856,7 @@ enddef
 
 def Test_generic_funcref_string()
   var lines =<< trim END
-    vim9script
+    mnv9script
 
     def Fn<A>(x: A): A
       return x
@@ -869,7 +869,7 @@ def Test_generic_funcref_string()
 
   # Get a generic funcref without specifying any type arguments
   lines =<< trim END
-    vim9script
+    mnv9script
     def Fn<A>()
     enddef
     var Fx = function('Fn')
@@ -879,7 +879,7 @@ def Test_generic_funcref_string()
 
   # Get a generic funcref specifying additional type arguments
   lines =<< trim END
-    vim9script
+    mnv9script
     def Fn<A>()
     enddef
     var Fx = function('Fn<number, string>')
@@ -888,7 +888,7 @@ def Test_generic_funcref_string()
 
   # Get a generic funcref specifying less type arguments
   lines =<< trim END
-    vim9script
+    mnv9script
     def Fn<A, B>()
     enddef
     var Fx = function('Fn<string>')
@@ -897,7 +897,7 @@ def Test_generic_funcref_string()
 
   # Get a generic funcref specifying non-existing type
   lines =<< trim END
-    vim9script
+    mnv9script
     def Fn<A>()
     enddef
     var Fx = function('Fn<foobar>')
@@ -906,7 +906,7 @@ def Test_generic_funcref_string()
 
   # Get a generic funcref specifying an empty type argument list
   lines =<< trim END
-    vim9script
+    mnv9script
     def Fn<A>()
     enddef
     var Fx = function('Fn<>')
@@ -915,7 +915,7 @@ def Test_generic_funcref_string()
 
   # Get a generic funcref specifying only the opening bracket after name
   lines =<< trim END
-    vim9script
+    mnv9script
     def Fn<A>()
     enddef
     var Fx = function('Fn<')
@@ -924,7 +924,7 @@ def Test_generic_funcref_string()
 
   # Get a generic funcref specifying only the opening bracket and type
   lines =<< trim END
-    vim9script
+    mnv9script
     def Fn<A>()
     enddef
     var Fx = function('Fn<number')
@@ -933,7 +933,7 @@ def Test_generic_funcref_string()
 
   # Get a generic funcref without specifying a type after comma
   lines =<< trim END
-    vim9script
+    mnv9script
     def Fn<A>()
     enddef
     var Fx = function('Fn<number,')
@@ -942,7 +942,7 @@ def Test_generic_funcref_string()
 
   # Get a funcref to a regular function as a generic function
   lines =<< trim END
-    vim9script
+    mnv9script
     def Fn()
     enddef
     var Fx = function('Fn<number>')
@@ -951,7 +951,7 @@ def Test_generic_funcref_string()
   v9.CheckSourceFailure(lines, 'E1560: Not a generic function:', 5)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     def Fn<A>()
     enddef
     var Fx = function('Fn')
@@ -960,7 +960,7 @@ def Test_generic_funcref_string()
   v9.CheckSourceFailure(lines, 'E1559: Type arguments missing for generic function', 5)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     def Fn<A>()
     enddef
     var Fx = function('Fn')
@@ -969,7 +969,7 @@ def Test_generic_funcref_string()
   v9.CheckSourceFailure(lines, "E1555: Empty type list specified for generic function '<>()'", 5)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     def Fn<A>()
     enddef
     var Fx = function('Fn')
@@ -978,7 +978,7 @@ def Test_generic_funcref_string()
   v9.CheckSourceFailure(lines, 'E1559: Type arguments missing for generic function', 5)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     def Fn<A, B>()
     enddef
     var Fx = function('Fn')
@@ -987,7 +987,7 @@ def Test_generic_funcref_string()
   v9.CheckSourceFailure(lines, 'E1559: Type arguments missing for generic function', 5)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     def Fn<A>()
     enddef
     var Fx = function('Fn')
@@ -999,7 +999,7 @@ enddef
 " Test for calling a generic funcref from another function
 def Test_generic_funcref_string_from_another_function()
   var lines =<< trim END
-    vim9script
+    mnv9script
 
     def Fn<A>(x: A): A
       return x
@@ -1015,7 +1015,7 @@ def Test_generic_funcref_string_from_another_function()
 
   # Get a generic funcref without specifying any type arguments
   lines =<< trim END
-    vim9script
+    mnv9script
     def Fn<A>()
     enddef
     def Foo()
@@ -1028,7 +1028,7 @@ def Test_generic_funcref_string_from_another_function()
 
   # Get a generic funcref specifying additional type arguments
   lines =<< trim END
-    vim9script
+    mnv9script
     def Fn<A>()
     enddef
     def Foo()
@@ -1041,7 +1041,7 @@ def Test_generic_funcref_string_from_another_function()
 
   # Get a generic funcref specifying less type arguments
   lines =<< trim END
-    vim9script
+    mnv9script
     def Fn<A, B>()
     enddef
     def Foo()
@@ -1054,7 +1054,7 @@ def Test_generic_funcref_string_from_another_function()
 
   # Get a generic funcref specifying an empty type argument list
   lines =<< trim END
-    vim9script
+    mnv9script
     def Fn<A>()
     enddef
     def Foo()
@@ -1066,7 +1066,7 @@ def Test_generic_funcref_string_from_another_function()
 
   # Get a generic funcref specifying only the opening bracket after name
   lines =<< trim END
-    vim9script
+    mnv9script
     def Fn<A>()
     enddef
     def Foo()
@@ -1078,7 +1078,7 @@ def Test_generic_funcref_string_from_another_function()
 
   # Get a generic funcref specifying only the opening bracket and type
   lines =<< trim END
-    vim9script
+    mnv9script
     def Fn<A>()
     enddef
     def Foo()
@@ -1090,7 +1090,7 @@ def Test_generic_funcref_string_from_another_function()
 
   # Get a generic funcref without specifying a type after comma
   lines =<< trim END
-    vim9script
+    mnv9script
     def Fn<A>()
     enddef
     def Foo()
@@ -1102,7 +1102,7 @@ def Test_generic_funcref_string_from_another_function()
 
   # Get a funcref to a regular function as a generic function
   lines =<< trim END
-    vim9script
+    mnv9script
     def Fn()
     enddef
     def Foo()
@@ -1114,7 +1114,7 @@ def Test_generic_funcref_string_from_another_function()
   v9.CheckSourceFailure(lines, 'E1560: Not a generic function:', 2)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     def Fn<A>(x: A): A
       return x
     enddef
@@ -1127,7 +1127,7 @@ def Test_generic_funcref_string_from_another_function()
   v9.CheckSourceFailure(lines, 'E1559: Type arguments missing for generic function', 2)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     def Fn<A>()
     enddef
     def Foo()
@@ -1139,7 +1139,7 @@ def Test_generic_funcref_string_from_another_function()
   v9.CheckSourceFailure(lines, 'E1555: Empty type list specified for generic function', 2)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     def Fn<A>()
     enddef
     def Foo()
@@ -1151,7 +1151,7 @@ def Test_generic_funcref_string_from_another_function()
   v9.CheckSourceFailure(lines, 'E1559: Type arguments missing for generic function', 2)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     def Fn<A>()
     enddef
     def Foo()
@@ -1165,7 +1165,7 @@ enddef
 
 def Test_generic_obj_method()
   var lines =<< trim END
-    vim9script
+    mnv9script
 
     class A
       def Fn<X>(t: X): X
@@ -1180,7 +1180,7 @@ def Test_generic_obj_method()
   v9.CheckSourceSuccess(lines)
 
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class A
       def Fn<>()
@@ -1191,7 +1191,7 @@ def Test_generic_obj_method()
   v9.CheckSourceFailure(lines, "E1555: Empty type list specified for generic function 'Fn'", 4)
 
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class A
       def Fn<,>()
@@ -1202,7 +1202,7 @@ def Test_generic_obj_method()
   v9.CheckSourceFailure(lines, "E1008: Missing <type> after <,>()", 4)
 
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class A
       def Fn<T>()
@@ -1214,7 +1214,7 @@ def Test_generic_obj_method()
   v9.CheckSourceFailureList(lines, ["E1555: Empty type list specified for generic function '<>()'"])
 
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class A
       def Fn<T>()
@@ -1226,7 +1226,7 @@ def Test_generic_obj_method()
   v9.CheckSourceFailure(lines, "E1556: Too many types specified for generic function 'Fn'", 8)
 
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class A
       def Fn<X, Y>()
@@ -1238,7 +1238,7 @@ def Test_generic_obj_method()
   v9.CheckSourceFailure(lines, "E1557: Not enough types specified for generic function 'Fn'", 8)
 
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class A
       def Fn<T>()
@@ -1250,7 +1250,7 @@ def Test_generic_obj_method()
   v9.CheckSourceFailure(lines, "E1559: Type arguments missing for generic function", 8)
 
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class A
       def Fn()
@@ -1264,7 +1264,7 @@ enddef
 
 def Test_generic_obj_method_call_from_another_method()
   var lines =<< trim END
-    vim9script
+    mnv9script
 
     class A
       def Fn<X>(t: X): X
@@ -1282,7 +1282,7 @@ def Test_generic_obj_method_call_from_another_method()
   v9.CheckSourceSuccess(lines)
 
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class A
       def Fn<T>()
@@ -1298,7 +1298,7 @@ def Test_generic_obj_method_call_from_another_method()
   v9.CheckSourceFailureList(lines, ["E1555: Empty type list specified for generic function '<>()'"])
 
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class A
       def Fn<T>()
@@ -1314,7 +1314,7 @@ def Test_generic_obj_method_call_from_another_method()
   v9.CheckSourceFailure(lines, "E1556: Too many types specified for generic function 'Fn'", 2)
 
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class A
       def Fn<X, Y>()
@@ -1330,7 +1330,7 @@ def Test_generic_obj_method_call_from_another_method()
   v9.CheckSourceFailure(lines, "E1557: Not enough types specified for generic function 'Fn'", 2)
 
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class A
       def Fn<T>()
@@ -1346,7 +1346,7 @@ def Test_generic_obj_method_call_from_another_method()
   v9.CheckSourceFailure(lines, "E1559: Type arguments missing for generic function", 2)
 
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class A
       def Fn()
@@ -1363,7 +1363,7 @@ def Test_generic_obj_method_call_from_another_method()
 
   # Try calling a non-existing generic object method
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class A
     endclass
@@ -1378,7 +1378,7 @@ def Test_generic_obj_method_call_from_another_method()
 
   # Error in compiling generic object method arguments
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class A
       def Fn<T, X>(x: number, y: number)
@@ -1395,7 +1395,7 @@ def Test_generic_obj_method_call_from_another_method()
 
   # Try calling a super abstract method from a child class
   lines =<< trim END
-    vim9script
+    mnv9script
 
     abstract class A
       abstract def F1()
@@ -1414,7 +1414,7 @@ def Test_generic_obj_method_call_from_another_method()
 
   # Try calling a protected method in a class
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class A
       def _Foo()
@@ -1432,7 +1432,7 @@ enddef
 
 def Test_generic_class_method()
   var lines =<< trim END
-    vim9script
+    mnv9script
 
     class A
       static def Fn<X>(t: X): X
@@ -1446,7 +1446,7 @@ def Test_generic_class_method()
   v9.CheckSourceSuccess(lines)
 
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class A
       static def Fn<>()
@@ -1457,7 +1457,7 @@ def Test_generic_class_method()
   v9.CheckSourceFailure(lines, "E1555: Empty type list specified for generic function 'Fn'", 4)
 
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class A
       static def Fn<,>()
@@ -1468,7 +1468,7 @@ def Test_generic_class_method()
   v9.CheckSourceFailure(lines, "E1008: Missing <type> after <,>()", 4)
 
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class A
       static def Fn<T>()
@@ -1479,7 +1479,7 @@ def Test_generic_class_method()
   v9.CheckSourceFailureList(lines, ["E1555: Empty type list specified for generic function '<>()'"])
 
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class A
       static def Fn<T>()
@@ -1490,7 +1490,7 @@ def Test_generic_class_method()
   v9.CheckSourceFailure(lines, "E1556: Too many types specified for generic function 'Fn'", 7)
 
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class A
       static def Fn<X, Y>()
@@ -1501,7 +1501,7 @@ def Test_generic_class_method()
   v9.CheckSourceFailure(lines, "E1557: Not enough types specified for generic function 'Fn'", 7)
 
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class A
       static def Fn<T>()
@@ -1512,7 +1512,7 @@ def Test_generic_class_method()
   v9.CheckSourceFailure(lines, "E1559: Type arguments missing for generic function 'Fn'", 7)
 
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class A
       static def Fn()
@@ -1525,7 +1525,7 @@ enddef
 
 def Test_generic_class_method_call_from_another_method()
   var lines =<< trim END
-    vim9script
+    mnv9script
 
     class A
       static def Fn<X>(t: X): X
@@ -1542,7 +1542,7 @@ def Test_generic_class_method_call_from_another_method()
   v9.CheckSourceSuccess(lines)
 
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class A
       static def Fn<T>()
@@ -1557,7 +1557,7 @@ def Test_generic_class_method_call_from_another_method()
   v9.CheckSourceFailureList(lines, ["E1555: Empty type list specified for generic function '<>()'"])
 
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class A
       static def Fn<T>()
@@ -1572,7 +1572,7 @@ def Test_generic_class_method_call_from_another_method()
   v9.CheckSourceFailure(lines, "E1556: Too many types specified for generic function 'Fn'", 1)
 
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class A
       static def Fn<X, Y>()
@@ -1587,7 +1587,7 @@ def Test_generic_class_method_call_from_another_method()
   v9.CheckSourceFailure(lines, "E1557: Not enough types specified for generic function 'Fn'", 1)
 
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class A
       static def Fn<T>()
@@ -1602,7 +1602,7 @@ def Test_generic_class_method_call_from_another_method()
   v9.CheckSourceFailure(lines, "E1559: Type arguments missing for generic function 'Fn'", 1)
 
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class A
       static def Fn()
@@ -1620,7 +1620,7 @@ enddef
 " Test for using a generic funcref from another method
 def Test_generic_funcref_use_from_def_method()
   var lines =<< trim END
-    vim9script
+    mnv9script
 
     def Foo<T>(t: T): T
       return t
@@ -1637,7 +1637,7 @@ def Test_generic_funcref_use_from_def_method()
 
   # Assigning a generic function without specifying any type arguments
   lines =<< trim END
-    vim9script
+    mnv9script
 
     def Foo<T>()
     enddef
@@ -1651,7 +1651,7 @@ def Test_generic_funcref_use_from_def_method()
 
   # Assigning a generic function specifying additional type arguments
   lines =<< trim END
-    vim9script
+    mnv9script
 
     def Foo<T>()
     enddef
@@ -1665,7 +1665,7 @@ def Test_generic_funcref_use_from_def_method()
 
   # Assigning a generic function specifying less type arguments
   lines =<< trim END
-    vim9script
+    mnv9script
 
     def Foo<X, Y>()
     enddef
@@ -1679,7 +1679,7 @@ def Test_generic_funcref_use_from_def_method()
 
   # Assigning a generic function specifying an empty type argument list
   lines =<< trim END
-    vim9script
+    mnv9script
 
     def Foo<T>()
     enddef
@@ -1693,7 +1693,7 @@ def Test_generic_funcref_use_from_def_method()
 
   # Assigning a generic function specifying only the opening bracket
   lines =<< trim END
-    vim9script
+    mnv9script
 
     def Foo<T>()
     enddef
@@ -1707,7 +1707,7 @@ def Test_generic_funcref_use_from_def_method()
 
   # Assigning a generic function without specifying the closing bracket
   lines =<< trim END
-    vim9script
+    mnv9script
 
     def Foo<T>()
     enddef
@@ -1721,7 +1721,7 @@ def Test_generic_funcref_use_from_def_method()
 
   # Assigning a generic function without specifying a type after comma
   lines =<< trim END
-    vim9script
+    mnv9script
 
     def Foo<X, Y>()
     enddef
@@ -1735,7 +1735,7 @@ def Test_generic_funcref_use_from_def_method()
 
   # Create a funcref to a regular function as a generic function
   lines =<< trim END
-    vim9script
+    mnv9script
 
     def Foo()
     enddef
@@ -1749,7 +1749,7 @@ def Test_generic_funcref_use_from_def_method()
 
   # Call a generic funcref using a different argument type
   lines =<< trim END
-    vim9script
+    mnv9script
 
     def Foo<T>(t: T)
     enddef
@@ -1764,7 +1764,7 @@ def Test_generic_funcref_use_from_def_method()
 
   # Assign a generic funcref return value to a variable of different type
   lines =<< trim END
-    vim9script
+    mnv9script
 
     def Foo<T>(t: T): T
       return t
@@ -1779,9 +1779,9 @@ def Test_generic_funcref_use_from_def_method()
   v9.CheckSourceFailure(lines, 'E1012: Type mismatch; expected number but got string', 2)
 enddef
 
-def Test_generic_vim9_lambda()
+def Test_generic_mnv9_lambda()
   var lines =<< trim END
-    vim9script
+    mnv9script
 
     def Fn<A, B, C>()
       var Lambda = (x: A, y: B): C => x + y
@@ -1796,7 +1796,7 @@ enddef
 " Test for using a generic type in a nested def function
 def Test_generic_nested_def()
   var lines =<< trim END
-    vim9script
+    mnv9script
     def F1<A, B, C>()
       def F2(x: A, y: B): C
         return x + y
@@ -1809,7 +1809,7 @@ def Test_generic_nested_def()
 
   # Lambda function in a nested def function
   lines =<< trim END
-    vim9script
+    mnv9script
     def F1<A, B, C>()
       def F2(): func
         var Lambda = (x: A, y: B): C => x + y
@@ -1827,7 +1827,7 @@ enddef
 " should be substituted.  Other "any" types should be ignored.
 def Test_generic_type_substitution()
   var lines =<< trim END
-    vim9script
+    mnv9script
     def Fn<T>(a: any, b: T): any
       return a
     enddef
@@ -1839,7 +1839,7 @@ enddef
 " Test for a global generic function g:MyFunc<T>
 def Test_generic_global_function()
   var lines =<< trim END
-    vim9script
+    mnv9script
     def g:Fn1<T>(a: T): T
       return a
     enddef
@@ -1856,7 +1856,7 @@ enddef
 " Test for calling a nested generic function
 def Test_generic_function_call_nested()
   var lines =<< trim END
-    vim9script
+    mnv9script
 
     def Id_<T>(o: T): T
       return o
@@ -1885,18 +1885,18 @@ enddef
 " Test for an imported generic function foo#MyFunc<T>
 def Test_generic_import()
   var lines =<< trim END
-    vim9script
+    mnv9script
     export def Fn<A, B>(a: A, b: B): B
       return b
     enddef
     export def Foobar()
     enddef
   END
-  writefile(lines, 'Ximport_generic.vim', 'D')
+  writefile(lines, 'Ximport_generic.mnv', 'D')
 
   lines =<< trim END
-    vim9script
-    import "./Ximport_generic.vim" as Foo
+    mnv9script
+    import "./Ximport_generic.mnv" as Foo
     assert_equal(20, Foo.Fn<string, number>('abc', 20))
     def MyFunc()
       assert_equal('xyz', Foo.Fn<number, string>(30, 'xyz'))
@@ -1906,16 +1906,16 @@ def Test_generic_import()
   v9.CheckSourceSuccess(lines)
 
   lines =<< trim END
-    vim9script
-    import "./Ximport_generic.vim" as Foo
+    mnv9script
+    import "./Ximport_generic.mnv" as Foo
 
     Foo.Fn<string>('abc', 20)
   END
   v9.CheckSourceFailure(lines, 'E1557: Not enough types specified for generic function', 4)
 
   lines =<< trim END
-    vim9script
-    import "./Ximport_generic.vim" as Foo
+    mnv9script
+    import "./Ximport_generic.mnv" as Foo
 
     def MyFunc()
       Foo.Fn<string>('abc', 20)
@@ -1925,16 +1925,16 @@ def Test_generic_import()
   v9.CheckSourceFailure(lines, 'E1557: Not enough types specified for generic function', 1)
 
   lines =<< trim END
-    vim9script
-    import "./Ximport_generic.vim" as Foo
+    mnv9script
+    import "./Ximport_generic.mnv" as Foo
 
     Foo.Fn<string, number>(10, 20)
   END
   v9.CheckSourceFailure(lines, 'E1013: Argument 1: type mismatch, expected string but got number', 4)
 
   lines =<< trim END
-    vim9script
-    import "./Ximport_generic.vim" as Foo
+    mnv9script
+    import "./Ximport_generic.mnv" as Foo
 
     def MyFunc()
       Foo.Fn<string, number>(10, 20)
@@ -1944,16 +1944,16 @@ def Test_generic_import()
   v9.CheckSourceFailure(lines, 'E1013: Argument 1: type mismatch, expected string but got number', 1)
 
   lines =<< trim END
-    vim9script
-    import "./Ximport_generic.vim" as Foo
+    mnv9script
+    import "./Ximport_generic.mnv" as Foo
 
     Foo.Fn(10, 20)
   END
   v9.CheckSourceFailure(lines, 'E1559: Type arguments missing for generic function', 4)
 
   lines =<< trim END
-    vim9script
-    import "./Ximport_generic.vim" as Foo
+    mnv9script
+    import "./Ximport_generic.mnv" as Foo
 
     def MyFunc()
       Foo.Fn(10, 20)
@@ -1963,16 +1963,16 @@ def Test_generic_import()
   v9.CheckSourceFailure(lines, 'E1559: Type arguments missing for generic function', 1)
 
   lines =<< trim END
-    vim9script
-    import "./Ximport_generic.vim" as Foo
+    mnv9script
+    import "./Ximport_generic.mnv" as Foo
 
     Foo.Fn<string, ('abc', 20)
   END
   v9.CheckSourceFailure(lines, "E1008: Missing <type> after <string,", 4)
 
   lines =<< trim END
-    vim9script
-    import "./Ximport_generic.vim" as Foo
+    mnv9script
+    import "./Ximport_generic.mnv" as Foo
 
     def MyFunc()
       Foo.Fn<string, ('abc', 20)
@@ -1982,16 +1982,16 @@ def Test_generic_import()
   v9.CheckSourceFailure(lines, "E1008: Missing <type> after <string, ", 1)
 
   lines =<< trim END
-    vim9script
-    import "./Ximport_generic.vim" as Foo
+    mnv9script
+    import "./Ximport_generic.mnv" as Foo
 
     Foo.Foobar<string>()
   END
   v9.CheckSourceFailure(lines, "E1560: Not a generic function", 4)
 
   lines =<< trim END
-    vim9script
-    import "./Ximport_generic.vim" as Foo
+    mnv9script
+    import "./Ximport_generic.mnv" as Foo
 
     def MyFunc()
       Foo.Foobar<string>()
@@ -2001,16 +2001,16 @@ def Test_generic_import()
   v9.CheckSourceFailure(lines, "E1560: Not a generic function: Foo", 1)
 
   lines =<< trim END
-    vim9script
-    import "./Ximport_generic.vim" as Foo
+    mnv9script
+    import "./Ximport_generic.mnv" as Foo
 
     Foo.Fx<string, number>('abc', 20)
   END
   v9.CheckSourceFailure(lines, 'E1048: Item not found in script: Fx', 4)
 
   lines =<< trim END
-    vim9script
-    import "./Ximport_generic.vim" as Foo
+    mnv9script
+    import "./Ximport_generic.mnv" as Foo
 
     def MyFunc()
       Foo.Fx<string, number>('abc', 20)
@@ -2021,15 +2021,15 @@ def Test_generic_import()
 
   # Source the script twice
   lines =<< trim END
-    vim9script
+    mnv9script
     export def Fn<A>(a: list<A>)
     enddef
   END
-  writefile(lines, 'Ximport_generic_2.vim', 'D')
+  writefile(lines, 'Ximport_generic_2.mnv', 'D')
 
   lines =<< trim END
-    vim9script
-    import "./Ximport_generic_2.vim" as Foo
+    mnv9script
+    import "./Ximport_generic_2.mnv" as Foo
 
     Foo.Fn<list<dict<any>>>([[{}]])
   END
@@ -2043,7 +2043,7 @@ enddef
 " Test for disassembling a generic function
 def Test_generic_function_disassemble()
   var lines =<< trim END
-    vim9script
+    mnv9script
     def Fn<A, B>(): A
       var x: A
       var y: B
@@ -2081,31 +2081,31 @@ def Test_generic_function_disassemble()
   unlet g:instr
 
   lines =<< trim END
-    vim9script
+    mnv9script
     disassemble Fn<number, dict<number>
   END
   v9.CheckScriptFailure(lines, "E1554: Missing '>' in generic function: <number, dict<number>", 2)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     disassemble Fn<number, dict<number>>
   END
   v9.CheckScriptFailure(lines, 'E1061: Cannot find function Fn<number, dict<number>>', 2)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     disassemble Fn<number,
   END
   v9.CheckScriptFailure(lines, "E1554: Missing '>' in generic function: <number,", 2)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     disassemble Fn<
   END
   v9.CheckScriptFailure(lines, "E1554: Missing '>' in generic function: <", 2)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     def Fn()
     enddef
     disassemble Fn<number>
@@ -2113,7 +2113,7 @@ def Test_generic_function_disassemble()
   v9.CheckScriptFailure(lines, 'E1560: Not a generic function:', 4)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     def Fn<T>()
     enddef
     disassemble Fn<number, string>
@@ -2121,7 +2121,7 @@ def Test_generic_function_disassemble()
   v9.CheckScriptFailure(lines, 'E1556: Too many types specified for generic function', 4)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     def Fn<T>()
     enddef
     disassemble Fn
@@ -2129,7 +2129,7 @@ def Test_generic_function_disassemble()
   v9.CheckScriptFailure(lines, 'E1559: Type arguments missing for generic function', 4)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     def Fn<A, B>()
     enddef
     disassemble Fn<number>
@@ -2137,7 +2137,7 @@ def Test_generic_function_disassemble()
   v9.CheckScriptFailure(lines, 'E1557: Not enough types specified for generic function', 4)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     def Fn<A, B>()
     enddef
     disassemble Fn<>
@@ -2148,7 +2148,7 @@ enddef
 " Test for disassembling a generic function calling another generic function
 def Test_nested_generic_func_call_disassemble()
   var lines =<< trim END
-    vim9script
+    mnv9script
     def Fn1<T>(o: T): T
       return o
     enddef
@@ -2179,7 +2179,7 @@ enddef
 " Test for disassembling a generic object method
 def Test_generic_disassemble_generic_obj_method()
   var lines =<< trim END
-    vim9script
+    mnv9script
     class Foo
       def Fn<A, B>()
         var x: A
@@ -2216,7 +2216,7 @@ def Test_generic_disassemble_generic_obj_method()
   unlet g:instr
 
   lines =<< trim END
-    vim9script
+    mnv9script
     class Foo
       def Fn<X, Y>()
       enddef
@@ -2226,7 +2226,7 @@ def Test_generic_disassemble_generic_obj_method()
   v9.CheckScriptFailure(lines, "E1554: Missing '>' in generic function: Fn<number, dict<number>", 6)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     class Foo
     endclass
     disassemble Foo.Fn<number, dict<number>>
@@ -2234,7 +2234,7 @@ def Test_generic_disassemble_generic_obj_method()
   v9.CheckScriptFailure(lines, 'E1337: Class variable "Fn" not found in class "Foo"', 4)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     class Foo
       def Fn<X, Y>()
       enddef
@@ -2244,7 +2244,7 @@ def Test_generic_disassemble_generic_obj_method()
   v9.CheckScriptFailure(lines, "E1554: Missing '>' in generic function: Fn<number,", 6)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     class Foo
       def Fn<X, Y>()
       enddef
@@ -2254,7 +2254,7 @@ def Test_generic_disassemble_generic_obj_method()
   v9.CheckScriptFailure(lines, "E1554: Missing '>' in generic function: Fn<", 6)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     class Foo
       def Fn()
       enddef
@@ -2264,7 +2264,7 @@ def Test_generic_disassemble_generic_obj_method()
   v9.CheckScriptFailure(lines, 'E1560: Not a generic function:', 6)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     class Foo
       def Fn<X>()
       enddef
@@ -2274,7 +2274,7 @@ def Test_generic_disassemble_generic_obj_method()
   v9.CheckScriptFailure(lines, 'E1556: Too many types specified for generic function', 6)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     class Foo
       def Fn<X>()
       enddef
@@ -2284,7 +2284,7 @@ def Test_generic_disassemble_generic_obj_method()
   v9.CheckScriptFailure(lines, 'E1559: Type arguments missing for generic function', 6)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     class Foo
       def Fn<X, Y>()
       enddef
@@ -2294,7 +2294,7 @@ def Test_generic_disassemble_generic_obj_method()
   v9.CheckScriptFailure(lines, 'E1557: Not enough types specified for generic function', 6)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     class Foo
       def Fn<X, Y>()
       enddef
@@ -2307,7 +2307,7 @@ enddef
 " Test for disassembling a generic class method
 def Test_generic_disassemble_generic_class_method()
   var lines =<< trim END
-    vim9script
+    mnv9script
     class Foo
       static def Fn<A, B>()
         var x: A
@@ -2344,7 +2344,7 @@ def Test_generic_disassemble_generic_class_method()
   unlet g:instr
 
   lines =<< trim END
-    vim9script
+    mnv9script
     class Foo
       static def Fn<X, Y>()
       enddef
@@ -2354,7 +2354,7 @@ def Test_generic_disassemble_generic_class_method()
   v9.CheckScriptFailure(lines, "E1554: Missing '>' in generic function: Fn<number, dict<number>", 6)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     class Foo
       static def Fn<X, Y>()
       enddef
@@ -2364,7 +2364,7 @@ def Test_generic_disassemble_generic_class_method()
   v9.CheckScriptFailure(lines, "E1554: Missing '>' in generic function: Fn<number,", 6)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     class Foo
       static def Fn<X, Y>()
       enddef
@@ -2374,7 +2374,7 @@ def Test_generic_disassemble_generic_class_method()
   v9.CheckScriptFailure(lines, "E1554: Missing '>' in generic function: Fn<", 6)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     class Foo
       static def Fn()
       enddef
@@ -2384,7 +2384,7 @@ def Test_generic_disassemble_generic_class_method()
   v9.CheckScriptFailure(lines, 'E1560: Not a generic function:', 6)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     class Foo
       static def Fn<X>()
       enddef
@@ -2394,7 +2394,7 @@ def Test_generic_disassemble_generic_class_method()
   v9.CheckScriptFailure(lines, 'E1556: Too many types specified for generic function', 6)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     class Foo
       static def Fn<X>()
       enddef
@@ -2404,7 +2404,7 @@ def Test_generic_disassemble_generic_class_method()
   v9.CheckScriptFailure(lines, 'E1559: Type arguments missing for generic function', 6)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     class Foo
       static def Fn<X, Y>()
       enddef
@@ -2414,7 +2414,7 @@ def Test_generic_disassemble_generic_class_method()
   v9.CheckScriptFailure(lines, 'E1557: Not enough types specified for generic function', 6)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     class Foo
       static def Fn<X, Y>()
       enddef
@@ -2427,7 +2427,7 @@ enddef
 " Test for disassembling a generic function using a Funcref variable
 def Test_generic_disassemble_variable()
   var lines =<< trim END
-    vim9script
+    mnv9script
 
     def Foo<T>()
       echomsg "Foo"
@@ -2448,7 +2448,7 @@ enddef
 
 def Test_generic_duplicate_names()
   var lines =<< trim END
-    vim9script
+    mnv9script
     def Fn<A, B, A>()
     enddef
     defcompile
@@ -2456,7 +2456,7 @@ def Test_generic_duplicate_names()
   v9.CheckScriptFailure(lines, 'E1561: Duplicate type variable name: A', 2)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
     endclass
     def Fn<A, B>()
@@ -2466,7 +2466,7 @@ def Test_generic_duplicate_names()
   v9.CheckScriptFailure(lines, 'E1041: Redefining script item: "A"', 4)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     type A = number
     def Fn<A, B>()
     enddef
@@ -2475,7 +2475,7 @@ def Test_generic_duplicate_names()
   v9.CheckScriptFailure(lines, 'E1041: Redefining script item: "A"', 3)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     var B = 'abc'
     def Fn<A, B>()
     enddef
@@ -2484,7 +2484,7 @@ def Test_generic_duplicate_names()
   v9.CheckScriptFailure(lines, 'E1041: Redefining script item: "B"', 3)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     def Fn1<A, B>()
     enddef
     def Fn2<A, B>()
@@ -2494,7 +2494,7 @@ def Test_generic_duplicate_names()
   v9.CheckScriptSuccess(lines)
 
   lines =<< trim END
-    vim9script
+    mnv9script
 
     def I<A>(x: A): A
       return x
@@ -2510,7 +2510,7 @@ enddef
 " Test for nested generic functions
 def Test_generic_nested_functions()
   var lines =<< trim END
-    vim9script
+    mnv9script
     def Fn<T>(t: T): T
       def Fx<A>(a: A): A
         return a
@@ -2523,7 +2523,7 @@ def Test_generic_nested_functions()
 
   # Use the generic type from the outer generic function
   lines =<< trim END
-    vim9script
+    mnv9script
     def Fn<A, B>(b: B): B
       def Fx<T>(t: T): T
         return t
@@ -2537,7 +2537,7 @@ def Test_generic_nested_functions()
 
   # duplicate definition
   lines =<< trim END
-    vim9script
+    mnv9script
     def Fn<T>()
       def Fn<A>()
       enddef
@@ -2548,7 +2548,7 @@ def Test_generic_nested_functions()
 
   # overlaps with a script-local function
   lines =<< trim END
-    vim9script
+    mnv9script
     def Fx()
     enddef
     def Fn<T>()
@@ -2561,7 +2561,7 @@ def Test_generic_nested_functions()
 
   # overlaps with another nested function
   lines =<< trim END
-    vim9script
+    mnv9script
     def Fn<T>()
       def Fx<A>()
       enddef
@@ -2574,7 +2574,7 @@ def Test_generic_nested_functions()
 
   # Empty list of types
   lines =<< trim END
-    vim9script
+    mnv9script
     def Fn<T>()
       def Fx<>()
       enddef
@@ -2584,7 +2584,7 @@ def Test_generic_nested_functions()
   v9.CheckScriptFailure(lines, 'E1555: Empty type list specified for generic function', 3)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     def Fn<T>()
       def Fx<,>()
       enddef
@@ -2595,7 +2595,7 @@ def Test_generic_nested_functions()
 
   # missing closing bracket in the inner generic function
   lines =<< trim END
-    vim9script
+    mnv9script
     def Fn<T>()
       def Fx<A()
       enddef
@@ -2605,7 +2605,7 @@ def Test_generic_nested_functions()
   v9.CheckScriptFailure(lines, "E1553: Missing comma after type in generic function: <A()", 3)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     def Fn<T>()
       def Fx<a>()
       enddef
@@ -2616,7 +2616,7 @@ def Test_generic_nested_functions()
 
   # duplicate generic type
   lines =<< trim END
-    vim9script
+    mnv9script
     def Fn<T>()
       def Fx<T>()
       enddef
@@ -2629,7 +2629,7 @@ enddef
 " Test for using a generic function in call() as a string
 def Test_generic_function_use_in_call_function_as_string()
   var lines =<< trim END
-    vim9script
+    mnv9script
     def Fn<A>(a: A): A
       return a
     enddef
@@ -2639,7 +2639,7 @@ def Test_generic_function_use_in_call_function_as_string()
 
   # Test for passing more types
   lines =<< trim END
-    vim9script
+    mnv9script
     def Fn<A>()
     enddef
     call("Fn<number, string>", [])
@@ -2648,7 +2648,7 @@ def Test_generic_function_use_in_call_function_as_string()
 
   # Test for passing less types
   lines =<< trim END
-    vim9script
+    mnv9script
     def Fn<A, B>()
     enddef
     call("Fn<string>", [])
@@ -2657,7 +2657,7 @@ def Test_generic_function_use_in_call_function_as_string()
 
   # Test for passing empty types
   lines =<< trim END
-    vim9script
+    mnv9script
     def Fn<A>()
     enddef
     call("Fn<>", [])
@@ -2666,7 +2666,7 @@ def Test_generic_function_use_in_call_function_as_string()
 
   # Test for passing no types
   lines =<< trim END
-    vim9script
+    mnv9script
     def Fn<A>()
     enddef
     call("Fn", [])
@@ -2675,7 +2675,7 @@ def Test_generic_function_use_in_call_function_as_string()
 
   # Test for missing types and closing bracket
   lines =<< trim END
-    vim9script
+    mnv9script
     def Fn<A>()
     enddef
     call("Fn<", [])
@@ -2684,7 +2684,7 @@ def Test_generic_function_use_in_call_function_as_string()
 
   # Test for missing types
   lines =<< trim END
-    vim9script
+    mnv9script
     def Fn<A>()
     enddef
     call("Fn<number", [])
@@ -2693,7 +2693,7 @@ def Test_generic_function_use_in_call_function_as_string()
 
   # Test for missing types
   lines =<< trim END
-    vim9script
+    mnv9script
     def Fn<A, B>()
     enddef
     call("Fn<number,", [])
@@ -2702,7 +2702,7 @@ def Test_generic_function_use_in_call_function_as_string()
 
   # Test for missing types
   lines =<< trim END
-    vim9script
+    mnv9script
     def Fn<A, B>()
     enddef
     call("Fn<number,>", [])
@@ -2711,7 +2711,7 @@ def Test_generic_function_use_in_call_function_as_string()
 
   # Test for missing types
   lines =<< trim END
-    vim9script
+    mnv9script
     def Fn<A, B>()
     enddef
     call("Fn<number, >", [])
@@ -2720,14 +2720,14 @@ def Test_generic_function_use_in_call_function_as_string()
 
   # Test for calling a non-existing generic function
   lines =<< trim END
-    vim9script
+    mnv9script
     call("FooBar<number>", [])
   END
   v9.CheckSourceFailure(lines, 'E1558: Unknown generic function', 2)
 
   # Test for calling a regular function as a generic function
   lines =<< trim END
-    vim9script
+    mnv9script
     def Fn()
     enddef
     call("Fn<number>", [])
@@ -2738,7 +2738,7 @@ enddef
 " Test for using a generic function in call() as a string in a method
 def Test_generic_use_in_call_func_as_string_in_method()
   var lines =<< trim END
-    vim9script
+    mnv9script
     def Fn<A>(a: A): A
       return a
     enddef
@@ -2751,7 +2751,7 @@ def Test_generic_use_in_call_func_as_string_in_method()
 
   # Test for passing more types
   lines =<< trim END
-    vim9script
+    mnv9script
     def Fn<A>()
     enddef
     def Foo()
@@ -2763,7 +2763,7 @@ def Test_generic_use_in_call_func_as_string_in_method()
 
   # Test for passing less types
   lines =<< trim END
-    vim9script
+    mnv9script
     def Fn<A, B>()
     enddef
     def Foo()
@@ -2775,7 +2775,7 @@ def Test_generic_use_in_call_func_as_string_in_method()
 
   # Test for passing empty types
   lines =<< trim END
-    vim9script
+    mnv9script
     def Fn<A>()
     enddef
     def Foo()
@@ -2787,7 +2787,7 @@ def Test_generic_use_in_call_func_as_string_in_method()
 
   # Test for passing no types
   lines =<< trim END
-    vim9script
+    mnv9script
     def Fn<A>()
     enddef
     def Foo()
@@ -2799,7 +2799,7 @@ def Test_generic_use_in_call_func_as_string_in_method()
 
   # Test for missing types and closing bracket
   lines =<< trim END
-    vim9script
+    mnv9script
     def Fn<A>()
     enddef
     def Foo()
@@ -2811,7 +2811,7 @@ def Test_generic_use_in_call_func_as_string_in_method()
 
   # Test for missing types
   lines =<< trim END
-    vim9script
+    mnv9script
     def Fn<A>()
     enddef
     def Foo()
@@ -2823,7 +2823,7 @@ def Test_generic_use_in_call_func_as_string_in_method()
 
   # Test for missing types
   lines =<< trim END
-    vim9script
+    mnv9script
     def Fn<A, B>()
     enddef
     def Foo()
@@ -2835,7 +2835,7 @@ def Test_generic_use_in_call_func_as_string_in_method()
 
   # Test for missing types
   lines =<< trim END
-    vim9script
+    mnv9script
     def Fn<A, B>()
     enddef
     def Foo()
@@ -2847,7 +2847,7 @@ def Test_generic_use_in_call_func_as_string_in_method()
 
   # Test for missing types
   lines =<< trim END
-    vim9script
+    mnv9script
     def Fn<A, B>()
     enddef
     def Foo()
@@ -2859,7 +2859,7 @@ def Test_generic_use_in_call_func_as_string_in_method()
 
   # Test for calling a non-existing generic function
   lines =<< trim END
-    vim9script
+    mnv9script
     def Foo()
       call("FooBar<number>", [])
     enddef
@@ -2869,7 +2869,7 @@ def Test_generic_use_in_call_func_as_string_in_method()
 
   # Test for calling a regular function as a generic function
   lines =<< trim END
-    vim9script
+    mnv9script
     def Fn()
     enddef
     def Foo()
@@ -2883,7 +2883,7 @@ enddef
 " Test for using a generic function in call() as a funcref
 def Test_generic_function_use_in_call_function_as_funcref()
   var lines =<< trim END
-    vim9script
+    mnv9script
     def Fn<A>(a: A): A
       return a
     enddef
@@ -2893,7 +2893,7 @@ def Test_generic_function_use_in_call_function_as_funcref()
 
   # Test for passing more types
   lines =<< trim END
-    vim9script
+    mnv9script
     def Fn<A>()
     enddef
     call(Fn<number, string>, [])
@@ -2902,7 +2902,7 @@ def Test_generic_function_use_in_call_function_as_funcref()
 
   # Test for passing less types
   lines =<< trim END
-    vim9script
+    mnv9script
     def Fn<A, B>()
     enddef
     call(Fn<string>, [])
@@ -2911,7 +2911,7 @@ def Test_generic_function_use_in_call_function_as_funcref()
 
   # Test for passing empty types
   lines =<< trim END
-    vim9script
+    mnv9script
     def Fn<A>()
     enddef
     call(Fn<>, [])
@@ -2920,7 +2920,7 @@ def Test_generic_function_use_in_call_function_as_funcref()
 
   # Test for passing no types
   lines =<< trim END
-    vim9script
+    mnv9script
     def Fn<A>()
     enddef
     call(Fn, [])
@@ -2929,7 +2929,7 @@ def Test_generic_function_use_in_call_function_as_funcref()
 
   # Test for missing types and closing bracket
   lines =<< trim END
-    vim9script
+    mnv9script
     def Fn<A>()
     enddef
     call(Fn<, [])
@@ -2938,7 +2938,7 @@ def Test_generic_function_use_in_call_function_as_funcref()
 
   # Test for missing types
   lines =<< trim END
-    vim9script
+    mnv9script
     def Fn<A>()
     enddef
     call(Fn<number, [])
@@ -2947,7 +2947,7 @@ def Test_generic_function_use_in_call_function_as_funcref()
 
   # Test for missing types
   lines =<< trim END
-    vim9script
+    mnv9script
     def Fn<A, B>()
     enddef
     call(Fn<number,, [])
@@ -2956,7 +2956,7 @@ def Test_generic_function_use_in_call_function_as_funcref()
 
   # Test for missing types
   lines =<< trim END
-    vim9script
+    mnv9script
     def Fn<A, B>()
     enddef
     call(Fn<number,>, [])
@@ -2965,7 +2965,7 @@ def Test_generic_function_use_in_call_function_as_funcref()
 
   # Test for missing types
   lines =<< trim END
-    vim9script
+    mnv9script
     def Fn<A, B>()
     enddef
     call(Fn<number, >, [])
@@ -2974,14 +2974,14 @@ def Test_generic_function_use_in_call_function_as_funcref()
 
   # Test for calling a non-existing generic function
   lines =<< trim END
-    vim9script
+    mnv9script
     call(FooBar<number>, [])
   END
   v9.CheckSourceFailure(lines, 'E121: Undefined variable: FooBar', 2)
 
   # Test for calling a regular function as a generic function
   lines =<< trim END
-    vim9script
+    mnv9script
     def Fn()
     enddef
     call(Fn<number>, [])
@@ -2992,7 +2992,7 @@ enddef
 " Test for using a generic function with the :call command
 def Test_generic_function_use_call_cmd()
   var lines =<< trim END
-    vim9script
+    mnv9script
     var funcArgs = {}
     def Fn<A>(a: A)
       funcArgs = a
@@ -3004,7 +3004,7 @@ def Test_generic_function_use_call_cmd()
 
   # Test for passing extra types
   lines =<< trim END
-    vim9script
+    mnv9script
     def Fn<A>()
     enddef
     call Fn<number, string>()
@@ -3013,7 +3013,7 @@ def Test_generic_function_use_call_cmd()
 
   # Test for passing less types
   lines =<< trim END
-    vim9script
+    mnv9script
     def Fn<A, B>()
     enddef
     call Fn<string>()
@@ -3022,7 +3022,7 @@ def Test_generic_function_use_call_cmd()
 
   # Test for passing empty types
   lines =<< trim END
-    vim9script
+    mnv9script
     def Fn<A>()
     enddef
     call Fn<>()
@@ -3031,7 +3031,7 @@ def Test_generic_function_use_call_cmd()
 
   # Test for passing no types
   lines =<< trim END
-    vim9script
+    mnv9script
     def Fn<A>()
     enddef
     call Fn()
@@ -3040,7 +3040,7 @@ def Test_generic_function_use_call_cmd()
 
   # Test for missing types and closing bracket
   lines =<< trim END
-    vim9script
+    mnv9script
     def Fn<A>()
     enddef
     call Fn<()
@@ -3049,7 +3049,7 @@ def Test_generic_function_use_call_cmd()
 
   # Test for missing types
   lines =<< trim END
-    vim9script
+    mnv9script
     def Fn<A>()
     enddef
     call Fn<number, ()
@@ -3058,7 +3058,7 @@ def Test_generic_function_use_call_cmd()
 
   # Test for missing types
   lines =<< trim END
-    vim9script
+    mnv9script
     def Fn<A, B>()
     enddef
     call Fn<number,,()
@@ -3067,7 +3067,7 @@ def Test_generic_function_use_call_cmd()
 
   # Test for missing types
   lines =<< trim END
-    vim9script
+    mnv9script
     def Fn<A, B>()
     enddef
     call Fn<number,>()
@@ -3076,7 +3076,7 @@ def Test_generic_function_use_call_cmd()
 
   # Test for missing types
   lines =<< trim END
-    vim9script
+    mnv9script
     def Fn<A, B>()
     enddef
     call Fn<number, >()
@@ -3085,14 +3085,14 @@ def Test_generic_function_use_call_cmd()
 
   # Test for calling a non-existing generic function
   lines =<< trim END
-    vim9script
+    mnv9script
     call FooBar<number>()
   END
   v9.CheckSourceFailure(lines, 'E1558: Unknown generic function', 2)
 
   # Test for calling a regular function as a generic function
   lines =<< trim END
-    vim9script
+    mnv9script
     def Fn()
     enddef
     call Fn<number>()
@@ -3102,7 +3102,7 @@ enddef
 
 def Test_generic_function_with_sort()
   var lines =<< trim END
-    vim9script
+    mnv9script
 
     def g:CompareByLength<T>(a: T, b: T): number
       return string(a)->strlen() - string(b)->strlen()
@@ -3131,7 +3131,7 @@ def Test_generic_function_with_sort()
   v9.CheckSourceSuccess(lines)
 
   lines =<< trim END
-    vim9script
+    mnv9script
 
     def Foo()
       var l = ['aaaa', 'aaa', 'a', 'aa']
@@ -3162,7 +3162,7 @@ enddef
 " Test for using a generic type in the return value of a function.
 def Test_generic_function_func_ret_val()
   var lines =<< trim END
-    vim9script
+    mnv9script
 
     def Id<U>(): func(U): U
       return (X: U) => X
@@ -3182,7 +3182,7 @@ def Test_generic_function_func_ret_val()
   v9.CheckSourceSuccess(lines)
 
   lines =<< trim END
-    vim9script
+    mnv9script
 
     def Id<U>(): func(U): U
       return (X: U) => X
@@ -3208,7 +3208,7 @@ enddef
 " Test for recursively calling a generic function
 def Test_generic_function_recursive_call()
   var lines =<< trim END
-    vim9script
+    mnv9script
 
     def Y0_<U>(): func(func(U): U): U
       return (F: func(U): U) => F(Y0_<U>()(F))
@@ -3220,7 +3220,7 @@ def Test_generic_function_recursive_call()
   v9.CheckSourceFailure(lines, "E132: Function call depth is higher than 'maxfuncdepth'", 1)
 
   lines =<< trim END
-    vim9script
+    mnv9script
 
     def Y0_<U>(): func(func(U): U): U
       return (F: func(U): U) => F(Y0_<U>()(F))
@@ -3238,7 +3238,7 @@ enddef
 " Test for overriding a generic object method
 def Test_generic_object_method_override()
   var lines =<< trim END
-    vim9script
+    mnv9script
 
     class A
       def Fn<T>(t: T): T
@@ -3265,7 +3265,7 @@ enddef
 " Test for failures in overriding a generic object method
 def Test_generic_object_method_override_fails()
   var lines =<< trim END
-    vim9script
+    mnv9script
 
     class A
       def Fn<T>(t: T): T
@@ -3282,7 +3282,7 @@ def Test_generic_object_method_override_fails()
   v9.CheckSourceFailure(lines, 'E1432: Overriding generic method "Fn" in class "A" with a concrete method', 13)
 
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class A
       def Fn(t: number): number
@@ -3299,7 +3299,7 @@ def Test_generic_object_method_override_fails()
   v9.CheckSourceFailure(lines, 'E1433: Overriding concrete method "Fn" in class "A" with a generic method', 13)
 
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class A
       def Fn<T>(t: T): T
@@ -3316,7 +3316,7 @@ def Test_generic_object_method_override_fails()
   v9.CheckSourceFailure(lines, 'E1434: Mismatched number of type variables for generic method  "Fn" in class "A"', 13)
 
   lines =<< trim END
-    vim9script
+    mnv9script
 
     class A
       def Fn<X, Y>(t: X): X
@@ -3336,7 +3336,7 @@ enddef
 " Test for overriding a generic abstract object method
 def Test_generic_abstract_object_method_override()
   var lines =<< trim END
-    vim9script
+    mnv9script
 
     abstract class A
       abstract def Fn<T>(t: T): T
@@ -3358,7 +3358,7 @@ enddef
 " Test for failures in overriding a generic abstract method
 def Test_generic_abstract_method_override_fails()
   var lines =<< trim END
-    vim9script
+    mnv9script
 
     abstract class A
       abstract def Fn<T>(t: T): T
@@ -3373,7 +3373,7 @@ def Test_generic_abstract_method_override_fails()
   v9.CheckSourceFailure(lines, 'E1432: Overriding generic method "Fn" in class "A" with a concrete method', 11)
 
   lines =<< trim END
-    vim9script
+    mnv9script
 
     abstract class A
       abstract def Fn(t: number): number
@@ -3388,7 +3388,7 @@ def Test_generic_abstract_method_override_fails()
   v9.CheckSourceFailure(lines, 'E1433: Overriding concrete method "Fn" in class "A" with a generic method', 11)
 
   lines =<< trim END
-    vim9script
+    mnv9script
 
     abstract class A
       abstract def Fn<T>(t: T): T
@@ -3403,7 +3403,7 @@ def Test_generic_abstract_method_override_fails()
   v9.CheckSourceFailure(lines, 'E1434: Mismatched number of type variables for generic method  "Fn" in class "A"', 11)
 
   lines =<< trim END
-    vim9script
+    mnv9script
 
     abstract class A
       abstract def Fn<X, Y>(t: X): X
@@ -3421,7 +3421,7 @@ enddef
 " Test for using a generic method to initialize an object member variable
 def Test_generic_method_in_object_member_init_expr()
   var lines =<< trim END
-    vim9script
+    mnv9script
 
     def Id<T>(o: T): T
       return o
@@ -3449,7 +3449,7 @@ enddef
 " Test for using generic type variables in the enum constructor
 def Test_generic_enum_constructor()
   var lines =<< trim END
-    vim9script
+    mnv9script
 
     enum CommonPair
       HelloWorld<string, string>('hello', 'world'),
@@ -3477,7 +3477,7 @@ enddef
 " Test for errors in using generic type variables in the enum constructor
 def Test_generic_enum_constructor_error()
   var lines =<< trim END
-    vim9script
+    mnv9script
     enum Foo
       HelloWorld<string>('hello')
       def new(a: string)
@@ -3487,7 +3487,7 @@ def Test_generic_enum_constructor_error()
   v9.CheckSourceFailure(lines, 'E1560: Not a generic function: new', 6)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     enum Foo
       HelloWorld<string>('hello')
     endenum
@@ -3495,7 +3495,7 @@ def Test_generic_enum_constructor_error()
   v9.CheckSourceFailure(lines, 'E1560: Not a generic function: new', 4)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     enum Foo
       HelloWorld('hello')
       def new<T>(a: T)
@@ -3505,7 +3505,7 @@ def Test_generic_enum_constructor_error()
   v9.CheckSourceFailure(lines, "E1559: Type arguments missing for generic function 'new'", 6)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     enum Foo
       HelloWorld<string, string>('hello')
       def new<T>(a: T)
@@ -3515,7 +3515,7 @@ def Test_generic_enum_constructor_error()
   v9.CheckSourceFailure(lines, "E1556: Too many types specified for generic function 'new'", 6)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     enum Foo
       HelloWorld<string>('hello')
       def new<A, B>(a: A)
@@ -3525,7 +3525,7 @@ def Test_generic_enum_constructor_error()
   v9.CheckSourceFailure(lines, "E1557: Not enough types specified for generic function 'new'", 6)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     enum Foo
       One<string>(),
       HelloWorld<>()
@@ -3536,7 +3536,7 @@ def Test_generic_enum_constructor_error()
   v9.CheckSourceFailure(lines, "E1555: Empty type list specified for generic function '<>()'", 4)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     enum Foo
       HelloWorld<number>()
       def new<>()
@@ -3546,7 +3546,7 @@ def Test_generic_enum_constructor_error()
   v9.CheckSourceFailure(lines, "E1555: Empty type list specified for generic function 'new'", 4)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     enum Foo
       One<string>(),
       Two<A>()
@@ -3560,7 +3560,7 @@ enddef
 " Test for using more than 10 type arguments
 def Test_generic_max_type_args()
   var lines =<< trim END
-    vim9script
+    mnv9script
 
     def Fn<A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12>(a1: A1): A1
       var x: A1 = a1
@@ -3574,4 +3574,4 @@ def Test_generic_max_type_args()
   v9.CheckSourceSuccess(lines)
 enddef
 
-" vim: ts=8 sw=2 sts=2 expandtab tw=80 fdm=marker
+" mnv: ts=8 sw=2 sts=2 expandtab tw=80 fdm=marker
diff --git a/uvim/src/testdir/test_vim9_import.vim b/uvim/src/testdir/test_mnv9_import.mnv
index a3bb60ccb1..3ee6c5408c 100644
--- a/uvim/src/testdir/test_vim9_import.vim
+++ b/uvim/src/testdir/test_mnv9_import.mnv
@@ -1,10 +1,10 @@
-" Test import/export of the Vim9 script language.
+" Test import/export of the MNV9 script language.
 " Also the autoload mechanism.
 
-import './util/vim9.vim' as v9
+import './util/mnv9.mnv' as v9
 
 let s:export_script_lines =<< trim END
-  vim9script
+  mnv9script
   var name: string = 'bob'
   def Concat(arg: string): string
     return name .. arg
@@ -36,12 +36,12 @@ def s:Undo_export_script_lines()
   unlet g:localname
 enddef
 
-def Test_vim9_import_export()
-  writefile(s:export_script_lines, 'Xexport.vim', 'D')
+def Test_mnv9_import_export()
+  writefile(s:export_script_lines, 'Xexport.mnv', 'D')
   var import_script_lines =<< trim END
-    vim9script
+    mnv9script
     var dir = './'
-    var ext = ".vim"
+    var ext = ".mnv"
     import dir .. 'Xexport' .. ext as expo
 
     g:exported1 = expo.exported
@@ -82,8 +82,8 @@ def Test_vim9_import_export()
     assert_equal('andthensome', 'andthen'->expo.AddSome())
     assert_equal('awesome', 'awe'->expo.AddRef())
   END
-  writefile(import_script_lines, 'Ximport.vim', 'D')
-  source Ximport.vim
+  writefile(import_script_lines, 'Ximport.mnv', 'D')
+  source Ximport.mnv
 
   assert_equal('bobbie', g:result)
   assert_equal('bob', g:localname)
@@ -114,20 +114,20 @@ def Test_vim9_import_export()
   unlet g:exported_later
   unlet g:imported_func
   unlet g:imported_name g:long_name g:imported_name_appended
-  delete('Ximport.vim')
+  delete('Ximport.mnv')
 
   # similar, with line breaks
   var import_line_break_script_lines =<< trim END
-    vim9script
-    import './Xexport.vim'
+    mnv9script
+    import './Xexport.mnv'
         as expo
     g:exported = expo.exported
     expo.exported += 7
     g:exported_added = expo.exported
     g:imported_func = expo.Exported()
   END
-  writefile(import_line_break_script_lines, 'Ximport_lbr.vim')
-  source Ximport_lbr.vim
+  writefile(import_line_break_script_lines, 'Ximport_lbr.mnv')
+  source Ximport_lbr.mnv
 
   assert_equal(11, g:exported)
   assert_equal(18, g:exported_added)
@@ -138,39 +138,39 @@ def Test_vim9_import_export()
   unlet g:exported
   unlet g:exported_added
   unlet g:imported_func
-  delete('Ximport_lbr.vim')
+  delete('Ximport_lbr.mnv')
 
   var import_shadows_cmdmod_lines =<< trim END
-      vim9script
-      import './Xexport.vim' as vim9
-      vim9.exp_name = 'Shadow'
-      assert_equal('Shadow', vim9.exp_name)
+      mnv9script
+      import './Xexport.mnv' as mnv9
+      mnv9.exp_name = 'Shadow'
+      assert_equal('Shadow', mnv9.exp_name)
   END
   v9.CheckScriptSuccess(import_shadows_cmdmod_lines)
 
   var line_break_before_dot =<< trim END
-    vim9script
-    import './Xexport.vim' as expo
+    mnv9script
+    import './Xexport.mnv' as expo
     g:exported = expo
                   .exported
   END
-  writefile(line_break_before_dot, 'Ximport_lbr_before_dot.vim')
-  assert_fails('source Ximport_lbr_before_dot.vim', 'E1060:', '', 3)
-  delete('Ximport_lbr_before_dot.vim')
+  writefile(line_break_before_dot, 'Ximport_lbr_before_dot.mnv')
+  assert_fails('source Ximport_lbr_before_dot.mnv', 'E1060:', '', 3)
+  delete('Ximport_lbr_before_dot.mnv')
 
   var line_break_after_dot =<< trim END
-    vim9script
-    import './Xexport.vim' as expo
+    mnv9script
+    import './Xexport.mnv' as expo
     g:exported = expo.
                   exported
   END
-  writefile(line_break_after_dot, 'Ximport_lbr_after_dot.vim')
-  assert_fails('source Ximport_lbr_after_dot.vim', 'E1074:', '', 3)
-  delete('Ximport_lbr_after_dot.vim')
+  writefile(line_break_after_dot, 'Ximport_lbr_after_dot.mnv')
+  assert_fails('source Ximport_lbr_after_dot.mnv', 'E1074:', '', 3)
+  delete('Ximport_lbr_after_dot.mnv')
 
   var import_star_as_lines =<< trim END
-    vim9script
-    import './Xexport.vim' as Export
+    mnv9script
+    import './Xexport.mnv' as Export
     def UseExport()
       g:exported_def = Export.exported
     enddef
@@ -179,8 +179,8 @@ def Test_vim9_import_export()
     assert_equal(0, exists('Export.notexported'))
     UseExport()
   END
-  writefile(import_star_as_lines, 'Ximport.vim')
-  source Ximport.vim
+  writefile(import_star_as_lines, 'Ximport.mnv')
+  source Ximport.mnv
 
   assert_equal(18, g:exported_def)
   assert_equal(18, g:exported_script)
@@ -188,228 +188,228 @@ def Test_vim9_import_export()
   unlet g:exported_script
 
   var import_star_as_lines_no_dot =<< trim END
-    vim9script
-    import './Xexport.vim' as Export
+    mnv9script
+    import './Xexport.mnv' as Export
     def Func()
       var dummy = 1
       var imported = Export + dummy
     enddef
     defcompile
   END
-  writefile(import_star_as_lines_no_dot, 'Ximport.vim')
-  assert_fails('source Ximport.vim', 'E1060:', '', 2, 'Func')
+  writefile(import_star_as_lines_no_dot, 'Ximport.mnv')
+  assert_fails('source Ximport.mnv', 'E1060:', '', 2, 'Func')
 
   var import_star_as_lines_dot_space =<< trim END
-    vim9script
-    import './Xexport.vim' as Export
+    mnv9script
+    import './Xexport.mnv' as Export
     def Func()
       var imported = Export . exported
     enddef
     defcompile
   END
-  writefile(import_star_as_lines_dot_space, 'Ximport.vim')
-  assert_fails('source Ximport.vim', 'E1074:', '', 1, 'Func')
+  writefile(import_star_as_lines_dot_space, 'Ximport.mnv')
+  assert_fails('source Ximport.mnv', 'E1074:', '', 1, 'Func')
 
-  writefile(s:export_script_lines, 'Xexport2.vim')
+  writefile(s:export_script_lines, 'Xexport2.mnv')
   var import_as_duplicated =<< trim END
-    vim9script
-    import './Xexport.vim' as expo
-    import './Xexport2.vim' as expo
+    mnv9script
+    import './Xexport.mnv' as expo
+    import './Xexport2.mnv' as expo
   END
-  writefile(import_as_duplicated, 'Ximport.vim')
-  assert_fails('source Ximport.vim', 'E1073:', '', 3, 'Ximport.vim')
-  delete('Xexport2.vim')
+  writefile(import_as_duplicated, 'Ximport.mnv')
+  assert_fails('source Ximport.mnv', 'E1073:', '', 3, 'Ximport.mnv')
+  delete('Xexport2.mnv')
 
   var import_star_as_lines_script_no_dot =<< trim END
-    vim9script
-    import './Xexport.vim' as Export
+    mnv9script
+    import './Xexport.mnv' as Export
     g:imported_script = Export exported
   END
-  writefile(import_star_as_lines_script_no_dot, 'Ximport.vim')
-  assert_fails('source Ximport.vim', 'E1060: Expected dot after name: Export exported')
+  writefile(import_star_as_lines_script_no_dot, 'Ximport.mnv')
+  assert_fails('source Ximport.mnv', 'E1060: Expected dot after name: Export exported')
 
   var import_star_as_lines_script_space_after_dot =<< trim END
-    vim9script
-    import './Xexport.vim' as Export
+    mnv9script
+    import './Xexport.mnv' as Export
     g:imported_script = Export. exported
   END
-  writefile(import_star_as_lines_script_space_after_dot, 'Ximport.vim')
-  assert_fails('source Ximport.vim', 'E1074:')
+  writefile(import_star_as_lines_script_space_after_dot, 'Ximport.mnv')
+  assert_fails('source Ximport.mnv', 'E1074:')
 
   var import_star_as_lines_missing_name =<< trim END
-    vim9script
-    import './Xexport.vim' as Export
+    mnv9script
+    import './Xexport.mnv' as Export
     def Func()
       var imported = Export.
     enddef
     defcompile
   END
-  writefile(import_star_as_lines_missing_name, 'Ximport.vim')
-  assert_fails('source Ximport.vim', 'E1048:', '', 1, 'Func')
+  writefile(import_star_as_lines_missing_name, 'Ximport.mnv')
+  assert_fails('source Ximport.mnv', 'E1048:', '', 1, 'Func')
 
   var import_star_as_lbr_lines =<< trim END
-    vim9script
-    import './Xexport.vim'
+    mnv9script
+    import './Xexport.mnv'
         as Export
     def UseExport()
       g:exported = Export.exported
     enddef
     UseExport()
   END
-  writefile(import_star_as_lbr_lines, 'Ximport.vim')
-  source Ximport.vim
+  writefile(import_star_as_lbr_lines, 'Ximport.mnv')
+  source Ximport.mnv
   assert_equal(18, g:exported)
   unlet g:exported
 
   # try to use something that exists but is not exported
   var import_not_exported_lines =<< trim END
-    vim9script
-    import './Xexport.vim' as expo
+    mnv9script
+    import './Xexport.mnv' as expo
     echo expo.name
   END
-  writefile(import_not_exported_lines, 'Ximport.vim')
-  assert_fails('source Ximport.vim', 'E1049:', '', 3, 'Ximport.vim')
+  writefile(import_not_exported_lines, 'Ximport.mnv')
+  assert_fails('source Ximport.mnv', 'E1049:', '', 3, 'Ximport.mnv')
 
   # try to import something that is already defined
   var import_already_defined =<< trim END
-    vim9script
+    mnv9script
     var exported = 'something'
-    import './Xexport.vim' as exported
+    import './Xexport.mnv' as exported
   END
-  writefile(import_already_defined, 'Ximport.vim')
-  assert_fails('source Ximport.vim', 'E1054:', '', 3, 'Ximport.vim')
+  writefile(import_already_defined, 'Ximport.mnv')
+  assert_fails('source Ximport.mnv', 'E1054:', '', 3, 'Ximport.mnv')
 
   # try changing an imported const
   var import_assign_to_const =<< trim END
-    vim9script
-    import './Xexport.vim' as expo
+    mnv9script
+    import './Xexport.mnv' as expo
     def Assign()
       expo.CONST = 987
     enddef
     defcompile
   END
-  writefile(import_assign_to_const, 'Ximport.vim')
-  assert_fails('source Ximport.vim', 'E46:', '', 1, '_Assign')
+  writefile(import_assign_to_const, 'Ximport.mnv')
+  assert_fails('source Ximport.mnv', 'E46:', '', 1, '_Assign')
 
   # try changing an imported final
   var import_assign_to_final =<< trim END
-    vim9script
-    import './Xexport.vim' as expo
+    mnv9script
+    import './Xexport.mnv' as expo
     def Assign()
       expo.theList = [2]
     enddef
     defcompile
   END
-  writefile(import_assign_to_final, 'Ximport.vim')
-  assert_fails('source Ximport.vim', 'E46:', '', 1, '_Assign')
+  writefile(import_assign_to_final, 'Ximport.mnv')
+  assert_fails('source Ximport.mnv', 'E46:', '', 1, '_Assign')
 
   var import_no_as_lines =<< trim END
-    vim9script
-    import './Xexport.vim' name
+    mnv9script
+    import './Xexport.mnv' name
   END
-  writefile(import_no_as_lines, 'Ximport.vim')
-  assert_fails('source Ximport.vim', 'E488:', '', 2, 'Ximport.vim')
+  writefile(import_no_as_lines, 'Ximport.mnv')
+  assert_fails('source Ximport.mnv', 'E488:', '', 2, 'Ximport.mnv')
 
   # trailing starts with "as"
   var import_bad_as_lines =<< trim END
-    vim9script
-    import './Xexport.vim' asname
+    mnv9script
+    import './Xexport.mnv' asname
   END
-  writefile(import_no_as_lines, 'Ximport.vim')
-  assert_fails('source Ximport.vim', 'E488:', '', 2, 'Ximport.vim')
+  writefile(import_no_as_lines, 'Ximport.mnv')
+  assert_fails('source Ximport.mnv', 'E488:', '', 2, 'Ximport.mnv')
 
   var import_invalid_string_lines =<< trim END
-    vim9script
-    import Xexport.vim
+    mnv9script
+    import Xexport.mnv
   END
-  writefile(import_invalid_string_lines, 'Ximport.vim')
-  assert_fails('source Ximport.vim', 'E121:', '', 2, 'Ximport.vim')
+  writefile(import_invalid_string_lines, 'Ximport.mnv')
+  assert_fails('source Ximport.mnv', 'E121:', '', 2, 'Ximport.mnv')
 
   var import_wrong_name_lines =<< trim END
-    vim9script
-    import './XnoExport.vim'
+    mnv9script
+    import './XnoExport.mnv'
   END
-  writefile(import_wrong_name_lines, 'Ximport.vim')
-  assert_fails('source Ximport.vim', 'E1053:', '', 2, 'Ximport.vim')
+  writefile(import_wrong_name_lines, 'Ximport.mnv')
+  assert_fails('source Ximport.mnv', 'E1053:', '', 2, 'Ximport.mnv')
 
   var import_redefining_lines =<< trim END
-    vim9script
-    import './Xexport.vim' as exported
+    mnv9script
+    import './Xexport.mnv' as exported
     var exported = 5
   END
-  writefile(import_redefining_lines, 'Ximport.vim')
-  assert_fails('source Ximport.vim', 'E1213: Redefining imported item "exported"', '', 3)
+  writefile(import_redefining_lines, 'Ximport.mnv')
+  assert_fails('source Ximport.mnv', 'E1213: Redefining imported item "exported"', '', 3)
 
   var import_missing_dot_lines =<< trim END
-    vim9script
-    import './Xexport.vim' as expo
+    mnv9script
+    import './Xexport.mnv' as expo
     def Test()
       expo = 9
     enddef
     defcompile
   END
-  writefile(import_missing_dot_lines, 'Ximport.vim')
-  assert_fails('source Ximport.vim', 'E1258:', '', 1)
+  writefile(import_missing_dot_lines, 'Ximport.mnv')
+  assert_fails('source Ximport.mnv', 'E1258:', '', 1)
 
   var import_missing_name_lines =<< trim END
-    vim9script
-    import './Xexport.vim' as expo
+    mnv9script
+    import './Xexport.mnv' as expo
     def Test()
       expo.99 = 9
     enddef
     defcompile
   END
-  writefile(import_missing_name_lines, 'Ximport.vim')
-  assert_fails('source Ximport.vim', 'E1259:', '', 1)
+  writefile(import_missing_name_lines, 'Ximport.mnv')
+  assert_fails('source Ximport.mnv', 'E1259:', '', 1)
 
   var import_assign_wrong_type_lines =<< trim END
-    vim9script
-    import './Xexport.vim' as expo
+    mnv9script
+    import './Xexport.mnv' as expo
     expo.exported = 'xxx'
   END
-  writefile(import_assign_wrong_type_lines, 'Ximport.vim')
-  assert_fails('source Ximport.vim', 'E1012: Type mismatch; expected number but got string', '', 3)
+  writefile(import_assign_wrong_type_lines, 'Ximport.mnv')
+  assert_fails('source Ximport.mnv', 'E1012: Type mismatch; expected number but got string', '', 3)
 
   var import_assign_const_lines =<< trim END
-    vim9script
-    import './Xexport.vim' as expo
+    mnv9script
+    import './Xexport.mnv' as expo
     expo.CONST = 4321
   END
-  writefile(import_assign_const_lines, 'Ximport.vim')
-  assert_fails('source Ximport.vim', 'E46: Cannot change read-only variable "CONST"', '', 3)
+  writefile(import_assign_const_lines, 'Ximport.mnv')
+  assert_fails('source Ximport.mnv', 'E46: Cannot change read-only variable "CONST"', '', 3)
 
-  # Check that in a Vim9 script 'cpo' is set to the Vim default.
+  # Check that in a MNV9 script 'cpo' is set to the MNV default.
   # Flags added or removed are also applied to the restored value.
   set cpo=abcd
   var lines =<< trim END
-    vim9script
-    g:cpo_in_vim9script = &cpo
+    mnv9script
+    g:cpo_in_mnv9script = &cpo
     set cpo+=f
     set cpo-=c
-    g:cpo_after_vim9script = &cpo
+    g:cpo_after_mnv9script = &cpo
   END
-  writefile(lines, 'Xvim9_script', 'D')
-  source Xvim9_script
+  writefile(lines, 'Xmnv9_script', 'D')
+  source Xmnv9_script
   assert_equal('fabd', &cpo)
-  set cpo&vim
-  assert_equal(&cpo, g:cpo_in_vim9script)
+  set cpo&mnv
+  assert_equal(&cpo, g:cpo_in_mnv9script)
   var newcpo = substitute(&cpo, 'c', '', '') .. 'f'
-  assert_equal(newcpo, g:cpo_after_vim9script)
+  assert_equal(newcpo, g:cpo_after_mnv9script)
 
-  delete('Xvim9_script')
+  delete('Xmnv9_script')
 enddef
 
 def Test_import_very_long_name()
   var lines =<< trim END
-      vim9script
+      mnv9script
 
       export var verylongnameverylongnameverylongnameverylongnameverylongnameverylongnameverylongnameverylongnameverylongnameverylongnameverylongnameverylongnameverylongnameverylongnameverylongnameverylongname = 'asdf'
   END
-  writefile(lines, 'Xverylong.vim', 'D')
+  writefile(lines, 'Xverylong.mnv', 'D')
 
   lines =<< trim END
-      vim9script
-      import './Xverylong.vim'
+      mnv9script
+      import './Xverylong.mnv'
 
       g:result = Xverylong.verylongnameverylongnameverylongnameverylongnameverylongnameverylongnameverylongnameverylongnameverylongnameverylongnameverylongnameverylongnameverylongnameverylongnameverylongnameverylongname
   END
@@ -421,17 +421,17 @@ enddef
 
 def Test_import_funcref()
   var lines =<< trim END
-      vim9script
+      mnv9script
       export def F(): number
         return 42
       enddef
       export const G = F
   END
-  writefile(lines, 'Xlib.vim', 'D')
+  writefile(lines, 'Xlib.mnv', 'D')
 
   lines =<< trim END
-      vim9script
-      import './Xlib.vim' as lib
+      mnv9script
+      import './Xlib.mnv' as lib
       const Foo = lib.G()
       assert_equal(42, Foo)
 
@@ -447,7 +447,7 @@ enddef
 def Test_export_closure()
   # tests that the closure in block can be compiled, not the import part
   var lines =<< trim END
-      vim9script
+      mnv9script
       {
         var foo = 42
         export def Bar(): number
@@ -463,7 +463,7 @@ def Test_import_duplicate_function()
   # Function Hover() exists in both scripts, partial should refer to the right
   # one.
   var lines =<< trim END
-      vim9script
+      mnv9script
 
       def Hover(d: dict<any>): string
         return 'found it'
@@ -477,12 +477,12 @@ def Test_import_duplicate_function()
 
       NewLspServer()
   END
-  writefile(lines, 'Xserver.vim', 'D')
+  writefile(lines, 'Xserver.mnv', 'D')
 
   lines =<< trim END
-      vim9script
+      mnv9script
 
-      import './Xserver.vim' as server
+      import './Xserver.mnv' as server
 
       export def Hover()
       enddef
@@ -498,66 +498,66 @@ enddef
 
 
 def Test_import_fails()
-  writefile([], 'Xfoo.vim', 'D')
+  writefile([], 'Xfoo.mnv', 'D')
   var lines =<< trim END
-      import './Xfoo.vim' as foo
+      import './Xfoo.mnv' as foo
       foo = 'bar'
   END
   v9.CheckDefAndScriptFailure(lines, ['E1094:', 'E1236: Cannot use foo itself'])
   lines =<< trim END
-      vim9script
-      import './Xfoo.vim' as foo
+      mnv9script
+      import './Xfoo.mnv' as foo
       var that = foo
   END
   v9.CheckScriptFailure(lines, 'E1060: Expected dot after name: foo')
   lines =<< trim END
-      vim9script
-      import './Xfoo.vim' as foo
+      mnv9script
+      import './Xfoo.mnv' as foo
       var that: any
       that += foo
   END
   v9.CheckScriptFailure(lines, 'E1060: Expected dot after name: foo')
   lines =<< trim END
-      vim9script
-      import './Xfoo.vim' as foo
+      mnv9script
+      import './Xfoo.mnv' as foo
       foo += 9
   END
   v9.CheckScriptFailure(lines, 'E1060: Expected dot after name: foo')
 
   lines =<< trim END
-      vim9script
-      import './Xfoo.vim' as 9foo
+      mnv9script
+      import './Xfoo.mnv' as 9foo
   END
   v9.CheckScriptFailure(lines, 'E1047:')
   lines =<< trim END
-      vim9script
-      import './Xfoo.vim' as the#foo
+      mnv9script
+      import './Xfoo.mnv' as the#foo
   END
   v9.CheckScriptFailure(lines, 'E1047:')
   lines =<< trim END
-      vim9script
-      import './Xfoo.vim' as g:foo
+      mnv9script
+      import './Xfoo.mnv' as g:foo
   END
   v9.CheckScriptFailure(lines, 'E1047:')
 
   lines =<< trim END
-      vim9script
+      mnv9script
       def TheFunc()
         echo 'the func'
       enddef
       export var Ref = TheFunc
   END
-  writefile([], 'Xthat.vim')
+  writefile([], 'Xthat.mnv')
 
   lines =<< trim END
-      import './Xthat.vim' as That
+      import './Xthat.mnv' as That
       That()
   END
   v9.CheckDefAndScriptFailure(lines, ['E1094:', 'E1236: Cannot use That itself'])
 
   lines =<< trim END
-      vim9script
-      import './Xthat.vim' as That
+      mnv9script
+      import './Xthat.mnv' as That
       def Func()
         echo That()
       enddef
@@ -566,87 +566,87 @@ def Test_import_fails()
   v9.CheckScriptFailure(lines, 'E1236: Cannot use That itself')
 
   lines =<< trim END
-      import './Xthat.vim' as one
-      import './Xthat.vim' as two
+      import './Xthat.mnv' as one
+      import './Xthat.mnv' as two
   END
   v9.CheckScriptFailure(lines, 'E1262:')
 
-  delete('Xthat.vim')
+  delete('Xthat.mnv')
 
   lines =<< trim END
-      vim9script
+      mnv9script
       export var item = 'hello'
-      import './Xyourself.vim'
+      import './Xyourself.mnv'
   END
-  writefile(lines, 'Xyourself.vim', 'D')
-  assert_fails('source Xyourself.vim', 'E1088:')
+  writefile(lines, 'Xyourself.mnv', 'D')
+  assert_fails('source Xyourself.mnv', 'E1088:')
 
   mkdir('Ximport', 'R')
 
-  writefile(['vim9script'], 'Ximport/.vim')
+  writefile(['mnv9script'], 'Ximport/.mnv')
   lines =<< trim END
-      vim9script
-      import './Ximport/.vim'
+      mnv9script
+      import './Ximport/.mnv'
   END
-  v9.CheckScriptFailure(lines, 'E1261: Cannot import .vim without using "as"')
+  v9.CheckScriptFailure(lines, 'E1261: Cannot import .mnv without using "as"')
   lines =<< trim END
-      vim9script
-      import './Ximport/.vim' as vim
+      mnv9script
+      import './Ximport/.mnv' as mnv
   END
   v9.CheckScriptSuccess(lines)
 
-  writefile(['vim9script'], 'Ximport/.vimrc')
+  writefile(['mnv9script'], 'Ximport/.mnvrc')
   lines =<< trim END
-      vim9script
-      import './Ximport/.vimrc'
+      mnv9script
+      import './Ximport/.mnvrc'
   END
-  v9.CheckScriptFailure(lines, 'E1257: Imported script must use "as" or end in .vim')
+  v9.CheckScriptFailure(lines, 'E1257: Imported script must use "as" or end in .mnv')
   lines =<< trim END
-      vim9script
-      import './Ximport/.vimrc' as vimrc
+      mnv9script
+      import './Ximport/.mnvrc' as mnvrc
   END
   v9.CheckScriptSuccess(lines)
 
   new
-  setline(1, ['vim9script', 'import "" as abc'])
+  setline(1, ['mnv9script', 'import "" as abc'])
   assert_fails('source', 'E1071: Invalid string for :import: "" as abc')
   setline(2, 'import [] as abc')
   assert_fails('source', 'E1071: Invalid string for :import: [] as abc')
   setline(2, 'import test_null_string() as abc')
   assert_fails('source', 'E1071: Invalid string for :import: test_null_string() as abc')
   bw!
-  call writefile(['vim9script', "import './Xfoo.vim' ask expo"], 'Xbar.vim')
-  assert_fails('source Xbar.vim', 'E488: Trailing characters: ask expo')
+  call writefile(['mnv9script', "import './Xfoo.mnv' ask expo"], 'Xbar.mnv')
+  assert_fails('source Xbar.mnv', 'E488: Trailing characters: ask expo')
   writefile([], 'Xtemp')
-  call writefile(['vim9script', "import './Xtemp'"], 'Xbar.vim')
-  assert_fails('source Xbar.vim', 'E1257: Imported script must use "as" or end in .vim: Xtemp')
+  call writefile(['mnv9script', "import './Xtemp'"], 'Xbar.mnv')
+  assert_fails('source Xbar.mnv', 'E1257: Imported script must use "as" or end in .mnv: Xtemp')
   delete('Xtemp')
-  call writefile(['vim9script', "import './Xfoo.vim' as abc | foobar"], 'Xbar.vim')
-  assert_fails('source Xbar.vim', 'E492: Not an editor command:  foobar')
-  call delete('Xbar.vim')
+  call writefile(['mnv9script', "import './Xfoo.mnv' as abc | foobar"], 'Xbar.mnv')
+  assert_fails('source Xbar.mnv', 'E492: Not an editor command:  foobar')
+  call delete('Xbar.mnv')
 enddef
 
 func g:Trigger()
-  source Ximport.vim
+  source Ximport.mnv
   return "echo 'yes'\<CR>"
 endfunc
 
 def Test_import_export_expr_map()
   # check that :import and :export work when buffer is locked
   var export_lines =<< trim END
-    vim9script
+    mnv9script
     export def That(): string
       return 'yes'
     enddef
   END
-  writefile(export_lines, 'Xexport_that.vim', 'D')
+  writefile(export_lines, 'Xexport_that.mnv', 'D')
 
   var import_lines =<< trim END
-    vim9script
-    import './Xexport_that.vim' as that
+    mnv9script
+    import './Xexport_that.mnv' as that
     assert_equal('yes', that.That())
   END
-  writefile(import_lines, 'Ximport.vim', 'D')
+  writefile(import_lines, 'Ximport.mnv', 'D')
 
   nnoremap <expr> trigger g:Trigger()
   feedkeys('trigger', "xt")
@@ -659,18 +659,18 @@ def Test_import_in_filetype()
   # check that :import works when the buffer is locked
   mkdir('ftplugin', 'pR')
   var export_lines =<< trim END
-    vim9script
+    mnv9script
     export var That = 'yes'
   END
-  writefile(export_lines, 'ftplugin/Xexport_ft.vim')
+  writefile(export_lines, 'ftplugin/Xexport_ft.mnv')
 
   var import_lines =<< trim END
-    vim9script
-    import './Xexport_ft.vim' as ft
+    mnv9script
+    import './Xexport_ft.mnv' as ft
     assert_equal('yes', ft.That)
     g:did_load_mytpe = 1
   END
-  writefile(import_lines, 'ftplugin/qf.vim')
+  writefile(import_lines, 'ftplugin/qf.mnv')
 
   var save_rtp = &rtp
   &rtp = getcwd() .. ',' .. &rtp
@@ -685,22 +685,22 @@ enddef
 
 def Test_use_import_in_mapping()
   var lines =<< trim END
-      vim9script
+      mnv9script
       export def Funcx(nr: number)
         g:result = nr
       enddef
   END
-  writefile(lines, 'XsomeExport.vim', 'D')
+  writefile(lines, 'XsomeExport.mnv', 'D')
   lines =<< trim END
-      vim9script
-      import './XsomeExport.vim' as some
+      mnv9script
+      import './XsomeExport.mnv' as some
       var Funcy = some.Funcx
       nnoremap <F3> :call <sid>Funcy(42)<cr>
       nnoremap <F4> :call <sid>some.Funcx(44)<cr>
   END
-  writefile(lines, 'Xmapscript.vim', 'D')
+  writefile(lines, 'Xmapscript.mnv', 'D')
 
-  source Xmapscript.vim
+  source Xmapscript.mnv
   feedkeys("\<F3>", "xt")
   assert_equal(42, g:result)
   feedkeys("\<F4>", "xt")
@@ -713,29 +713,29 @@ enddef
 
 def Test_use_relative_autoload_import_in_mapping()
   var lines =<< trim END
-      vim9script
+      mnv9script
       export def Func()
         g:result = 42
       enddef
   END
-  writefile(lines, 'XrelautoloadExport.vim', 'D')
+  writefile(lines, 'XrelautoloadExport.mnv', 'D')
   lines =<< trim END
-      vim9script
-      import autoload './XrelautoloadExport.vim' as some
+      mnv9script
+      import autoload './XrelautoloadExport.mnv' as some
       nnoremap <F3> :call <SID>some.Func()<CR>
   END
-  writefile(lines, 'Xmapscript.vim', 'D')
+  writefile(lines, 'Xmapscript.mnv', 'D')
 
-  source Xmapscript.vim
-  assert_match('\d\+ A: .*XrelautoloadExport.vim', execute('scriptnames')->split("\n")[-1])
+  source Xmapscript.mnv
+  assert_match('\d\+ A: .*XrelautoloadExport.mnv', execute('scriptnames')->split("\n")[-1])
   var l = getscriptinfo()
-  assert_match('XrelautoloadExport.vim$', l[-1].name)
+  assert_match('XrelautoloadExport.mnv$', l[-1].name)
   assert_true(l[-1].autoload)
   feedkeys("\<F3>", "xt")
   assert_equal(42, g:result)
   l = getscriptinfo({name: 'XrelautoloadExport'})
   assert_true(len(l) == 1)
-  assert_match('XrelautoloadExport.vim$', l[0].name)
+  assert_match('XrelautoloadExport.mnv$', l[0].name)
   assert_false(l[0].autoload)
   assert_equal(999999, l[0].version)
 
@@ -746,34 +746,34 @@ enddef
 def Test_autoload_import_var()
   # variable name starts with "autoload"
   var lines =<< trim END
-      vim9script
-      var autoloaded = "Xtest.vim"
+      mnv9script
+      var autoloaded = "Xtest.mnv"
       import autoloaded
   END
-  v9.CheckScriptFailure(lines, 'E1053: Could not import "Xtest.vim')
+  v9.CheckScriptFailure(lines, 'E1053: Could not import "Xtest.mnv')
 enddef
 
 def Test_use_autoload_import_in_mapping()
   var lines =<< trim END
-      vim9script
+      mnv9script
       export def Func()
         g:result = 49
       enddef
   END
   mkdir('Ximpdir/autoload', 'pR')
-  writefile(lines, 'Ximpdir/autoload/XautoloadExport.vim')
+  writefile(lines, 'Ximpdir/autoload/XautoloadExport.mnv')
   var save_rtp = &rtp
   exe 'set rtp^=' .. getcwd() .. '/Ximpdir'
 
   lines =<< trim END
-      vim9script
-      import autoload 'XautoloadExport.vim' as some
+      mnv9script
+      import autoload 'XautoloadExport.mnv' as some
       nnoremap <F3> :call <SID>some.Func()<CR>
   END
-  writefile(lines, 'Xmapscript.vim', 'D')
+  writefile(lines, 'Xmapscript.mnv', 'D')
 
-  source Xmapscript.vim
-  assert_match('\d\+ A: .*autoload/XautoloadExport.vim', execute('scriptnames')->split("\n")[-1])
+  source Xmapscript.mnv
+  assert_match('\d\+ A: .*autoload/XautoloadExport.mnv', execute('scriptnames')->split("\n")[-1])
   feedkeys("\<F3>", "xt")
   assert_equal(49, g:result)
 
@@ -784,16 +784,16 @@ enddef
 
 def Test_use_import_in_command_completion()
   var lines =<< trim END
-      vim9script
+      mnv9script
       export def Complete(..._): list<string>
         return ['abcd']
       enddef
   END
-  writefile(lines, 'Xscript.vim', 'D')
+  writefile(lines, 'Xscript.mnv', 'D')
 
   lines =<< trim END
-      vim9script
-      import './Xscript.vim'
+      mnv9script
+      import './Xscript.mnv'
 
       command -nargs=1 -complete=customlist,Xscript.Complete Cmd echo 'ok'
       feedkeys(":Cmd ab\<Tab>\<C-B>#\<CR>", 'xnt')
@@ -806,16 +806,16 @@ enddef
 
 def Test_use_import_with_funcref_in_command_completion()
   var lines =<< trim END
-      vim9script
+      mnv9script
       export def Complete(..._): list<string>
         return ['abcd']
       enddef
   END
-  writefile(lines, 'Xscript.vim', 'D')
+  writefile(lines, 'Xscript.mnv', 'D')
 
   lines =<< trim END
-      vim9script
-      import './Xscript.vim'
+      mnv9script
+      import './Xscript.mnv'
 
       var Ref = Xscript.Complete
       exe "command -nargs=1 -complete=customlist," .. expand('<SID>') .. "Ref  Cmd echo 'ok'"
@@ -833,7 +833,7 @@ def Test_use_autoload_import_in_insert_completion()
   exe 'set rtp^=' .. getcwd() .. '/Xinsdir'
 
   var lines =<< trim END
-      vim9script
+      mnv9script
       export def ThesaurusFunc(findbase: bool, _): any
         if findbase
           return 1
@@ -847,13 +847,13 @@ def Test_use_autoload_import_in_insert_completion()
       enddef
       g:completion_loaded = 'yes'
   END
-  writefile(lines, 'Xinsdir/autoload/completion.vim')
+  writefile(lines, 'Xinsdir/autoload/completion.mnv')
 
   new
   lines =<< trim END
-      vim9script
+      mnv9script
       g:completion_loaded = 'no'
-      import autoload 'completion.vim'
+      import autoload 'completion.mnv'
       set thesaurusfunc=completion.ThesaurusFunc
       assert_equal('no', g:completion_loaded)
       feedkeys("i\<C-X>\<C-T>\<C-N>\<Esc>", 'xt')
@@ -873,17 +873,17 @@ def Test_use_autoload_import_partial_in_opfunc()
   exe 'set rtp^=' .. getcwd() .. '/Xpartdir'
 
   var lines =<< trim END
-      vim9script
+      mnv9script
       export def Opfunc1(..._)
         g:opfunc_called = 'yes'
       enddef
   END
-  writefile(lines, 'Xpartdir/autoload/opfunc.vim')
+  writefile(lines, 'Xpartdir/autoload/opfunc.mnv')
 
   new
   lines =<< trim END
-      vim9script
-      import autoload 'opfunc.vim'
+      mnv9script
+      import autoload 'opfunc.mnv'
       nnoremap <expr> <F3> TheFunc()
       def TheFunc(): string
         &operatorfunc = function('opfunc.Opfunc1', [0])
@@ -906,17 +906,17 @@ def Test_set_opfunc_to_autoload_func_directly()
   exe 'set rtp^=' .. getcwd() .. '/Xdirdir'
 
   var lines =<< trim END
-      vim9script
+      mnv9script
       export def Opfunc2(..._)
         g:opfunc_called = 'yes'
       enddef
   END
-  writefile(lines, 'Xdirdir/autoload/opfunc.vim')
+  writefile(lines, 'Xdirdir/autoload/opfunc.mnv')
 
   new
   lines =<< trim END
-      vim9script
-      import autoload 'opfunc.vim'
+      mnv9script
+      import autoload 'opfunc.mnv'
       nnoremap <expr> <F3> TheFunc()
       def TheFunc(): string
         &operatorfunc = opfunc.Opfunc2
@@ -939,7 +939,7 @@ def Test_use_autoload_import_in_fold_expression()
   exe 'set rtp^=' .. getcwd() .. '/Xfolddir'
 
   var lines =<< trim END
-      vim9script
+      mnv9script
       export def Expr(): string
         return getline(v:lnum) =~ '^#' ? '>1' : '1'
       enddef
@@ -948,11 +948,11 @@ def Test_use_autoload_import_in_fold_expression()
       enddef
       g:fold_loaded = 'yes'
   END
-  writefile(lines, 'Xfolddir/autoload/fold.vim')
+  writefile(lines, 'Xfolddir/autoload/fold.mnv')
 
   lines =<< trim END
-      vim9script
-      import autoload 'fold.vim'
+      mnv9script
+      import autoload 'fold.mnv'
       &foldexpr = 'fold.Expr()'
       &foldtext = 'fold.Text()'
       &foldmethod = 'expr'
@@ -977,7 +977,7 @@ enddef
 
 def Test_autoload_import_relative()
   var lines =<< trim END
-      vim9script
+      mnv9script
 
       g:loaded = 'yes'
       export def RelFunc(): string
@@ -990,16 +990,16 @@ def Test_autoload_import_relative()
       export var someText = 'some text'
       var notexp = 'bad'
   END
-  writefile(lines, 'XimportRel.vim', 'D')
-  writefile(lines, 'XimportRel2.vim', 'D')
-  writefile(lines, 'XimportRel3.vim', 'D')
-  writefile(lines, 'XimportRel4.vim', 'D')
-  writefile(lines, 'XimportRel5.vim', 'D')
+  writefile(lines, 'XimportRel.mnv', 'D')
+  writefile(lines, 'XimportRel2.mnv', 'D')
+  writefile(lines, 'XimportRel3.mnv', 'D')
+  writefile(lines, 'XimportRel4.mnv', 'D')
+  writefile(lines, 'XimportRel5.mnv', 'D')
 
   lines =<< trim END
-      vim9script
+      mnv9script
       g:loaded = 'no'
-      import autoload './XimportRel.vim'
+      import autoload './XimportRel.mnv'
       assert_equal('no', g:loaded)
 
       def AFunc(): string
@@ -1025,29 +1025,29 @@ def Test_autoload_import_relative()
   v9.CheckScriptSuccess(lines)
 
   lines =<< trim END
-      vim9script
-      import autoload './XimportRel.vim'
+      mnv9script
+      import autoload './XimportRel.mnv'
       echo XimportRel.NotExported()
   END
   v9.CheckScriptFailure(lines, 'E1049: Item not exported in script: NotExported', 3)
 
   lines =<< trim END
-      vim9script
-      import autoload './XimportRel.vim'
+      mnv9script
+      import autoload './XimportRel.mnv'
       echo XimportRel.notexp
   END
   v9.CheckScriptFailure(lines, 'E1049: Item not exported in script: notexp', 3)
 
   lines =<< trim END
-      vim9script
-      import autoload './XimportRel.vim'
+      mnv9script
+      import autoload './XimportRel.mnv'
       XimportRel.notexp = 'bad'
   END
   v9.CheckScriptFailure(lines, 'E1049: Item not exported in script: notexp', 3)
 
   lines =<< trim END
-      vim9script
-      import autoload './XimportRel.vim'
+      mnv9script
+      import autoload './XimportRel.mnv'
       def Func()
         echo XimportRel.NotExported()
       enddef
@@ -1056,8 +1056,8 @@ def Test_autoload_import_relative()
   v9.CheckScriptFailure(lines, 'E1049: Item not exported in script: NotExported', 1)
 
   lines =<< trim END
-      vim9script
-      import autoload './XimportRel.vim'
+      mnv9script
+      import autoload './XimportRel.mnv'
       def Func()
         echo XimportRel.notexp
       enddef
@@ -1067,8 +1067,8 @@ def Test_autoload_import_relative()
 
   # Same, script not imported before
   lines =<< trim END
-      vim9script
-      import autoload './XimportRel4.vim'
+      mnv9script
+      import autoload './XimportRel4.mnv'
       def Func()
         echo XimportRel4.notexp
       enddef
@@ -1079,8 +1079,8 @@ def Test_autoload_import_relative()
   # does not fail if the script wasn't loaded yet and only compiling
   g:loaded = 'no'
   lines =<< trim END
-      vim9script
-      import autoload './XimportRel2.vim'
+      mnv9script
+      import autoload './XimportRel2.mnv'
       def Func()
         echo XimportRel2.notexp
       enddef
@@ -1090,8 +1090,8 @@ def Test_autoload_import_relative()
   assert_equal('no', g:loaded)
 
   lines =<< trim END
-      vim9script
-      import autoload './XimportRel.vim'
+      mnv9script
+      import autoload './XimportRel.mnv'
       def Func()
         XimportRel.notexp = 'bad'
       enddef
@@ -1101,8 +1101,8 @@ def Test_autoload_import_relative()
 
   # fails with a not loaded import
   lines =<< trim END
-      vim9script
-      import autoload './XimportRel3.vim'
+      mnv9script
+      import autoload './XimportRel3.mnv'
       def Func()
         XimportRel3.notexp = 'bad'
       enddef
@@ -1113,8 +1113,8 @@ def Test_autoload_import_relative()
   unlet g:loaded
 
   lines =<< trim END
-      vim9script
-      import autoload './XimportRel5.vim'
+      mnv9script
+      import autoload './XimportRel5.mnv'
       def Func()
         XimportRel5.nosuchvar = 'bad'
       enddef
@@ -1124,16 +1124,16 @@ def Test_autoload_import_relative()
   unlet g:loaded
 
   # nasty: delete script after compiling function
-  writefile(['vim9script'], 'XimportRelDel.vim')
+  writefile(['mnv9script'], 'XimportRelDel.mnv')
   lines =<< trim END
-      vim9script
+      mnv9script
 
-      import autoload './XimportRelDel.vim'
+      import autoload './XimportRelDel.mnv'
       def DoIt()
         echo XimportRelDel.var
       enddef
       defcompile
-      delete('XimportRelDel.vim')
+      delete('XimportRelDel.mnv')
       DoIt()
   END
   v9.CheckScriptFailure(lines, 'E484:')
@@ -1143,22 +1143,22 @@ enddef
 " Github issues: #14565, #14579
 def Test_autoload_import_relative_compiled_buffer()
   var lines =<< trim END
-    vim9script
+    mnv9script
 
     export def F1(): string
-        return 'InFile.vim'
+        return 'InFile.mnv'
     enddef
   END
-  writefile(lines, 'Ximportrelativebuffer.vim', 'D')
+  writefile(lines, 'Ximportrelativebuffer.mnv', 'D')
   lines =<< trim END
-    vim9script
+    mnv9script
 
-    import autoload './Ximportrelativebuffer.vim' as xfile
+    import autoload './Ximportrelativebuffer.mnv' as xfile
 
     def F(): string
       return xfile.F1()
     enddef
-    assert_equal('InFile.vim', F())
+    assert_equal('InFile.mnv', F())
   END
   new
   setline(1, lines)
@@ -1173,26 +1173,26 @@ enddef
 def Test_autoload_import_relative_from_buffer_in_dir()
   mkdir('Ximportrelative/dir1/dir2', 'pR')
   var lines =<< trim END
-    vim9script
+    mnv9script
 
     export def F1(): string
-        return 'InFile.vim'
+        return 'InFile.mnv'
     enddef
   END
-  writefile(lines, 'Ximportrelative/dir1/dir2/Ximport.vim')
+  writefile(lines, 'Ximportrelative/dir1/dir2/Ximport.mnv')
   lines =<< trim END
-    vim9script
+    mnv9script
 
-    import autoload './Ximport.vim' as xfile
+    import autoload './Ximport.mnv' as xfile
 
     def F(): string
       return xfile.F1()
     enddef
-    assert_equal('InFile.vim', F())
+    assert_equal('InFile.mnv', F())
   END
-  writefile(lines, 'Ximportrelative/dir1/dir2/Xrelative.vim')
+  writefile(lines, 'Ximportrelative/dir1/dir2/Xrelative.mnv')
 
-  split Ximportrelative/dir1/dir2/Xrelative.vim
+  split Ximportrelative/dir1/dir2/Xrelative.mnv
   :source
   # source one more time to detect issues with clearing the script state and
   # variables
@@ -1204,7 +1204,7 @@ enddef
 def Test_autoload_export_variables()
   mkdir('Xautoload_vars/autoload', 'pR')
   var lines =<< trim END
-    vim9script
+    mnv9script
     g:Xautoload_vars_autoload = true
     export var val = 11
     val = 42
@@ -1212,12 +1212,12 @@ def Test_autoload_export_variables()
 
   # Test that the imported script, above, can modify the exported variable;
   # and test that the importing script, below, can modify the variable.
-  writefile(lines, 'Xautoload_vars/autoload/Xauto_vars_f2.vim', 'D')
+  writefile(lines, 'Xautoload_vars/autoload/Xauto_vars_f2.mnv', 'D')
   lines =<< trim END
-    vim9script
+    mnv9script
     g:Xautoload_vars_autoload = false
 
-    import autoload './Xautoload_vars/autoload/Xauto_vars_f2.vim' as f2
+    import autoload './Xautoload_vars/autoload/Xauto_vars_f2.mnv' as f2
     # Verify that the import statement does not load the file.
     assert_equal(false, g:Xautoload_vars_autoload)
 
@@ -1247,15 +1247,15 @@ def Test_autoload_export_variables()
 
   # Test const var is not modifiable.
   lines =<< trim END
-    vim9script
+    mnv9script
     export const val = 11
     val = 42
   END
-  writefile(lines, 'Xautoload_vars/autoload/Xauto_vars_f3.vim', 'D')
+  writefile(lines, 'Xautoload_vars/autoload/Xauto_vars_f3.mnv', 'D')
   lines =<< trim END
-    vim9script
+    mnv9script
 
-    import autoload './Xautoload_vars/autoload/Xauto_vars_f3.vim' as f3
+    import autoload './Xautoload_vars/autoload/Xauto_vars_f3.mnv' as f3
 
     var x = f3.val
   END
@@ -1263,14 +1263,14 @@ def Test_autoload_export_variables()
 
   # Test const var is not modifiable from importing script.
   lines =<< trim END
-    vim9script
+    mnv9script
     export const val = 11
   END
-  writefile(lines, 'Xautoload_vars/autoload/Xauto_vars_f4.vim', 'D')
+  writefile(lines, 'Xautoload_vars/autoload/Xauto_vars_f4.mnv', 'D')
   lines =<< trim END
-    vim9script
+    mnv9script
 
-    import autoload './Xautoload_vars/autoload/Xauto_vars_f4.vim' as f4
+    import autoload './Xautoload_vars/autoload/Xauto_vars_f4.mnv' as f4
 
     f4.val = 13
   END
@@ -1279,14 +1279,14 @@ def Test_autoload_export_variables()
   # Test const var is not modifiable from importing script from :def.
   # Github issue: #14606
   lines =<< trim END
-    vim9script
+    mnv9script
     export const val = 11
   END
-  writefile(lines, 'Xautoload_vars/autoload/Xauto_vars_f5.vim', 'D')
+  writefile(lines, 'Xautoload_vars/autoload/Xauto_vars_f5.mnv', 'D')
   lines =<< trim END
-    vim9script
+    mnv9script
 
-    import autoload './Xautoload_vars/autoload/Xauto_vars_f5.vim' as f5
+    import autoload './Xautoload_vars/autoload/Xauto_vars_f5.mnv' as f5
 
     def F()
       f5.val = 13
@@ -1297,14 +1297,14 @@ def Test_autoload_export_variables()
 
   # Still part of Github issue: #14606
   lines =<< trim END
-    vim9script
+    mnv9script
     export var val = 11
   END
-  writefile(lines, 'Xautoload_vars/autoload/Xauto_vars_f6.vim', 'D')
+  writefile(lines, 'Xautoload_vars/autoload/Xauto_vars_f6.mnv', 'D')
   lines =<< trim END
-    vim9script
+    mnv9script
 
-    import autoload './Xautoload_vars/autoload/Xauto_vars_f6.vim' as f6
+    import autoload './Xautoload_vars/autoload/Xauto_vars_f6.mnv' as f6
 
     def F()
       f6.val = 13
@@ -1318,16 +1318,16 @@ enddef
 def Test_autoload_import_relative_autoload_dir()
   mkdir('autoload', 'pR')
   var lines =<< trim END
-      vim9script
+      mnv9script
       export def Bar()
         g:called_bar = 'yes'
       enddef
   END
-  writefile(lines, 'autoload/script.vim')
+  writefile(lines, 'autoload/script.mnv')
 
   lines =<< trim END
-      vim9script
-      import autoload './autoload/script.vim'
+      mnv9script
+      import autoload './autoload/script.mnv'
       def Foo()
         script.Bar()
       enddef
@@ -1341,16 +1341,16 @@ enddef
 
 def Test_autoload_import_deleted()
   var lines =<< trim END
-      vim9script
+      mnv9script
       export const FOO = 1
   END
-  writefile(lines, 'Xa.vim', 'D')
+  writefile(lines, 'Xa.mnv', 'D')
 
   lines =<< trim END
-      vim9script
-      import autoload './Xa.vim'
+      mnv9script
+      import autoload './Xa.mnv'
 
-      delete('Xa.vim')
+      delete('Xa.mnv')
       var x = Xa.FOO
   END
   v9.CheckScriptFailure(lines, 'E484:')
@@ -1359,17 +1359,17 @@ enddef
 def Test_autoload_import_using_const()
   mkdir('Xdir/autoload', 'pR')
   var lines =<< trim END
-      vim9script
+      mnv9script
       export const FOO = 42
       echomsg FOO
   END
-  writefile(lines, 'Xdir/autoload/exp.vim')
+  writefile(lines, 'Xdir/autoload/exp.mnv')
 
   var save_rtp = &rtp
   exe 'set rtp^=' .. getcwd() .. '/Xdir'
   lines =<< trim END
-      vim9script
-      import autoload 'exp.vim'
+      mnv9script
+      import autoload 'exp.mnv'
       assert_equal(42, exp.FOO)
   END
   v9.CheckScriptSuccess(lines)
@@ -1384,7 +1384,7 @@ endfunc
 
 def Run_Test_import_in_diffexpr()
   var lines =<< trim END
-      vim9script
+      mnv9script
 
       export def DiffExpr()
         # Prepend some text to check diff type detection
@@ -1396,7 +1396,7 @@ def Run_Test_import_in_diffexpr()
   writefile(lines, 'Xdiffexpr', 'D')
 
   lines =<< trim END
-      vim9script
+      mnv9script
       import './Xdiffexpr' as diff
 
       set diffexpr=diff.DiffExpr()
@@ -1423,7 +1423,7 @@ enddef
 
 def Test_import_in_patchexpr()
   var lines =<< trim END
-    vim9script
+    mnv9script
     export def TPatch()
       call writefile(['output file'], v:fname_out)
     enddef
@@ -1431,7 +1431,7 @@ def Test_import_in_patchexpr()
   writefile(lines, 'Xpatchexpr', 'D')
 
   lines =<< trim END
-      vim9script
+      mnv9script
       import './Xpatchexpr' as patch
       set patchexpr=patch.TPatch()
   END
@@ -1450,7 +1450,7 @@ enddef
 
 def Test_import_in_formatexpr()
   var lines =<< trim END
-      vim9script
+      mnv9script
       export def MyFormatExpr(): number
         g:did_format = 'yes'
         return 0
@@ -1459,7 +1459,7 @@ def Test_import_in_formatexpr()
   writefile(lines, 'Xformatter', 'D')
 
   lines =<< trim END
-      vim9script
+      mnv9script
       import './Xformatter' as format
       set formatexpr=format.MyFormatExpr()
   END
@@ -1480,16 +1480,16 @@ def Test_import_in_includeexpr()
   new
 
   var lines =<< trim END
-      vim9script
+      mnv9script
       export def DoSub(): string
         return substitute(v:fname, 'that', 'this', '')
       enddef
   END
-  writefile(lines, 'Xinclude.vim', 'D')
+  writefile(lines, 'Xinclude.mnv', 'D')
 
   lines =<< trim END
-    vim9script
-    import './Xinclude.vim'
+    mnv9script
+    import './Xinclude.mnv'
     set includeexpr=Xinclude.DoSub()
   END
   v9.CheckScriptSuccess(lines)
@@ -1505,7 +1505,7 @@ enddef
 
 def Test_import_in_indentexpr()
   var lines =<< trim END
-      vim9script
+      mnv9script
       export def GetIndent(): number
         return 5
       enddef
@@ -1513,7 +1513,7 @@ def Test_import_in_indentexpr()
   writefile(lines, 'Xindenter', 'D')
 
   lines =<< trim END
-      vim9script
+      mnv9script
       import './Xindenter' as indent
       set indentexpr=indent.GetIndent()
       set debug=throw
@@ -1536,18 +1536,18 @@ endfunc
 
 def Run_Test_import_in_printexpr()
   var lines =<< trim END
-      vim9script
+      mnv9script
       export def PrintFile(): bool
         g:printed = 'yes'
         delete('v:fname_in')
         return false
       enddef
   END
-  writefile(lines, 'Xprint.vim', 'D')
+  writefile(lines, 'Xprint.mnv', 'D')
 
   lines =<< trim END
-      vim9script
-      import './Xprint.vim'
+      mnv9script
+      import './Xprint.mnv'
       set printexpr=Xprint.PrintFile()
   END
   v9.CheckScriptSuccess(lines)
@@ -1566,7 +1566,7 @@ endfunc
 
 def Run_Test_import_in_findfunc()
   var lines =<< trim END
-    vim9script
+    mnv9script
 
     export def FindFunc(pat: string, cmdexpand: bool): list<string>
       var fnames = ['Xfile1.c', 'Xfile2.c', 'Xfile3.c']
@@ -1577,7 +1577,7 @@ def Run_Test_import_in_findfunc()
 
   # Test using the "set" command
   lines =<< trim END
-    vim9script
+    mnv9script
     import './Xfindfunc' as find1
 
     set findfunc=find1.FindFunc
@@ -1596,7 +1596,7 @@ def Run_Test_import_in_findfunc()
 
   # Test using the option variable
   lines =<< trim END
-    vim9script
+    mnv9script
     import './Xfindfunc' as find2
 
     &findfunc = find2.FindFunc
@@ -1618,7 +1618,7 @@ enddef
 
 def Test_import_in_charconvert()
   var lines =<< trim END
-      vim9script
+      mnv9script
       export def MakeUpper(): bool
         var data = readfile(v:fname_in)
         map(data, 'toupper(v:val)')
@@ -1626,11 +1626,11 @@ def Test_import_in_charconvert()
         return false  # success
       enddef
   END
-  writefile(lines, 'Xconvert.vim', 'D')
+  writefile(lines, 'Xconvert.mnv', 'D')
 
   lines =<< trim END
-      vim9script
-      import './Xconvert.vim' as conv
+      mnv9script
+      import './Xconvert.mnv' as conv
       set charconvert=conv.MakeUpper()
   END
   v9.CheckScriptSuccess(lines)
@@ -1652,16 +1652,16 @@ endfunc
 
 def Run_Test_import_in_spellsuggest_expr()
   var lines =<< trim END
-      vim9script
+      mnv9script
       export def MySuggest(): list<any>
         return [['Fox', 8], ['Fop', 9]]
       enddef
   END
-  writefile(lines, 'Xsuggest.vim', 'D')
+  writefile(lines, 'Xsuggest.mnv', 'D')
 
   lines =<< trim END
-      vim9script
-      import './Xsuggest.vim' as sugg
+      mnv9script
+      import './Xsuggest.mnv' as sugg
       set spell spellsuggest=expr:sugg.MySuggest()
   END
   v9.CheckScriptSuccess(lines)
@@ -1674,15 +1674,15 @@ enddef
 
 def Test_import_in_lambda_method()
   var lines =<< trim END
-      vim9script
+      mnv9script
       export def Retarg(e: any): any
         return e
       enddef
   END
-  writefile(lines, 'XexportRetarg.vim', 'D')
+  writefile(lines, 'XexportRetarg.mnv', 'D')
   lines =<< trim END
-      vim9script
-      import './XexportRetarg.vim'
+      mnv9script
+      import './XexportRetarg.mnv'
       def Lambda(): string
         var F = (x) => x->XexportRetarg.Retarg()
         return F('arg')
@@ -1698,21 +1698,21 @@ def Test_export_shadows_global_function()
   exe 'set rtp^=' .. getcwd() .. '/Xglobdir'
 
   var lines =<< trim END
-      vim9script
+      mnv9script
       export def Shadow(): string
         return 'Shadow()'
       enddef
   END
-  writefile(lines, 'Xglobdir/autoload/shadow.vim')
+  writefile(lines, 'Xglobdir/autoload/shadow.mnv')
 
   lines =<< trim END
-      vim9script
+      mnv9script
 
       def g:Shadow(): string
         return 'global'
       enddef
 
-      import autoload 'shadow.vim'
+      import autoload 'shadow.mnv'
       assert_equal('Shadow()', shadow.Shadow())
   END
   v9.CheckScriptSuccess(lines)
@@ -1724,15 +1724,15 @@ enddef
 
 def Test_export_fails()
   v9.CheckScriptFailure(['export var some = 123'], 'E1042:')
-  v9.CheckScriptFailure(['vim9script', 'export var g:some'], 'E1022:')
-  v9.CheckScriptFailure(['vim9script', 'export echo 134'], 'E1043:')
-  v9.CheckScriptFailure(['vim9script', 'export function /a1b2c3'], 'E1044:')
+  v9.CheckScriptFailure(['mnv9script', 'export var g:some'], 'E1022:')
+  v9.CheckScriptFailure(['mnv9script', 'export echo 134'], 'E1043:')
+  v9.CheckScriptFailure(['mnv9script', 'export function /a1b2c3'], 'E1044:')
 
   assert_fails('export echo 1', 'E1043:')
 enddef
 
 func Test_import_fails_without_script()
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   " call indirectly to avoid compilation error for missing functions
   call Run_Test_import_fails_on_command_line()
@@ -1740,23 +1740,23 @@ endfunc
 
 def Run_Test_import_fails_on_command_line()
   var export =<< trim END
-    vim9script
+    mnv9script
     export def Foo(): number
         return 0
     enddef
   END
-  writefile(export, 'XexportCmd.vim', 'D')
+  writefile(export, 'XexportCmd.mnv', 'D')
 
-  var buf = g:RunVimInTerminal('-c "import Foo from ''./XexportCmd.vim''"', {
+  var buf = g:RunMNVInTerminal('-c "import Foo from ''./XexportCmd.mnv''"', {
                 rows: 6, wait_for_ruler: 0})
   g:WaitForAssert(() => assert_match('^E1094:', term_getline(buf, 5)))
 
-  g:StopVimInTerminal(buf)
+  g:StopMNVInTerminal(buf)
 enddef
 
-def Test_vim9_reload_noclear()
+def Test_mnv9_reload_noclear()
   var lines =<< trim END
-    vim9script
+    mnv9script
     export var exported = 'thexport'
 
     export def TheFunc(x = 0)
@@ -1764,7 +1764,7 @@ def Test_vim9_reload_noclear()
   END
   writefile(lines, 'XExportReload', 'D')
   lines =<< trim END
-    vim9script noclear
+    mnv9script noclear
     g:loadCount += 1
     var reloaded = 'init'
     import './XExportReload' as exp
@@ -1804,28 +1804,28 @@ def Test_vim9_reload_noclear()
   unlet g:loadCount
 
   lines =<< trim END
-      vim9script
+      mnv9script
       def Inner()
       enddef
   END
-  lines->writefile('XreloadScript.vim', 'D')
-  source XreloadScript.vim
+  lines->writefile('XreloadScript.mnv', 'D')
+  source XreloadScript.mnv
 
   lines =<< trim END
-      vim9script
+      mnv9script
       def Outer()
         def Inner()
         enddef
       enddef
       defcompile
   END
-  lines->writefile('XreloadScript.vim')
-  source XreloadScript.vim
+  lines->writefile('XreloadScript.mnv')
+  source XreloadScript.mnv
 enddef
 
-def Test_vim_reload_noclear_arg_count()
+def Test_mnv_reload_noclear_arg_count()
   var lines =<< trim END
-      vim9script noclear
+      mnv9script noclear
 
       if !exists('g:didload')
         def Test(a: string, b: string)
@@ -1843,13 +1843,13 @@ def Test_vim_reload_noclear_arg_count()
       Call()
       g:didload = 1
   END
-  lines->writefile('XreloadScript_1.vim', 'D')
-  source XreloadScript_1.vim
-  assert_fails('source XreloadScript_1.vim', 'E1106: One argument too many')
+  lines->writefile('XreloadScript_1.mnv', 'D')
+  source XreloadScript_1.mnv
+  assert_fails('source XreloadScript_1.mnv', 'E1106: One argument too many')
   unlet g:didload
 
   lines =<< trim END
-      vim9script noclear
+      mnv9script noclear
 
       if !exists('g:didload')
         def Test(a: string, b: string, c: string)
@@ -1867,13 +1867,13 @@ def Test_vim_reload_noclear_arg_count()
       Call()
       g:didload = 1
   END
-  lines->writefile('XreloadScript_2.vim', 'D')
-  source XreloadScript_2.vim
-  assert_fails('source XreloadScript_2.vim', 'E1106: 2 arguments too many')
+  lines->writefile('XreloadScript_2.mnv', 'D')
+  source XreloadScript_2.mnv
+  assert_fails('source XreloadScript_2.mnv', 'E1106: 2 arguments too many')
   unlet g:didload
 
   lines =<< trim END
-      vim9script noclear
+      mnv9script noclear
 
       if !exists('g:didload')
         def Test(a: string)
@@ -1891,13 +1891,13 @@ def Test_vim_reload_noclear_arg_count()
       Call()
       g:didload = 1
   END
-  lines->writefile('XreloadScript_3.vim', 'D')
-  source XreloadScript_3.vim
-  assert_fails('source XreloadScript_3.vim', 'E1190: One argument too few')
+  lines->writefile('XreloadScript_3.mnv', 'D')
+  source XreloadScript_3.mnv
+  assert_fails('source XreloadScript_3.mnv', 'E1190: One argument too few')
   unlet g:didload
 
   lines =<< trim END
-      vim9script noclear
+      mnv9script noclear
 
       if !exists('g:didload')
         def Test(a: string)
@@ -1915,15 +1915,15 @@ def Test_vim_reload_noclear_arg_count()
       Call()
       g:didload = 1
   END
-  lines->writefile('XreloadScript_4.vim', 'D')
-  source XreloadScript_4.vim
-  assert_fails('source XreloadScript_4.vim', 'E1190: 2 arguments too few')
+  lines->writefile('XreloadScript_4.mnv', 'D')
+  source XreloadScript_4.mnv
+  assert_fails('source XreloadScript_4.mnv', 'E1190: 2 arguments too few')
   unlet g:didload
 enddef
 
-def Test_vim9_reload_noclear_error()
+def Test_mnv9_reload_noclear_error()
   var lines =<< trim END
-      vim9script noclear
+      mnv9script noclear
 
       if !exists('g:didload')
         def Test(a: string)
@@ -1941,16 +1941,16 @@ def Test_vim9_reload_noclear_error()
       Call()
       g:didload = 1
   END
-  lines->writefile('XreloadScriptErr.vim', 'D')
-  source XreloadScriptErr.vim
-  assert_fails('source XreloadScriptErr.vim', 'E1001: Variable not found: ax')
+  lines->writefile('XreloadScriptErr.mnv', 'D')
+  source XreloadScriptErr.mnv
+  assert_fails('source XreloadScriptErr.mnv', 'E1001: Variable not found: ax')
 
   unlet g:didload
 enddef
 
-def Test_vim9_reload_import()
+def Test_mnv9_reload_import()
   var lines =<< trim END
-    vim9script
+    mnv9script
     const var = ''
     var valone = 1234
     def MyFunc(arg: string)
@@ -1963,43 +1963,43 @@ def Test_vim9_reload_import()
       return valtwo
     enddef
   END
-  writefile(lines + morelines, 'Xreload.vim', 'D')
-  source Xreload.vim
-  source Xreload.vim
-  source Xreload.vim
+  writefile(lines + morelines, 'Xreload.mnv', 'D')
+  source Xreload.mnv
+  source Xreload.mnv
+  source Xreload.mnv
 
   # cannot declare a var twice
   lines =<< trim END
-    vim9script
+    mnv9script
     var valone = 1234
     var valone = 5678
   END
-  writefile(lines, 'Xreload.vim')
-  assert_fails('source Xreload.vim', 'E1041:', '', 3, 'Xreload.vim')
+  writefile(lines, 'Xreload.mnv')
+  assert_fails('source Xreload.mnv', 'E1041:', '', 3, 'Xreload.mnv')
 
-  delete('Ximport.vim')
+  delete('Ximport.mnv')
 enddef
 
 " if a script is reloaded with a script-local variable that changed its type, a
 " compiled function using that variable must fail.
 def Test_script_reload_change_type()
   var lines =<< trim END
-    vim9script noclear
+    mnv9script noclear
     var str = 'string'
     def g:GetStr(): string
       return str .. 'xxx'
     enddef
   END
-  writefile(lines, 'Xreload.vim', 'D')
-  source Xreload.vim
+  writefile(lines, 'Xreload.mnv', 'D')
+  source Xreload.mnv
   echo g:GetStr()
 
   lines =<< trim END
-    vim9script noclear
+    mnv9script noclear
     var str = 1234
   END
-  writefile(lines, 'Xreload.vim')
-  source Xreload.vim
+  writefile(lines, 'Xreload.mnv')
+  source Xreload.mnv
   assert_fails('echo g:GetStr()', 'E1150:')
 
   delfunc g:GetStr
@@ -2010,7 +2010,7 @@ command CallFunc echo 'nop'
 
 def Test_script_reload_from_function()
   var lines =<< trim END
-      vim9script
+      mnv9script
 
       if exists('g:loadedThis')
         finish
@@ -2019,12 +2019,12 @@ def Test_script_reload_from_function()
       delcommand CallFunc
       command CallFunc Func()
       def Func()
-        so XreloadFunc.vim
+        so XreloadFunc.mnv
         g:didTheFunc = 1
       enddef
   END
-  writefile(lines, 'XreloadFunc.vim', 'D')
-  source XreloadFunc.vim
+  writefile(lines, 'XreloadFunc.mnv', 'D')
+  source XreloadFunc.mnv
   CallFunc
   assert_equal(1, g:didTheFunc)
 
@@ -2039,9 +2039,9 @@ enddef
 
 " Not exported function that is referenced needs to be accessed by the
 " script-local name.
-def Test_vim9_funcref()
+def Test_mnv9_funcref()
   var sortlines =<< trim END
-      vim9script
+      mnv9script
       def Compare(i1: number, i2: number): number
         return i2 - i1
       enddef
@@ -2054,25 +2054,25 @@ def Test_vim9_funcref()
         return arg
       enddef
   END
-  writefile(sortlines, 'Xsort.vim', 'D')
+  writefile(sortlines, 'Xsort.mnv', 'D')
 
   var lines =<< trim END
-    vim9script
-    import './Xsort.vim'
+    mnv9script
+    import './Xsort.mnv'
     def Test()
       g:result = Xsort.FastSort()
     enddef
     Test()
   END
-  writefile(lines, 'Xscript.vim', 'D')
-  source Xscript.vim
+  writefile(lines, 'Xscript.mnv', 'D')
+  source Xscript.mnv
   assert_equal([4, 3, 2, 1, 0], g:result)
   unlet g:result
 
   lines =<< trim END
-    vim9script
+    mnv9script
     # using a function imported with "as"
-    import './Xsort.vim' as anAlias
+    import './Xsort.mnv' as anAlias
     assert_equal('yes', anAlias.GetString('yes'))
 
     # using the function from a compiled function
@@ -2085,7 +2085,7 @@ def Test_vim9_funcref()
     # error when using a function that isn't exported
     assert_fails('anAlias.Compare(1, 2)', 'E1049:')
   END
-  writefile(lines, 'Xscript.vim')
+  writefile(lines, 'Xscript.mnv')
 
   var Funcref = function('s:RetSome')
   assert_equal('some', Funcref())
@@ -2094,9 +2094,9 @@ enddef
 " Check that when searching for "FilterFunc" it finds the import in the
 " script where FastFilter() is called from, both as a string and as a direct
 " function reference.
-def Test_vim9_funcref_other_script()
+def Test_mnv9_funcref_other_script()
   var filterLines =<< trim END
-    vim9script
+    mnv9script
     export def FilterFunc(idx: number, val: number): bool
       return idx % 2 == 1
     enddef
@@ -2107,11 +2107,11 @@ def Test_vim9_funcref_other_script()
       return range(10)->filter(FilterFunc)
     enddef
   END
-  writefile(filterLines, 'Xfilter.vim', 'D')
+  writefile(filterLines, 'Xfilter.mnv', 'D')
 
   var lines =<< trim END
-    vim9script
-    import './Xfilter.vim' as filter
+    mnv9script
+    import './Xfilter.mnv' as filter
     def Test()
       var x: list<number> = filter.FastFilter()
     enddef
@@ -2126,8 +2126,8 @@ enddef
 
 def Test_import_absolute()
   var import_lines = [
-        'vim9script',
-        'import "' .. escape(getcwd(), '\') .. '/Xexport_abs.vim" as abs',
+        'mnv9script',
+        'import "' .. escape(getcwd(), '\') .. '/Xexport_abs.mnv" as abs',
         'def UseExported()',
         '  g:imported_abs = abs.exported',
         '  abs.exported = 8888',
@@ -2136,22 +2136,22 @@ def Test_import_absolute()
         'UseExported()',
         'g:import_disassembled = execute("disass UseExported")',
         ]
-  writefile(import_lines, 'Ximport_abs.vim', 'D')
-  writefile(s:export_script_lines, 'Xexport_abs.vim', 'D')
+  writefile(import_lines, 'Ximport_abs.mnv', 'D')
+  writefile(s:export_script_lines, 'Xexport_abs.mnv', 'D')
 
-  source Ximport_abs.vim
+  source Ximport_abs.mnv
 
   assert_equal(9876, g:imported_abs)
   assert_equal(8888, g:imported_after)
   assert_match('<SNR>\d\+_UseExported\_s*' ..
           'g:imported_abs = abs.exported\_s*' ..
-          '0 LOADSCRIPT exported-2 from .*Xexport_abs.vim\_s*' ..
+          '0 LOADSCRIPT exported-2 from .*Xexport_abs.mnv\_s*' ..
           '1 STOREG g:imported_abs\_s*' ..
           'abs.exported = 8888\_s*' ..
           '2 PUSHNR 8888\_s*' ..
-          '3 STORESCRIPT exported-2 in .*Xexport_abs.vim\_s*' ..
+          '3 STORESCRIPT exported-2 in .*Xexport_abs.mnv\_s*' ..
           'g:imported_after = abs.exported\_s*' ..
-          '4 LOADSCRIPT exported-2 from .*Xexport_abs.vim\_s*' ..
+          '4 LOADSCRIPT exported-2 from .*Xexport_abs.mnv\_s*' ..
           '5 STOREG g:imported_after',
         g:import_disassembled)
 
@@ -2162,17 +2162,17 @@ enddef
 
 def Test_import_rtp()
   var import_lines = [
-        'vim9script',
-        'import "Xexport_rtp.vim" as rtp',
+        'mnv9script',
+        'import "Xexport_rtp.mnv" as rtp',
         'g:imported_rtp = rtp.exported',
         ]
-  writefile(import_lines, 'Ximport_rtp.vim', 'D')
+  writefile(import_lines, 'Ximport_rtp.mnv', 'D')
   mkdir('import', 'pR')
-  writefile(s:export_script_lines, 'import/Xexport_rtp.vim')
+  writefile(s:export_script_lines, 'import/Xexport_rtp.mnv')
 
   var save_rtp = &rtp
   &rtp = getcwd()
-  source Ximport_rtp.vim
+  source Ximport_rtp.mnv
   &rtp = save_rtp
 
   assert_equal(9876, g:imported_rtp)
@@ -2183,27 +2183,27 @@ enddef
 
 def Test_import_compile_error()
   var export_lines = [
-        'vim9script',
+        'mnv9script',
         'export def ExpFunc(): string',
         '  return notDefined',
         'enddef',
         ]
-  writefile(export_lines, 'Xexported.vim', 'D')
+  writefile(export_lines, 'Xexported.mnv', 'D')
 
   var import_lines = [
-        'vim9script',
-        'import "./Xexported.vim" as expo',
+        'mnv9script',
+        'import "./Xexported.mnv" as expo',
         'def ImpFunc()',
         '  echo expo.ExpFunc()',
         'enddef',
         'defcompile',
         ]
-  writefile(import_lines, 'Ximport.vim', 'D')
+  writefile(import_lines, 'Ximport.mnv', 'D')
 
   try
-    source Ximport.vim
+    source Ximport.mnv
   catch /E1001/
-    # Error should be before the Xexported.vim file.
+    # Error should be before the Xexported.mnv file.
     assert_match('E1001: Variable not found: notDefined', v:exception)
     assert_match('function <SNR>\d\+_ImpFunc\[1\]..<SNR>\d\+_ExpFunc, line 1', v:throwpoint)
   endtry
@@ -2211,16 +2211,16 @@ enddef
 
 def Test_func_overrules_import_fails()
   var export_lines =<< trim END
-      vim9script
+      mnv9script
       export def Func()
         echo 'imported'
       enddef
   END
-  writefile(export_lines, 'XexportedFunc.vim', 'D')
+  writefile(export_lines, 'XexportedFunc.mnv', 'D')
 
   var lines =<< trim END
-    vim9script
-    import './XexportedFunc.vim' as Func
+    mnv9script
+    import './XexportedFunc.mnv' as Func
     def Func()
       echo 'local to function'
     enddef
@@ -2228,8 +2228,8 @@ def Test_func_overrules_import_fails()
   v9.CheckScriptFailure(lines, 'E1213: Redefining imported item "Func"')
 
   lines =<< trim END
-    vim9script
-    import './XexportedFunc.vim' as Func
+    mnv9script
+    import './XexportedFunc.mnv' as Func
     def Outer()
       def Func()
         echo 'local to function'
@@ -2240,9 +2240,9 @@ def Test_func_overrules_import_fails()
   v9.CheckScriptFailure(lines, 'E1236:')
 enddef
 
-def Test_source_vim9_from_legacy()
-  var vim9_lines =<< trim END
-    vim9script
+def Test_source_mnv9_from_legacy()
+  var mnv9_lines =<< trim END
+    mnv9script
     var local = 'local'
     g:global = 'global'
     export var exported = 'exported'
@@ -2250,10 +2250,10 @@ def Test_source_vim9_from_legacy()
        return 'text'
     enddef
   END
-  writefile(vim9_lines, 'Xvim9_script.vim', 'D')
+  writefile(mnv9_lines, 'Xmnv9_script.mnv', 'D')
 
   var legacy_lines =<< trim END
-    source Xvim9_script.vim
+    source Xmnv9_script.mnv
 
     call assert_false(exists('local'))
     call assert_false(exists('exported'))
@@ -2261,25 +2261,25 @@ def Test_source_vim9_from_legacy()
     call assert_equal('global', global)
     call assert_equal('global', g:global)
   END
-  writefile(legacy_lines, 'Xlegacy_script.vim', 'D')
+  writefile(legacy_lines, 'Xlegacy_script.mnv', 'D')
 
-  source Xlegacy_script.vim
+  source Xlegacy_script.mnv
   assert_equal('global', g:global)
   unlet g:global
 
   legacy_lines =<< trim END
-    import './Xvim9_script.vim'
-    let g:global = s:Xvim9_script.GetText()
+    import './Xmnv9_script.mnv'
+    let g:global = s:Xmnv9_script.GetText()
   END
-  writefile(legacy_lines, 'Xlegacyimport.vim', 'D')
-  source Xlegacyimport.vim
+  writefile(legacy_lines, 'Xlegacyimport.mnv', 'D')
+  source Xlegacyimport.mnv
   assert_equal('text', g:global)
   unlet g:global
 enddef
 
-def Test_import_vim9_from_legacy()
-  var vim9_lines =<< trim END
-    vim9script
+def Test_import_mnv9_from_legacy()
+  var mnv9_lines =<< trim END
+    mnv9script
     var local = 'local'
     g:global = 'global'
     export var exported = 'exported'
@@ -2294,14 +2294,14 @@ def Test_import_vim9_from_legacy()
     export const CONST = 10
     export final finalVar = 'abc'
   END
-  writefile(vim9_lines, 'Xvim9_export.vim', 'D')
+  writefile(mnv9_lines, 'Xmnv9_export.mnv', 'D')
 
   var legacy_lines =<< trim END
-    import './Xvim9_export.vim' as vim9
+    import './Xmnv9_export.mnv' as mnv9
 
-    call assert_false(exists('vim9'))
+    call assert_false(exists('mnv9'))
     call assert_false(exists('local'))
-    call assert_false(exists('s:vim9.local'))
+    call assert_false(exists('s:mnv9.local'))
     call assert_equal('global', global)
     call assert_equal('global', g:global)
     call assert_false(exists('exported'))
@@ -2309,38 +2309,38 @@ def Test_import_vim9_from_legacy()
     call assert_false(exists('*GetText'))
 
     " imported symbol is script-local
-    call assert_equal('exported', s:vim9.exported)
-    call assert_equal('text', s:vim9.GetText())
-    call s:vim9.exportedDict.Fn(5)
-    call assert_equal(27, s:vim9.exported_nr)
-    call call(s:vim9.exportedDict.Fn, [3])
-    call assert_equal(30, s:vim9.exported_nr)
-    call assert_fails('let s:vim9.CONST = 20', 'E46: Cannot change read-only variable "CONST"')
-    call assert_fails('let s:vim9.finalVar = ""', 'E46: Cannot change read-only variable "finalVar"')
-    call assert_fails('let s:vim9.non_existing_var = 20', 'E1048: Item not found in script: non_existing_var')
-  END
-  writefile(legacy_lines, 'Xlegacy_script.vim', 'D')
-
-  source Xlegacy_script.vim
+    call assert_equal('exported', s:mnv9.exported)
+    call assert_equal('text', s:mnv9.GetText())
+    call s:mnv9.exportedDict.Fn(5)
+    call assert_equal(27, s:mnv9.exported_nr)
+    call call(s:mnv9.exportedDict.Fn, [3])
+    call assert_equal(30, s:mnv9.exported_nr)
+    call assert_fails('let s:mnv9.CONST = 20', 'E46: Cannot change read-only variable "CONST"')
+    call assert_fails('let s:mnv9.finalVar = ""', 'E46: Cannot change read-only variable "finalVar"')
+    call assert_fails('let s:mnv9.non_existing_var = 20', 'E1048: Item not found in script: non_existing_var')
+  END
+  writefile(legacy_lines, 'Xlegacy_script.mnv', 'D')
+
+  source Xlegacy_script.mnv
   assert_equal('global', g:global)
   unlet g:global
 enddef
 
 def Test_cmdline_win()
-  # if the Vim syntax highlighting uses Vim9 constructs they can be used from
+  # if the MNV syntax highlighting uses MNV9 constructs they can be used from
   # the command line window.
   mkdir('rtp/syntax', 'pR')
   var export_lines =<< trim END
-    vim9script
+    mnv9script
     export var That = 'yes'
   END
-  writefile(export_lines, 'rtp/syntax/Xexport.vim')
+  writefile(export_lines, 'rtp/syntax/Xexport.mnv')
   var import_lines =<< trim END
-    vim9script
-    import './Xexport.vim' as exp
+    mnv9script
+    import './Xexport.mnv' as exp
     echo exp.That
   END
-  writefile(import_lines, 'rtp/syntax/vim.vim')
+  writefile(import_lines, 'rtp/syntax/mnv.mnv')
   var save_rtp = &rtp
   &rtp = getcwd() .. '/rtp' .. ',' .. &rtp
   syntax on
@@ -2359,27 +2359,27 @@ enddef
 
 def Test_import_gone_when_sourced_twice()
   var exportlines =<< trim END
-      vim9script
+      mnv9script
       if exists('g:guard')
         finish
       endif
       g:guard = 1
       export var name = 'someName'
   END
-  writefile(exportlines, 'XexportScript.vim', 'D')
+  writefile(exportlines, 'XexportScript.mnv', 'D')
 
   var lines =<< trim END
-      vim9script
-      import './XexportScript.vim' as expo
+      mnv9script
+      import './XexportScript.mnv' as expo
       def g:GetName(): string
         return expo.name
       enddef
   END
-  writefile(lines, 'XscriptImport.vim', 'D')
-  so XscriptImport.vim
+  writefile(lines, 'XscriptImport.mnv', 'D')
+  so XscriptImport.mnv
   assert_equal('someName', g:GetName())
 
-  so XexportScript.vim
+  so XexportScript.mnv
   assert_fails('call g:GetName()', 'E1149:')
 
   delfunc g:GetName
@@ -2387,9 +2387,9 @@ def Test_import_gone_when_sourced_twice()
 enddef
 
 " test using an auto-loaded function and variable
-def Test_vim9_autoload_full_name()
+def Test_mnv9_autoload_full_name()
   var lines =<< trim END
-     vim9script
+     mnv9script
      export def Gettest(): string
        return 'test'
      enddef
@@ -2402,7 +2402,7 @@ def Test_vim9_autoload_full_name()
   END
 
   mkdir('Xfulldir/autoload', 'pR')
-  writefile(lines, 'Xfulldir/autoload/some.vim')
+  writefile(lines, 'Xfulldir/autoload/some.mnv')
   var save_rtp = &rtp
   exe 'set rtp^=' .. getcwd() .. '/Xfulldir'
 
@@ -2416,25 +2416,25 @@ def Test_vim9_autoload_full_name()
 
   # upper case script name works
   lines =<< trim END
-     vim9script
+     mnv9script
      export def GetOther(): string
        return 'other'
      enddef
   END
-  writefile(lines, 'Xfulldir/autoload/Other.vim')
+  writefile(lines, 'Xfulldir/autoload/Other.mnv')
   assert_equal('other', g:Other#GetOther())
 
   &rtp = save_rtp
 enddef
 
-def Test_vim9script_autoload()
+def Test_mnv9script_autoload()
   mkdir('Xaldir/autoload', 'pR')
   var save_rtp = &rtp
   exe 'set rtp^=' .. getcwd() .. '/Xaldir'
 
   # when the path has "/autoload/" prefix is not needed
   var lines =<< trim END
-     vim9script
+     mnv9script
      g:prefixed_loaded += 1
 
      export def Gettest(): string
@@ -2454,13 +2454,13 @@ def Test_vim9script_autoload()
      export final fname = 'final'
      export const cname = 'const'
   END
-  writefile(lines, 'Xaldir/autoload/prefixed.vim')
+  writefile(lines, 'Xaldir/autoload/prefixed.mnv')
 
   g:prefixed_loaded = 0
   g:expected_loaded = 0
   lines =<< trim END
-      vim9script
-      import autoload 'prefixed.vim'
+      mnv9script
+      import autoload 'prefixed.mnv'
       assert_equal(g:expected_loaded, g:prefixed_loaded)
       assert_equal('test', prefixed.Gettest())
       assert_equal(1, g:prefixed_loaded)
@@ -2498,62 +2498,62 @@ def Test_import_autoload_not_exported()
 
   # error when using an item that is not exported from an autoload script
   var exportLines =<< trim END
-      vim9script
+      mnv9script
       var notExported = 123
       def NotExport()
         echo 'nop'
       enddef
   END
-  writefile(exportLines, 'Xnimdir/autoload/notExport1.vim')
+  writefile(exportLines, 'Xnimdir/autoload/notExport1.mnv')
 
   var lines =<< trim END
-      vim9script
-      import autoload 'notExport1.vim'
+      mnv9script
+      import autoload 'notExport1.mnv'
       echo notExport1.notFound
   END
   v9.CheckScriptFailure(lines, 'E1048: Item not found in script: notFound')
 
   lines =<< trim END
-      vim9script
-      import autoload 'notExport1.vim'
+      mnv9script
+      import autoload 'notExport1.mnv'
       echo notExport1.notExported
   END
   v9.CheckScriptFailure(lines, 'E1049: Item not exported in script: notExported')
 
   lines =<< trim END
-      vim9script
-      import autoload 'notExport1.vim'
+      mnv9script
+      import autoload 'notExport1.mnv'
       echo notExport1.NotFunc()
   END
   v9.CheckScriptFailure(lines, 'E1048: Item not found in script: NotFunc')
 
   lines =<< trim END
-      vim9script
-      import autoload 'notExport1.vim'
+      mnv9script
+      import autoload 'notExport1.mnv'
       echo notExport1.NotExport()
   END
   v9.CheckScriptFailure(lines, 'E1049: Item not exported in script: NotExport')
 
   lines =<< trim END
-      vim9script
-      import autoload 'notExport1.vim'
+      mnv9script
+      import autoload 'notExport1.mnv'
       echo 'text'->notExport1.NotFunc()
   END
   v9.CheckScriptFailure(lines, 'E1048: Item not found in script: NotFunc')
 
   lines =<< trim END
-      vim9script
-      import autoload 'notExport1.vim'
+      mnv9script
+      import autoload 'notExport1.mnv'
       echo 'text'->notExport1.NotExport()
   END
   v9.CheckScriptFailure(lines, 'E1049: Item not exported in script: NotExport')
 
   # using a :def function we use a different autoload script every time so that
   # the function is compiled without the script loaded
-  writefile(exportLines, 'Xnimdir/autoload/notExport2.vim')
+  writefile(exportLines, 'Xnimdir/autoload/notExport2.mnv')
   lines =<< trim END
-      vim9script
-      import autoload 'notExport2.vim'
+      mnv9script
+      import autoload 'notExport2.mnv'
       def Testit()
         echo notExport2.notFound
       enddef
@@ -2561,10 +2561,10 @@ def Test_import_autoload_not_exported()
   END
   v9.CheckScriptFailure(lines, 'E1048: Item not found in script: notExport2#notFound')
 
-  writefile(exportLines, 'Xnimdir/autoload/notExport3.vim')
+  writefile(exportLines, 'Xnimdir/autoload/notExport3.mnv')
   lines =<< trim END
-      vim9script
-      import autoload 'notExport3.vim'
+      mnv9script
+      import autoload 'notExport3.mnv'
       def Testit()
         echo notExport3.notExported
       enddef
@@ -2573,10 +2573,10 @@ def Test_import_autoload_not_exported()
   # don't get E1049 because it is too complicated to figure out
   v9.CheckScriptFailure(lines, 'E1048: Item not found in script: notExport3#notExported')
 
-  writefile(exportLines, 'Xnimdir/autoload/notExport4.vim')
+  writefile(exportLines, 'Xnimdir/autoload/notExport4.mnv')
   lines =<< trim END
-      vim9script
-      import autoload 'notExport4.vim'
+      mnv9script
+      import autoload 'notExport4.mnv'
       def Testit()
         echo notExport4.NotFunc()
       enddef
@@ -2584,10 +2584,10 @@ def Test_import_autoload_not_exported()
   END
   v9.CheckScriptFailure(lines, 'E117: Unknown function: notExport4#NotFunc')
 
-  writefile(exportLines, 'Xnimdir/autoload/notExport5.vim')
+  writefile(exportLines, 'Xnimdir/autoload/notExport5.mnv')
   lines =<< trim END
-      vim9script
-      import autoload 'notExport5.vim'
+      mnv9script
+      import autoload 'notExport5.mnv'
       def Testit()
         echo notExport5.NotExport()
       enddef
@@ -2595,10 +2595,10 @@ def Test_import_autoload_not_exported()
   END
   v9.CheckScriptFailure(lines, 'E117: Unknown function: notExport5#NotExport')
 
-  writefile(exportLines, 'Xnimdir/autoload/notExport6.vim')
+  writefile(exportLines, 'Xnimdir/autoload/notExport6.mnv')
   lines =<< trim END
-      vim9script
-      import autoload 'notExport6.vim'
+      mnv9script
+      import autoload 'notExport6.mnv'
       def Testit()
         echo 'text'->notExport6.NotFunc()
       enddef
@@ -2606,10 +2606,10 @@ def Test_import_autoload_not_exported()
   END
   v9.CheckScriptFailure(lines, 'E117: Unknown function: notExport6#NotFunc')
 
-  writefile(exportLines, 'Xnimdir/autoload/notExport7.vim')
+  writefile(exportLines, 'Xnimdir/autoload/notExport7.mnv')
   lines =<< trim END
-      vim9script
-      import autoload 'notExport7.vim'
+      mnv9script
+      import autoload 'notExport7.mnv'
       def Testit()
         echo 'text'->notExport7.NotExport()
       enddef
@@ -2620,13 +2620,13 @@ def Test_import_autoload_not_exported()
   &rtp = save_rtp
 enddef
 
-def Test_vim9script_autoload_call()
+def Test_mnv9script_autoload_call()
   mkdir('Xcalldir/autoload', 'pR')
   var save_rtp = &rtp
   exe 'set rtp^=' .. getcwd() .. '/Xcalldir'
 
   var lines =<< trim END
-     vim9script
+     mnv9script
 
      export def RetArg(arg: string): string
        return arg
@@ -2636,13 +2636,13 @@ def Test_vim9script_autoload_call()
        g:result = 'other'
      enddef
   END
-  writefile(lines, 'Xcalldir/autoload/another.vim')
+  writefile(lines, 'Xcalldir/autoload/another.mnv')
 
   lines =<< trim END
-      vim9script
-      import autoload 'another.vim'
+      mnv9script
+      import autoload 'another.mnv'
 
-      # compile this before 'another.vim' is loaded
+      # compile this before 'another.mnv' is loaded
       def CallAnother()
         assert_equal('foo', 'foo'->another.RetArg())
       enddef
@@ -2663,28 +2663,28 @@ def Test_vim9script_autoload_call()
   &rtp = save_rtp
 enddef
 
-def Test_vim9script_noclear_autoload()
+def Test_mnv9script_noclear_autoload()
   mkdir('Xnocdir/autoload', 'pR')
   var save_rtp = &rtp
   exe 'set rtp^=' .. getcwd() .. '/Xnocdir'
 
   var lines =<< trim END
-      vim9script
+      mnv9script
       export def Func(): string
         return 'called'
       enddef
       g:double_loaded = 'yes'
   END
-  writefile(lines, 'Xnocdir/autoload/double.vim')
+  writefile(lines, 'Xnocdir/autoload/double.mnv')
 
   lines =<< trim END
-      vim9script noclear
+      mnv9script noclear
       if exists('g:script_loaded')
         finish
       endif
       g:script_loaded = true
 
-      import autoload 'double.vim'
+      import autoload 'double.mnv'
       nnoremap <F3> <ScriptCmd>g:result = double.Func()<CR>
   END
   g:double_loaded = 'no'
@@ -2703,11 +2703,11 @@ def Test_vim9script_noclear_autoload()
   &rtp = save_rtp
 enddef
 
-def Test_vim9script_autoload_duplicate()
+def Test_mnv9script_autoload_duplicate()
   mkdir('Xdupdir/autoload', 'pR')
 
   var lines =<< trim END
-     vim9script
+     mnv9script
 
      export def Func()
      enddef
@@ -2715,11 +2715,11 @@ def Test_vim9script_autoload_duplicate()
      def Func()
      enddef
   END
-  writefile(lines, 'Xdupdir/autoload/dupfunc.vim')
-  assert_fails('source Xdupdir/autoload/dupfunc.vim', 'E1073:')
+  writefile(lines, 'Xdupdir/autoload/dupfunc.mnv')
+  assert_fails('source Xdupdir/autoload/dupfunc.mnv', 'E1073:')
 
   lines =<< trim END
-     vim9script
+     mnv9script
 
      def Func()
      enddef
@@ -2727,65 +2727,65 @@ def Test_vim9script_autoload_duplicate()
      export def Func()
      enddef
   END
-  writefile(lines, 'Xdupdir/autoload/dup2func.vim')
-  assert_fails('source Xdupdir/autoload/dup2func.vim', 'E1073:')
+  writefile(lines, 'Xdupdir/autoload/dup2func.mnv')
+  assert_fails('source Xdupdir/autoload/dup2func.mnv', 'E1073:')
 
   lines =<< trim END
-     vim9script
+     mnv9script
 
      def Func()
      enddef
 
      export var Func = 'asdf'
   END
-  writefile(lines, 'Xdupdir/autoload/dup3func.vim')
-  assert_fails('source Xdupdir/autoload/dup3func.vim', 'E1041: Redefining script item: "Func"')
+  writefile(lines, 'Xdupdir/autoload/dup3func.mnv')
+  assert_fails('source Xdupdir/autoload/dup3func.mnv', 'E1041: Redefining script item: "Func"')
 
   lines =<< trim END
-     vim9script
+     mnv9script
 
      export var Func = 'asdf'
 
      def Func()
      enddef
   END
-  writefile(lines, 'Xdupdir/autoload/dup4func.vim')
-  assert_fails('source Xdupdir/autoload/dup4func.vim', 'E1041:')
+  writefile(lines, 'Xdupdir/autoload/dup4func.mnv')
+  assert_fails('source Xdupdir/autoload/dup4func.mnv', 'E1041:')
 
   lines =<< trim END
-     vim9script
+     mnv9script
 
      var Func = 'asdf'
 
      export def Func()
      enddef
   END
-  writefile(lines, 'Xdupdir/autoload/dup5func.vim')
-  assert_fails('source Xdupdir/autoload/dup5func.vim', 'E707:')
+  writefile(lines, 'Xdupdir/autoload/dup5func.mnv')
+  assert_fails('source Xdupdir/autoload/dup5func.mnv', 'E707:')
 
   lines =<< trim END
-     vim9script
+     mnv9script
 
      export def Func()
      enddef
 
      var Func = 'asdf'
   END
-  writefile(lines, 'Xdupdir/autoload/dup6func.vim')
-  assert_fails('source Xdupdir/autoload/dup6func.vim', 'E1041: Redefining script item: "Func"')
+  writefile(lines, 'Xdupdir/autoload/dup6func.mnv')
+  assert_fails('source Xdupdir/autoload/dup6func.mnv', 'E1041: Redefining script item: "Func"')
 enddef
 
 def Test_autoload_missing_function_name()
   mkdir('Xmisdir/autoload', 'pR')
 
   var lines =<< trim END
-     vim9script
+     mnv9script
 
      def loadme#()
      enddef
   END
-  writefile(lines, 'Xmisdir/autoload/loadme.vim')
-  assert_fails('source Xmisdir/autoload/loadme.vim', 'E129:')
+  writefile(lines, 'Xmisdir/autoload/loadme.mnv')
+  assert_fails('source Xmisdir/autoload/loadme.mnv', 'E129:')
 enddef
 
 def Test_autoload_name_wrong()
@@ -2793,17 +2793,17 @@ def Test_autoload_name_wrong()
      def Xscriptname#Func()
      enddef
   END
-  writefile(lines, 'Xscriptname.vim', 'D')
+  writefile(lines, 'Xscriptname.mnv', 'D')
   v9.CheckScriptFailure(lines, 'E746:')
 
   mkdir('Xwrodir/autoload', 'pR')
   lines =<< trim END
-     vim9script
+     mnv9script
      def somescript#Func()
      enddef
   END
-  writefile(lines, 'Xwrodir/autoload/somescript.vim')
-  assert_fails('source Xwrodir/autoload/somescript.vim', 'E1263:')
+  writefile(lines, 'Xwrodir/autoload/somescript.mnv')
+  assert_fails('source Xwrodir/autoload/somescript.mnv', 'E1263:')
 
   delete('Xwrodir', 'rf')
 enddef
@@ -2814,7 +2814,7 @@ def Test_import_autoload_postponed()
   exe 'set rtp^=' .. getcwd() .. '/Xpostdir'
 
   var lines =<< trim END
-      vim9script
+      mnv9script
 
       g:loaded_postponed = 'true'
       export var variable = 'bla'
@@ -2822,12 +2822,12 @@ def Test_import_autoload_postponed()
         return 'bla'
       enddef
   END
-  writefile(lines, 'Xpostdir/autoload/postponed.vim')
+  writefile(lines, 'Xpostdir/autoload/postponed.mnv')
 
   lines =<< trim END
-      vim9script
+      mnv9script
 
-      import autoload 'postponed.vim'
+      import autoload 'postponed.mnv'
       def Tryit()
         echo postponed.variable
         echo postponed.Function()
@@ -2850,7 +2850,7 @@ def Test_import_autoload_override()
   test_override('autoload', 1)
 
   var lines =<< trim END
-      vim9script
+      mnv9script
 
       g:loaded_override = 'true'
       export var variable = 'bla'
@@ -2858,12 +2858,12 @@ def Test_import_autoload_override()
         return 'bla'
       enddef
   END
-  writefile(lines, 'Xoverdir/autoload/override.vim')
+  writefile(lines, 'Xoverdir/autoload/override.mnv')
 
   lines =<< trim END
-      vim9script
+      mnv9script
 
-      import autoload 'override.vim'
+      import autoload 'override.mnv'
       assert_equal('true', g:loaded_override)
 
       def Tryit()
@@ -2884,7 +2884,7 @@ def Test_autoload_mapping()
   exe 'set rtp^=' .. getcwd() .. '/Xmapdir'
 
   var lines =<< trim END
-      vim9script
+      mnv9script
 
       g:toggle_loaded = 'yes'
 
@@ -2895,12 +2895,12 @@ def Test_autoload_mapping()
         g:doit_called = 'yes'
       enddef
   END
-  writefile(lines, 'Xmapdir/autoload/toggle.vim')
+  writefile(lines, 'Xmapdir/autoload/toggle.mnv')
 
   lines =<< trim END
-      vim9script
+      mnv9script
 
-      import autoload 'toggle.vim'
+      import autoload 'toggle.mnv'
 
       nnoremap <silent> <expr> tt toggle.Toggle()
       nnoremap <silent> xx <ScriptCmd>toggle.Doit()<CR>
@@ -2909,12 +2909,12 @@ def Test_autoload_mapping()
   v9.CheckScriptSuccess(lines)
   assert_false(exists("g:toggle_loaded"))
   assert_false(exists("g:toggle_called"))
-  assert_match('\d A: \f*[/\\]toggle.vim', execute('scriptnames'))
+  assert_match('\d A: \f*[/\\]toggle.mnv', execute('scriptnames'))
 
   feedkeys("tt", 'xt')
   assert_equal('yes', g:toggle_loaded)
   assert_equal('yes', g:toggle_called)
-  assert_match('\d: \f*[/\\]toggle.vim', execute('scriptnames'))
+  assert_match('\d: \f*[/\\]toggle.mnv', execute('scriptnames'))
 
   feedkeys("xx", 'xt')
   assert_equal('yes', g:doit_called)
@@ -2929,21 +2929,21 @@ def Test_autoload_mapping()
   &rtp = save_rtp
 enddef
 
-def Test_vim9script_autoload_fails()
+def Test_mnv9script_autoload_fails()
   var lines =<< trim END
-      vim9script autoload
+      mnv9script autoload
       var n = 0
   END
   v9.CheckScriptFailure(lines, 'E475: Invalid argument: autoload')
 
   lines =<< trim END
-      vim9script noclear noclear
+      mnv9script noclear noclear
       var n = 0
   END
   v9.CheckScriptFailure(lines, 'E983: Duplicate argument: noclear')
 
   lines =<< trim END
-      vim9script noclears
+      mnv9script noclears
       var n = 0
   END
   v9.CheckScriptFailure(lines, 'E475: Invalid argument: noclears')
@@ -2951,60 +2951,60 @@ enddef
 
 def Test_import_autoload_fails()
   var lines =<< trim END
-      vim9script
-      import autoload autoload 'prefixed.vim'
+      mnv9script
+      import autoload autoload 'prefixed.mnv'
   END
   v9.CheckScriptFailure(lines, 'E121: Undefined variable: autoload')
 
   lines =<< trim END
-      vim9script
-      import autoload './doesNotExist.vim'
+      mnv9script
+      import autoload './doesNotExist.mnv'
   END
   v9.CheckScriptFailure(lines, 'E282:', 2)
 
   lines =<< trim END
-      vim9script
-      import autoload '/dir/doesNotExist.vim'
+      mnv9script
+      import autoload '/dir/doesNotExist.mnv'
   END
   v9.CheckScriptFailure(lines, 'E282:', 2)
 
   lines =<< trim END
-      vim9script
+      mnv9script
       import autoload '../testdir'
   END
   v9.CheckScriptFailure(lines, 'E17:', 2)
 
   lines =<< trim END
-      vim9script
-      import autoload 'doesNotExist.vim'
+      mnv9script
+      import autoload 'doesNotExist.mnv'
   END
-  v9.CheckScriptFailure(lines, 'E1053: Could not import "doesNotExist.vim"')
+  v9.CheckScriptFailure(lines, 'E1053: Could not import "doesNotExist.mnv"')
 enddef
 
 " test disassembling an auto-loaded function starting with "debug"
-def Test_vim9_autoload_disass()
+def Test_mnv9_autoload_disass()
   mkdir('Xdasdir/autoload', 'pR')
   var save_rtp = &rtp
   exe 'set rtp^=' .. getcwd() .. '/Xdasdir'
 
   var lines =<< trim END
-     vim9script
+     mnv9script
      export def Test(): string
        return 'debug'
      enddef
   END
-  writefile(lines, 'Xdasdir/autoload/debugit.vim')
+  writefile(lines, 'Xdasdir/autoload/debugit.mnv')
 
   lines =<< trim END
-     vim9script
+     mnv9script
      export def Test(): string
        return 'profile'
      enddef
   END
-  writefile(lines, 'Xdasdir/autoload/profileit.vim')
+  writefile(lines, 'Xdasdir/autoload/profileit.mnv')
 
   lines =<< trim END
-    vim9script
+    mnv9script
     assert_equal('debug', debugit#Test())
     disass debugit#Test
     assert_equal('profile', profileit#Test())
@@ -3015,17 +3015,17 @@ def Test_vim9_autoload_disass()
   &rtp = save_rtp
 enddef
 
-" test using a vim9script that is auto-loaded from an autocmd
-def Test_vim9_aucmd_autoload()
+" test using a mnv9script that is auto-loaded from an autocmd
+def Test_mnv9_aucmd_autoload()
   var lines =<< trim END
-     vim9script
+     mnv9script
      export def Test()
          echomsg getreg('"')
      enddef
   END
 
   mkdir('Xauldir/autoload', 'pR')
-  writefile(lines, 'Xauldir/autoload/foo.vim')
+  writefile(lines, 'Xauldir/autoload/foo.mnv')
   var save_rtp = &rtp
   exe 'set rtp^=' .. getcwd() .. '/Xauldir'
   augroup test
@@ -3041,31 +3041,31 @@ def Test_vim9_aucmd_autoload()
 enddef
 
 " test using a autoloaded file that is case sensitive
-def Test_vim9_autoload_case_sensitive()
+def Test_mnv9_autoload_case_sensitive()
   var lines =<< trim END
-     vim9script
+     mnv9script
      export def CaseSensitive(): string
        return 'done'
      enddef
   END
 
   mkdir('Xcasedir/autoload', 'pR')
-  writefile(lines, 'Xcasedir/autoload/CaseSensitive.vim')
+  writefile(lines, 'Xcasedir/autoload/CaseSensitive.mnv')
   var save_rtp = &rtp
   exe 'set rtp^=' .. getcwd() .. '/Xcasedir'
 
   lines =<< trim END
-      vim9script
-      import autoload 'CaseSensitive.vim'
+      mnv9script
+      import autoload 'CaseSensitive.mnv'
       assert_equal('done', CaseSensitive.CaseSensitive())
   END
   v9.CheckScriptSuccess(lines)
 
   if !has('fname_case')
     lines =<< trim END
-        vim9script
-        import autoload 'CaseSensitive.vim'
-        import autoload 'casesensitive.vim'
+        mnv9script
+        import autoload 'CaseSensitive.mnv'
+        import autoload 'casesensitive.mnv'
     END
     v9.CheckScriptFailure(lines, 'E1262:')
   endif
@@ -3074,9 +3074,9 @@ def Test_vim9_autoload_case_sensitive()
 enddef
 
 " This was causing a crash because suppress_errthrow wasn't reset.
-def Test_vim9_autoload_error()
+def Test_mnv9_autoload_error()
   var lines =<< trim END
-      vim9script
+      mnv9script
       def crash#func()
           try
               for x in List()
@@ -3094,9 +3094,9 @@ def Test_vim9_autoload_error()
       endtry
   END
   call mkdir('Xruntime/autoload', 'pR')
-  call writefile(lines, 'Xruntime/autoload/crash.vim')
+  call writefile(lines, 'Xruntime/autoload/crash.mnv')
 
-  # run in a separate Vim to avoid the side effects of assert_fails()
+  # run in a separate MNV to avoid the side effects of assert_fails()
   lines =<< trim END
     exe 'set rtp^=' .. getcwd() .. '/Xruntime'
     call crash#func()
@@ -3104,49 +3104,49 @@ def Test_vim9_autoload_error()
     qall!
   END
   writefile(lines, 'Xscript', 'D')
-  g:RunVim([], [], '-S Xscript')
+  g:RunMNV([], [], '-S Xscript')
   assert_equal(['ok'], readfile('Xdidit'))
 
   delete('Xdidit')
 
   lines =<< trim END
-    vim9script
+    mnv9script
     var foo#bar = 'asdf'
   END
   v9.CheckScriptFailure(lines, 'E461: Illegal variable name: foo#bar', 2)
 enddef
 
-def Test_vim9_import_symlink()
+def Test_mnv9_import_symlink()
   if !has('unix')
     CheckUnix
   else
     mkdir('Xto/plugin', 'pR')
     var lines =<< trim END
-        vim9script
-        import autoload 'bar.vim'
+        mnv9script
+        import autoload 'bar.mnv'
         def FooFunc(): string
           return bar.Func()
         enddef
         g:resultFunc = FooFunc()
         g:resultValue = bar.value
     END
-    writefile(lines, 'Xto/plugin/foo.vim')
+    writefile(lines, 'Xto/plugin/foo.mnv')
 
     mkdir('Xto/autoload', 'pR')
     lines =<< trim END
-        vim9script
+        mnv9script
         export def Func(): string
           return 'func'
         enddef
         export var value = 'val'
     END
-    writefile(lines, 'Xto/autoload/bar.vim')
+    writefile(lines, 'Xto/autoload/bar.mnv')
 
     var save_rtp = &rtp
     &rtp = getcwd() .. '/Xfrom'
     system('ln -s ' .. getcwd() .. '/Xto Xfrom')
 
-    source Xfrom/plugin/foo.vim
+    source Xfrom/plugin/foo.mnv
     assert_equal('func', g:resultFunc)
     assert_equal('val', g:resultValue)
 
@@ -3169,18 +3169,18 @@ def Test_vim9_import_symlink()
     # Access item from :def imported through symbolic linked directory. #14536
     mkdir('Xto/real_dir', 'pR')
     lines =<< trim END
-        vim9script
+        mnv9script
         export const val = 17
         export def F(): number
           return 23
         enddef
     END
-    writefile(lines, 'Xto/real_dir/real_file.vim')
+    writefile(lines, 'Xto/real_dir/real_file.mnv')
     system('ln -s real_dir Xto/syml_dir')
     defer delete('Xto/syml_dir')
     lines =<< trim END
-      vim9script
-      import autoload './Xto/syml_dir/real_file.vim'
+      mnv9script
+      import autoload './Xto/syml_dir/real_file.mnv'
 
       def Fmain()
         assert_equal(17, real_file.val)
@@ -3197,7 +3197,7 @@ enddef
 
 def Test_export_in_conditional_block()
   var lines =<< trim END
-      vim9script
+      mnv9script
       if exists('this_will_fail')
         export var MyVar = "hello"
       endif
@@ -3215,39 +3215,39 @@ def Test_import_autloaded_script()
   exe 'set rtp^=' .. getcwd() .. '/Ximporttwice'
 
   var lines =<< trim END
-    vim9script
+    mnv9script
 
     export def H(): number
       return 10
     enddef
   END
-  writefile(lines, 'Ximporttwice/autoload/hello.vim')
+  writefile(lines, 'Ximporttwice/autoload/hello.mnv')
 
   lines =<< trim END
-    vim9script
+    mnv9script
 
-    import "./hello.vim"
+    import "./hello.mnv"
     export def W(): number
       return 20
     enddef
   END
-  writefile(lines, 'Ximporttwice/autoload/world.vim')
+  writefile(lines, 'Ximporttwice/autoload/world.mnv')
 
   lines =<< trim END
-    vim9script
+    mnv9script
 
-    import autoload '../autoload/hello.vim'
-    import autoload '../autoload/world.vim'
+    import autoload '../autoload/hello.mnv'
+    import autoload '../autoload/world.mnv'
 
     command Hello echo hello.H()
     command World echo world.W()
   END
-  writefile(lines, 'Ximporttwice/plugin/main.vim')
+  writefile(lines, 'Ximporttwice/plugin/main.mnv')
 
   lines =<< trim END
-    vim9script
+    mnv9script
 
-    source ./Ximporttwice/plugin/main.vim
+    source ./Ximporttwice/plugin/main.mnv
     assert_equal(['20'], execute('World')->split("\n"))
   END
   v9.CheckScriptSuccess(lines)
@@ -3259,19 +3259,19 @@ enddef
 def Test_autoload_import_dict_func()
   mkdir('Xdir/autoload', 'pR')
   var lines =<< trim END
-    vim9script
+    mnv9script
     export var al_exported_nr: number = 33
     def Al_AddNum(n: number)
       al_exported_nr += n
     enddef
     export var al_exportedDict: dict<func> = {Fn: Al_AddNum}
   END
-  writefile(lines, 'Xdir/autoload/Xdictfunc.vim')
+  writefile(lines, 'Xdir/autoload/Xdictfunc.mnv')
 
   var save_rtp = &rtp
   exe 'set rtp^=' .. getcwd() .. '/Xdir'
   lines =<< trim END
-    import './Xdir/autoload/Xdictfunc.vim'
+    import './Xdir/autoload/Xdictfunc.mnv'
     call Xdictfunc#al_exportedDict.Fn(5)
     call assert_equal(38, Xdictfunc#al_exported_nr)
     call call(Xdictfunc#al_exportedDict.Fn, [3])
@@ -3284,15 +3284,15 @@ enddef
 " Test for changing the value of an imported Dict item
 def Test_set_imported_dict_item()
   var lines =<< trim END
-    vim9script
+    mnv9script
     export var dict1: dict<bool> = {bflag: false}
     export var dict2: dict<dict<bool>> = {x: {bflag: false}}
   END
-  writefile(lines, 'XimportedDict.vim', 'D')
+  writefile(lines, 'XimportedDict.mnv', 'D')
 
   lines =<< trim END
-    vim9script
-    import './XimportedDict.vim'
+    mnv9script
+    import './XimportedDict.mnv'
     assert_equal(XimportedDict.dict1.bflag, false)
     XimportedDict.dict1.bflag = true
     assert_equal(XimportedDict.dict1.bflag, true)
@@ -3312,8 +3312,8 @@ def Test_set_imported_dict_item()
   v9.CheckScriptSuccess(lines)
 
   lines =<< trim END
-    vim9script
-    import './XimportedDict.vim'
+    mnv9script
+    import './XimportedDict.mnv'
     XimportedDict.dict2.x.bflag = []
   END
   v9.CheckScriptFailure(lines, 'E1012: Type mismatch; expected bool but got list<any>', 3)
@@ -3322,16 +3322,16 @@ enddef
 " Test for changing the value of an imported class member
 def Test_set_imported_class_member()
   var lines =<< trim END
-    vim9script
+    mnv9script
     export class Config
       public static var option = false
     endclass
   END
-  writefile(lines, 'XimportedClass.vim', 'D')
+  writefile(lines, 'XimportedClass.mnv', 'D')
 
   lines =<< trim END
-    vim9script
-    import './XimportedClass.vim' as foo
+    mnv9script
+    import './XimportedClass.mnv' as foo
     type FooConfig = foo.Config
     assert_equal(false, FooConfig.option)
     assert_equal(false, foo.Config.option)
@@ -3342,30 +3342,30 @@ def Test_set_imported_class_member()
   v9.CheckScriptSuccess(lines)
 enddef
 
-" Test for using an imported function from the vimrc file.  The function is
+" Test for using an imported function from the mnvrc file.  The function is
 " defined in the 'start' directory of a package.
-def Test_import_from_vimrc()
+def Test_import_from_mnvrc()
   mkdir('Ximport/pack/foobar/start/foo/autoload', 'pR')
   var lines =<< trim END
-    vim9script
+    mnv9script
     export def Foo()
       writefile(['Foo called'], 'Xoutput.log')
     enddef
   END
-  writefile(lines, 'Ximport/pack/foobar/start/foo/autoload/foo.vim')
+  writefile(lines, 'Ximport/pack/foobar/start/foo/autoload/foo.mnv')
   lines =<< trim END
-    vim9script
+    mnv9script
     set packpath+=./Ximport
     try
-      import autoload 'foo.vim'
+      import autoload 'foo.mnv'
       foo.Foo()
     catch
-      writefile(['Failed to import foo.vim'], 'Xoutput.log')
+      writefile(['Failed to import foo.mnv'], 'Xoutput.log')
     endtry
     qall!
   END
-  writefile(lines, 'Xvimrc', 'D')
-  g:RunVim([], [], '-u Xvimrc')
+  writefile(lines, 'Xmnvrc', 'D')
+  g:RunMNV([], [], '-u Xmnvrc')
   assert_equal(['Foo called'], readfile('Xoutput.log'))
   delete('Xoutput.log')
 enddef
@@ -3373,14 +3373,14 @@ enddef
 " Test for changing a locked imported variable
 def Test_import_locked_var()
   var lines =<< trim END
-    vim9script
+    mnv9script
     export var Foo: number = 10
     lockvar Foo
   END
-  writefile(lines, 'Ximportlockedvar.vim', 'D')
+  writefile(lines, 'Ximportlockedvar.mnv', 'D')
   lines =<< trim END
-    vim9script
-    import './Ximportlockedvar.vim' as Bar
+    mnv9script
+    import './Ximportlockedvar.mnv' as Bar
     Bar.Foo = 20
   END
   v9.CheckScriptFailure(lines, 'E741: Value is locked: Foo', 3)
@@ -3389,29 +3389,29 @@ enddef
 " Test for using an autoload imported class as the function return type
 def Test_imported_class_as_def_func_rettype()
   var lines =<< trim END
-    vim9script
+    mnv9script
 
     export class Foo
       var name: string = "foo"
     endclass
   END
-  writefile(lines, 'Ximportclassrettype1.vim', 'D')
+  writefile(lines, 'Ximportclassrettype1.mnv', 'D')
 
   lines =<< trim END
-    vim9script
+    mnv9script
 
-    import autoload "./Ximportclassrettype1.vim" as A
+    import autoload "./Ximportclassrettype1.mnv" as A
 
     export def CreateFoo(): A.Foo
       return A.Foo.new()
     enddef
   END
-  writefile(lines, 'Ximportclassrettype2.vim', 'D')
+  writefile(lines, 'Ximportclassrettype2.mnv', 'D')
 
   lines =<< trim END
-    vim9script
+    mnv9script
 
-    import './Ximportclassrettype2.vim' as B
+    import './Ximportclassrettype2.mnv' as B
 
     var foo = B.CreateFoo()
     assert_equal('foo', foo.name)
@@ -3420,10 +3420,10 @@ def Test_imported_class_as_def_func_rettype()
 enddef
 
 " Test for don't crash when using a combination of import and class extends
-def Test_vim9_import_and_class_extends()
+def Test_mnv9_import_and_class_extends()
   var lines =<< trim END
-    vim9script
-    import './cccc.vim'
+    mnv9script
+    import './cccc.mnv'
     export class Property extends cccc.Run
       public var value: string
       def new(this.value)
@@ -3431,21 +3431,21 @@ def Test_vim9_import_and_class_extends()
     enddef
     endclass
   END
-  writefile(lines, './aaaa.vim', 'D')
+  writefile(lines, './aaaa.mnv', 'D')
 
   lines =<< trim END
-    vim9script
+    mnv9script
     export class Run
       public var value2: string
       def new(this.value)
       enddef
     endclass
   END
-  writefile(lines, './cccc.vim', 'D')
+  writefile(lines, './cccc.mnv', 'D')
 
   lines =<< trim END
-    vim9script
-    import './aaaa.vim'
+    mnv9script
+    import './aaaa.mnv'
     class View
       var content = aaaa.Property.new('')
     endclass
@@ -3457,31 +3457,31 @@ def Test_vim9_import_and_class_extends()
 enddef
 
 " Test for import and class extends
-def Test_vim9_import_and_class_extends_2()
+def Test_mnv9_import_and_class_extends_2()
   mkdir('import', 'R')
   var save_rtp = &rtp
   &rtp = getcwd()
 
   var lines =<< trim END
-    vim9script
+    mnv9script
     export class Property
       public var value: string
     endclass
   END
-  writefile(lines, './import/libproperty.vim')
+  writefile(lines, './import/libproperty.mnv')
 
   lines =<< trim END
-    vim9script
-    import 'libproperty.vim'
+    mnv9script
+    import 'libproperty.mnv'
     export class View
       var _content = libproperty.Property.new('')
     endclass
   END
-  writefile(lines, './import/libview.vim')
+  writefile(lines, './import/libview.mnv')
 
   lines =<< trim END
-    vim9script
-    import 'libview.vim'
+    mnv9script
+    import 'libview.mnv'
     class MyView extends libview.View
       def new(value: string)
         this._content.value = value
@@ -3499,7 +3499,7 @@ def Test_use_imported_class_as_type()
   mkdir('Xdir/autoload', 'D')
   mkdir('Xdir/import', 'D')
   var lines =<< trim END
-    vim9script
+    mnv9script
     export class B
       var foo: string
       def new()
@@ -3507,19 +3507,19 @@ def Test_use_imported_class_as_type()
       enddef
     endclass
   END
-  writefile(lines, 'Xdir/autoload/b.vim')
+  writefile(lines, 'Xdir/autoload/b.mnv')
 
   lines =<< trim END
-    vim9script
-    import autoload '../autoload/b.vim'
+    mnv9script
+    import autoload '../autoload/b.mnv'
     export class A
       final AO: b.B = b.B.new()
     endclass
     var a = A.new()
     assert_equal('bar', a.AO.foo)
   END
-  writefile(lines, 'Xdir/import/a.vim')
-  source Xdir/import/a.vim
+  writefile(lines, 'Xdir/import/a.mnv')
+  source Xdir/import/a.mnv
 enddef
 
 " Test for using an autoloaded class from another autoloaded script
@@ -3532,7 +3532,7 @@ def Test_class_from_auloaded_script()
   mkdir('Xdir/autoload/SomeClass/bar', 'p')
 
   var lines =<< trim END
-    vim9script
+    mnv9script
 
     export class Baz
       static var v1: string = "v1"
@@ -3542,12 +3542,12 @@ def Test_class_from_auloaded_script()
       enddef
     endclass
   END
-  writefile(lines, 'Xdir/autoload/SomeClass/bar/baz.vim', 'D')
+  writefile(lines, 'Xdir/autoload/SomeClass/bar/baz.mnv', 'D')
 
   lines =<< trim END
-    vim9script
+    mnv9script
 
-    import autoload './bar/baz.vim'
+    import autoload './bar/baz.mnv'
 
     export def MyTestFoo(): string
       assert_fails('var x = baz.Baz.NonExisting()', 'E1325: Method "NonExisting" not found in class "Baz"')
@@ -3557,13 +3557,13 @@ def Test_class_from_auloaded_script()
       return $'{instance.GetName()} {baz.Baz.v1} {instance.v2}'
     enddef
   END
-  writefile(lines, 'Xdir/autoload/SomeClass/foo.vim', 'D')
+  writefile(lines, 'Xdir/autoload/SomeClass/foo.mnv', 'D')
 
   lines =<< trim END
-    vim9script
+    mnv9script
 
-    import autoload 'SomeClass/foo.vim'
-    import autoload 'SomeClass/bar/baz.vim'
+    import autoload 'SomeClass/foo.mnv'
+    import autoload 'SomeClass/bar/baz.mnv'
 
     def NotInAutoload()
       # Use non-existing class method and variable
@@ -3603,19 +3603,19 @@ def Test_enum_from_auloaded_script()
   mkdir('Xdir/autoload/', 'p')
 
   var lines =<< trim END
-    vim9script
+    mnv9script
     export enum Color
       Red,
       Green,
       Blue
     endenum
   END
-  writefile(lines, 'Xdir/autoload/color.vim', 'D')
+  writefile(lines, 'Xdir/autoload/color.mnv', 'D')
 
   lines =<< trim END
-    vim9script
+    mnv9script
 
-    import autoload 'color.vim'
+    import autoload 'color.mnv'
 
     def CheckColor()
       var c = color.Color.Green
@@ -3632,18 +3632,18 @@ enddef
 " imported class
 def Test_import_member_initializer()
   var lines =<< trim END
-    vim9script
+    mnv9script
     const DEFAULT = 'default'
     export class Foo
       public var x = DEFAULT
     endclass
   END
-  writefile(lines, 'Ximportclass.vim', 'D')
+  writefile(lines, 'Ximportclass.mnv', 'D')
 
-  # The initializer for Foo.x is evaluated in the context of Ximportclass.vim.
+  # The initializer for Foo.x is evaluated in the context of Ximportclass.mnv.
   lines =<< trim END
-    vim9script
-    import './Ximportclass.vim' as X
+    mnv9script
+    import './Ximportclass.mnv' as X
     class Bar extends X.Foo
     endclass
     var o = Bar.new()
@@ -3653,7 +3653,7 @@ def Test_import_member_initializer()
 
   # Another test
   lines =<< trim END
-    vim9script
+    mnv9script
 
     export interface IObjKey
       var unique_object_id: string
@@ -3668,12 +3668,12 @@ def Test_import_member_initializer()
       return "SomeKey"
     enddef
   END
-  writefile(lines, 'XobjKey.vim', 'D')
+  writefile(lines, 'XobjKey.mnv', 'D')
 
   lines =<< trim END
-    vim9script
+    mnv9script
 
-    import "./XobjKey.vim" as obj_key
+    import "./XobjKey.mnv" as obj_key
 
     const GenKey = obj_key.GenerateKey
 
@@ -3696,7 +3696,7 @@ enddef
 
 def Test_import_name_conflict_with_local_variable()
   var lines =<< trim END
-    vim9script
+    mnv9script
 
     export class Foo
       def Method(): string
@@ -3704,14 +3704,14 @@ def Test_import_name_conflict_with_local_variable()
       enddef
     endclass
   END
-  writefile(lines, 'Xvim9.vim', 'D')
+  writefile(lines, 'Xmnv9.mnv', 'D')
 
   lines =<< trim END
-    import './Xvim9.vim'
+    import './Xmnv9.mnv'
 
     function! s:Main() abort
-      let Xvim9 = s:Xvim9.Foo.new()
-      call assert_equal('Method', Xvim9.Method())
+      let Xmnv9 = s:Xmnv9.Foo.new()
+      call assert_equal('Method', Xmnv9.Method())
     endfunction
 
     call s:Main()
@@ -3719,4 +3719,4 @@ def Test_import_name_conflict_with_local_variable()
   v9.CheckScriptSuccess(lines)
 enddef
 
-" vim: ts=8 sw=2 sts=2 expandtab tw=80 fdm=marker
+" mnv: ts=8 sw=2 sts=2 expandtab tw=80 fdm=marker
diff --git a/uvim/src/testdir/test_vim9_interface.vim b/uvim/src/testdir/test_mnv9_interface.mnv
index 742b871f16..ec549bda80 100644
--- a/uvim/src/testdir/test_vim9_interface.vim
+++ b/uvim/src/testdir/test_mnv9_interface.mnv
@@ -1,11 +1,11 @@
-" Tests for Vim9 interface
+" Tests for MNV9 interface
 
-import './util/vim9.vim' as v9
+import './util/mnv9.mnv' as v9
 
 " Tests for basic interface declaration and errors
 def Test_interface_basics()
   var lines =<< trim END
-    vim9script
+    mnv9script
     interface Something
       var ro_var: list<number>
       def GetCount(): number
@@ -18,10 +18,10 @@ def Test_interface_basics()
       static var count = 7
     endinterface
   END
-  v9.CheckSourceFailure(lines, 'E1342: Interface can only be defined in Vim9 script', 1)
+  v9.CheckSourceFailure(lines, 'E1342: Interface can only be defined in MNV9 script', 1)
 
   lines =<< trim END
-    vim9script
+    mnv9script
 
     interface Some
       var value: number
@@ -33,7 +33,7 @@ def Test_interface_basics()
   v9.CheckSourceSuccess(lines)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     interface somethingWrong
       static var count = 7
     endinterface
@@ -41,7 +41,7 @@ def Test_interface_basics()
   v9.CheckSourceFailure(lines, 'E1343: Interface name must start with an uppercase letter: somethingWrong', 2)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     interface SomethingWrong
       var value: string
       var count = 7
@@ -51,7 +51,7 @@ def Test_interface_basics()
   v9.CheckSourceFailure(lines, 'E1344: Cannot initialize a variable in an interface', 4)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     interface SomethingWrong
       var value: string
       var count: number
@@ -64,7 +64,7 @@ def Test_interface_basics()
 
   # Test for "interface" cannot be abbreviated
   lines =<< trim END
-    vim9script
+    mnv9script
     inte Something
     endinterface
   END
@@ -72,7 +72,7 @@ def Test_interface_basics()
 
   # Test for "endinterface" cannot be abbreviated
   lines =<< trim END
-    vim9script
+    mnv9script
     interface Something
     endin
   END
@@ -80,24 +80,24 @@ def Test_interface_basics()
 
   # Additional commands after "interface name"
   lines =<< trim END
-    vim9script
+    mnv9script
     interface Something | var x = 10 | var y = 20
     endinterface
   END
   v9.CheckSourceFailure(lines, "E488: Trailing characters: | var x = 10", 2)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     export interface EnterExit
       def Enter(): void
       def Exit(): void
     endinterface
   END
-  writefile(lines, 'XdefIntf.vim', 'D')
+  writefile(lines, 'XdefIntf.mnv', 'D')
 
   lines =<< trim END
-    vim9script
-    import './XdefIntf.vim' as defIntf
+    mnv9script
+    import './XdefIntf.mnv' as defIntf
     export def With(ee: defIntf.EnterExit, F: func)
       ee.Enter()
       try
@@ -110,7 +110,7 @@ def Test_interface_basics()
   v9.CheckScriptSuccess(lines)
 
   var imported =<< trim END
-    vim9script
+    mnv9script
     export abstract class EnterExit
       def Enter(): void
       enddef
@@ -118,15 +118,15 @@ def Test_interface_basics()
       enddef
     endclass
   END
-  writefile(imported, 'XdefIntf2.vim', 'D')
+  writefile(imported, 'XdefIntf2.mnv', 'D')
 
-  lines[1] = " import './XdefIntf2.vim' as defIntf"
+  lines[1] = " import './XdefIntf2.mnv' as defIntf"
   v9.CheckScriptSuccess(lines)
 enddef
 
 def Test_class_interface_wrong_end()
   var lines =<< trim END
-    vim9script
+    mnv9script
     abstract class SomeName
       var member = 'text'
     endinterface
@@ -134,7 +134,7 @@ def Test_class_interface_wrong_end()
   v9.CheckSourceFailure(lines, 'E476: Invalid command: endinterface, expected endclass', 4)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     export interface AnotherName
       var member: string
     endclass
@@ -145,7 +145,7 @@ enddef
 " Test for using string() with an interface
 def Test_interface_to_string()
   var lines =<< trim END
-    vim9script
+    mnv9script
     interface Intf
       def Method(nr: number)
     endinterface
@@ -156,7 +156,7 @@ enddef
 
 def Test_class_implements_interface()
   var lines =<< trim END
-    vim9script
+    mnv9script
 
     interface Some
       var count: number
@@ -185,7 +185,7 @@ def Test_class_implements_interface()
   v9.CheckSourceSuccess(lines)
 
   lines =<< trim END
-    vim9script
+    mnv9script
 
     interface Some
       var count: number
@@ -198,7 +198,7 @@ def Test_class_implements_interface()
   v9.CheckSourceFailure(lines, 'E1350: Duplicate "implements"', 7)
 
   lines =<< trim END
-    vim9script
+    mnv9script
 
     interface Some
       var count: number
@@ -211,7 +211,7 @@ def Test_class_implements_interface()
   v9.CheckSourceFailure(lines, 'E1351: Duplicate interface after "implements": Some', 7)
 
   lines =<< trim END
-    vim9script
+    mnv9script
 
     interface Some
       var counter: number
@@ -228,7 +228,7 @@ def Test_class_implements_interface()
   v9.CheckSourceFailure(lines, 'E1348: Variable "counter" of interface "Some" is not implemented', 13)
 
   lines =<< trim END
-    vim9script
+    mnv9script
 
     interface Some
       var count: number
@@ -246,7 +246,7 @@ def Test_class_implements_interface()
 
   # Check different order of members in class and interface works.
   lines =<< trim END
-    vim9script
+    mnv9script
 
       interface Result
         var label: string
@@ -273,7 +273,7 @@ def Test_class_implements_interface()
 
   # Interface name after "extends" doesn't end in a space or NUL character
   lines =<< trim END
-    vim9script
+    mnv9script
     interface A
     endinterface
     class B extends A"
@@ -283,7 +283,7 @@ def Test_class_implements_interface()
 
   # Trailing characters after a class name
   lines =<< trim END
-    vim9script
+    mnv9script
     class A bbb
     endclass
   END
@@ -291,7 +291,7 @@ def Test_class_implements_interface()
 
   # using "implements" with a non-existing class
   lines =<< trim END
-    vim9script
+    mnv9script
     class A implements B
     endclass
   END
@@ -299,7 +299,7 @@ def Test_class_implements_interface()
 
   # using "implements" with a regular class
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
     endclass
     class B implements A
@@ -309,7 +309,7 @@ def Test_class_implements_interface()
 
   # using "implements" with a variable
   lines =<< trim END
-    vim9script
+    mnv9script
     var T: number = 10
     class A implements T
     endclass
@@ -318,7 +318,7 @@ def Test_class_implements_interface()
 
   # implements should be followed by a white space
   lines =<< trim END
-    vim9script
+    mnv9script
     interface A
     endinterface
     class B implements A;
@@ -327,7 +327,7 @@ def Test_class_implements_interface()
   v9.CheckSourceFailure(lines, 'E1315: White space required after name: A;', 4)
 
   lines =<< trim END
-    vim9script
+    mnv9script
 
     interface One
       def IsEven(nr: number): bool
@@ -340,7 +340,7 @@ def Test_class_implements_interface()
   v9.CheckSourceFailure(lines, 'E1383: Method "IsEven": type mismatch, expected func(number): bool but got func(number): string', 9)
 
   lines =<< trim END
-    vim9script
+    mnv9script
 
     interface One
       def IsEven(nr: number): bool
@@ -353,7 +353,7 @@ def Test_class_implements_interface()
   v9.CheckSourceFailure(lines, 'E1383: Method "IsEven": type mismatch, expected func(number): bool but got func(bool): bool', 9)
 
   lines =<< trim END
-    vim9script
+    mnv9script
 
     interface One
       def IsEven(nr: number): bool
@@ -367,7 +367,7 @@ def Test_class_implements_interface()
 
   # access superclass interface members from subclass, mix variable order
   lines =<< trim END
-    vim9script
+    mnv9script
 
     interface I1
       var mvar1: number
@@ -419,7 +419,7 @@ def Test_class_implements_interface()
   # Access superclass interface members from subclass, mix variable order.
   # Two interfaces, one on A, one on B; each has both kinds of variables
   lines =<< trim END
-    vim9script
+    mnv9script
 
     interface I1
       var mvar1: number
@@ -490,7 +490,7 @@ def Test_class_implements_interface()
 
   # Using two interface names without a space after the ","
   lines =<< trim END
-    vim9script
+    mnv9script
     interface A
     endinterface
     interface B
@@ -502,7 +502,7 @@ def Test_class_implements_interface()
 
   # No interface name after a comma
   lines =<< trim END
-    vim9script
+    mnv9script
     interface A
     endinterface
     class B implements A,
@@ -512,7 +512,7 @@ def Test_class_implements_interface()
 
   # No interface name after implements
   lines =<< trim END
-    vim9script
+    mnv9script
     class A implements
     endclass
   END
@@ -521,7 +521,7 @@ enddef
 
 def Test_call_interface_method()
   var lines =<< trim END
-    vim9script
+    mnv9script
     interface Base
       def Enter(): void
     endinterface
@@ -544,7 +544,7 @@ def Test_call_interface_method()
   v9.CheckSourceSuccess(lines)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     class Base
       def Enter(): void
         g:result ..= 'base'
@@ -570,7 +570,7 @@ def Test_call_interface_method()
 
   # method of interface returns a value
   lines =<< trim END
-    vim9script
+    mnv9script
     interface Base
       def Enter(): string
     endinterface
@@ -595,7 +595,7 @@ def Test_call_interface_method()
   v9.CheckSourceSuccess(lines)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     class Base
       def Enter(): string
         return null_string
@@ -623,7 +623,7 @@ def Test_call_interface_method()
 
   # No class that implements the interface.
   lines =<< trim END
-    vim9script
+    mnv9script
 
     interface IWithEE
       def Enter(): any
@@ -642,7 +642,7 @@ enddef
 " Test for implementing an imported interface
 def Test_implement_imported_interface()
   var lines =<< trim END
-    vim9script
+    mnv9script
     export interface Imp_Intf1
       def Fn1(): number
     endinterface
@@ -650,11 +650,11 @@ def Test_implement_imported_interface()
       def Fn2(): number
     endinterface
   END
-  writefile(lines, 'Ximportinterface.vim', 'D')
+  writefile(lines, 'Ximportinterface.mnv', 'D')
 
   lines =<< trim END
-    vim9script
-    import './Ximportinterface.vim' as Xintf
+    mnv9script
+    import './Ximportinterface.mnv' as Xintf
 
     class A implements Xintf.Imp_Intf1, Xintf.Imp_Intf2
       def Fn1(): number
@@ -674,7 +674,7 @@ enddef
 " Test for changing the member access of an interface in a implementation class
 def Test_change_interface_member_access()
   var lines =<< trim END
-    vim9script
+    mnv9script
     interface A
       var val: number
     endinterface
@@ -685,7 +685,7 @@ def Test_change_interface_member_access()
   v9.CheckSourceFailure(lines, 'E1367: Access level of variable "val" of interface "A" is different', 7)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     interface A
       var val: number
     endinterface
@@ -699,7 +699,7 @@ enddef
 " Test for using a interface method using a child object
 def Test_interface_method_from_child()
   var lines =<< trim END
-    vim9script
+    mnv9script
 
     interface A
       def Foo(): string
@@ -736,7 +736,7 @@ enddef
 " by the child class.
 def Test_interface_overridden_method_from_child()
   var lines =<< trim END
-    vim9script
+    mnv9script
 
     interface A
       def Foo(): string
@@ -775,7 +775,7 @@ enddef
 " Test for interface inheritance
 def Test_interface_inheritance()
   var lines =<< trim END
-    vim9script
+    mnv9script
 
     interface A
       def A_Fn(): string
@@ -852,7 +852,7 @@ def Test_interface_inheritance()
 
   # Both the parent and child classes implement the same interface
   lines =<< trim END
-    vim9script
+    mnv9script
 
     interface I
       def Foo(): string
@@ -884,7 +884,7 @@ enddef
 " variable or a protected method or a public variable
 def Test_interface_with_unsupported_members()
   var lines =<< trim END
-    vim9script
+    mnv9script
     interface A
       static var num: number
     endinterface
@@ -892,7 +892,7 @@ def Test_interface_with_unsupported_members()
   v9.CheckSourceFailure(lines, 'E1378: Static member not supported in an interface', 3)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     interface A
       static var _num: number
     endinterface
@@ -900,7 +900,7 @@ def Test_interface_with_unsupported_members()
   v9.CheckSourceFailure(lines, 'E1378: Static member not supported in an interface', 3)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     interface A
       public static var num: number
     endinterface
@@ -908,7 +908,7 @@ def Test_interface_with_unsupported_members()
   v9.CheckSourceFailure(lines, 'E1387: public variable not supported in an interface', 3)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     interface A
       public static var num: number
     endinterface
@@ -916,7 +916,7 @@ def Test_interface_with_unsupported_members()
   v9.CheckSourceFailure(lines, 'E1387: public variable not supported in an interface', 3)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     interface A
       static var _num: number
     endinterface
@@ -924,7 +924,7 @@ def Test_interface_with_unsupported_members()
   v9.CheckSourceFailure(lines, 'E1378: Static member not supported in an interface', 3)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     interface A
       static def Foo(d: dict<any>): list<string>
     endinterface
@@ -932,7 +932,7 @@ def Test_interface_with_unsupported_members()
   v9.CheckSourceFailure(lines, 'E1378: Static member not supported in an interface', 3)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     interface A
       static def _Foo(d: dict<any>): list<string>
     endinterface
@@ -940,7 +940,7 @@ def Test_interface_with_unsupported_members()
   v9.CheckSourceFailure(lines, 'E1378: Static member not supported in an interface', 3)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     interface A
       var _Foo: list<string>
     endinterface
@@ -948,7 +948,7 @@ def Test_interface_with_unsupported_members()
   v9.CheckSourceFailure(lines, 'E1379: Protected variable not supported in an interface', 3)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     interface A
       def _Foo(d: dict<any>): list<string>
     endinterface
@@ -959,7 +959,7 @@ enddef
 " Test for extending an interface
 def Test_extend_interface()
   var lines =<< trim END
-    vim9script
+    mnv9script
     interface A
       var var1: list<string>
       def Foo()
@@ -981,7 +981,7 @@ def Test_extend_interface()
 
   # extending empty interface
   lines =<< trim END
-    vim9script
+    mnv9script
     interface A
     endinterface
     interface B extends A
@@ -992,7 +992,7 @@ def Test_extend_interface()
   v9.CheckSourceSuccess(lines)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     interface A
       def Foo()
     endinterface
@@ -1006,7 +1006,7 @@ def Test_extend_interface()
   v9.CheckSourceFailure(lines, 'E1349: Method "Foo" of interface "A" is not implemented', 10)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     interface A
       def Foo()
     endinterface
@@ -1022,7 +1022,7 @@ def Test_extend_interface()
 
   # interface cannot extend a class
   lines =<< trim END
-    vim9script
+    mnv9script
     class A
     endclass
     interface B extends A
@@ -1032,7 +1032,7 @@ def Test_extend_interface()
 
   # class cannot extend an interface
   lines =<< trim END
-    vim9script
+    mnv9script
     interface A
     endinterface
     class B extends A
@@ -1042,7 +1042,7 @@ def Test_extend_interface()
 
   # interface cannot implement another interface
   lines =<< trim END
-    vim9script
+    mnv9script
     interface A
     endinterface
     interface B implements A
@@ -1052,7 +1052,7 @@ def Test_extend_interface()
 
   # interface cannot extend multiple interfaces
   lines =<< trim END
-    vim9script
+    mnv9script
     interface A
     endinterface
     interface B
@@ -1064,7 +1064,7 @@ def Test_extend_interface()
 
   # Variable type in an extended interface is of different type
   lines =<< trim END
-    vim9script
+    mnv9script
     interface A
       var val1: number
     endinterface
@@ -1083,7 +1083,7 @@ enddef
 " defined in the parent class.
 def Test_child_class_implements_interface()
   var lines =<< trim END
-    vim9script
+    mnv9script
 
     interface Intf
       def F1(): list<list<number>>
@@ -1146,7 +1146,7 @@ def Test_child_class_implements_interface()
 
   # One of the interface methods is not found
   lines =<< trim END
-    vim9script
+    mnv9script
 
     interface Intf
       def F1()
@@ -1177,7 +1177,7 @@ def Test_child_class_implements_interface()
 
   # One of the interface methods is of different type
   lines =<< trim END
-    vim9script
+    mnv9script
 
     interface Intf
       def F1()
@@ -1211,7 +1211,7 @@ def Test_child_class_implements_interface()
 
   # One of the interface variables is not present
   lines =<< trim END
-    vim9script
+    mnv9script
 
     interface Intf
       var var1: list<dict<number>>
@@ -1237,7 +1237,7 @@ def Test_child_class_implements_interface()
 
   # One of the interface variables is of different type
   lines =<< trim END
-    vim9script
+    mnv9script
 
     interface Intf
       var var1: list<dict<number>>
@@ -1266,7 +1266,7 @@ enddef
 " Test for extending an interface with duplicate variables and methods
 def Test_interface_extends_with_dup_members()
   var lines =<< trim END
-    vim9script
+    mnv9script
     interface A
       var n1: number
       def Foo1(): number
@@ -1308,7 +1308,7 @@ enddef
 " member variables.
 def Test_implement_interface_with_different_variable_order()
   var lines =<< trim END
-    vim9script
+    mnv9script
 
     interface IX
       var F: func(): string
@@ -1332,7 +1332,7 @@ enddef
 " Test for inheriting interfaces from an imported super class
 def Test_interface_inheritance_with_imported_super()
   var lines =<< trim END
-    vim9script
+    mnv9script
 
     export interface I
       def F(): string
@@ -1344,12 +1344,12 @@ def Test_interface_inheritance_with_imported_super()
       enddef
     endclass
   END
-  writefile(lines, 'Xinheritintfimportclass.vim', 'D')
+  writefile(lines, 'Xinheritintfimportclass.mnv', 'D')
 
   lines =<< trim END
-    vim9script
+    mnv9script
 
-    import './Xinheritintfimportclass.vim' as i_imp
+    import './Xinheritintfimportclass.mnv' as i_imp
 
     # class C extends i_imp.A
     class C extends i_imp.A implements i_imp.I
@@ -1370,7 +1370,7 @@ enddef
 " Test for defining an interface in a function
 def Test_interface_defined_in_function()
   var lines =<< trim END
-    vim9script
+    mnv9script
     def Fn()
       var x = 1
       interface Foo
@@ -1385,7 +1385,7 @@ enddef
 " concrete type in the interface
 def Test_implements_using_var_type_any()
   var lines =<< trim END
-    vim9script
+    mnv9script
     interface A
       var val: list<dict<string>>
     endinterface
@@ -1399,7 +1399,7 @@ def Test_implements_using_var_type_any()
 
   # initialize instance variable using a different type
   lines =<< trim END
-    vim9script
+    mnv9script
     interface A
       var val: list<dict<string>>
     endinterface
@@ -1414,7 +1414,7 @@ enddef
 " Test interface garbage collection
 func Test_interface_garbagecollect()
   let lines =<< trim END
-    vim9script
+    mnv9script
 
     interface I
       var ro_obj_var: number
@@ -1456,4 +1456,4 @@ func Test_interface_garbagecollect()
   call v9.CheckSourceSuccess(lines)
 endfunc
 
-" vim: ts=8 sw=2 sts=2 expandtab tw=80 fdm=marker
+" mnv: ts=8 sw=2 sts=2 expandtab tw=80 fdm=marker
diff --git a/uvim/src/testdir/test_vim9_python3.vim b/uvim/src/testdir/test_mnv9_python3.mnv
index 42a112a7d8..43f49612b7 100644
--- a/uvim/src/testdir/test_vim9_python3.vim
+++ b/uvim/src/testdir/test_mnv9_python3.mnv
@@ -1,5 +1,5 @@
 
-import './util/vim9.vim' as v9
+import './util/mnv9.mnv' as v9
 CheckFeature python3
 
 def Test_python3_py3eval_locals()
@@ -13,4 +13,4 @@ def Test_python3_py3eval_locals()
   v9.CheckDefAndScriptSuccess(lines)
 enddef
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_vim9_script.vim b/uvim/src/testdir/test_mnv9_script.mnv
index eefb6174d8..0b42ed7803 100644
--- a/uvim/src/testdir/test_vim9_script.vim
+++ b/uvim/src/testdir/test_mnv9_script.mnv
@@ -1,18 +1,18 @@
-" Test various aspects of the Vim9 script language.
+" Test various aspects of the MNV9 script language.
 
-import './util/vim9.vim' as v9
-source util/screendump.vim
+import './util/mnv9.mnv' as v9
+source util/screendump.mnv
 
-def Test_vim9script_feature()
+def Test_mnv9script_feature()
   # example from the help, here the feature is always present
   var lines =<< trim END
       " old style comment
-      if !has('vim9script')
+      if !has('mnv9script')
         " legacy commands would go here
         finish
       endif
-      vim9script
-      # Vim9 script commands go here
+      mnv9script
+      # MNV9 script commands go here
       g:didit = true
   END
   v9.CheckScriptSuccess(lines)
@@ -39,7 +39,7 @@ def Test_range_only()
 
   # missing command does not print the line
   var lines =<< trim END
-    vim9script
+    mnv9script
     :1|
     assert_equal('three$', g:Screenline(&lines))
     :|
@@ -54,7 +54,7 @@ def Test_range_only()
       :1,999
   END
   v9.CheckDefExecAndScriptFailure(lines, 'E16:', 2)
-  set cpo&vim
+  set cpo&mnv
 
   v9.CheckDefExecAndScriptFailure([":'x"], 'E20:', 1)
 
@@ -94,7 +94,7 @@ let g:anumber = 123
 def Test_delfunction()
   # Check function is defined in script namespace
   v9.CheckScriptSuccess([
-      'vim9script',
+      'mnv9script',
       'func CheckMe()',
       '  return 123',
       'endfunc',
@@ -106,13 +106,13 @@ def Test_delfunction()
 
   # Check function in script namespace cannot be deleted
   v9.CheckScriptFailure([
-      'vim9script',
+      'mnv9script',
       'func DeleteMe1()',
       'endfunc',
       'delfunction DeleteMe1',
       ], 'E1084:')
   v9.CheckScriptFailure([
-      'vim9script',
+      'mnv9script',
       'func DeleteMe2()',
       'endfunc',
       'def DoThat()',
@@ -121,13 +121,13 @@ def Test_delfunction()
       'DoThat()',
       ], 'E1084:')
   v9.CheckScriptFailure([
-      'vim9script',
+      'mnv9script',
       'def DeleteMe3()',
       'enddef',
       'delfunction DeleteMe3',
       ], 'E1084:')
   v9.CheckScriptFailure([
-      'vim9script',
+      'mnv9script',
       'def DeleteMe4()',
       'enddef',
       'def DoThat()',
@@ -138,7 +138,7 @@ def Test_delfunction()
 
   # Check that global :def function can be replaced and deleted
   var lines =<< trim END
-      vim9script
+      mnv9script
       def g:Global(): string
         return "yes"
       enddef
@@ -154,7 +154,7 @@ def Test_delfunction()
 
   # Check that global function can be replaced by a :def function and deleted
   lines =<< trim END
-      vim9script
+      mnv9script
       func g:Global()
         return "yes"
       endfunc
@@ -170,7 +170,7 @@ def Test_delfunction()
 
   # Check that global :def function can be replaced by a function and deleted
   lines =<< trim END
-      vim9script
+      mnv9script
       def g:Global(): string
         return "yes"
       enddef
@@ -204,7 +204,7 @@ def Test_wrong_type()
   v9.CheckDefFailure(['var name: ned'], 'E1010:')
   v9.CheckDefFailure(['var name: pam'], 'E1010:')
   v9.CheckDefFailure(['var name: sam'], 'E1010:')
-  v9.CheckDefFailure(['var name: vim'], 'E1010:')
+  v9.CheckDefFailure(['var name: mnv'], 'E1010:')
 
   v9.CheckDefFailure(['var Ref: number', 'Ref()'], 'E1085:')
   v9.CheckDefFailure(['var Ref: string', 'var res = Ref()'], 'E1085:')
@@ -213,7 +213,7 @@ enddef
 def Test_script_namespace()
   # defining a function or variable with s: is not allowed
   var lines =<< trim END
-      vim9script
+      mnv9script
       def s:Function()
       enddef
   END
@@ -221,11 +221,11 @@ def Test_script_namespace()
 
   for decl in ['var', 'const', 'final']
     lines =<< trim END
-        vim9script
+        mnv9script
         var s:var = 'var'
     END
     v9.CheckScriptFailure([
-        'vim9script',
+        'mnv9script',
         decl .. ' s:var = "var"',
         ], 'E1268:')
   endfor
@@ -233,21 +233,21 @@ def Test_script_namespace()
   # Calling a function or using a variable with s: is not allowed at script
   # level
   lines =<< trim END
-      vim9script
+      mnv9script
       def Function()
       enddef
       s:Function()
   END
   v9.CheckScriptFailure(lines, 'E1268:')
   lines =<< trim END
-      vim9script
+      mnv9script
       def Function()
       enddef
       call s:Function()
   END
   v9.CheckScriptFailure(lines, 'E1268:')
   lines =<< trim END
-      vim9script
+      mnv9script
       var var = 'var'
       echo s:var
   END
@@ -256,7 +256,7 @@ enddef
 
 def Test_script_wrong_type()
   var lines =<< trim END
-      vim9script
+      mnv9script
       var dict: dict<string>
       dict['a'] = ['x']
   END
@@ -305,7 +305,7 @@ def Test_const()
 
   # also when used as a builtin function argument
   lines =<< trim END
-      vim9script
+      mnv9script
 
       def SorterFunc(lhs: dict<string>, rhs: dict<string>): number
         return lhs.name <# rhs.name ? -1 : 1
@@ -329,35 +329,35 @@ def Test_const_bang()
       var = 99
   END
   v9.CheckDefExecFailure(lines, 'E1018:', 2)
-  v9.CheckScriptFailure(['vim9script'] + lines, 'E46:', 3)
+  v9.CheckScriptFailure(['mnv9script'] + lines, 'E46:', 3)
 
   lines =<< trim END
       const ll = [2, 3, 4]
       ll[0] = 99
   END
   v9.CheckDefExecFailure(lines, 'E1119:', 2)
-  v9.CheckScriptFailure(['vim9script'] + lines, 'E741:', 3)
+  v9.CheckScriptFailure(['mnv9script'] + lines, 'E741:', 3)
 
   lines =<< trim END
       const ll = [2, 3, 4]
       ll[3] = 99
   END
   v9.CheckDefExecFailure(lines, 'E1118:', 2)
-  v9.CheckScriptFailure(['vim9script'] + lines, 'E684:', 3)
+  v9.CheckScriptFailure(['mnv9script'] + lines, 'E684:', 3)
 
   lines =<< trim END
       const dd = {one: 1, two: 2}
       dd["one"] = 99
   END
   v9.CheckDefExecFailure(lines, 'E1121:', 2)
-  v9.CheckScriptFailure(['vim9script'] + lines, 'E741:', 3)
+  v9.CheckScriptFailure(['mnv9script'] + lines, 'E741:', 3)
 
   lines =<< trim END
       const dd = {one: 1, two: 2}
       dd["three"] = 99
   END
   v9.CheckDefExecFailure(lines, 'E1120:')
-  v9.CheckScriptFailure(['vim9script'] + lines, 'E741:', 3)
+  v9.CheckScriptFailure(['mnv9script'] + lines, 'E741:', 3)
 enddef
 
 def Test_range_no_colon()
@@ -388,7 +388,7 @@ enddef
 
 def Test_block_local_vars()
   var lines =<< trim END
-      vim9script
+      mnv9script
       v:testing = 1
       if true
         var text = ['hello']
@@ -422,10 +422,10 @@ def Test_block_local_vars()
       qall!
   END
 
-  # need to execute this with a separate Vim instance to avoid the current
+  # need to execute this with a separate MNV instance to avoid the current
   # context gets garbage collected.
   writefile(lines, 'Xscript', 'D')
-  g:RunVim([], [], '-S Xscript')
+  g:RunMNV([], [], '-S Xscript')
   assert_equal(['ok'], readfile('Xdidit'))
 
   delete('Xdidit')
@@ -433,7 +433,7 @@ enddef
 
 def Test_block_local_vars_with_func()
   var lines =<< trim END
-      vim9script
+      mnv9script
       if true
         var foo = 'foo'
         if true
@@ -469,7 +469,7 @@ enddef
 " Test for using heredoc in a :command command block
 def Test_command_block_heredoc()
   var lines =<< trim CODE
-    vim9script
+    mnv9script
     com SomeCommand {
         g:someVar =<< trim END
           aaa
@@ -491,7 +491,7 @@ def Test_command_block_heredoc()
 
   # Execute a command with heredoc in a block
   lines =<< trim CODE
-    vim9script
+    mnv9script
     com SomeCommand {
         g:someVar =<< trim END
           aaa
@@ -507,7 +507,7 @@ def Test_command_block_heredoc()
 
   # Heredoc with comment
   lines =<< trim CODE
-    vim9script
+    mnv9script
     com SomeCommand {
         g:someVar =<< trim END # comment
           aaa
@@ -523,7 +523,7 @@ def Test_command_block_heredoc()
 
   # heredoc evaluation
   lines =<< trim CODE
-    vim9script
+    mnv9script
     com SomeCommand {
         var suffix = '---'
         g:someVar =<< trim eval END
@@ -546,7 +546,7 @@ def Test_command_block_heredoc()
 
   # command following heredoc
   lines =<< trim CODE
-    vim9script
+    mnv9script
     com SomeCommand {
         var l =<< trim END
           eee
@@ -563,7 +563,7 @@ def Test_command_block_heredoc()
 
   # Error in heredoc
   lines =<< trim CODE
-    vim9script
+    mnv9script
     com SomeCommand {
         g:someVar =<< trim END
           eee
@@ -594,7 +594,7 @@ enddef
 
 def Test_block_in_a_string()
   var lines =<< trim END
-    vim9script
+    mnv9script
 
     def Foo(): string
       var x = ' => { # abc'
@@ -616,7 +616,7 @@ enddef
 " Test for a block in a command with comments
 def Test_block_command_with_comment()
   var lines =<< trim END
-    vim9script
+    mnv9script
 
     g:Str = ''
     command Cmd1 {
@@ -661,7 +661,7 @@ enddef
 
 " Test for using too many nested blocks
 def Test_too_many_nested_blocks()
-  var lines = ['vim9script']
+  var lines = ['mnv9script']
   lines += repeat(['{'], 51) + ['echo "Hello"'] + repeat(['}'], 51)
   v9.CheckSourceFailure(lines, 'E579: Block nesting too deep: {')
 enddef
@@ -961,7 +961,7 @@ def Test_try_catch_throw()
   assert_equal(6, ReturnInFinally())
 
   var lines =<< trim END
-      vim9script
+      mnv9script
       try
         acos('0.5')
           ->setline(1)
@@ -975,7 +975,7 @@ def Test_try_catch_throw()
 
   # missing catch and/or finally
   lines =<< trim END
-      vim9script
+      mnv9script
       try
         echo 'something'
       endtry
@@ -1064,7 +1064,7 @@ enddef
 
 def Test_throw_in_nested_try()
   var lines =<< trim END
-      vim9script
+      mnv9script
 
       def Try(F: func(): void)
         try
@@ -1099,7 +1099,7 @@ enddef
 
 def Test_try_var_decl()
   var lines =<< trim END
-      vim9script
+      mnv9script
       try
         var in_try = 1
         assert_equal(1, get(s:, 'in_try', -1))
@@ -1123,7 +1123,7 @@ enddef
 
 def Test_try_ends_in_return()
   var lines =<< trim END
-      vim9script
+      mnv9script
       def Foo(): string
         try
           return 'foo'
@@ -1136,7 +1136,7 @@ def Test_try_ends_in_return()
   v9.CheckScriptSuccess(lines)
 
   lines =<< trim END
-      vim9script
+      mnv9script
       def Foo(): string
         try
           return 'foo'
@@ -1150,7 +1150,7 @@ def Test_try_ends_in_return()
   v9.CheckScriptFailure(lines, 'E1095:')
 
   lines =<< trim END
-      vim9script
+      mnv9script
       def Foo(): string
         try
           return 'foo'
@@ -1163,7 +1163,7 @@ def Test_try_ends_in_return()
   v9.CheckScriptFailure(lines, 'E1027:')
 
   lines =<< trim END
-      vim9script
+      mnv9script
       def Foo(): string
         try
           echo 'foo'
@@ -1181,7 +1181,7 @@ enddef
 
 def Test_try_in_catch()
   var lines =<< trim END
-      vim9script
+      mnv9script
       var seq = []
       def DoIt()
         try
@@ -1243,7 +1243,7 @@ enddef
 
 def Test_break_in_try_in_for()
   var lines =<< trim END
-      vim9script
+      mnv9script
       def Ls(): list<string>
         var ls: list<string>
         for s in ['abc', 'def']
@@ -1278,7 +1278,7 @@ enddef
 def Test_cnext_works_in_catch()
   CheckFeature quickfix
   var lines =<< trim END
-      vim9script
+      mnv9script
       au BufEnter * eval 1 + 2
       writefile(['text'], 'Xcncfile1')
       writefile(['text'], 'Xcncfile2')
@@ -1304,7 +1304,7 @@ def Test_cnext_works_in_catch()
       qall
   END
   writefile(lines, 'XCatchCnext', 'D')
-  g:RunVim([], [], '--clean -S XCatchCnext')
+  g:RunMNV([], [], '--clean -S XCatchCnext')
   assert_equal(['1'], readfile('Xcncresult'))
 
   delete('Xcncfile1')
@@ -1320,7 +1320,7 @@ enddef
 
 def Test_nocatch_throw_silenced()
   var lines =<< trim END
-    vim9script
+    mnv9script
     def Func()
       throw 'error'
     enddef
@@ -1554,10 +1554,10 @@ def Test_throw_line_number()
 enddef
 
 
-def Test_throw_vimscript()
+def Test_throw_mnvscript()
   # only checks line continuation
   var lines =<< trim END
-      vim9script
+      mnv9script
       try
         throw 'one'
               .. 'two'
@@ -1568,7 +1568,7 @@ def Test_throw_vimscript()
   v9.CheckScriptSuccess(lines)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     @r = ''
     def Func()
       throw @r
@@ -1587,7 +1587,7 @@ enddef
 def Test_error_in_nested_function()
   # an error in a nested :function aborts executing in the calling :def function
   var lines =<< trim END
-      vim9script
+      mnv9script
       def Func()
         Error()
         g:test_var = 1
@@ -1604,7 +1604,7 @@ enddef
 
 def Test_abort_after_error()
   var lines =<< trim END
-      vim9script
+      mnv9script
       while true
         echo notfound
       endwhile
@@ -1616,12 +1616,12 @@ def Test_abort_after_error()
   unlet g:gotthere
 enddef
 
-def Test_cexpr_vimscript()
+def Test_cexpr_mnvscript()
   CheckFeature quickfix
   # only checks line continuation
   set errorformat=File\ %f\ line\ %l
   var lines =<< trim END
-      vim9script
+      mnv9script
       cexpr 'File'
                 .. ' someFile' ..
                    ' line 19'
@@ -1630,7 +1630,7 @@ def Test_cexpr_vimscript()
   v9.CheckScriptSuccess(lines)
 
   lines =<< trim END
-      vim9script
+      mnv9script
       def CexprFail()
         au QuickfixCmdPre * echo g:doesnotexist
         cexpr 'File otherFile line 99'
@@ -1645,7 +1645,7 @@ def Test_cexpr_vimscript()
   au! QuickfixCmdPre
 
   lines =<< trim END
-      vim9script
+      mnv9script
       def CexprFail()
         cexpr g:aNumber
         g:didContinue = 'yes'
@@ -1665,7 +1665,7 @@ enddef
 def Test_statusline_syntax()
   # legacy syntax is used for 'statusline'
   var lines =<< trim END
-      vim9script
+      mnv9script
       func g:Status()
         return '%{"x" is# "x"}'
       endfunc
@@ -1676,10 +1676,10 @@ def Test_statusline_syntax()
   v9.CheckScriptSuccess(lines)
 enddef
 
-def Test_list_vimscript()
+def Test_list_mnvscript()
   # checks line continuation and comments
   var lines =<< trim END
-      vim9script
+      mnv9script
       var mylist = [
             'one',
             # comment
@@ -1720,19 +1720,19 @@ if has('channel')
     try
       call FuncWithError()
     catch
-      call assert_match('Vim:E908:', v:exception)
+      call assert_match('MNV:E908:', v:exception)
     endtry
   endfunc
 endif
 
-def Test_vim9script_mix()
+def Test_mnv9script_mix()
   var lines =<< trim END
     if has(g:feature)
       " legacy script
       let g:legacy = 1
       finish
     endif
-    vim9script
+    mnv9script
     g:legacy = 0
   END
   g:feature = 'eval'
@@ -1746,25 +1746,25 @@ def Test_vim9script_mix()
   assert_equal(0, g:legacy)
 enddef
 
-def Test_vim9script_fails()
-  v9.CheckScriptFailure(['scriptversion 2', 'vim9script'], 'E1039:')
-  v9.CheckScriptFailure(['vim9script', 'scriptversion 2'], 'E1040:')
+def Test_mnv9script_fails()
+  v9.CheckScriptFailure(['scriptversion 2', 'mnv9script'], 'E1039:')
+  v9.CheckScriptFailure(['mnv9script', 'scriptversion 2'], 'E1040:')
 
-  v9.CheckScriptFailure(['vim9script', 'var str: string', 'str = 1234'], 'E1012:')
-  v9.CheckScriptFailure(['vim9script', 'const str = "asdf"', 'str = "xxx"'], 'E46:')
+  v9.CheckScriptFailure(['mnv9script', 'var str: string', 'str = 1234'], 'E1012:')
+  v9.CheckScriptFailure(['mnv9script', 'const str = "asdf"', 'str = "xxx"'], 'E46:')
 
-  assert_fails('vim9script', 'E1038:')
-  v9.CheckDefFailure(['vim9script'], 'E1038:')
+  assert_fails('mnv9script', 'E1038:')
+  v9.CheckDefFailure(['mnv9script'], 'E1038:')
 
   # no error when skipping
   if has('nothing')
-    vim9script
+    mnv9script
   endif
 enddef
 
 def Test_script_var_shadows_function()
   var lines =<< trim END
-      vim9script
+      mnv9script
       def Func(): number
         return 123
       enddef
@@ -1775,7 +1775,7 @@ enddef
 
 def Test_function_shadows_script_var()
   var lines =<< trim END
-      vim9script
+      mnv9script
       var Func = 1
       def Func(): number
         return 123
@@ -1799,18 +1799,18 @@ def Test_script_var_shadows_command()
   v9.CheckDefAndScriptFailure(lines, 'E1207:', 2)
 enddef
 
-def Test_vim9script_call_wrong_type()
+def Test_mnv9script_call_wrong_type()
   var lines =<< trim END
-      vim9script
+      mnv9script
       var Time = 'localtime'
       Time()
   END
   v9.CheckScriptFailure(lines, 'E1085:')
 enddef
 
-def Test_vim9script_reload_delfunc()
+def Test_mnv9script_reload_delfunc()
   var first_lines =<< trim END
-    vim9script
+    mnv9script
     def FuncYes(): string
       return 'yes'
     enddef
@@ -1832,26 +1832,26 @@ def Test_vim9script_reload_delfunc()
   END
 
   # FuncNo() is defined
-  writefile(first_lines + withno_lines, 'Xreloaded.vim', 'D')
-  source Xreloaded.vim
+  writefile(first_lines + withno_lines, 'Xreloaded.mnv', 'D')
+  source Xreloaded.mnv
   g:DoCheck(true)
 
   # FuncNo() is not redefined
-  writefile(first_lines + nono_lines, 'Xreloaded.vim')
-  source Xreloaded.vim
+  writefile(first_lines + nono_lines, 'Xreloaded.mnv')
+  source Xreloaded.mnv
   g:DoCheck(false)
 
   # FuncNo() is back
-  writefile(first_lines + withno_lines, 'Xreloaded.vim')
-  source Xreloaded.vim
+  writefile(first_lines + withno_lines, 'Xreloaded.mnv')
+  source Xreloaded.mnv
   g:DoCheck(false)
 enddef
 
-def Test_vim9script_reload_lambda_def_func()
+def Test_mnv9script_reload_lambda_def_func()
   CheckFeature timers
 
   var lines =<< trim END
-    vim9script
+    mnv9script
 
     def F()
       g:call_result += 1
@@ -1864,14 +1864,14 @@ def Test_vim9script_reload_lambda_def_func()
   END
 
   g:call_result = 0
-  writefile(lines, 'Xtest933.vim', 'D')
-  source Xtest933.vim
+  writefile(lines, 'Xtest933.mnv', 'D')
+  source Xtest933.mnv
 
   # Simulate the CmdlineLeave event that fires before the second :so
   doautocmd CmdlineLeave :
 
   # Re-source: F is redefined; without the fix this causes E933 when timer fires
-  source Xtest933.vim
+  source Xtest933.mnv
 
   # Allow the 0ms timer to fire
   sleep 10m
@@ -1882,39 +1882,39 @@ def Test_vim9script_reload_lambda_def_func()
   unlet! g:call_result
 enddef
 
-def Test_vim9script_reload_delvar()
+def Test_mnv9script_reload_delvar()
   # write the script with a script-local variable
   var lines =<< trim END
-    vim9script
+    mnv9script
     var name = 'string'
   END
-  writefile(lines, 'XreloadVar.vim', 'D')
-  source XreloadVar.vim
+  writefile(lines, 'XreloadVar.mnv', 'D')
+  source XreloadVar.mnv
 
   # now write the script using the same variable locally - works
   lines =<< trim END
-    vim9script
+    mnv9script
     def Func()
       var name = 'string'
     enddef
   END
-  writefile(lines, 'XreloadVar.vim')
-  source XreloadVar.vim
+  writefile(lines, 'XreloadVar.mnv')
+  source XreloadVar.mnv
 enddef
 
 def Test_func_redefine_error()
   var lines = [
-        'vim9script',
+        'mnv9script',
         'def Func()',
         '  eval [][0]',
         'enddef',
         'Func()',
         ]
-  writefile(lines, 'Xtestscript.vim', 'D')
+  writefile(lines, 'Xtestscript.mnv', 'D')
 
   for count in range(3)
     try
-      source Xtestscript.vim
+      source Xtestscript.mnv
     catch /E684/
       # function name should contain <SNR> every time
       assert_match('E684: List index out of range', v:exception)
@@ -1925,7 +1925,7 @@ enddef
 
 def Test_func_redefine_fails()
   var lines =<< trim END
-    vim9script
+    mnv9script
     def Func()
       echo 'one'
     enddef
@@ -1936,7 +1936,7 @@ def Test_func_redefine_fails()
   v9.CheckScriptFailure(lines, 'E1073:')
 
   lines =<< trim END
-    vim9script
+    mnv9script
     def Foo(): string
       return 'foo'
     enddef
@@ -1951,7 +1951,7 @@ enddef
 def Test_lambda_split()
   # this was using freed memory, because of the split expression
   var lines =<< trim END
-      vim9script
+      mnv9script
       try
       0
       0->(0
@@ -1977,17 +1977,17 @@ def Test_no_insert_xit()
   v9.CheckDefExecFailure(['t = 1'], 'E1100:')
   v9.CheckDefExecFailure(['x = 1'], 'E1100:')
 
-  v9.CheckScriptFailure(['vim9script', 'a = 1'], 'E488:')
-  v9.CheckScriptFailure(['vim9script', 'a'], 'E1100:')
-  v9.CheckScriptFailure(['vim9script', 'c = 1'], 'E488:')
-  v9.CheckScriptFailure(['vim9script', 'c'], 'E1100:')
-  v9.CheckScriptFailure(['vim9script', 'i = 1'], 'E488:')
-  v9.CheckScriptFailure(['vim9script', 'i'], 'E1100:')
-  v9.CheckScriptFailure(['vim9script', 'o = 1'], 'E1100:')
-  v9.CheckScriptFailure(['vim9script', 'o'], 'E1100:')
-  v9.CheckScriptFailure(['vim9script', 't'], 'E1100:')
-  v9.CheckScriptFailure(['vim9script', 't = 1'], 'E1100:')
-  v9.CheckScriptFailure(['vim9script', 'x = 1'], 'E1100:')
+  v9.CheckScriptFailure(['mnv9script', 'a = 1'], 'E488:')
+  v9.CheckScriptFailure(['mnv9script', 'a'], 'E1100:')
+  v9.CheckScriptFailure(['mnv9script', 'c = 1'], 'E488:')
+  v9.CheckScriptFailure(['mnv9script', 'c'], 'E1100:')
+  v9.CheckScriptFailure(['mnv9script', 'i = 1'], 'E488:')
+  v9.CheckScriptFailure(['mnv9script', 'i'], 'E1100:')
+  v9.CheckScriptFailure(['mnv9script', 'o = 1'], 'E1100:')
+  v9.CheckScriptFailure(['mnv9script', 'o'], 'E1100:')
+  v9.CheckScriptFailure(['mnv9script', 't'], 'E1100:')
+  v9.CheckScriptFailure(['mnv9script', 't = 1'], 'E1100:')
+  v9.CheckScriptFailure(['mnv9script', 'x = 1'], 'E1100:')
 enddef
 
 def s:IfElse(what: number): string
@@ -2062,7 +2062,7 @@ enddef
 
 def Test_if_else_func_using_var()
   var lines =<< trim END
-      vim9script
+      mnv9script
 
       const debug = true
       if debug
@@ -2084,7 +2084,7 @@ def Test_if_else_func_using_var()
   unlet g:where
 
   lines =<< trim END
-      vim9script
+      mnv9script
 
       const debug = false
       if debug
@@ -2320,10 +2320,10 @@ def Test_execute_cmd()
   endif
 enddef
 
-def Test_execute_cmd_vimscript()
+def Test_execute_cmd_mnvscript()
   # only checks line continuation
   var lines =<< trim END
-      vim9script
+      mnv9script
       execute 'g:someVar'
                 .. ' = ' ..
                    '28'
@@ -2336,7 +2336,7 @@ enddef
 def Test_execute_finish()
   # the empty lines are relevant here
   var lines =<< trim END
-      vim9script
+      mnv9script
 
       var vname = "g:hello"
 
@@ -2373,7 +2373,7 @@ def Test_echo_cmd()
 
   # Test for echoing a script local function name
   var lines =<< trim END
-    vim9script
+    mnv9script
     def ScriptLocalEcho()
     enddef
     echo ScriptLocalEcho
@@ -2394,10 +2394,10 @@ def Test_echomsg_cmd()
   v9.CheckDefFailure(['echomsg "xxx"# comment'], 'E488:')
 enddef
 
-def Test_echomsg_cmd_vimscript()
+def Test_echomsg_cmd_mnvscript()
   # only checks line continuation
   var lines =<< trim END
-      vim9script
+      mnv9script
       echomsg 'here'
                 .. ' is ' ..
                    'a message'
@@ -2415,10 +2415,10 @@ def Test_echoerr_cmd()
   endtry
 enddef
 
-def Test_echoerr_cmd_vimscript()
+def Test_echoerr_cmd_mnvscript()
   # only checks line continuation
   var lines =<< trim END
-      vim9script
+      mnv9script
       try
         echoerr 'this'
                 .. ' is ' ..
@@ -2458,7 +2458,7 @@ enddef
 
 def Test_for_outside_of_function()
   var lines =<< trim END
-    vim9script
+    mnv9script
     new
     for var in range(0, 3)
       append(line('$'), var)
@@ -2473,8 +2473,8 @@ def Test_for_outside_of_function()
     endfor
     assert_equal(' loop 1 loop 2 loop 3', result)
   END
-  writefile(lines, 'Xvim9for.vim', 'D')
-  source Xvim9for.vim
+  writefile(lines, 'Xmnv9for.mnv', 'D')
+  source Xmnv9for.mnv
 enddef
 
 def Test_for_skipped_block()
@@ -2902,7 +2902,7 @@ enddef
 
 def Test_define_global_closure_in_loops()
   var lines =<< trim END
-      vim9script
+      mnv9script
 
       def Func()
         for i in range(3)
@@ -2942,7 +2942,7 @@ enddef
 " Test for using a closure in a for loop after another for/while loop
 def Test_for_loop_with_closure_after_another_loop()
   var lines =<< trim END
-    vim9script
+    mnv9script
     def Fn()
       # first loop with a local variable
       for i in 'a'
@@ -2975,7 +2975,7 @@ def Test_for_loop_fails()
   v9.CheckDefAndScriptFailure(['for # in range(5)'], 'E690:')
   v9.CheckDefAndScriptFailure(['for i In range(5)'], 'E690:')
   v9.CheckDefAndScriptFailure(['var x = 5', 'for x in range(5)', 'endfor'], ['E1017:', 'E1041:'])
-  v9.CheckScriptFailure(['vim9script', 'var x = 5', 'for x in range(5)', '# comment', 'endfor'], 'E1041:', 3)
+  v9.CheckScriptFailure(['mnv9script', 'var x = 5', 'for x in range(5)', '# comment', 'endfor'], 'E1041:', 3)
   v9.CheckScriptFailure(['def Func(arg: any)', 'for arg in range(5)', 'enddef', 'defcompile'], 'E1006:')
   delfunc! g:Func
   v9.CheckDefFailure(['for i in xxx'], 'E1001:')
@@ -3088,7 +3088,7 @@ def Test_for_loop_fails()
 
   # Test for too many for loops
   lines =<< trim END
-    vim9script
+    mnv9script
     def Foo()
       for a in range(1)
         for b in range(1)
@@ -3122,9 +3122,9 @@ def Test_for_loop_script_var()
   # cannot use s:var in a :def function
   v9.CheckDefFailure(['for s:var in range(3)', 'echo 3'], 'E1254:')
 
-  # can use s:var in Vim9 script, with or without s:
+  # can use s:var in MNV9 script, with or without s:
   var lines =<< trim END
-    vim9script
+    mnv9script
     var total = 0
     for s:var in [1, 2, 3]
       total += s:var
@@ -3351,7 +3351,7 @@ enddef
 
 def Test_while_loop_in_script()
   var lines =<< trim END
-      vim9script
+      mnv9script
       var result = ''
       var cnt = 0
       while cnt < 3
@@ -3436,31 +3436,31 @@ def Test_automatic_line_continuation()
         )
 enddef
 
-def Test_vim9_comment()
+def Test_mnv9_comment()
   v9.CheckScriptSuccess([
-      'vim9script',
+      'mnv9script',
       '# something',
       '#something',
       '#{{something',
       ])
   v9.CheckScriptFailure([
-      'vim9script',
+      'mnv9script',
       '#{something',
       ], 'E1170:')
 
   split Xv9cfile
   v9.CheckScriptSuccess([
-      'vim9script',
+      'mnv9script',
       'edit #something',
       ])
   v9.CheckScriptSuccess([
-      'vim9script',
+      'mnv9script',
       'edit #{something',
       ])
   close
 
   v9.CheckScriptFailure([
-      'vim9script',
+      'mnv9script',
       ':# something',
       ], 'E488:')
   v9.CheckScriptFailure([
@@ -3485,15 +3485,15 @@ def Test_vim9_comment()
       'echo "yes"# comment',
       ], 'E488:')
   v9.CheckScriptSuccess([
-      'vim9script',
+      'mnv9script',
       'echo "yes" # something',
       ])
   v9.CheckScriptFailure([
-      'vim9script',
+      'mnv9script',
       'echo "yes"# something',
       ], 'E121:')
   v9.CheckScriptFailure([
-      'vim9script',
+      'mnv9script',
       'echo# something',
       ], 'E1144:')
   v9.CheckScriptFailure([
@@ -3505,15 +3505,15 @@ def Test_vim9_comment()
       'exe "echo"# comment',
       ], 'E488:')
   v9.CheckScriptSuccess([
-      'vim9script',
+      'mnv9script',
       'exe "echo" # something',
       ])
   v9.CheckScriptFailure([
-      'vim9script',
+      'mnv9script',
       'exe "echo"# something',
       ], 'E121:')
   v9.CheckScriptFailure([
-      'vim9script',
+      'mnv9script',
       'exe# something',
       ], 'E1144:')
   v9.CheckScriptFailure([
@@ -3527,7 +3527,7 @@ def Test_vim9_comment()
       'endtry',
       ], 'E1144:')
   v9.CheckScriptFailure([
-      'vim9script',
+      'mnv9script',
       'try# comment',
       'echo "yes"',
       ], 'E1144:')
@@ -3550,7 +3550,7 @@ def Test_vim9_comment()
       'endtry',
       ], 'E1144:')
   v9.CheckScriptFailure([
-      'vim9script',
+      'mnv9script',
       'try',
       '  echo "yes"',
       'catch# comment',
@@ -3569,7 +3569,7 @@ def Test_vim9_comment()
       'endtry# comment',
       ], 'E1144:')
   v9.CheckScriptFailure([
-      'vim9script',
+      'mnv9script',
       'try',
       '  echo "yes"',
       'catch',
@@ -3577,192 +3577,192 @@ def Test_vim9_comment()
       ], 'E1144:')
 
   v9.CheckScriptSuccess([
-      'vim9script',
+      'mnv9script',
       'hi # comment',
       ])
   v9.CheckScriptFailure([
-      'vim9script',
+      'mnv9script',
       'hi# comment',
       ], 'E1144:')
   v9.CheckScriptSuccess([
-      'vim9script',
+      'mnv9script',
       'hi Search # comment',
       ])
   v9.CheckScriptFailure([
-      'vim9script',
+      'mnv9script',
       'hi Search# comment',
       ], 'E416:')
   v9.CheckScriptSuccess([
-      'vim9script',
+      'mnv9script',
       'hi link This Search # comment',
       ])
   v9.CheckScriptFailure([
-      'vim9script',
+      'mnv9script',
       'hi link This That# comment',
       ], 'E413:')
   v9.CheckScriptSuccess([
-      'vim9script',
+      'mnv9script',
       'hi clear This # comment',
       'hi clear # comment',
       ])
   # not tested, because it doesn't give an error but a warning:
   # hi clear This# comment',
   v9.CheckScriptFailure([
-      'vim9script',
+      'mnv9script',
       'hi clear# comment',
       ], 'E416:')
 
   v9.CheckScriptSuccess([
-      'vim9script',
+      'mnv9script',
       'hi Group term=bold',
       'match Group /todo/ # comment',
       ])
   v9.CheckScriptFailure([
-      'vim9script',
+      'mnv9script',
       'hi Group term=bold',
       'match Group /todo/# comment',
       ], 'E488:')
   v9.CheckScriptSuccess([
-      'vim9script',
+      'mnv9script',
       'match # comment',
       ])
   v9.CheckScriptFailure([
-      'vim9script',
+      'mnv9script',
       'match# comment',
       ], 'E1144:')
   v9.CheckScriptSuccess([
-      'vim9script',
+      'mnv9script',
       'match none # comment',
       ])
   v9.CheckScriptFailure([
-      'vim9script',
+      'mnv9script',
       'match none# comment',
       ], 'E475:')
 
   v9.CheckScriptSuccess([
-      'vim9script',
+      'mnv9script',
       'menutrans clear # comment',
       ])
   v9.CheckScriptFailure([
-      'vim9script',
+      'mnv9script',
       'menutrans clear# comment text',
       ], 'E474:')
 
   v9.CheckScriptSuccess([
-      'vim9script',
+      'mnv9script',
       'syntax clear # comment',
       ])
   v9.CheckScriptFailure([
-      'vim9script',
+      'mnv9script',
       'syntax clear# comment text',
       ], 'E28:')
   v9.CheckScriptSuccess([
-      'vim9script',
+      'mnv9script',
       'syntax keyword Word some',
       'syntax clear Word # comment',
       ])
   v9.CheckScriptFailure([
-      'vim9script',
+      'mnv9script',
       'syntax keyword Word some',
       'syntax clear Word# comment text',
       ], 'E28:')
 
   v9.CheckScriptSuccess([
-      'vim9script',
+      'mnv9script',
       'syntax list # comment',
       ])
   v9.CheckScriptFailure([
-      'vim9script',
+      'mnv9script',
       'syntax list# comment text',
       ], 'E28:')
 
   v9.CheckScriptSuccess([
-      'vim9script',
+      'mnv9script',
       'syntax match Word /pat/ oneline # comment',
       ])
   v9.CheckScriptFailure([
-      'vim9script',
+      'mnv9script',
       'syntax match Word /pat/ oneline# comment',
       ], 'E475:')
 
   v9.CheckScriptSuccess([
-      'vim9script',
+      'mnv9script',
       'syntax keyword Word word # comm[ent',
       ])
   v9.CheckScriptFailure([
-      'vim9script',
+      'mnv9script',
       'syntax keyword Word word# comm[ent',
       ], 'E789:')
 
   v9.CheckScriptSuccess([
-      'vim9script',
+      'mnv9script',
       'syntax match Word /pat/ # comment',
       ])
   v9.CheckScriptFailure([
-      'vim9script',
+      'mnv9script',
       'syntax match Word /pat/# comment',
       ], 'E402:')
 
   v9.CheckScriptSuccess([
-      'vim9script',
+      'mnv9script',
       'syntax match Word /pat/ contains=Something # comment',
       ])
   v9.CheckScriptFailure([
-      'vim9script',
+      'mnv9script',
       'syntax match Word /pat/ contains=Something# comment',
       ], 'E475:')
   v9.CheckScriptFailure([
-      'vim9script',
+      'mnv9script',
       'syntax match Word /pat/ contains= # comment',
       ], 'E406:')
   v9.CheckScriptFailure([
-      'vim9script',
+      'mnv9script',
       'syntax match Word /pat/ contains=# comment',
       ], 'E475:')
 
   v9.CheckScriptSuccess([
-      'vim9script',
+      'mnv9script',
       'syntax region Word start=/pat/ end=/pat/ # comment',
       ])
   v9.CheckScriptFailure([
-      'vim9script',
+      'mnv9script',
       'syntax region Word start=/pat/ end=/pat/# comment',
       ], 'E402:')
 
   v9.CheckScriptSuccess([
-      'vim9script',
+      'mnv9script',
       'syntax sync # comment',
       ])
   v9.CheckScriptFailure([
-      'vim9script',
+      'mnv9script',
       'syntax sync# comment',
       ], 'E404:')
   v9.CheckScriptSuccess([
-      'vim9script',
+      'mnv9script',
       'syntax sync ccomment # comment',
       ])
   v9.CheckScriptFailure([
-      'vim9script',
+      'mnv9script',
       'syntax sync ccomment# comment',
       ], 'E404:')
 
   v9.CheckScriptSuccess([
-      'vim9script',
+      'mnv9script',
       'syntax cluster Some contains=Word # comment',
       ])
   v9.CheckScriptFailure([
-      'vim9script',
+      'mnv9script',
       'syntax cluster Some contains=Word# comment',
       ], 'E475:')
 
   v9.CheckScriptSuccess([
-      'vim9script',
+      'mnv9script',
       'command Echo echo # comment',
       'command Echo # comment',
       'delcommand Echo',
       ])
   v9.CheckScriptFailure([
-      'vim9script',
+      'mnv9script',
       'command Echo echo# comment',
       'Echo',
       ], 'E1144:')
@@ -3775,13 +3775,13 @@ def Test_vim9_comment()
       'delcommand Echo',
       ])
   v9.CheckScriptSuccess([
-      'vim9script',
+      'mnv9script',
       'command Echo cd # comment',
       'Echo',
       'delcommand Echo',
       ])
   v9.CheckScriptFailure([
-      'vim9script',
+      'mnv9script',
       'command Echo cd " comment',
       'Echo',
       ], 'E344:')
@@ -3789,58 +3789,58 @@ def Test_vim9_comment()
   chdir(curdir)
 
   v9.CheckScriptFailure([
-      'vim9script',
+      'mnv9script',
       'command Echo# comment',
       ], 'E182:')
   v9.CheckScriptFailure([
-      'vim9script',
+      'mnv9script',
       'command Echo echo',
       'command Echo# comment',
       ], 'E182:')
   delcommand Echo
 
   v9.CheckScriptSuccess([
-      'vim9script',
+      'mnv9script',
       'function # comment',
       ])
   v9.CheckScriptFailure([
-      'vim9script',
+      'mnv9script',
       'function " comment',
       ], 'E129:')
   v9.CheckScriptFailure([
-      'vim9script',
+      'mnv9script',
       'function# comment',
       ], 'E1144:')
   v9.CheckScriptSuccess([
-      'vim9script',
-      'import "./util/vim9.vim" as v9',
+      'mnv9script',
+      'import "./util/mnv9.mnv" as v9',
       'function v9.CheckScriptSuccess # comment',
       ])
   v9.CheckScriptFailure([
-      'vim9script',
-      'import "./util/vim9.vim" as v9',
+      'mnv9script',
+      'import "./util/mnv9.mnv" as v9',
       'function v9.CheckScriptSuccess# comment',
       ], 'E1048: Item not found in script: CheckScriptSuccess#')
 
   v9.CheckScriptSuccess([
-      'vim9script',
+      'mnv9script',
       'func g:DeleteMeA()',
       'endfunc',
       'delfunction g:DeleteMeA # comment',
       ])
   v9.CheckScriptFailure([
-      'vim9script',
+      'mnv9script',
       'func g:DeleteMeB()',
       'endfunc',
       'delfunction g:DeleteMeB# comment',
       ], 'E488:')
 
   v9.CheckScriptSuccess([
-      'vim9script',
+      'mnv9script',
       'call execute("ls") # comment',
       ])
   v9.CheckScriptFailure([
-      'vim9script',
+      'mnv9script',
       'call execute("ls")# comment',
       ], 'E488:')
 
@@ -3849,7 +3849,7 @@ def Test_vim9_comment()
       'enddef',
       ], 'E488:')
   v9.CheckScriptFailure([
-      'vim9script',
+      'mnv9script',
       'def Test() " comment',
       'enddef',
       ], 'E488:')
@@ -3860,7 +3860,7 @@ def Test_vim9_comment()
       'delfunc Test',
       ])
   v9.CheckScriptSuccess([
-      'vim9script',
+      'mnv9script',
       'func Test() " comment',
       'endfunc',
       ])
@@ -3875,7 +3875,7 @@ def Test_vim9_comment()
       ], 'E488:')
 
   var lines =<< trim END
-      vim9script
+      mnv9script
       syn region Text
       \ start='foo'
       #\ comment
@@ -3887,7 +3887,7 @@ def Test_vim9_comment()
   v9.CheckScriptSuccess(lines)
 
   lines =<< trim END
-      vim9script
+      mnv9script
       syn region Text
       \ start='foo'
       "\ comment
@@ -3896,24 +3896,24 @@ def Test_vim9_comment()
   v9.CheckScriptFailure(lines, 'E399:')
 enddef
 
-def Test_vim9_comment_gui()
+def Test_mnv9_comment_gui()
   CheckCanRunGui
 
   v9.CheckScriptFailure([
-      'vim9script',
+      'mnv9script',
       'gui#comment'
       ], 'E1144:')
   v9.CheckScriptFailure([
-      'vim9script',
+      'mnv9script',
       'gui -f#comment'
       ], 'E194:')
 enddef
 
-def Test_vim9_comment_not_compiled()
-  au TabEnter *.vim g:entered = 1
+def Test_mnv9_comment_not_compiled()
+  au TabEnter *.mnv g:entered = 1
   au TabEnter *.x g:entered = 2
 
-  edit test.vim
+  edit test.mnv
   doautocmd TabEnter #comment
   assert_equal(1, g:entered)
 
@@ -3930,7 +3930,7 @@ def Test_vim9_comment_not_compiled()
   unlet g:entered
 
   v9.CheckScriptSuccess([
-      'vim9script',
+      'mnv9script',
       'g:var = 123',
       'b:var = 456',
       'w:var = 777',
@@ -3939,42 +3939,42 @@ def Test_vim9_comment_not_compiled()
       ])
 
   v9.CheckScriptFailure([
-      'vim9script',
+      'mnv9script',
       'let var = 123',
-      ], 'E1126: Cannot use :let in Vim9 script')
+      ], 'E1126: Cannot use :let in MNV9 script')
 
   v9.CheckScriptFailure([
-      'vim9script',
+      'mnv9script',
       'var g:var = 123',
       ], 'E1016: Cannot declare a global variable:')
 
   v9.CheckScriptFailure([
-      'vim9script',
+      'mnv9script',
       'var b:var = 123',
       ], 'E1016: Cannot declare a buffer variable:')
 
   v9.CheckScriptFailure([
-      'vim9script',
+      'mnv9script',
       'var w:var = 123',
       ], 'E1016: Cannot declare a window variable:')
 
   v9.CheckScriptFailure([
-      'vim9script',
+      'mnv9script',
       'var t:var = 123',
       ], 'E1016: Cannot declare a tab variable:')
 
   v9.CheckScriptFailure([
-      'vim9script',
+      'mnv9script',
       'var v:version = 123',
       ], 'E1016: Cannot declare a v: variable:')
 
   v9.CheckScriptFailure([
-      'vim9script',
+      'mnv9script',
       'var $VARIABLE = "text"',
       ], 'E1016: Cannot declare an environment variable:')
 
   v9.CheckScriptFailure([
-      'vim9script',
+      'mnv9script',
       'g:var = 123',
       'unlet g:var# comment1',
       ], 'E108:')
@@ -3985,7 +3985,7 @@ def Test_vim9_comment_not_compiled()
       ], 'E488:')
 
   v9.CheckScriptSuccess([
-      'vim9script',
+      'mnv9script',
       'if 1 # comment2',
       '  echo "yes"',
       'elseif 2 #comment',
@@ -3994,14 +3994,14 @@ def Test_vim9_comment_not_compiled()
       ])
 
   v9.CheckScriptFailure([
-      'vim9script',
+      'mnv9script',
       'if 1# comment3',
       '  echo "yes"',
       'endif',
       ], 'E488:')
 
   v9.CheckScriptFailure([
-      'vim9script',
+      'mnv9script',
       'if 0 # comment4',
       '  echo "yes"',
       'elseif 2#comment',
@@ -4010,17 +4010,17 @@ def Test_vim9_comment_not_compiled()
       ], 'E488:')
 
   v9.CheckScriptSuccess([
-      'vim9script',
+      'mnv9script',
       'var v = 1 # comment5',
       ])
 
   v9.CheckScriptFailure([
-      'vim9script',
+      'mnv9script',
       'var v = 1# comment6',
       ], 'E488:')
 
   v9.CheckScriptSuccess([
-      'vim9script',
+      'mnv9script',
       'new',
       'setline(1, ["# define pat", "last"])',
       ':$',
@@ -4029,7 +4029,7 @@ def Test_vim9_comment_not_compiled()
       ])
 
   v9.CheckScriptFailure([
-      'vim9script',
+      'mnv9script',
       'new',
       'setline(1, ["# define pat", "last"])',
       ':$',
@@ -4038,14 +4038,14 @@ def Test_vim9_comment_not_compiled()
       ], 'E488:')
 
   v9.CheckScriptFailure([
-      'vim9script',
+      'mnv9script',
       'func! SomeFunc()',
       ], 'E477:')
 enddef
 
 def Test_finish()
   var lines =<< trim END
-    vim9script
+    mnv9script
     g:res = 'one'
     if v:false | finish | endif
     g:res = 'two'
@@ -4061,7 +4061,7 @@ enddef
 
 def Test_forward_declaration()
   var lines =<< trim END
-    vim9script
+    mnv9script
     def GetValue(): string
       return theVal
     enddef
@@ -4081,7 +4081,7 @@ enddef
 
 def Test_declare_script_var_in_func()
   var lines =<< trim END
-      vim9script
+      mnv9script
       func Declare()
         let s:local = 123
       endfunc
@@ -4092,7 +4092,7 @@ enddef
 
 def Test_lock_script_var()
   var lines =<< trim END
-      vim9script
+      mnv9script
       var local = 123
       assert_equal(123, local)
 
@@ -4116,10 +4116,10 @@ def Test_lock_script_var()
 enddef
 
 
-func Test_vim9script_not_global()
-  " check that items defined in Vim9 script are script-local, not global
-  let vim9lines =<< trim END
-    vim9script
+func Test_mnv9script_not_global()
+  " check that items defined in MNV9 script are script-local, not global
+  let mnv9lines =<< trim END
+    mnv9script
     var name = 'local'
     func TheFunc()
       echo 'local'
@@ -4128,8 +4128,8 @@ func Test_vim9script_not_global()
       echo 'local'
     enddef
   END
-  call writefile(vim9lines, 'Xvim9script.vim', 'D')
-  source Xvim9script.vim
+  call writefile(mnv9lines, 'Xmnv9script.mnv', 'D')
+  source Xmnv9script.mnv
   try
     echo g:var
     assert_report('did not fail')
@@ -4150,7 +4150,7 @@ func Test_vim9script_not_global()
   endtry
 endfunc
 
-def Test_vim9_copen()
+def Test_mnv9_copen()
   CheckFeature quickfix
   # this was giving an error for setting w:quickfix_title
   copen
@@ -4159,7 +4159,7 @@ enddef
 
 def Test_script_var_in_autocmd()
   # using a script variable from an autocommand, defined in a :def function in a
-  # legacy Vim script, cannot check the variable type.
+  # legacy MNV script, cannot check the variable type.
   var lines =<< trim END
     let s:counter = 1
     def s:Func()
@@ -4181,7 +4181,7 @@ def Test_error_in_autoload_script()
   mkdir(dir .. '/autoload', 'pR')
 
   var lines =<< trim END
-      vim9script noclear
+      mnv9script noclear
       export def Autoloaded()
       enddef
       def Broken()
@@ -4190,10 +4190,10 @@ def Test_error_in_autoload_script()
       enddef
       Broken()
   END
-  writefile(lines, dir .. '/autoload/script.vim')
+  writefile(lines, dir .. '/autoload/script.mnv')
 
   lines =<< trim END
-      vim9script
+      mnv9script
       def CallAutoloaded()
         script#Autoloaded()
       enddef
@@ -4213,11 +4213,11 @@ def Test_error_in_autoload_script()
   &rtp = save_rtp
 enddef
 
-" Test for sourcing a Vim9 script with a function script variable and "noclear".
+" Test for sourcing a MNV9 script with a function script variable and "noclear".
 " The type for the variable is dynamically allocated and should be freed.
 def Test_source_func_script_var()
   var lines =<< trim END
-    vim9script noclear
+    mnv9script noclear
     var Fn: func(list<any>): any
     Fn = function('min')
     assert_equal(2, Fn([4, 2]))
@@ -4231,19 +4231,19 @@ enddef
 
 def Test_error_in_autoload_script_foldexpr()
   var save_rtp = &rtp
-  mkdir('Xvim/autoload', 'pR')
-  &runtimepath = 'Xvim'
+  mkdir('Xmnv/autoload', 'pR')
+  &runtimepath = 'Xmnv'
 
   var lines =<< trim END
-      vim9script
+      mnv9script
       eval [][0]
       echomsg 'no error'
   END
-  lines->writefile('Xvim/autoload/script.vim')
+  lines->writefile('Xmnv/autoload/script.mnv')
 
   lines =<< trim END
-      vim9script
-      import autoload 'script.vim'
+      mnv9script
+      import autoload 'script.mnv'
       &foldmethod = 'expr'
       &foldexpr = 'script.Func()'
       redraw
@@ -4254,21 +4254,21 @@ enddef
 def Test_invalid_sid()
   assert_fails('func <SNR>1234_func', 'E123:')
 
-  if g:RunVim([], ['wq! Xdidit'], '+"func <SNR>1_func"')
+  if g:RunMNV([], ['wq! Xdidit'], '+"func <SNR>1_func"')
     assert_equal([], readfile('Xdidit'))
   endif
   delete('Xdidit')
 enddef
 
 def Test_restoring_cpo()
-  writefile(['vim9script', 'set nocp'], 'Xsourced', 'D')
+  writefile(['mnv9script', 'set nocp'], 'Xsourced', 'D')
   writefile(['call writefile(["done"], "Xdone")', 'quit!'], 'Xclose', 'D')
-  if g:RunVim([], [], '-u NONE +"set cpo+=a" -S Xsourced -S Xclose')
+  if g:RunMNV([], [], '-u NONE +"set cpo+=a" -S Xsourced -S Xclose')
     assert_equal(['done'], readfile('Xdone'))
   endif
   delete('Xdone')
 
-  writefile(['vim9script', 'g:cpoval = &cpo'], 'XanotherScript', 'D')
+  writefile(['mnv9script', 'g:cpoval = &cpo'], 'XanotherScript', 'D')
   set cpo=aABceFsMny>
   edit XanotherScript
   so %
@@ -4281,21 +4281,21 @@ def Test_restoring_cpo()
   assert_equal('aABceFsMny>', &cpo)
   assert_equal('aABceFsMny>', g:cpoval)
 
-  set cpo&vim
+  set cpo&mnv
   unlet g:cpoval
 
   if has('unix')
-    # 'cpo' is not restored in main vimrc
+    # 'cpo' is not restored in main mnvrc
     var save_HOME = $HOME
     $HOME = getcwd() .. '/Xhome'
     mkdir('Xhome', 'R')
     var lines =<< trim END
-        vim9script
+        mnv9script
         writefile(['before: ' .. &cpo], 'Xrporesult')
         set cpo+=M
         writefile(['after: ' .. &cpo], 'Xrporesult', 'a')
     END
-    writefile(lines, 'Xhome/.vimrc')
+    writefile(lines, 'Xhome/.mnvrc')
 
     lines =<< trim END
         call writefile(['later: ' .. &cpo], 'Xrporesult', 'a')
@@ -4303,13 +4303,13 @@ def Test_restoring_cpo()
     writefile(lines, 'Xlegacy', 'D')
 
     lines =<< trim END
-        vim9script
-        call writefile(['vim9: ' .. &cpo], 'Xrporesult', 'a')
+        mnv9script
+        call writefile(['mnv9: ' .. &cpo], 'Xrporesult', 'a')
         qa
     END
-    writefile(lines, 'Xvim9', 'D')
+    writefile(lines, 'Xmnv9', 'D')
 
-    var cmd = g:GetVimCommand() .. " -S Xlegacy -S Xvim9"
+    var cmd = g:GetMNVCommand() .. " -S Xlegacy -S Xmnv9"
     cmd = substitute(cmd, '-u NONE', '', '')
     exe "silent !" .. cmd
 
@@ -4317,7 +4317,7 @@ def Test_restoring_cpo()
         'before: aABceFsz',
         'after: aABceFszM',
         'later: aABceFszM',
-        'vim9: aABceFsz'], readfile('Xrporesult'))
+        'mnv9: aABceFsz'], readfile('Xrporesult'))
 
     $HOME = save_HOME
     delete('Xrporesult')
@@ -4334,28 +4334,28 @@ endfunc
 def Run_test_no_redraw_when_restoring_cpo()
   CheckScreendump
   var lines =<< trim END
-    vim9script
+    mnv9script
     export def Func()
     enddef
   END
   mkdir('Xnordir/autoload', 'pR')
-  writefile(lines, 'Xnordir/autoload/script.vim')
+  writefile(lines, 'Xnordir/autoload/script.mnv')
 
   lines =<< trim END
-      vim9script
+      mnv9script
       set cpo+=M
       exe 'set rtp^=' .. getcwd() .. '/Xnordir'
       au CmdlineEnter : ++once timer_start(0, (_) => script#Func())
       setline(1, 'some text')
   END
   writefile(lines, 'XTest_redraw_cpo', 'D')
-  var buf = g:RunVimInTerminal('-S XTest_redraw_cpo', {'rows': 6})
+  var buf = g:RunMNVInTerminal('-S XTest_redraw_cpo', {'rows': 6})
   term_sendkeys(buf, "V:")
-  g:VerifyScreenDump(buf, 'Test_vim9_no_redraw', {})
+  g:VerifyScreenDump(buf, 'Test_mnv9_no_redraw', {})
 
   # clean up
   term_sendkeys(buf, "\<Esc>u")
-  g:StopVimInTerminal(buf)
+  g:StopMNVInTerminal(buf)
 enddef
 
 func Test_reject_declaration()
@@ -4365,15 +4365,15 @@ endfunc
 
 def Run_test_reject_declaration()
   CheckScreendump
-  var buf = g:RunVimInTerminal('', {'rows': 6})
-  term_sendkeys(buf, ":vim9cmd var x: number\<CR>")
-  g:VerifyScreenDump(buf, 'Test_vim9_reject_declaration_1', {})
+  var buf = g:RunMNVInTerminal('', {'rows': 6})
+  term_sendkeys(buf, ":mnv9cmd var x: number\<CR>")
+  g:VerifyScreenDump(buf, 'Test_mnv9_reject_declaration_1', {})
   term_sendkeys(buf, ":\<CR>")
-  term_sendkeys(buf, ":vim9cmd g:foo = 123 | echo g:foo\<CR>")
-  g:VerifyScreenDump(buf, 'Test_vim9_reject_declaration_2', {})
+  term_sendkeys(buf, ":mnv9cmd g:foo = 123 | echo g:foo\<CR>")
+  g:VerifyScreenDump(buf, 'Test_mnv9_reject_declaration_2', {})
 
   # clean up
-  g:StopVimInTerminal(buf)
+  g:StopMNVInTerminal(buf)
 enddef
 
 def Test_minimal_command_name_length()
@@ -4421,13 +4421,13 @@ def Test_minimal_command_name_length()
   endfor
 
   var lines =<< trim END
-      vim9script
+      mnv9script
       def SomeFunc()
       endd
   END
   v9.CheckScriptFailure(lines, 'E1065:')
   lines =<< trim END
-      vim9script
+      mnv9script
       def SomeFunc()
       endde
   END
@@ -4443,14 +4443,14 @@ def Test_unset_any_variable()
 enddef
 
 func Test_define_func_at_command_line()
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   " call indirectly to avoid compilation error for missing functions
   call Run_Test_define_func_at_command_line()
 endfunc
 
 def Run_Test_define_func_at_command_line()
-  # run in a separate Vim instance to avoid the script context
+  # run in a separate MNV instance to avoid the script context
   var lines =<< trim END
     func CheckAndQuit()
       call assert_fails('call Afunc()', 'E117: Unknown function: Bfunc')
@@ -4459,18 +4459,18 @@ def Run_Test_define_func_at_command_line()
   END
   writefile([''], 'Xdidcmd', 'D')
   writefile(lines, 'XcallFunc', 'D')
-  var buf = g:RunVimInTerminal('-S XcallFunc', {rows: 6})
+  var buf = g:RunMNVInTerminal('-S XcallFunc', {rows: 6})
   # define Afunc() on the command line
   term_sendkeys(buf, ":def Afunc()\<CR>Bfunc()\<CR>enddef\<CR>")
   term_sendkeys(buf, ":call CheckAndQuit()\<CR>")
   g:WaitForAssert(() => assert_equal(['errors: []'], readfile('Xdidcmd')))
 
-  call g:StopVimInTerminal(buf)
+  call g:StopMNVInTerminal(buf)
 enddef
 
 def Test_script_var_scope()
   var lines =<< trim END
-      vim9script
+      mnv9script
       if true
         if true
           var one = 'one'
@@ -4482,7 +4482,7 @@ def Test_script_var_scope()
   v9.CheckScriptFailure(lines, 'E121:', 7)
 
   lines =<< trim END
-      vim9script
+      mnv9script
       if true
         if false
           var one = 'one'
@@ -4497,7 +4497,7 @@ def Test_script_var_scope()
   v9.CheckScriptFailure(lines, 'E121:', 10)
 
   lines =<< trim END
-      vim9script
+      mnv9script
       while true
         var one = 'one'
         echo one
@@ -4508,7 +4508,7 @@ def Test_script_var_scope()
   v9.CheckScriptFailure(lines, 'E121:', 7)
 
   lines =<< trim END
-      vim9script
+      mnv9script
       for i in range(1)
         var one = 'one'
         echo one
@@ -4518,7 +4518,7 @@ def Test_script_var_scope()
   v9.CheckScriptFailure(lines, 'E121:', 6)
 
   lines =<< trim END
-      vim9script
+      mnv9script
       {
         var one = 'one'
         assert_equal('one', one)
@@ -4529,7 +4529,7 @@ def Test_script_var_scope()
   v9.CheckScriptSuccess(lines)
 
   lines =<< trim END
-      vim9script
+      mnv9script
       {
         var one = 'one'
         echo one
@@ -4541,7 +4541,7 @@ enddef
 
 def Test_catch_exception_in_callback()
   var lines =<< trim END
-    vim9script
+    mnv9script
     def Callback(...l: list<any>)
       try
         var x: string
@@ -4570,7 +4570,7 @@ def Test_no_unknown_error_after_error()
     throw 'Skipped: does not work on MS-Windows'
   endif
   var lines =<< trim END
-      vim9script
+      mnv9script
       var source: list<number>
       def Out_cb(...l: list<any>)
           eval [][0]
@@ -4625,7 +4625,7 @@ enddef
 
 def Test_script_var_gone_when_sourced_twice()
   var lines =<< trim END
-      vim9script
+      mnv9script
       if exists('g:guard')
         finish
       endif
@@ -4638,12 +4638,12 @@ def Test_script_var_gone_when_sourced_twice()
         name = arg
       enddef
   END
-  writefile(lines, 'XscriptTwice.vim', 'D')
-  so XscriptTwice.vim
+  writefile(lines, 'XscriptTwice.mnv', 'D')
+  so XscriptTwice.mnv
   assert_equal('thename', g:GetName())
   g:SetName('newname')
   assert_equal('newname', g:GetName())
-  so XscriptTwice.vim
+  so XscriptTwice.mnv
   assert_fails('call g:GetName()', 'E1149:')
   assert_fails('call g:SetName("x")', 'E1149:')
 
@@ -4701,7 +4701,7 @@ enddef
 
 def Test_mapping_line_number()
   var lines =<< trim END
-      vim9script
+      mnv9script
       def g:FuncA()
           # Some comment
           FuncB(0)
@@ -4771,7 +4771,7 @@ enddef
 
 def Test_option_set_line_number()
   var lines =<< trim END
-      vim9script
+      mnv9script
       # line2
       # line3
       def F()
@@ -4826,7 +4826,7 @@ def Test_xxx_echoerr_line_number()
 enddef
 
 func Test_debug_with_lambda()
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   " call indirectly to avoid compilation error for missing functions
   call Run_Test_debug_with_lambda()
@@ -4834,7 +4834,7 @@ endfunc
 
 def Run_Test_debug_with_lambda()
   var lines =<< trim END
-      vim9script
+      mnv9script
       def Func()
         var n = 0
         echo [0]->filter((_, v) => v == n)
@@ -4843,17 +4843,17 @@ def Run_Test_debug_with_lambda()
       Func()
   END
   writefile(lines, 'XdebugFunc', 'D')
-  var buf = g:RunVimInTerminal('-S XdebugFunc', {rows: 10, wait_for_ruler: 0})
+  var buf = g:RunMNVInTerminal('-S XdebugFunc', {rows: 10, wait_for_ruler: 0})
   g:WaitForAssert(() => assert_match('^>', term_getline(buf, 10)))
 
   term_sendkeys(buf, "cont\<CR>")
   g:WaitForAssert(() => assert_match('\[0\]', term_getline(buf, 9)))
 
-  g:StopVimInTerminal(buf)
+  g:StopMNVInTerminal(buf)
 enddef
 
 func Test_debug_running_out_of_lines()
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   " call indirectly to avoid compilation error for missing functions
   call Run_Test_debug_running_out_of_lines()
@@ -4861,7 +4861,7 @@ endfunc
 
 def Run_Test_debug_running_out_of_lines()
   var lines =<< trim END
-      vim9script
+      mnv9script
       def Crash()
           #
           #
@@ -4878,7 +4878,7 @@ def Run_Test_debug_running_out_of_lines()
       Crash()
   END
   writefile(lines, 'XdebugFunc', 'D')
-  var buf = g:RunVimInTerminal('-S XdebugFunc', {rows: 10, wait_for_ruler: 0})
+  var buf = g:RunMNVInTerminal('-S XdebugFunc', {rows: 10, wait_for_ruler: 0})
   g:WaitForAssert(() => assert_match('^>', term_getline(buf, 10)))
 
   term_sendkeys(buf, "next\<CR>")
@@ -4888,12 +4888,12 @@ def Run_Test_debug_running_out_of_lines()
   term_sendkeys(buf, "cont\<CR>")
   g:TermWait(buf)
 
-  g:StopVimInTerminal(buf)
+  g:StopMNVInTerminal(buf)
 enddef
 
 def Test_ambiguous_command_error()
   var lines =<< trim END
-      vim9script
+      mnv9script
       command CmdA echomsg 'CmdA'
       command CmdB echomsg 'CmdB'
       Cmd
@@ -4901,7 +4901,7 @@ def Test_ambiguous_command_error()
   v9.CheckScriptFailure(lines, 'E464: Ambiguous use of user-defined command: Cmd', 4)
 
   lines =<< trim END
-      vim9script
+      mnv9script
       def Func()
         Cmd
       enddef
@@ -4910,7 +4910,7 @@ def Test_ambiguous_command_error()
   v9.CheckScriptFailure(lines, 'E464: Ambiguous use of user-defined command: Cmd', 1)
 
   lines =<< trim END
-      vim9script
+      mnv9script
       nnoremap <F3> <ScriptCmd>Cmd<CR>
       feedkeys("\<F3>", 'xt')
   END
@@ -4921,13 +4921,13 @@ def Test_ambiguous_command_error()
   nunmap <F3>
 enddef
 
-" Execute this near the end, profiling doesn't stop until Vim exits.
+" Execute this near the end, profiling doesn't stop until MNV exits.
 " This only tests that it works, not the profiling output.
 def Test_profile_with_lambda()
   CheckFeature profile
 
   var lines =<< trim END
-      vim9script
+      mnv9script
 
       def ProfiledWithLambda()
         var n = 3
@@ -4977,10 +4977,10 @@ def Test_profile_with_lambda()
         writefile([result], 'Xdidprofile')
       endtry
   END
-  writefile(lines, 'Xprofile.vim', 'D')
-  call system(g:GetVimCommand()
+  writefile(lines, 'Xprofile.mnv', 'D')
+  call system(g:GetMNVCommand()
         .. ' --clean'
-        .. ' -c "so Xprofile.vim"'
+        .. ' -c "so Xprofile.mnv"'
         .. ' -c "qall!"')
   call assert_equal(0, v:shell_error)
 
@@ -4992,18 +4992,18 @@ enddef
 
 func Test_misplaced_type()
   CheckScreendump
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
   call Run_Test_misplaced_type()
 endfunc
 
 def Run_Test_misplaced_type()
   CheckScreendump
   writefile(['let g:somevar = "asdf"'], 'XTest_misplaced_type', 'D')
-  var buf = g:RunVimInTerminal('-S XTest_misplaced_type', {'rows': 6})
-  term_sendkeys(buf, ":vim9cmd echo islocked('somevar: string')\<CR>")
+  var buf = g:RunMNVInTerminal('-S XTest_misplaced_type', {'rows': 6})
+  term_sendkeys(buf, ":mnv9cmd echo islocked('somevar: string')\<CR>")
   g:VerifyScreenDump(buf, 'Test_misplaced_type', {})
 
-  g:StopVimInTerminal(buf)
+  g:StopMNVInTerminal(buf)
 enddef
 
 " Ensure echo doesn't crash when stringifying empty variables.
@@ -5048,7 +5048,7 @@ enddef
 def Test_free_type_before_use()
   # this rather complicated script was freeing a type before using it
   var lines =<< trim END
-      vim9script
+      mnv9script
 
       def Scan(rel: list<dict<any>>): func(func(dict<any>))
         return (Emit: func(dict<any>)) => {
@@ -5080,7 +5080,7 @@ enddef
 " memory was reallocated (Github issue #13178)
 def Test_refer_funcref_instr_after_realloc()
   var lines =<< trim END
-    vim9script
+    mnv9script
     def A(d: bool)
       var e = abs(0)
       var f = &emoji
@@ -5128,7 +5128,7 @@ enddef
 " Test for calling a deferred function after an exception
 def Test_defer_after_exception()
   var lines =<< trim END
-    vim9script
+    mnv9script
 
     var callTrace: list<number> = []
     def Bar()
@@ -5169,7 +5169,7 @@ enddef
 " not propagated into the calling functions.
 def Test_multidefer_with_exception()
   var lines =<< trim END
-    vim9script
+    mnv9script
 
     var callTrace: list<number> = []
     def Except()
@@ -5238,7 +5238,7 @@ enddef
 " Test for using defer without parenthesis for the function name
 def Test_defer_func_without_paren()
   var lines =<< trim END
-    vim9script
+    mnv9script
     def Foo()
       defer Bar
     enddef
@@ -5250,7 +5250,7 @@ enddef
 " Test for using defer without parenthesis for the function name
 def Test_defer_non_existing_func()
   var lines =<< trim END
-    vim9script
+    mnv9script
     def Foo()
       defer Bar()
     enddef
@@ -5262,7 +5262,7 @@ enddef
 " Test for using defer with an invalid function name
 def Test_defer_invalid_func()
   var lines =<< trim END
-    vim9script
+    mnv9script
     def Foo()
       var Abc = 10
       defer Abc()
@@ -5275,7 +5275,7 @@ enddef
 " Test for using defer with an invalid argument to a function
 def Test_defer_invalid_func_arg()
   var lines =<< trim END
-    vim9script
+    mnv9script
     def Bar(x: number)
     enddef
     def Foo()
@@ -5289,7 +5289,7 @@ enddef
 " Test for using defer with a lambda funcref
 def Test_defer_lambda_funcref()
   var lines =<< trim END
-    vim9script
+    mnv9script
     var lfr_result = ''
     def Foo()
       var Fn = () => {
@@ -5306,7 +5306,7 @@ enddef
 " Test for using defer with a lambda and a command block
 def Test_defer_lambda_func()
   var lines =<< trim END
-    vim9script
+    mnv9script
     var result = ''
     def Foo()
       result = 'xxx'
@@ -5323,7 +5323,7 @@ def Test_defer_lambda_func()
 
   # Error: argument type mismatch
   lines =<< trim END
-    vim9script
+    mnv9script
     def Foo()
       defer (a: number, b: string): number => {
         return 0
@@ -5335,7 +5335,7 @@ def Test_defer_lambda_func()
 
   # Error: not enough arguments
   lines =<< trim END
-    vim9script
+    mnv9script
     def Foo()
       defer (a: number) => {
       }()
@@ -5346,7 +5346,7 @@ def Test_defer_lambda_func()
 
   # Error: too many arguments
   lines =<< trim END
-    vim9script
+    mnv9script
     def Foo()
       defer () => {
       }(10)
@@ -5357,7 +5357,7 @@ def Test_defer_lambda_func()
 
   # Error: invalid command in command-block
   lines =<< trim END
-    vim9script
+    mnv9script
     def Foo()
       defer () => {
         xxx
@@ -5369,7 +5369,7 @@ def Test_defer_lambda_func()
 
   # Error: missing return
   lines =<< trim END
-    vim9script
+    mnv9script
     def Foo()
       defer (): number => {
       }()
@@ -5380,7 +5380,7 @@ def Test_defer_lambda_func()
 
   # Error: missing lambda body
   lines =<< trim END
-    vim9script
+    mnv9script
     def Foo()
       defer (a: number): number
     enddef
@@ -5390,7 +5390,7 @@ def Test_defer_lambda_func()
 
   # Error: invalid lambda syntax
   lines =<< trim END
-    vim9script
+    mnv9script
     def Foo()
       defer (
     enddef
@@ -5400,7 +5400,7 @@ def Test_defer_lambda_func()
 
   # Error: lambda without arguments
   lines =<< trim END
-    vim9script
+    mnv9script
     def Foo()
       defer () => {
       }
@@ -5414,7 +5414,7 @@ enddef
 " Test for using an non-existing type in a "for" statement.
 def Test_invalid_type_in_for()
   var lines =<< trim END
-    vim9script
+    mnv9script
     def Foo()
       for b: x in range(10)
       endfor
@@ -5428,7 +5428,7 @@ enddef
 " statement.
 def Test_for_stmt_space_before_type()
   var lines =<< trim END
-    vim9script
+    mnv9script
     def Foo()
       for a
            :number in range(10)
@@ -5442,7 +5442,7 @@ enddef
 " This test used to cause a use-after-free memory access
 def Test_for_empty_line_after_lambda()
   var lines =<< trim END
-    vim9script
+    mnv9script
     echomsg range(0, 2)->map((_, v) => {
       return 1
     })
@@ -5452,7 +5452,7 @@ def Test_for_empty_line_after_lambda()
   v9.CheckSourceSuccess(lines)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     echomsg range(0, 1)->map((_, v) => {
       return 1
     }) range(0, 1)->map((_, v) => {
@@ -5467,7 +5467,7 @@ enddef
 " Test for evaluating a lambda block from a string
 def Test_eval_lambda_block()
   var lines =<< trim END
-    vim9script
+    mnv9script
     var Fn = eval("(x: number): number => {\nreturn x * 2\n}")
     assert_equal(6, Fn(3))
   END
@@ -5509,20 +5509,20 @@ enddef
 " Test for using an unknown type in a typecast
 def Test_unknown_type_in_typecast()
   var lines =<< trim END
-    vim9script
+    mnv9script
     var a = <MyType>b
   END
   v9.CheckSourceFailure(lines, 'E1010: Type not recognized: MyType', 2)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     var Fn = <funcx(number, number): number>b
   END
   v9.CheckSourceFailure(lines, 'E1010: Type not recognized: funcx(number, number): number', 2)
 
   # Wrong type in a type cast
   lines =<< trim END
-    vim9script
+    mnv9script
     var i: number = <number>true
   END
   v9.CheckSourceFailure(lines, 'E1012: Type mismatch; expected number but got bool', 2)
@@ -5532,7 +5532,7 @@ enddef
 " This exercises some conditions in the assignment statement parsing code.
 def Test_method_call_with_list_arg()
   var lines =<< trim END
-    vim9script
+    mnv9script
 
     def Foo(l: list<number>)
       g:save_list = l
@@ -5554,7 +5554,7 @@ enddef
 " Test for using more than one has() check in a compound if condition.
 def Test_has_func_shortcircuit()
   var lines =<< trim END
-    vim9script
+    mnv9script
     def Has_And1_Cond(): string
       # true && false
       if has('jumplist') && has('foobar')
@@ -5567,7 +5567,7 @@ def Test_has_func_shortcircuit()
   v9.CheckSourceSuccess(lines)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     def Has_And2_Cond(): string
       # false && true
       if has('foobar') && has('jumplist')
@@ -5580,7 +5580,7 @@ def Test_has_func_shortcircuit()
   v9.CheckSourceSuccess(lines)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     def Has_And3_Cond(): string
       # false && false
       if has('foobar') && has('foobaz')
@@ -5593,7 +5593,7 @@ def Test_has_func_shortcircuit()
   v9.CheckSourceSuccess(lines)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     def Has_Or1_Cond(): string
       # true || false
       if has('jumplist') || has('foobar')
@@ -5606,7 +5606,7 @@ def Test_has_func_shortcircuit()
   v9.CheckSourceSuccess(lines)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     def Has_Or2_Cond(): string
       # false || true
       if has('foobar') || has('jumplist')
@@ -5619,7 +5619,7 @@ def Test_has_func_shortcircuit()
   v9.CheckSourceSuccess(lines)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     def Has_Or3_Cond(): string
       # false || false
       if has('foobar') || has('foobaz')
@@ -5676,7 +5676,7 @@ enddef
 def Test_if_cond_shortcircuit_skip_indexing()
   # indexing a list
   var lines =<< trim END
-    vim9script
+    mnv9script
     def Foo(): string
       const l = [false]
       if false && l[0]
@@ -5693,7 +5693,7 @@ def Test_if_cond_shortcircuit_skip_indexing()
 
   # indexing a tuple
   lines =<< trim END
-    vim9script
+    mnv9script
     def Foo(): string
       const t = (false)
       if false && t[0]
@@ -5710,7 +5710,7 @@ def Test_if_cond_shortcircuit_skip_indexing()
 
   # indexing a dict
   lines =<< trim END
-    vim9script
+    mnv9script
     def Foo(): string
       const d = {x: false}
       if false && d['x']
@@ -5727,7 +5727,7 @@ def Test_if_cond_shortcircuit_skip_indexing()
 
   # indexing a blob
   lines =<< trim END
-    vim9script
+    mnv9script
     def Foo(): string
       const b = 0z00
       if false && b[0]
@@ -5746,7 +5746,7 @@ enddef
 " Test for defining a dict with multiple keys in a command-block
 def Test_multikey_dict_in_block()
   var lines =<< trim END
-    vim9script
+    mnv9script
     command NewCommand {
          g:TestDict = {
            'key': 'v1',
@@ -5762,7 +5762,7 @@ enddef
 " Test for using the type() function with void
 def Test_type_func_with_void()
   var lines =<< trim END
-    vim9script
+    mnv9script
     def GetVoidValue(): void
     enddef
     echo type(GetVoidValue())
@@ -5778,23 +5778,23 @@ def Test_substitute_cmd()
   assert_equal('otherthing', getline(1))
   bwipe!
 
-  # also when the context is Vim9 script
+  # also when the context is MNV9 script
   var lines =<< trim END
-    vim9script
+    mnv9script
     new
     setline(1, 'something')
     :substitute(some(other(
     assert_equal('otherthing', getline(1))
     bwipe!
   END
-  writefile(lines, 'Xvim9lines', 'D')
-  source Xvim9lines
+  writefile(lines, 'Xmnv9lines', 'D')
+  source Xmnv9lines
 enddef
 
 def Test_call_stack_string()
   CheckScreendump
   var lines =<< trim END
-    vim9script
+    mnv9script
 
     def CheckStack(stack: string, expected: string)
       const caller = stack->split('\.\.')[-1]->substitute('\[\d\+\]', '', '')
@@ -5821,8 +5821,8 @@ def Test_call_stack_string()
     endfor
   END
   writefile(lines, 'XTest_call_stack_string', 'D')
-  var buf = g:RunVimInTerminal('-S XTest_call_stack_string', {'rows': 20})
-  g:StopVimInTerminal(buf)
+  var buf = g:RunMNVInTerminal('-S XTest_call_stack_string', {'rows': 20})
+  g:StopMNVInTerminal(buf)
 enddef
 
-" vim: ts=8 sw=2 sts=2 expandtab tw=80 fdm=marker
+" mnv: ts=8 sw=2 sts=2 expandtab tw=80 fdm=marker
diff --git a/uvim/src/testdir/test_vim9_typealias.vim b/uvim/src/testdir/test_mnv9_typealias.mnv
index f09f5d8b61..02271a07ff 100644
--- a/uvim/src/testdir/test_vim9_typealias.vim
+++ b/uvim/src/testdir/test_mnv9_typealias.mnv
@@ -1,12 +1,12 @@
-" Test Vim9 type aliases
+" Test MNV9 type aliases
 
-import './util/vim9.vim' as v9
+import './util/mnv9.mnv' as v9
 
 " Test for :type command to create type aliases
 def Test_typealias()
   # Use type alias at script level
   var lines =<< trim END
-    vim9script
+    mnv9script
     type ListOfStrings = list<string>
     def Foo(a: ListOfStrings): ListOfStrings
       return a
@@ -23,7 +23,7 @@ def Test_typealias()
 
   # Use type alias at def function level
   lines =<< trim END
-    vim9script
+    mnv9script
     type ListOfStrings = list<string>
     def Foo(a: ListOfStrings): ListOfStrings
       return a
@@ -41,92 +41,92 @@ def Test_typealias()
   END
   v9.CheckSourceSuccess(lines)
 
-  # Use :type outside a Vim9 script
+  # Use :type outside a MNV9 script
   lines =<< trim END
     type Index = number
   END
-  v9.CheckSourceFailure(lines, 'E1393: Type can only be defined in Vim9 script', 1)
+  v9.CheckSourceFailure(lines, 'E1393: Type can only be defined in MNV9 script', 1)
 
   # The complete "type" should be specified
   lines =<< trim END
-    vim9script
+    mnv9script
     typ Index = number
   END
   v9.CheckSourceFailure(lines, 'E1065: Command cannot be shortened: typ Index = number', 2)
 
   # Use :type without any arguments
   lines =<< trim END
-    vim9script
+    mnv9script
     type
   END
   v9.CheckSourceFailure(lines, 'E1397: Missing type alias name', 2)
 
   # Use :type with a name but no type
   lines =<< trim END
-    vim9script
+    mnv9script
     type MyType
   END
   v9.CheckSourceFailure(lines, "E398: Missing '=': ", 2)
 
   # Use :type with a name but no type following "="
   lines =<< trim END
-    vim9script
+    mnv9script
     type MyType =
   END
   v9.CheckSourceFailure(lines, 'E1398: Missing type alias type', 2)
 
   # No space before or after "="
   lines =<< trim END
-    vim9script
+    mnv9script
     type MyType=number
   END
   v9.CheckSourceFailure(lines, 'E1315: White space required after name: MyType=number', 2)
 
   # No space after "="
   lines =<< trim END
-    vim9script
+    mnv9script
     type MyType =number
   END
   v9.CheckSourceFailure(lines, "E1069: White space required after '=': =number", 2)
 
   # type alias without "="
   lines =<< trim END
-    vim9script
+    mnv9script
     type Index number
   END
   v9.CheckSourceFailure(lines, "E398: Missing '=': number", 2)
 
   # type alias for a non-existing type
   lines =<< trim END
-    vim9script
+    mnv9script
     type Index = integer
   END
   v9.CheckSourceFailure(lines, 'E1010: Type not recognized: integer', 2)
 
   # type alias starting with lower-case letter
   lines =<< trim END
-    vim9script
+    mnv9script
     type index = number
   END
   v9.CheckSourceFailure(lines, 'E1394: Type name must start with an uppercase letter: index = number', 2)
 
   # No white space following the alias name
   lines =<< trim END
-    vim9script
+    mnv9script
     type Index:number
   END
   v9.CheckSourceFailure(lines, 'E1315: White space required after name: Index:number', 2)
 
   # something following the type alias
   lines =<< trim END
-    vim9script
+    mnv9script
     type ListOfNums = list<number> string
   END
   v9.CheckSourceFailure(lines, 'E488: Trailing characters:  string', 2)
 
   # type alias name collides with a variable name
   lines =<< trim END
-    vim9script
+    mnv9script
     var ListOfNums: number = 10
     type ListOfNums = list<number>
   END
@@ -134,7 +134,7 @@ def Test_typealias()
 
   # duplicate type alias name
   lines =<< trim END
-    vim9script
+    mnv9script
     type MyList = list<number>
     type MyList = list<string>
   END
@@ -142,7 +142,7 @@ def Test_typealias()
 
   # def function argument name collision with a type alias
   lines =<< trim END
-    vim9script
+    mnv9script
     type A = list<number>
     def Foo(A: number)
     enddef
@@ -151,7 +151,7 @@ def Test_typealias()
 
   # def function local variable name collision with a type alias
   lines =<< trim END
-    vim9script
+    mnv9script
     type A = list<number>
     def Foo()
       var A: number = 10
@@ -162,7 +162,7 @@ def Test_typealias()
 
   # type alias a variable
   lines =<< trim END
-    vim9script
+    mnv9script
     var A: list<number> = []
     type B = A
   END
@@ -170,7 +170,7 @@ def Test_typealias()
 
   # type alias a class
   lines =<< trim END
-    vim9script
+    mnv9script
     class C
     endclass
     type AC = C
@@ -180,7 +180,7 @@ def Test_typealias()
 
   # another command follows a type alias
   lines =<< trim END
-    vim9script
+    mnv9script
     type MyType = number | var x = 20
     assert_equal(20, x)
   END
@@ -196,7 +196,7 @@ def Test_typealias()
 
   # type alias a type alias
   lines =<< trim END
-    vim9script
+    mnv9script
     type A = string
     type B = A
     var b: B = 'abc'
@@ -211,7 +211,7 @@ def Test_typealias()
 
   # Assigning to a type alias (script level)
   lines =<< trim END
-    vim9script
+    mnv9script
     type MyType = list<number>
     MyType = [1, 2, 3]
   END
@@ -219,7 +219,7 @@ def Test_typealias()
 
   # Assigning a type alias (def function level)
   lines =<< trim END
-    vim9script
+    mnv9script
     type A = list<string>
     def Foo()
       var x = A
@@ -230,7 +230,7 @@ def Test_typealias()
 
   # Using type alias in an expression (script level)
   lines =<< trim END
-    vim9script
+    mnv9script
     type MyType = list<number>
     assert_fails('var m = MyType', 'E1403: Type alias "MyType" cannot be used as a value')
     assert_fails('var i = MyType + 1', 'E1403: Type alias "MyType" cannot be used as a value')
@@ -243,7 +243,7 @@ def Test_typealias()
 
   # Using type alias in an expression (def function level)
   lines =<< trim END
-    vim9script
+    mnv9script
     type MyType = list<number>
     def Foo()
       var x = MyType + 1
@@ -254,7 +254,7 @@ def Test_typealias()
 
   # Using type alias in an expression (def function level)
   lines =<< trim END
-    vim9script
+    mnv9script
     type MyType = list<number>
     def Foo()
       MyType = list<string>
@@ -265,7 +265,7 @@ def Test_typealias()
 
   # Using type alias in an expression (def function level)
   lines =<< trim END
-    vim9script
+    mnv9script
     type MyType = list<number>
     def Foo()
       MyType += 10
@@ -276,7 +276,7 @@ def Test_typealias()
 
   # Convert type alias to a string (def function level)
   lines =<< trim END
-    vim9script
+    mnv9script
     type MyType = list<number>
     def Foo()
       var x = $"-{MyType}-"
@@ -287,7 +287,7 @@ def Test_typealias()
 
   # Using type alias as a float
   lines =<< trim END
-    vim9script
+    mnv9script
     type B = number
     sort([1.1, B], 'f')
   END
@@ -295,7 +295,7 @@ def Test_typealias()
 
   # Creating a typealias in a def function
   lines =<< trim END
-    vim9script
+    mnv9script
     def Foo()
       var n: number = 10
       type A = list<string>
@@ -306,7 +306,7 @@ def Test_typealias()
 
   # json_encode should fail with a type alias
   lines =<< trim END
-    vim9script
+    mnv9script
     type A = list<string>
     var x = json_encode(A)
   END
@@ -314,7 +314,7 @@ def Test_typealias()
 
   # Comparing type alias with a number (script level)
   lines =<< trim END
-    vim9script
+    mnv9script
     type A = list<string>
     var n: number
     var x = A == n
@@ -323,7 +323,7 @@ def Test_typealias()
 
   # Comparing type alias with a number (def function level)
   lines =<< trim END
-    vim9script
+    mnv9script
     type A = list<string>
     def Foo()
       var n: number
@@ -335,7 +335,7 @@ def Test_typealias()
 
   # casting a number to a type alias (script level)
   lines =<< trim END
-    vim9script
+    mnv9script
     type MyType = bool
     assert_equal(true, <MyType>1 == true)
   END
@@ -345,14 +345,14 @@ enddef
 " Test for exporting and importing type aliases
 def Test_typealias_import()
   var lines =<< trim END
-    vim9script
+    mnv9script
     export type MyType = list<number>
   END
-  writefile(lines, 'Xtypeexport.vim', 'D')
+  writefile(lines, 'Xtypeexport.mnv', 'D')
 
   lines =<< trim END
-    vim9script
-    import './Xtypeexport.vim' as A
+    mnv9script
+    import './Xtypeexport.mnv' as A
 
     var myList: A.MyType = [1, 2, 3]
     def Foo(l: A.MyType)
@@ -364,8 +364,8 @@ def Test_typealias_import()
 
   # Use a non existing type alias
   lines =<< trim END
-    vim9script
-    import './Xtypeexport.vim' as A
+    mnv9script
+    import './Xtypeexport.mnv' as A
 
     var myNum: A.SomeType = 10
   END
@@ -373,13 +373,13 @@ def Test_typealias_import()
 
   # Use a type alias that is not exported
   lines =<< trim END
-    vim9script
+    mnv9script
     type NewType = dict<string>
   END
-  writefile(lines, 'Xtypeexport2.vim', 'D')
+  writefile(lines, 'Xtypeexport2.mnv', 'D')
   lines =<< trim END
-    vim9script
-    import './Xtypeexport2.vim' as A
+    mnv9script
+    import './Xtypeexport2.mnv' as A
 
     var myDict: A.NewType = {}
   END
@@ -387,13 +387,13 @@ def Test_typealias_import()
 
   # Using the same name as an imported type alias
   lines =<< trim END
-    vim9script
+    mnv9script
     export type MyType2 = list<number>
   END
-  writefile(lines, 'Xtypeexport3.vim', 'D')
+  writefile(lines, 'Xtypeexport3.mnv', 'D')
   lines =<< trim END
-    vim9script
-    import './Xtypeexport3.vim' as A
+    mnv9script
+    import './Xtypeexport3.mnv' as A
 
     type MyType2 = A.MyType2
     var myList1: A.MyType2 = [1, 2, 3]
@@ -405,15 +405,15 @@ def Test_typealias_import()
 
   # Using an exported class to create a type alias
   lines =<< trim END
-    vim9script
+    mnv9script
     export class MyClass
       var val = 10
     endclass
   END
-  writefile(lines, 'Xtypeexport4.vim', 'D')
+  writefile(lines, 'Xtypeexport4.mnv', 'D')
   lines =<< trim END
-    vim9script
-    import './Xtypeexport4.vim' as T
+    mnv9script
+    import './Xtypeexport4.mnv' as T
 
     type MyType3 = T.MyClass
     var c: MyType3 = MyType3.new()
@@ -425,7 +425,7 @@ enddef
 " Test for using typealias as a def function argument and return type
 def Test_typealias_func_argument()
   var lines =<< trim END
-    vim9script
+    mnv9script
     type A = list<number>
     def Foo(l: A): A
       assert_equal([1, 2], l)
@@ -438,7 +438,7 @@ def Test_typealias_func_argument()
 
   # passing a type alias variable to a function expecting a specific type
   lines =<< trim END
-    vim9script
+    mnv9script
     type A = list<number>
     def Foo(l: list<number>)
       assert_equal([1, 2], l)
@@ -450,7 +450,7 @@ def Test_typealias_func_argument()
 
   # passing a type alias variable to a function expecting any
   lines =<< trim END
-    vim9script
+    mnv9script
     type A = list<number>
     def Foo(l: any)
       assert_equal([1, 2], l)
@@ -464,7 +464,7 @@ enddef
 " Using a type alias with a builtin function
 def Test_typealias_with_builtin_functions()
   var lines =<< trim END
-    vim9script
+    mnv9script
     type A = list<func>
     var x = empty(A)
   END
@@ -472,7 +472,7 @@ def Test_typealias_with_builtin_functions()
 
   # Using a type alias with len()
   lines =<< trim END
-    vim9script
+    mnv9script
     type A = list<func>
     var x = len(A)
   END
@@ -480,7 +480,7 @@ def Test_typealias_with_builtin_functions()
 
   # Using a type alias with len()
   lines =<< trim END
-    vim9script
+    mnv9script
     type A = list<func>
     def Foo()
       var x = len(A)
@@ -491,7 +491,7 @@ def Test_typealias_with_builtin_functions()
 
   # Using a type alias with eval()
   lines =<< trim END
-    vim9script
+    mnv9script
     type A = number
     def Foo()
       var x = eval("A")
@@ -504,14 +504,14 @@ enddef
 " Test for type alias refcount
 def Test_typealias_refcount()
   var lines =<< trim END
-    vim9script
+    mnv9script
     type A = list<func>
     assert_equal(1, test_refcount(A))
   END
   v9.CheckScriptSuccess(lines)
 
   lines =<< trim END
-    vim9script
+    mnv9script
     type B = list<number>
     var x: B = []
     assert_equal(1, test_refcount(B))
@@ -522,7 +522,7 @@ enddef
 " Test for using instanceof() with a type alias
 def Test_typealias_instanceof()
   var lines =<< trim END
-    vim9script
+    mnv9script
     class C
     endclass
 
@@ -549,7 +549,7 @@ enddef
 " Test for type aliasing a class
 def Test_typealias_class()
   var lines =<< trim END
-    vim9script
+    mnv9script
     class C
       var color = 'green'
     endclass
@@ -564,7 +564,7 @@ enddef
 def Test_type_as_func_argument_or_return_value()
   # check typealias as arg, function call in script level
   var lines =<< trim END
-    vim9script
+    mnv9script
     type A = number
     def Foo(arg: any)
     enddef
@@ -574,7 +574,7 @@ def Test_type_as_func_argument_or_return_value()
 
   # check typealias as function return, function call in script level
   lines =<< trim END
-    vim9script
+    mnv9script
     type A = number
     def Foo(): any
       return A
@@ -585,7 +585,7 @@ def Test_type_as_func_argument_or_return_value()
 
   # check typealias as arg, function call in :def
   lines =<< trim END
-    vim9script
+    mnv9script
     type A = number
     def Foo(arg: any)
     enddef
@@ -598,7 +598,7 @@ def Test_type_as_func_argument_or_return_value()
 
   # check typealias as function return, function call in :def
   lines =<< trim END
-    vim9script
+    mnv9script
     type A = number
     def Foo(): any
       return A
@@ -612,7 +612,7 @@ def Test_type_as_func_argument_or_return_value()
 
   # check funcref using typealias as arg at script level
   lines =<< trim END
-    vim9script
+    mnv9script
     type A = number
     def F(arg: any)
       echo typename(arg)
@@ -626,7 +626,7 @@ def Test_type_as_func_argument_or_return_value()
 
   # check funcref using typealias as arg in :def
   lines =<< trim END
-    vim9script
+    mnv9script
     type A = number
     def F(arg: any)
       echo typename(arg)
@@ -643,7 +643,7 @@ def Test_type_as_func_argument_or_return_value()
 
   # check funcref using typealias as return
   lines =<< trim END
-    vim9script
+    mnv9script
     type A = number
     def F(): any
       return A
@@ -657,7 +657,7 @@ def Test_type_as_func_argument_or_return_value()
 
   # check deferred function using typealias as arg
   lines =<< trim END
-    vim9script
+    mnv9script
     type A = number
     def F(arg: any)
     enddef
@@ -673,7 +673,7 @@ enddef
 def Test_class_as_func_argument_or_return_value()
   # check class typealias as arg, function call in script level
   var lines =<< trim END
-    vim9script
+    mnv9script
     class C
     endclass
     type A = C
@@ -685,7 +685,7 @@ def Test_class_as_func_argument_or_return_value()
 
   # check class typealias as function return, function call in script level
   lines =<< trim END
-    vim9script
+    mnv9script
     class C
     endclass
     type A = C
@@ -698,7 +698,7 @@ def Test_class_as_func_argument_or_return_value()
 
   # check class typealias as arg, function call in :def
   lines =<< trim END
-    vim9script
+    mnv9script
     class C
     endclass
     type A = C
@@ -713,7 +713,7 @@ def Test_class_as_func_argument_or_return_value()
 
   # check class typealias as function return, function call in :def
   lines =<< trim END
-    vim9script
+    mnv9script
     class C
     endclass
     type A = C
@@ -729,7 +729,7 @@ def Test_class_as_func_argument_or_return_value()
 
   # check funcref using class typealias as arg at script level
   lines =<< trim END
-    vim9script
+    mnv9script
     class C
     endclass
     type A = C
@@ -745,7 +745,7 @@ def Test_class_as_func_argument_or_return_value()
 
   # check funcref using class typealias as arg in :def
   lines =<< trim END
-    vim9script
+    mnv9script
     class C
     endclass
     type A = C
@@ -764,7 +764,7 @@ def Test_class_as_func_argument_or_return_value()
 
   # check funcref using class typealias as return
   lines =<< trim END
-    vim9script
+    mnv9script
     class C
     endclass
     type A = C
@@ -780,7 +780,7 @@ def Test_class_as_func_argument_or_return_value()
 
   # check deferred function using class typealias as arg
   lines =<< trim END
-    vim9script
+    mnv9script
     class C
     endclass
     type A = C
@@ -797,7 +797,7 @@ enddef
 def Test_passing_typealias_to_builtin()
   # type, typename, string, instanceof are allowed type argument
   var lines =<< trim END
-    vim9script
+    mnv9script
     type T = number
     var x: any
     x = type(T)
@@ -807,9 +807,9 @@ def Test_passing_typealias_to_builtin()
   v9.CheckScriptSuccess(lines)
 
   # check argument to add at script level
-  # Note: add() is special cased in compile_call in vim9expr
+  # Note: add() is special cased in compile_call in mnv9expr
   lines =<< trim END
-    vim9script
+    mnv9script
     type T = number
     add([], T)
   END
@@ -817,7 +817,7 @@ def Test_passing_typealias_to_builtin()
 
   # check argument to add in :def
   lines =<< trim END
-    vim9script
+    mnv9script
     type T = number
     def F()
       add([], T)
@@ -828,7 +828,7 @@ def Test_passing_typealias_to_builtin()
 
   # check member call argument to add at script level
   lines =<< trim END
-    vim9script
+    mnv9script
     type T = number
     []->add(T)
   END
@@ -836,7 +836,7 @@ def Test_passing_typealias_to_builtin()
 
   # check member call argument to add in :def
   lines =<< trim END
-    vim9script
+    mnv9script
     type T = number
     def F()
       []->add(T)
@@ -848,7 +848,7 @@ def Test_passing_typealias_to_builtin()
   # Try "empty()" builtin
   # check argument to empty at script level
   lines =<< trim END
-    vim9script
+    mnv9script
     type T = number
     empty(T)
   END
@@ -856,7 +856,7 @@ def Test_passing_typealias_to_builtin()
 
   # check argument to empty in :def
   lines =<< trim END
-    vim9script
+    mnv9script
     type T = number
     def F()
       empty(T)
@@ -867,7 +867,7 @@ def Test_passing_typealias_to_builtin()
 
   # check member call argument to empty at script level
   lines =<< trim END
-    vim9script
+    mnv9script
     type T = number
     T->empty()
   END
@@ -875,7 +875,7 @@ def Test_passing_typealias_to_builtin()
 
   # check member call argument to empty in :def
   lines =<< trim END
-    vim9script
+    mnv9script
     type T = number
     def F()
       T->empty()
@@ -887,7 +887,7 @@ def Test_passing_typealias_to_builtin()
   # Try "abs()" builtin
   # check argument to abs at script level
   lines =<< trim END
-    vim9script
+    mnv9script
     type T = number
     abs(T)
   END
@@ -895,7 +895,7 @@ def Test_passing_typealias_to_builtin()
 
   # check argument to abs in :def
   lines =<< trim END
-    vim9script
+    mnv9script
     type T = number
     def F()
       abs(T)
@@ -906,7 +906,7 @@ def Test_passing_typealias_to_builtin()
 
   # check member call argument to abs at script level
   lines =<< trim END
-    vim9script
+    mnv9script
     type T = number
     T->abs()
   END
@@ -914,7 +914,7 @@ def Test_passing_typealias_to_builtin()
 
   # check member call argument to abs in :def
   lines =<< trim END
-    vim9script
+    mnv9script
     type T = number
     def F()
       T->abs()
@@ -924,4 +924,4 @@ def Test_passing_typealias_to_builtin()
   v9.CheckScriptFailure(lines, 'E1407: Cannot use a Typealias as a variable or value')
 enddef
 
-" vim: ts=8 sw=2 sts=2 expandtab tw=80 fdm=marker
+" mnv: ts=8 sw=2 sts=2 expandtab tw=80 fdm=marker
diff --git a/uvim/src/testdir/test_viminfo.vim b/uvim/src/testdir/test_mnvinfo.mnv
index b3a8b91cb1..50b2b6c3c8 100644
--- a/uvim/src/testdir/test_viminfo.vim
+++ b/uvim/src/testdir/test_mnvinfo.mnv
@@ -1,10 +1,10 @@
-" Test for reading and writing .viminfo
+" Test for reading and writing .mnvinfo
 
-func Test_viminfo_read_and_write()
+func Test_mnvinfo_read_and_write()
   " First clear 'history', so that "hislen" is zero.  Then set it again,
-  " simulating Vim starting up.
+  " simulating MNV starting up.
   set history=0
-  wviminfo Xviminfo
+  wmnvinfo Xmnvinfo
   set history=1000
 
   call histdel(':')
@@ -16,12 +16,12 @@ func Test_viminfo_read_and_write()
 	\ '|copied as-is',
 	\ '|and one more',
 	\ ]
-  call writefile(lines, 'Xviminfo', 'D')
-  rviminfo Xviminfo
+  call writefile(lines, 'Xmnvinfo', 'D')
+  rmnvinfo Xmnvinfo
   call assert_equal('asdf', @/)
 
-  wviminfo Xviminfo
-  let lines = readfile('Xviminfo')
+  wmnvinfo Xmnvinfo
+  let lines = readfile('Xmnvinfo')
   let done = 0
   for line in lines
     if line[0] == '|' && line !~ '^|[234],' && line !~ '^|<'
@@ -39,12 +39,12 @@ func Test_viminfo_read_and_write()
 endfunc
 
 func Test_global_vars()
-  let g:MY_GLOBAL_STRING = "Vim Editor"
+  let g:MY_GLOBAL_STRING = "MNV Editor"
   let g:MY_GLOBAL_NUM = 345
   let g:MY_GLOBAL_FLOAT = 3.14
   let test_dict = {'foo': 1, 'bar': 0, 'longvarible': 1000}
   let g:MY_GLOBAL_DICT = test_dict
-  " store a really long list, so line wrapping will occur in viminfo file
+  " store a really long list, so line wrapping will occur in mnvinfo file
   let test_list = range(1,100)
   let g:MY_GLOBAL_LIST = test_list
   let test_blob = 0z00112233445566778899aabbccddeeff
@@ -59,8 +59,8 @@ func Test_global_vars()
   let g:MY_GLOBAL_NONE = test_none
   let g:MY_GLOBAL_FUNCREF = function('min')
 
-  set viminfo='100,<50,s10,h,!,nviminfo
-  wv! Xviminfo
+  set mnvinfo='100,<50,s10,h,!,nmnvinfo
+  wv! Xmnvinfo
 
   unlet g:MY_GLOBAL_STRING
   unlet g:MY_GLOBAL_NUM
@@ -74,8 +74,8 @@ func Test_global_vars()
   unlet g:MY_GLOBAL_NONE
   unlet g:MY_GLOBAL_FUNCREF
 
-  rv! Xviminfo
-  call assert_equal("Vim Editor", g:MY_GLOBAL_STRING)
+  rv! Xmnvinfo
+  call assert_equal("MNV Editor", g:MY_GLOBAL_STRING)
   call assert_equal(345, g:MY_GLOBAL_NUM)
   call assert_equal(3.14, g:MY_GLOBAL_FLOAT)
   call assert_equal(test_dict, g:MY_GLOBAL_DICT)
@@ -87,7 +87,7 @@ func Test_global_vars()
   call assert_equal(test_none, g:MY_GLOBAL_NONE)
   call assert_false(exists("g:MY_GLOBAL_FUNCREF"))
 
-  " When reading global variables from viminfo, if a variable cannot be
+  " When reading global variables from mnvinfo, if a variable cannot be
   " modified, then the value should not be changed.
   unlet g:MY_GLOBAL_STRING
   unlet g:MY_GLOBAL_NUM
@@ -99,14 +99,14 @@ func Test_global_vars()
   const g:MY_GLOBAL_STRING = 'New Value'
   const g:MY_GLOBAL_NUM = 987
   const g:MY_GLOBAL_FLOAT = 1.16
-  const g:MY_GLOBAL_DICT = {'editor': 'vim'}
+  const g:MY_GLOBAL_DICT = {'editor': 'mnv'}
   const g:MY_GLOBAL_LIST = [5, 7, 13]
   const g:MY_GLOBAL_BLOB = 0zDEADBEEF
-  call assert_fails('rv! Xviminfo', 'E741:')
+  call assert_fails('rv! Xmnvinfo', 'E741:')
   call assert_equal('New Value', g:MY_GLOBAL_STRING)
   call assert_equal(987, g:MY_GLOBAL_NUM)
   call assert_equal(1.16, g:MY_GLOBAL_FLOAT)
-  call assert_equal({'editor': 'vim'}, g:MY_GLOBAL_DICT)
+  call assert_equal({'editor': 'mnv'}, g:MY_GLOBAL_DICT)
   call assert_equal([5, 7 , 13], g:MY_GLOBAL_LIST)
   call assert_equal(0zDEADBEEF, g:MY_GLOBAL_BLOB)
 
@@ -117,15 +117,15 @@ func Test_global_vars()
   unlet g:MY_GLOBAL_LIST
   unlet g:MY_GLOBAL_BLOB
 
-  " Test for invalid values for a blob, list, dict in a viminfo file
+  " Test for invalid values for a blob, list, dict in a mnvinfo file
   call writefile([
         \ "!GLOB_BLOB_1\tBLO\t123",
         \ "!GLOB_BLOB_2\tBLO\t012",
         \ "!GLOB_BLOB_3\tBLO\t0z1x",
         \ "!GLOB_BLOB_4\tBLO\t0z12 ab",
         \ "!GLOB_LIST_1\tLIS\t1 2",
-        \ "!GLOB_DICT_1\tDIC\t1 2"], 'Xviminfo', 'D')
-  call assert_fails('rv! Xviminfo', 'E488:')
+        \ "!GLOB_DICT_1\tDIC\t1 2"], 'Xmnvinfo', 'D')
+  call assert_fails('rv! Xmnvinfo', 'E488:')
   call assert_equal('123', g:GLOB_BLOB_1)
   call assert_equal(1, type(g:GLOB_BLOB_1))
   call assert_equal('012', g:GLOB_BLOB_2)
@@ -139,7 +139,7 @@ func Test_global_vars()
   call assert_equal('1 2', g:GLOB_DICT_1)
   call assert_equal(1, type(g:GLOB_DICT_1))
 
-  set viminfo-=!
+  set mnvinfo-=!
 endfunc
 
 func Test_global_vars_with_circular_reference()
@@ -148,20 +148,20 @@ func Test_global_vars_with_circular_reference()
   let g:MY_GLOBAL_DICT = {}
   let g:MY_GLOBAL_DICT['self'] = g:MY_GLOBAL_DICT
 
-  set viminfo='100,<50,s10,h,!,nviminfo
-  wv! Xviminfo
+  set mnvinfo='100,<50,s10,h,!,nmnvinfo
+  wv! Xmnvinfo
   call assert_equal(v:errmsg, '')
 
   unlet g:MY_GLOBAL_LIST
   unlet g:MY_GLOBAL_DICT
 
-  rv! Xviminfo
+  rv! Xmnvinfo
   call assert_equal(v:errmsg, '')
   call assert_true(!exists('g:MY_GLOBAL_LIST'))
   call assert_true(!exists('g:MY_GLOBAL_DICT'))
 
-  call delete('Xviminfo')
-  set viminfo-=!
+  call delete('Xmnvinfo')
+  set mnvinfo-=!
 endfunc
 
 func Test_cmdline_history()
@@ -176,8 +176,8 @@ func Test_cmdline_history()
   " split into three lines
   let long1400 = repeat(" 'fourteeeeen'", 100)
   call histadd(':', "echo " . long1400)
-  wviminfo Xviminfo
-  let lines = readfile('Xviminfo')
+  wmnvinfo Xmnvinfo
+  let lines = readfile('Xmnvinfo')
   let done_colon = 0
   let done_bar = 0
   let lnum = 0
@@ -221,31 +221,31 @@ func Test_cmdline_history()
   call assert_equal(3, done_bar)
 
   call histdel(':')
-  rviminfo Xviminfo
+  rmnvinfo Xmnvinfo
   call assert_equal("echo " . long1400, histget(':', -1))
   call assert_equal("echo " . long800, histget(':', -2))
   call assert_equal("echo 'one'", histget(':', -3))
 
-  " If the value for the '/' or ':' or '@' field in 'viminfo' is zero, then
+  " If the value for the '/' or ':' or '@' field in 'mnvinfo' is zero, then
   " the corresponding history entries are not saved.
-  set viminfo='100,/0,:0,@0,<50,s10,h,!,nviminfo
+  set mnvinfo='100,/0,:0,@0,<50,s10,h,!,nmnvinfo
   call histdel('/')
   call histdel(':')
   call histdel('@')
   call histadd('/', 'foo')
   call histadd(':', 'bar')
   call histadd('@', 'baz')
-  wviminfo! Xviminfo
+  wmnvinfo! Xmnvinfo
   call histdel('/')
   call histdel(':')
   call histdel('@')
-  rviminfo! Xviminfo
+  rmnvinfo! Xmnvinfo
   call assert_equal('', histget('/'))
   call assert_equal('', histget(':'))
   call assert_equal('', histget('@'))
 
-  call delete('Xviminfo')
-  set viminfo&vim
+  call delete('Xmnvinfo')
+  set mnvinfo&mnv
 endfunc
 
 func Test_cmdline_history_order()
@@ -256,7 +256,7 @@ func Test_cmdline_history_order()
   call histadd(':', "echo '22'")
   call test_settime(33)
   call histadd(':', "echo '33'")
-  wviminfo Xviminfo
+  wmnvinfo Xmnvinfo
 
   call histdel(':')
   " items go in between
@@ -265,7 +265,7 @@ func Test_cmdline_history_order()
   call test_settime(27)
   call histadd(':', "echo '27'")
 
-  rviminfo Xviminfo
+  rmnvinfo Xmnvinfo
   call assert_equal("echo '33'", histget(':', -1))
   call assert_equal("echo '27'", histget(':', -2))
   call assert_equal("echo '22'", histget(':', -3))
@@ -279,7 +279,7 @@ func Test_cmdline_history_order()
   call test_settime(39)
   call histadd(':', "echo '39'")
 
-  rviminfo Xviminfo
+  rmnvinfo Xmnvinfo
   call assert_equal("echo '39'", histget(':', -1))
   call assert_equal("echo '33'", histget(':', -2))
   call assert_equal("echo '22'", histget(':', -3))
@@ -296,10 +296,10 @@ func Test_cmdline_history_order()
   call histadd(':', "echo '27'")
   call test_settime(39)
   call histadd(':', "echo '39'")
-  wviminfo Xviminfo
+  wmnvinfo Xmnvinfo
 
   call histdel(':')
-  rviminfo Xviminfo
+  rmnvinfo Xmnvinfo
   call assert_equal("echo '39'", histget(':', -1))
   call assert_equal("echo '33'", histget(':', -2))
   call assert_equal("echo '27'", histget(':', -3))
@@ -308,10 +308,10 @@ func Test_cmdline_history_order()
   call assert_equal("echo '11'", histget(':', -6))
   call assert_equal("echo '8'", histget(':', -7))
 
-  call delete('Xviminfo')
+  call delete('Xmnvinfo')
 endfunc
 
-func Test_viminfo_registers()
+func Test_mnvinfo_registers()
   call test_settime(8)
   call setreg('a', "eight", 'c')
   call test_settime(20)
@@ -319,13 +319,13 @@ func Test_viminfo_registers()
   call test_settime(40)
   call setreg('c', ["four", "agai"], 'b4')
   let l = []
-  set viminfo='100,<600,s10,h,!,nviminfo
+  set mnvinfo='100,<600,s10,h,!,nmnvinfo
   for i in range(500)
     call add(l, 'something')
   endfor
   call setreg('d', l, 'l')
   call setreg('e', "abc\<C-V>xyz")
-  wviminfo Xviminfo
+  wmnvinfo Xmnvinfo
 
   call test_settime(10)
   call setreg('a', '', 'b10')
@@ -336,7 +336,7 @@ func Test_viminfo_registers()
   call test_settime(30)
   call setreg('d', 'drop', 'l')
   call setreg('e', 'drop')
-  rviminfo Xviminfo
+  rmnvinfo Xmnvinfo
 
   call assert_equal("", getreg('a'))
   call assert_equal("\<C-V>10", getregtype('a'))
@@ -353,44 +353,44 @@ func Test_viminfo_registers()
   while len < 445
     let s = repeat('a', len)
     call setreg('"', s)
-    wviminfo Xviminfo
+    wmnvinfo Xmnvinfo
     call setreg('"', '')
-    rviminfo Xviminfo
+    rmnvinfo Xmnvinfo
     call assert_equal(s, getreg('"'), 'wrong register at length: ' . len)
 
     let len += 1
   endwhile
 
-  " If the maximum number of lines saved for a register ('<' in 'viminfo') is
+  " If the maximum number of lines saved for a register ('<' in 'mnvinfo') is
   " zero, then register values should not be saved.
   let @a = 'abc'
-  set viminfo='100,<0,s10,h,!,nviminfo
-  wviminfo Xviminfo
+  set mnvinfo='100,<0,s10,h,!,nmnvinfo
+  wmnvinfo Xmnvinfo
   let @a = 'xyz'
-  rviminfo! Xviminfo
+  rmnvinfo! Xmnvinfo
   call assert_equal('xyz', @a)
   " repeat the test with '"' instead of '<'
   let @b = 'def'
-  set viminfo='100,\"0,s10,h,!,nviminfo
-  wviminfo Xviminfo
+  set mnvinfo='100,\"0,s10,h,!,nmnvinfo
+  wmnvinfo Xmnvinfo
   let @b = 'rst'
-  rviminfo! Xviminfo
+  rmnvinfo! Xmnvinfo
   call assert_equal('rst', @b)
 
-  " If the maximum size of an item ('s' in 'viminfo') is zero, then register
+  " If the maximum size of an item ('s' in 'mnvinfo') is zero, then register
   " values should not be saved.
   let @c = '123'
-  set viminfo='100,<20,s0,h,!,nviminfo
-  wviminfo Xviminfo
+  set mnvinfo='100,<20,s0,h,!,nmnvinfo
+  wmnvinfo Xmnvinfo
   let @c = '456'
-  rviminfo! Xviminfo
+  rmnvinfo! Xmnvinfo
   call assert_equal('456', @c)
 
-  call delete('Xviminfo')
-  set viminfo&vim
+  call delete('Xmnvinfo')
+  set mnvinfo&mnv
 endfunc
 
-func Test_viminfo_marks()
+func Test_mnvinfo_marks()
   sp bufa
   let bufa = bufnr('%')
   sp bufb
@@ -409,9 +409,9 @@ func Test_viminfo_marks()
   call setpos("'0", [bufa, 11, 1, 0])
 
   call test_settime(45)
-  wviminfo Xviminfo
+  wmnvinfo Xmnvinfo
 
-  " Writing viminfo inserts the '0 mark.
+  " Writing mnvinfo inserts the '0 mark.
   call assert_equal([bufb, 1, 1, 0], getpos("'0"))
   call assert_equal([bufa, 11, 1, 0], getpos("'1"))
   call assert_equal([bufb, 12, 1, 0], getpos("'2"))
@@ -428,7 +428,7 @@ func Test_viminfo_marks()
   call test_settime(55)
   call setpos("'0", [bufa, 21, 1, 0])
 
-  rviminfo Xviminfo
+  rmnvinfo Xmnvinfo
 
   call assert_equal([bufa, 1, 1, 0], getpos("'A"))
   call assert_equal([bufb, 2, 3, 0], getpos("'B"))
@@ -441,29 +441,29 @@ func Test_viminfo_marks()
   call assert_equal([bufb, 22, 1, 0], getpos("'3")) " time 30
   call assert_equal([bufb, 12, 1, 0], getpos("'4")) " time 25
 
-  " deleted file marks are removed from viminfo
+  " deleted file marks are removed from mnvinfo
   delmark C
-  wviminfo Xviminfo
-  rviminfo Xviminfo
+  wmnvinfo Xmnvinfo
+  rmnvinfo Xmnvinfo
   call assert_equal([0, 0, 0, 0], getpos("'C"))
 
-  " deleted file marks stay in viminfo if defined in another vim later
+  " deleted file marks stay in mnvinfo if defined in another mnv later
   call test_settime(70)
   call setpos("'D", [bufb, 8, 1, 0])
-  wviminfo Xviminfo
+  wmnvinfo Xmnvinfo
   call test_settime(65)
   delmark D
   call assert_equal([0, 0, 0, 0], getpos("'D"))
   call test_settime(75)
-  rviminfo Xviminfo
+  rmnvinfo Xmnvinfo
   call assert_equal([bufb, 8, 1, 0], getpos("'D"))
 
-  call delete('Xviminfo')
+  call delete('Xmnvinfo')
   exe 'bwipe ' . bufa
   exe 'bwipe ' . bufb
 endfunc
 
-func Test_viminfo_jumplist()
+func Test_mnvinfo_jumplist()
   split testbuf
   clearjumps
   call setline(1, ['time 05', 'time 10', 'time 15', 'time 20', 'time 30', 'last pos'])
@@ -474,7 +474,7 @@ func Test_viminfo_jumplist()
   exe "normal /30\r"
   call test_settime(30)
   exe "normal /last pos\r"
-  wviminfo Xviminfo
+  wmnvinfo Xmnvinfo
 
   clearjumps
   call cursor(1, 1)
@@ -484,7 +484,7 @@ func Test_viminfo_jumplist()
   exe "normal /last pos\r"
   call test_settime(40)
   exe "normal ?30\r"
-  rviminfo Xviminfo
+  rmnvinfo Xmnvinfo
 
   call assert_equal('time 30', getline('.'))
   exe "normal \<C-O>"
@@ -508,9 +508,9 @@ func Test_viminfo_jumplist()
   call test_settime(40)
   exe "normal ?30\r"
   " Test merge when writing
-  wviminfo Xviminfo
+  wmnvinfo Xmnvinfo
   clearjumps
-  rviminfo Xviminfo
+  rmnvinfo Xmnvinfo
 
   let last_line = line('.')
   exe "normal \<C-O>"
@@ -535,36 +535,36 @@ func Test_viminfo_jumplist()
   for i in range(100)
     exe "normal /here\r"
   endfor
-  rviminfo Xviminfo
+  rmnvinfo Xmnvinfo
 
-  " must be newest mark that comes from viminfo.
+  " must be newest mark that comes from mnvinfo.
   exe "normal \<C-O>"
   call assert_equal(last_line, line('.'))
 
   bwipe!
-  call delete('Xviminfo')
+  call delete('Xmnvinfo')
 endfunc
 
-func Test_viminfo_encoding()
+func Test_mnvinfo_encoding()
   set enc=latin1
   call histdel(':')
   call histadd(':', "echo '\xe9'")
-  wviminfo Xviminfo
+  wmnvinfo Xmnvinfo
 
   set fencs=utf-8,latin1
   set enc=utf-8
-  sp Xviminfo
+  sp Xmnvinfo
   call assert_equal('latin1', &fenc)
   close
 
   call histdel(':')
-  rviminfo Xviminfo
+  rmnvinfo Xmnvinfo
   call assert_equal("echo 'é'", histget(':', -1))
 
-  call delete('Xviminfo')
+  call delete('Xmnvinfo')
 endfunc
 
-func Test_viminfo_bad_syntax()
+func Test_mnvinfo_bad_syntax()
   let lines = []
   call add(lines, '|<')  " empty continuation line
   call add(lines, '|234234234234234324,nothing')
@@ -576,23 +576,23 @@ func Test_viminfo_bad_syntax()
   call add(lines, '|1,"x\') " trailing backslash
   call add(lines, '|1,,,,') "trailing comma
   call add(lines, '|1,>234') " trailing continuation line
-  call writefile(lines, 'Xviminfo', 'D')
-  rviminfo Xviminfo
+  call writefile(lines, 'Xmnvinfo', 'D')
+  rmnvinfo Xmnvinfo
 
-  call delete('Xviminfo')
+  call delete('Xmnvinfo')
 endfunc
 
-func Test_viminfo_bad_syntax2()
+func Test_mnvinfo_bad_syntax2()
   let lines = []
   call add(lines, '|1,4')
 
-  " bad viminfo syntax for history barline
+  " bad mnvinfo syntax for history barline
   call add(lines, '|2') " invalid number of fields in a history barline
   call add(lines, '|2,9,1,1,"x"') " invalid value for the history type
   call add(lines, '|2,0,,1,"x"') " no timestamp
   call add(lines, '|2,0,1,1,10') " non-string text
 
-  " bad viminfo syntax for register barline
+  " bad mnvinfo syntax for register barline
   call add(lines, '|3') " invalid number of fields in a register barline
   call add(lines, '|3,1,1,1,1,,1,"x"') " missing width field
   call add(lines, '|3,0,80,1,1,1,1,"x"') " invalid register number
@@ -600,18 +600,18 @@ func Test_viminfo_bad_syntax2()
   call add(lines, '|3,0,10,1,20,1,1,"x"') " invalid line count
   call add(lines, '|3,0,10,1,0,1,1') " zero line count
 
-  " bad viminfo syntax for mark barline
+  " bad mnvinfo syntax for mark barline
   call add(lines, '|4') " invalid number of fields in a mark barline
   call add(lines, '|4,1,1,1,1,1') " invalid value for file name
   call add(lines, '|4,20,1,1,1,"x"') " invalid value for file name
   call add(lines, '|4,49,0,1,1,"x"') " invalid value for line number
 
-  call writefile(lines, 'Xviminfo', 'D')
-  rviminfo Xviminfo
+  call writefile(lines, 'Xmnvinfo', 'D')
+  rmnvinfo Xmnvinfo
 endfunc
 
-" This used to crash Vim (GitHub issue #12652)
-func Test_viminfo_bad_syntax3()
+" This used to crash MNV (GitHub issue #12652)
+func Test_mnvinfo_bad_syntax3()
   let lines =<< trim END
     call writefile([], 'Xvbs3.result')
     qall!
@@ -620,19 +620,19 @@ func Test_viminfo_bad_syntax3()
 
   let lines = []
   call add(lines, '|1,4')
-  " bad viminfo syntax for register barline
+  " bad mnvinfo syntax for register barline
   call add(lines, '|3,1,1,1,1,0,71489,,125') " empty line1
-  call writefile(lines, 'Xviminfo', 'D')
+  call writefile(lines, 'Xmnvinfo', 'D')
 
-  call RunVim([], [], '--clean -i Xviminfo -S Xvbs3script')
+  call RunMNV([], [], '--clean -i Xmnvinfo -S Xvbs3script')
   call assert_true(filereadable('Xvbs3.result'))
 
   call delete('Xvbs3.result')
 endfunc
 
-func Test_viminfo_file_marks()
-  silent! bwipe test_viminfo.vim
-  silent! bwipe Xviminfo
+func Test_mnvinfo_file_marks()
+  silent! bwipe test_mnvinfo.mnv
+  silent! bwipe Xmnvinfo
 
   call test_settime(10)
   edit ten
@@ -640,7 +640,7 @@ func Test_viminfo_file_marks()
   edit again
   call test_settime(30)
   edit thirty
-  wviminfo Xviminfo
+  wmnvinfo Xmnvinfo
 
   call test_settime(20)
   edit twenty
@@ -648,9 +648,9 @@ func Test_viminfo_file_marks()
   edit again
   call test_settime(40)
   edit forty
-  wviminfo Xviminfo
+  wmnvinfo Xmnvinfo
 
-  sp Xviminfo
+  sp Xmnvinfo
   1
   for name in ['forty', 'again', 'thirty', 'twenty', 'ten']
     /^>
@@ -658,16 +658,16 @@ func Test_viminfo_file_marks()
   endfor
   close
 
-  call delete('Xviminfo')
+  call delete('Xmnvinfo')
 endfunc
 
-func Test_viminfo_file_mark_tabclose()
+func Test_mnvinfo_file_mark_tabclose()
   tabnew Xtestfileintab
   call setline(1, ['a','b','c','d','e'])
   4
   q!
-  wviminfo Xviminfo
-  sp Xviminfo
+  wmnvinfo Xmnvinfo
+  sp Xmnvinfo
   /^> .*Xtestfileintab
   let lnum = line('.')
   while 1
@@ -687,13 +687,13 @@ func Test_viminfo_file_mark_tabclose()
     endif
   endwhile
 
-  call delete('Xviminfo')
+  call delete('Xmnvinfo')
   silent! bwipe Xtestfileintab
 endfunc
 
-func Test_viminfo_file_mark_zero_time()
+func Test_mnvinfo_file_mark_zero_time()
   let lines = [
-	\ '# Viminfo version',
+	\ '# MNVinfo version',
 	\ '|1,4',
 	\ '',
 	\ '*encoding=utf-8',
@@ -703,42 +703,42 @@ func Test_viminfo_file_mark_zero_time()
 	\ '|4,66,1,0,0,"/tmp/nothing"',
 	\ "",
 	\ ]
-  call writefile(lines, 'Xviminfo', 'D')
+  call writefile(lines, 'Xmnvinfo', 'D')
   delmark B
-  rviminfo Xviminfo
+  rmnvinfo Xmnvinfo
   call assert_equal(1, line("'B"))
   delmark B
 endfunc
 
 " Test for saving and restoring file marks in unloaded buffers
-func Test_viminfo_file_mark_unloaded_buf()
-  let save_viminfo = &viminfo
-  set viminfo&vim
-  call writefile(repeat(['vim'], 10), 'Xfile1', 'D')
+func Test_mnvinfo_file_mark_unloaded_buf()
+  let save_mnvinfo = &mnvinfo
+  set mnvinfo&mnv
+  call writefile(repeat(['mnv'], 10), 'Xfile1', 'D')
   %bwipe
   edit! Xfile1
   call setpos("'u", [0, 3, 1, 0])
   call setpos("'v", [0, 5, 1, 0])
   enew
-  wviminfo Xviminfo
+  wmnvinfo Xmnvinfo
   %bwipe
   edit Xfile1
-  rviminfo! Xviminfo
+  rmnvinfo! Xmnvinfo
   call assert_equal([0, 3, 1, 0], getpos("'u"))
   call assert_equal([0, 5, 1, 0], getpos("'v"))
   %bwipe
-  call delete('Xviminfo')
-  let &viminfo = save_viminfo
+  call delete('Xmnvinfo')
+  let &mnvinfo = save_mnvinfo
 endfunc
 
-func Test_viminfo_oldfiles()
+func Test_mnvinfo_oldfiles()
   set noswapfile
   let v:oldfiles = []
   let lines = [
 	\ '# comment line',
 	\ '*encoding=utf-8',
 	\ '',
-	\ ':h viminfo',
+	\ ':h mnvinfo',
 	\ '?/session',
 	\ '=myvar',
 	\ '@123',
@@ -755,12 +755,12 @@ func Test_viminfo_oldfiles()
 	\ "\t\"\t11\t0",
 	\ "",
 	\ ]
-  call writefile(lines, 'Xviminfo', 'D')
+  call writefile(lines, 'Xmnvinfo', 'D')
   delmark E
   edit /tmp/file_two.txt
-  rviminfo! Xviminfo
+  rmnvinfo! Xmnvinfo
 
-  call assert_equal('h viminfo', histget(':'))
+  call assert_equal('h mnvinfo', histget(':'))
   call assert_equal('session', histget('/'))
   call assert_equal('myvar', histget('='))
   call assert_equal('123', histget('@'))
@@ -778,34 +778,34 @@ func Test_viminfo_oldfiles()
   set swapfile&
 endfunc
 
-" Test for storing and restoring buffer list in 'viminfo'
-func Test_viminfo_bufferlist()
-  " If there are arguments, then :rviminfo doesn't read the buffer list.
-  " Need to delete all the arguments for :rviminfo to work.
+" Test for storing and restoring buffer list in 'mnvinfo'
+func Test_mnvinfo_bufferlist()
+  " If there are arguments, then :rmnvinfo doesn't read the buffer list.
+  " Need to delete all the arguments for :rmnvinfo to work.
   %argdelete
-  set viminfo&vim
+  set mnvinfo&mnv
 
   edit Xfile1
   edit Xfile2
-  set viminfo-=%
-  wviminfo Xviminfo
+  set mnvinfo-=%
+  wmnvinfo Xmnvinfo
   %bwipe
-  rviminfo Xviminfo
+  rmnvinfo Xmnvinfo
   call assert_equal(1, len(getbufinfo()))
 
   edit Xfile1
   edit Xfile2
-  set viminfo^=%
-  wviminfo Xviminfo
+  set mnvinfo^=%
+  wmnvinfo Xmnvinfo
   %bwipe
-  rviminfo Xviminfo
+  rmnvinfo Xmnvinfo
   let l = getbufinfo()
   call assert_equal(3, len(l))
   call assert_equal('Xfile1', bufname(l[1].bufnr))
   call assert_equal('Xfile2', bufname(l[2].bufnr))
 
   " The quickfix, terminal, unlisted, unnamed buffers are not stored in the
-  " viminfo file
+  " mnvinfo file
   %bw!
   edit Xfile1
   new
@@ -815,87 +815,87 @@ func Test_viminfo_bufferlist()
   if has('terminal')
     terminal
   endif
-  wviminfo! Xviminfo
+  wmnvinfo! Xmnvinfo
   %bwipe!
-  rviminfo Xviminfo
+  rmnvinfo Xmnvinfo
   let l = getbufinfo()
   call assert_equal(2, len(l))
   call assert_true(bufexists('Xfile1'))
 
   " If a count is specified for '%', then only that many buffers should be
-  " stored in the viminfo file.
+  " stored in the mnvinfo file.
   %bw!
-  set viminfo&vim
+  set mnvinfo&mnv
   new Xbuf1
   new Xbuf2
-  set viminfo+=%1
-  wviminfo! Xviminfo
+  set mnvinfo+=%1
+  wmnvinfo! Xmnvinfo
   %bwipe!
-  rviminfo! Xviminfo
+  rmnvinfo! Xmnvinfo
   let l = getbufinfo()
   call assert_equal(2, len(l))
   call assert_true(bufexists('Xbuf1'))
   call assert_false(bufexists('Xbuf2'))
 
-  call delete('Xviminfo')
+  call delete('Xmnvinfo')
   %bwipe
-  set viminfo&vim
+  set mnvinfo&mnv
 endfunc
 
-" Test for errors in a viminfo file
-func Test_viminfo_error()
-  " Non-existing viminfo files
-  call assert_fails('rviminfo xyz', 'E195:')
+" Test for errors in a mnvinfo file
+func Test_mnvinfo_error()
+  " Non-existing mnvinfo files
+  call assert_fails('rmnvinfo xyz', 'E195:')
 
   " Illegal starting character
-  call writefile(["a 123"], 'Xviminfo', 'D')
-  call assert_fails('rv Xviminfo', 'E575:')
+  call writefile(["a 123"], 'Xmnvinfo', 'D')
+  call assert_fails('rv Xmnvinfo', 'E575:')
 
-  " Illegal register name in the viminfo file
-  call writefile(['"@	LINE	0'], 'Xviminfo')
-  call assert_fails('rv Xviminfo', 'E577:')
+  " Illegal register name in the mnvinfo file
+  call writefile(['"@	LINE	0'], 'Xmnvinfo')
+  call assert_fails('rv Xmnvinfo', 'E577:')
 
   " Invalid file mark line
-  call writefile(['>', '@'], 'Xviminfo')
-  call assert_fails('rv Xviminfo', 'E576:')
+  call writefile(['>', '@'], 'Xmnvinfo')
+  call assert_fails('rv Xmnvinfo', 'E576:')
 
-  " Too many errors in viminfo file
-  call writefile(repeat(["a 123"], 15), 'Xviminfo')
-  call assert_fails('rv Xviminfo', 'E575:')
+  " Too many errors in mnvinfo file
+  call writefile(repeat(["a 123"], 15), 'Xmnvinfo')
+  call assert_fails('rv Xmnvinfo', 'E575:')
 
-  call writefile(['>'] + repeat(['@'], 10), 'Xviminfo')
-  call assert_fails('rv Xviminfo', 'E576:')
+  call writefile(['>'] + repeat(['@'], 10), 'Xmnvinfo')
+  call assert_fails('rv Xmnvinfo', 'E576:')
 
-  call writefile(repeat(['"@'], 15), 'Xviminfo')
-  call assert_fails('rv Xviminfo', 'E577:')
+  call writefile(repeat(['"@'], 15), 'Xmnvinfo')
+  call assert_fails('rv Xmnvinfo', 'E577:')
 endfunc
 
-" Test for saving and restoring last substitute string in viminfo
-func Test_viminfo_lastsub()
+" Test for saving and restoring last substitute string in mnvinfo
+func Test_mnvinfo_lastsub()
   enew
   call append(0, "blue blue blue")
   call cursor(1, 1)
   s/blue/green/
-  wviminfo Xviminfo
+  wmnvinfo Xmnvinfo
   s/blue/yellow/
-  rviminfo! Xviminfo
+  rmnvinfo! Xmnvinfo
   &
   call assert_equal("green yellow green", getline(1))
   enew!
-  call delete('Xviminfo')
+  call delete('Xmnvinfo')
 endfunc
 
 " Test saving and restoring the register values using the older method
-func Test_viminfo_registers_old()
+func Test_mnvinfo_registers_old()
   let lines = [
-	\ '# Viminfo version',
+	\ '# MNVinfo version',
 	\ '|1,1',
 	\ '',
 	\ '*encoding=utf-8',
 	\ '',
 	\ '# Registers:',
 	\ '""0 CHAR  0',
-	\ '	Vim',
+	\ '	MNV',
 	\ '"a  CHAR  0',
 	\ '	red',
 	\ '"c  BLOCK  0',
@@ -908,14 +908,14 @@ func Test_viminfo_registers_old()
 	\ "	:echo 'Hello'\<CR>",
 	\ "",
 	\ ]
-  call writefile(lines, 'Xviminfo', 'D')
+  call writefile(lines, 'Xmnvinfo', 'D')
   let @a = 'one'
   let @b = 'two'
   let @m = 'three'
   let @" = 'four'
   let @t = ":echo 'Unix'\<CR>"
   silent! normal @t
-  rviminfo! Xviminfo
+  rmnvinfo! Xmnvinfo
   call assert_equal('red', getreg('a'))
   call assert_equal("v", getregtype('a'))
   call assert_equal('two', getreg('b'))
@@ -924,194 +924,194 @@ func Test_viminfo_registers_old()
   call assert_equal("abc\ndef\n", getreg('d'))
   call assert_equal("V", getregtype('d'))
   call assert_equal(":echo 'Hello'\<CR>", getreg('m'))
-  call assert_equal('Vim', getreg('"'))
+  call assert_equal('MNV', getreg('"'))
   call assert_equal("\nHello", execute('normal @@'))
 
   let @" = ''
 endfunc
 
 " Test for saving and restoring large number of lines in a register
-func Test_viminfo_large_register()
-  let save_viminfo = &viminfo
-  set viminfo&vim
-  set viminfo-=<50
-  set viminfo+=<200
+func Test_mnvinfo_large_register()
+  let save_mnvinfo = &mnvinfo
+  set mnvinfo&mnv
+  set mnvinfo-=<50
+  set mnvinfo+=<200
   let lines = ['"r	CHAR	0']
   call extend(lines, repeat(["\tsun is rising"], 200))
-  call writefile(lines, 'Xviminfo', 'D')
+  call writefile(lines, 'Xmnvinfo', 'D')
   let @r = ''
-  rviminfo! Xviminfo
+  rmnvinfo! Xmnvinfo
   call assert_equal(join(repeat(["sun is rising"], 200), "\n"), @r)
 
   let @r = ''
-  let &viminfo = save_viminfo
+  let &mnvinfo = save_mnvinfo
 endfunc
 
-" Test for setting 'viminfofile' to NONE
-func Test_viminfofile_none()
-  let save_vif = &viminfofile
-  set viminfofile=NONE
-  wviminfo Xviminfo
-  call assert_false(filereadable('Xviminfo'))
-  call writefile([''], 'Xviminfo', 'D')
-  call assert_fails('rviminfo Xviminfo', 'E195:')
+" Test for setting 'mnvinfofile' to NONE
+func Test_mnvinfofile_none()
+  let save_vif = &mnvinfofile
+  set mnvinfofile=NONE
+  wmnvinfo Xmnvinfo
+  call assert_false(filereadable('Xmnvinfo'))
+  call writefile([''], 'Xmnvinfo', 'D')
+  call assert_fails('rmnvinfo Xmnvinfo', 'E195:')
 
-  let &viminfofile = save_vif
+  let &mnvinfofile = save_vif
 endfunc
 
-" Test for an unwritable and unreadable 'viminfo' file
-func Test_viminfo_perm()
+" Test for an unwritable and unreadable 'mnvinfo' file
+func Test_mnvinfo_perm()
   CheckUnix
   CheckNotRoot
-  call writefile([''], 'Xviminfo', 'D')
-  call setfperm('Xviminfo', 'r-x------')
-  call assert_fails('wviminfo Xviminfo', 'E137:')
-  call setfperm('Xviminfo', '--x------')
-  call assert_fails('rviminfo Xviminfo', 'E195:')
+  call writefile([''], 'Xmnvinfo', 'D')
+  call setfperm('Xmnvinfo', 'r-x------')
+  call assert_fails('wmnvinfo Xmnvinfo', 'E137:')
+  call setfperm('Xmnvinfo', '--x------')
+  call assert_fails('rmnvinfo Xmnvinfo', 'E195:')
 
-  " Try to write the viminfo to a directory
+  " Try to write the mnvinfo to a directory
   call mkdir('Xvifdir', 'R')
-  call assert_fails('wviminfo Xvifdir', 'E137:')
-  call assert_fails('rviminfo Xvifdir', 'E195:')
+  call assert_fails('wmnvinfo Xvifdir', 'E137:')
+  call assert_fails('rmnvinfo Xvifdir', 'E195:')
 endfunc
 
-" Test for writing to an existing viminfo file merges the file marks
-func XTest_viminfo_marks_merge()
-  let save_viminfo = &viminfo
-  set viminfo&vim
-  set viminfo^=%
+" Test for writing to an existing mnvinfo file merges the file marks
+func XTest_mnvinfo_marks_merge()
+  let save_mnvinfo = &mnvinfo
+  set mnvinfo&mnv
+  set mnvinfo^=%
   enew
   %argdelete
   %bwipe
 
   call writefile(repeat(['editor'], 10), 'Xbufa', 'D')
-  call writefile(repeat(['Vim'], 10), 'Xbufb', 'D')
+  call writefile(repeat(['MNV'], 10), 'Xbufb', 'D')
 
   " set marks in buffers
   call test_settime(10)
   edit Xbufa
   4mark a
-  wviminfo Xviminfo
+  wmnvinfo Xmnvinfo
   edit Xbufb
   4mark b
-  wviminfo Xviminfo
+  wmnvinfo Xmnvinfo
   %bwipe
 
   " set marks in buffers again
   call test_settime(20)
   edit Xbufb
   6mark b
-  wviminfo Xviminfo
+  wmnvinfo Xmnvinfo
   edit Xbufa
   6mark a
-  wviminfo Xviminfo
+  wmnvinfo Xmnvinfo
   %bwipe
 
   " Load the buffer and check the marks
   edit Xbufa
-  rviminfo! Xviminfo
+  rmnvinfo! Xmnvinfo
   call assert_equal(6, line("'a"))
   edit Xbufb
-  rviminfo! Xviminfo
+  rmnvinfo! Xmnvinfo
   call assert_equal(6, line("'b"))
 
   " cleanup
   %bwipe
-  call delete('Xviminfo')
+  call delete('Xmnvinfo')
   call test_settime(0)
-  let &viminfo=save_viminfo
+  let &mnvinfo=save_mnvinfo
 endfunc
 
-" Test for errors in setting 'viminfo'
-func Test_viminfo_option_error()
+" Test for errors in setting 'mnvinfo'
+func Test_mnvinfo_option_error()
   " Missing number
-  call assert_fails('set viminfo=\"', 'E526:')
+  call assert_fails('set mnvinfo=\"', 'E526:')
   for c in split("'/:<@s", '\zs')
-    call assert_fails('set viminfo=' .. c, 'E526:')
+    call assert_fails('set mnvinfo=' .. c, 'E526:')
   endfor
 
   " Missing comma
-  call assert_fails('set viminfo=%10!', 'E527:')
-  call assert_fails('set viminfo=!%10', 'E527:')
-  call assert_fails('set viminfo=h%10', 'E527:')
-  call assert_fails('set viminfo=c%10', 'E527:')
-  call assert_fails('set viminfo=:10%10', 'E527:')
+  call assert_fails('set mnvinfo=%10!', 'E527:')
+  call assert_fails('set mnvinfo=!%10', 'E527:')
+  call assert_fails('set mnvinfo=h%10', 'E527:')
+  call assert_fails('set mnvinfo=c%10', 'E527:')
+  call assert_fails('set mnvinfo=:10%10', 'E527:')
 
   " Missing ' setting
-  call assert_fails('set viminfo=%10', 'E528:')
+  call assert_fails('set mnvinfo=%10', 'E528:')
 endfunc
 
-func Test_viminfo_oldfiles_newfile()
-  CheckRunVimInTerminal
+func Test_mnvinfo_oldfiles_newfile()
+  CheckRunMNVInTerminal
 
-  let save_viminfo = &viminfo
-  let save_viminfofile = &viminfofile
-  set viminfo&vim
+  let save_mnvinfo = &mnvinfo
+  let save_mnvinfofile = &mnvinfofile
+  set mnvinfo&mnv
   let v:oldfiles = []
   let commands =<< trim [CODE]
-    set viminfofile=Xviminfofile
-    set viminfo&vim
+    set mnvinfofile=Xmnvinfofile
+    set mnvinfo&mnv
     w! Xnew-file.txt
     qall
   [CODE]
-  call writefile(commands, 'Xviminfotest', 'D')
-  let buf = RunVimInTerminal('-S Xviminfotest', #{wait_for_ruler: 0})
+  call writefile(commands, 'Xmnvinfotest', 'D')
+  let buf = RunMNVInTerminal('-S Xmnvinfotest', #{wait_for_ruler: 0})
   call WaitForAssert({-> assert_equal("finished", term_getstatus(buf))})
 
-  let &viminfofile = 'Xviminfofile'
-  rviminfo! Xviminfofile
+  let &mnvinfofile = 'Xmnvinfofile'
+  rmnvinfo! Xmnvinfofile
   call assert_match('Xnew-file.txt$', v:oldfiles[0])
   call assert_equal(1, len(v:oldfiles))
 
-  call delete('Xviminfofile')
+  call delete('Xmnvinfofile')
   call delete('Xnew-file.txt')
 
   let v:oldfiles = test_null_list()
   call assert_equal("\nNo old files", execute('oldfiles'))
 
-  let &viminfo = save_viminfo
-  let &viminfofile = save_viminfofile
+  let &mnvinfo = save_mnvinfo
+  let &mnvinfofile = save_mnvinfofile
 endfunc
 
-" When writing CTRL-V or "\n" to a viminfo file, it is converted to CTRL-V
+" When writing CTRL-V or "\n" to a mnvinfo file, it is converted to CTRL-V
 " CTRL-V and CTRL-V n respectively.
-func Test_viminfo_with_Ctrl_V()
+func Test_mnvinfo_with_Ctrl_V()
   silent! exe "normal! /\<C-V>\<C-V>\n"
-  wviminfo Xviminfo
-  call assert_notequal(-1, readfile('Xviminfo')->index("?/\<C-V>\<C-V>"))
+  wmnvinfo Xmnvinfo
+  call assert_notequal(-1, readfile('Xmnvinfo')->index("?/\<C-V>\<C-V>"))
   let @/ = 'abc'
-  rviminfo! Xviminfo
+  rmnvinfo! Xmnvinfo
   call assert_equal("\<C-V>", @/)
   silent! exe "normal! /\<C-V>\<C-J>\n"
-  wviminfo Xviminfo
-  call assert_notequal(-1, readfile('Xviminfo')->index("?/\<C-V>n"))
+  wmnvinfo Xmnvinfo
+  call assert_notequal(-1, readfile('Xmnvinfo')->index("?/\<C-V>n"))
   let @/ = 'abc'
-  rviminfo! Xviminfo
+  rmnvinfo! Xmnvinfo
   call assert_equal("\n", @/)
-  call delete('Xviminfo')
+  call delete('Xmnvinfo')
 endfunc
 
-" Test for the 'r' field in 'viminfo' (removal media)
-func Test_viminfo_removable_media()
+" Test for the 'r' field in 'mnvinfo' (removal media)
+func Test_mnvinfo_removable_media()
   CheckUnix
   if !isdirectory('/tmp') || getftype('/tmp') != 'dir'
     return
   endif
-  let save_viminfo = &viminfo
-  set viminfo+=r/tmp
-  edit /tmp/Xvima1b2c3
-  wviminfo Xviminfo
-  let matches = readfile('Xviminfo')->filter("v:val =~ 'Xvima1b2c3'")
+  let save_mnvinfo = &mnvinfo
+  set mnvinfo+=r/tmp
+  edit /tmp/Xmnva1b2c3
+  wmnvinfo Xmnvinfo
+  let matches = readfile('Xmnvinfo')->filter("v:val =~ 'Xmnva1b2c3'")
   call assert_equal(0, matches->len())
-  let &viminfo = save_viminfo
-  call delete('Xviminfo')
+  let &mnvinfo = save_mnvinfo
+  call delete('Xmnvinfo')
 endfunc
 
-" Test for the 'h' flag in 'viminfo'. If 'h' is not present, then the last
-" search pattern read from 'viminfo' should be highlighted with 'hlsearch'.
+" Test for the 'h' flag in 'mnvinfo'. If 'h' is not present, then the last
+" search pattern read from 'mnvinfo' should be highlighted with 'hlsearch'.
 " If 'h' is present, then the last search pattern should not be highlighted.
-func Test_viminfo_hlsearch()
-  set viminfo&vim
+func Test_mnvinfo_hlsearch()
+  set mnvinfo&mnv
 
   new
   call setline(1, ['one two three'])
@@ -1123,217 +1123,217 @@ func Test_viminfo_hlsearch()
   let hiSearch = screenattr(1, 9)
   let hiNormal = screenattr(1, 1)
 
-  set viminfo-=h
+  set mnvinfo-=h
   let @/='two'
-  wviminfo! Xviminfo
+  wmnvinfo! Xmnvinfo
   let @/='one'
-  rviminfo! Xviminfo
+  rmnvinfo! Xmnvinfo
   redraw!
   call assert_equal(hiSearch, screenattr(1, 5))
   call assert_equal(hiSearch, screenattr(1, 6))
   call assert_equal(hiSearch, screenattr(1, 7))
 
-  set viminfo+=h
+  set mnvinfo+=h
   let @/='two'
-  wviminfo! Xviminfo
+  wmnvinfo! Xmnvinfo
   let @/='one'
-  rviminfo! Xviminfo
+  rmnvinfo! Xmnvinfo
   redraw!
   call assert_equal(hiNormal, screenattr(1, 5))
   call assert_equal(hiNormal, screenattr(1, 6))
   call assert_equal(hiNormal, screenattr(1, 7))
 
-  call delete('Xviminfo')
-  set hlsearch& viminfo&vim
+  call delete('Xmnvinfo')
+  set hlsearch& mnvinfo&mnv
   bw!
 endfunc
 
-" Test for restoring the magicness of the last search pattern from the viminfo
+" Test for restoring the magicness of the last search pattern from the mnvinfo
 " file.
-func Test_viminfo_last_spat_magic()
-  set viminfo&vim
+func Test_mnvinfo_last_spat_magic()
+  set mnvinfo&mnv
   new
   call setline(1, ' one abc a.c')
 
   " restore 'nomagic'
   set nomagic
   exe "normal gg/a.c\<CR>"
-  wviminfo! Xviminfo
+  wmnvinfo! Xmnvinfo
   set magic
   exe "normal gg/one\<CR>"
-  rviminfo! Xviminfo
+  rmnvinfo! Xmnvinfo
   exe "normal! gg/\<CR>"
   call assert_equal(10, col('.'))
 
   " restore 'magic'
   set magic
   exe "normal gg/a.c\<CR>"
-  wviminfo! Xviminfo
+  wmnvinfo! Xmnvinfo
   set nomagic
   exe "normal gg/one\<CR>"
-  rviminfo! Xviminfo
+  rmnvinfo! Xmnvinfo
   exe "normal! gg/\<CR>"
   call assert_equal(6, col('.'))
 
-  call delete('Xviminfo')
-  set viminfo&vim magic&
+  call delete('Xmnvinfo')
+  set mnvinfo&mnv magic&
   bw!
 endfunc
 
-" Test for restoring the smartcase of the last search pattern from the viminfo
+" Test for restoring the smartcase of the last search pattern from the mnvinfo
 " file.
-func Test_viminfo_last_spat_smartcase()
+func Test_mnvinfo_last_spat_smartcase()
   new
   call setline(1, ' one abc Abc')
   set ignorecase smartcase
 
   " Searching with * should disable smartcase
   exe "normal! gg$b*"
-  wviminfo! Xviminfo
+  wmnvinfo! Xmnvinfo
   exe "normal gg/one\<CR>"
-  rviminfo! Xviminfo
+  rmnvinfo! Xmnvinfo
   exe "normal! gg/\<CR>"
   call assert_equal(6, col('.'))
 
-  call delete('Xviminfo')
-  set ignorecase& smartcase& viminfo&
+  call delete('Xmnvinfo')
+  set ignorecase& smartcase& mnvinfo&
   bw!
 endfunc
 
 " Test for restoring the last search pattern with a line or character offset
-" from the viminfo file.
-func Test_viminfo_last_spat_offset()
+" from the mnvinfo file.
+func Test_mnvinfo_last_spat_offset()
   new
   call setline(1, ['one', 'two', 'three', 'four', 'five'])
   " line offset
   exe "normal! /two/+2\<CR>"
-  wviminfo! Xviminfo
+  wmnvinfo! Xmnvinfo
   exe "normal gg/five\<CR>"
-  rviminfo! Xviminfo
+  rmnvinfo! Xmnvinfo
   exe "normal! gg/\<CR>"
   call assert_equal(4, line('.'))
   " character offset
   exe "normal! gg/^th/e+2\<CR>"
-  wviminfo! Xviminfo
+  wmnvinfo! Xmnvinfo
   exe "normal gg/two\<CR>"
-  rviminfo! Xviminfo
+  rmnvinfo! Xmnvinfo
   exe "normal! gg/\<CR>"
   call assert_equal([3, 4], [line('.'), col('.')])
-  call delete('Xviminfo')
+  call delete('Xmnvinfo')
   bw!
 endfunc
 
 " Test for saving and restoring the last executed register (@ command)
-" from the viminfo file
-func Test_viminfo_last_exec_reg()
+" from the mnvinfo file
+func Test_mnvinfo_last_exec_reg()
   let g:val = 1
   let @a = ":let g:val += 1\n"
   normal! @a
-  wviminfo! Xviminfo
+  wmnvinfo! Xmnvinfo
   let @b = ''
   normal! @b
-  rviminfo! Xviminfo
+  rmnvinfo! Xmnvinfo
   normal @@
   call assert_equal(3, g:val)
-  call delete('Xviminfo')
+  call delete('Xmnvinfo')
 endfunc
 
-" Test for merging file marks in a viminfo file
-func Test_viminfo_merge_file_marks()
+" Test for merging file marks in a mnvinfo file
+func Test_mnvinfo_merge_file_marks()
   for [f, l, t] in [['a.txt', 5, 10], ['b.txt', 10, 20]]
     call test_settime(t)
     exe 'edit ' .. f
     call setline(1, range(1, 20))
     exe l . 'mark a'
-    wviminfo Xviminfo
+    wmnvinfo Xmnvinfo
     bw!
   endfor
   call test_settime(30)
   for [f, l] in [['a.txt', 5], ['b.txt', 10]]
     exe 'edit ' .. f
-    rviminfo! Xviminfo
+    rmnvinfo! Xmnvinfo
     call assert_equal(l, line("'a"))
     bw!
   endfor
-  call delete('Xviminfo')
+  call delete('Xmnvinfo')
   call test_settime(0)
 endfunc
 
-" Test for merging file marks from a old viminfo file
-func Test_viminfo_merge_old_filemarks()
+" Test for merging file marks from a old mnvinfo file
+func Test_mnvinfo_merge_old_filemarks()
   let lines = []
   call add(lines, '|1,4')
   call add(lines, '> ' .. fnamemodify('a.txt', ':p:~'))
   call add(lines, "\tb\t7\t0\n")
-  call writefile(lines, 'Xviminfo', 'D')
+  call writefile(lines, 'Xmnvinfo', 'D')
   edit b.txt
   call setline(1, range(1, 20))
   12mark b
-  wviminfo Xviminfo
+  wmnvinfo Xmnvinfo
   bw!
   edit a.txt
-  rviminfo! Xviminfo
+  rmnvinfo! Xmnvinfo
   call assert_equal(7, line("'b"))
   edit b.txt
-  rviminfo! Xviminfo
+  rmnvinfo! Xmnvinfo
   call assert_equal(12, line("'b"))
 endfunc
 
-" Test for merging the jump list from a old viminfo file
-func Test_viminfo_merge_old_jumplist()
+" Test for merging the jump list from a old mnvinfo file
+func Test_mnvinfo_merge_old_jumplist()
   let lines = []
   call add(lines, "-'  10  1  " .. fnamemodify('a.txt', ':p:~'))
   call add(lines, "-'  20  1  " .. fnamemodify('a.txt', ':p:~'))
   call add(lines, "-'  30  1  " .. fnamemodify('b.txt', ':p:~'))
   call add(lines, "-'  40  1  " .. fnamemodify('b.txt', ':p:~'))
-  call writefile(lines, 'Xviminfo', 'D')
+  call writefile(lines, 'Xmnvinfo', 'D')
   clearjumps
-  rviminfo! Xviminfo
+  rmnvinfo! Xmnvinfo
   let l = getjumplist()[0]
   call assert_equal([40, 30, 20, 10], [l[0].lnum, l[1].lnum, l[2].lnum,
         \ l[3].lnum])
   bw!
 endfunc
 
-func Test_viminfo_oldfiles_filter()
+func Test_mnvinfo_oldfiles_filter()
   let v:oldfiles = []
-  let _viminfofile = &viminfofile
-  let &viminfofile=''
+  let _mnvinfofile = &mnvinfofile
+  let &mnvinfofile=''
   let lines = [
 	\ '# comment line',
 	\ '*encoding=utf-8',
-	\ "> /tmp/vimrc_one.vim",
+	\ "> /tmp/mnvrc_one.mnv",
 	\ "\t\"\t11\t0",
 	\ "",
 	\ "> /tmp/foobar.txt",
 	\ "\t\"\t11\t0",
 	\ "",
 	\ ]
-  call writefile(lines, 'Xviminfo1', 'D')
-  rviminfo! Xviminfo1
+  call writefile(lines, 'Xmnvinfo1', 'D')
+  rmnvinfo! Xmnvinfo1
   new
   " filter returns a single item
-  let a = execute('filter /vim/ oldfiles')->split('\n')
+  let a = execute('filter /mnv/ oldfiles')->split('\n')
   call assert_equal(1, len(a))
   " filter returns more than a single match
   let a = execute('filter #tmp# oldfiles')->split('\n')
   call assert_equal(2, len(a))
   " don't get prompted for the file, but directly open it
-  filter /vim/ browse oldfiles
-  call assert_equal("/tmp/vimrc_one.vim", expand("%"))
+  filter /mnv/ browse oldfiles
+  call assert_equal("/tmp/mnvrc_one.mnv", expand("%"))
   bw
-  let &viminfofile = _viminfofile
+  let &mnvinfofile = _mnvinfofile
 endfunc
 
-func Test_viminfo_global_var()
-  let _viminfofile = &viminfofile
-  let _viminfo = &viminfo
-  let &viminfofile=''
-  set viminfo+=!
+func Test_mnvinfo_global_var()
+  let _mnvinfofile = &mnvinfofile
+  let _mnvinfo = &mnvinfo
+  let &mnvinfofile=''
+  set mnvinfo+=!
   let lines = [
     \ '# comment line',
     \ "",
-    \ '# Viminfo version',
+    \ '# MNVinfo version',
     \ '|1,4',
     \ "",
     \ '*encoding=utf-8',
@@ -1343,52 +1343,52 @@ func Test_viminfo_global_var()
     \ "!VAR\tFLO\t-inf",
     \ "",
     \ ]
-  call writefile(lines, 'Xviminfo2', 'D')
-  rviminfo! Xviminfo2
+  call writefile(lines, 'Xmnvinfo2', 'D')
+  rmnvinfo! Xmnvinfo2
   call assert_equal(0.0, g:VAL)
   call assert_equal(str2float("-inf"), g:VAR)
-  let &viminfofile = _viminfofile
-  let &viminfo = _viminfo
+  let &mnvinfofile = _mnvinfofile
+  let &mnvinfo = _mnvinfo
 endfunc
 
-func Test_viminfo_len_one()
-  let _viminfofile = &viminfofile
-  let &viminfofile=''
-  let viminfo_file = tempname()
+func Test_mnvinfo_len_one()
+  let _mnvinfofile = &mnvinfofile
+  let &mnvinfofile=''
+  let mnvinfo_file = tempname()
   call histadd('cmd', '" TEST')
-  defer delete(viminfo_file)
+  defer delete(mnvinfo_file)
 
-  " Craft a viminfo entry with ^V1 length prefix (len == 1)
+  " Craft a mnvinfo entry with ^V1 length prefix (len == 1)
   call writefile([
       \ '*encoding=utf-8',
       \ ':' .. "\x161" .. 'X',
-      \ ], viminfo_file, 'b')
+      \ ], mnvinfo_file, 'b')
 
   " Should not crash or cause memory errors
-  exe 'rviminfo! ' .. viminfo_file
+  exe 'rmnvinfo! ' .. mnvinfo_file
   call assert_equal('" TEST', histget(':', -1))
 
-  let &viminfofile = _viminfofile
+  let &mnvinfofile = _mnvinfofile
 endfunc
 
-func Test_viminfo_len_overflow()
-  let _viminfofile = &viminfofile
-  let &viminfofile=''
-  let viminfo_file = tempname()
-  defer delete(viminfo_file)
+func Test_mnvinfo_len_overflow()
+  let _mnvinfofile = &mnvinfofile
+  let &mnvinfofile=''
+  let mnvinfo_file = tempname()
+  defer delete(mnvinfo_file)
 
-  " Craft a viminfo entry with size_t length overflow
-  call writefile(['# Viminfo',
+  " Craft a mnvinfo entry with size_t length overflow
+  call writefile(['# MNVinfo',
         \ '|1,4', '|2,>4294967311',
         \ '|<"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA',
         \ '|<BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB',
         \ '|<CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC',
-        \ '|<DDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD'], viminfo_file, 'b')
+        \ '|<DDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD'], mnvinfo_file, 'b')
 
   " Should not crash or cause memory errors
-  exe 'rviminfo! ' .. viminfo_file
+  exe 'rmnvinfo! ' .. mnvinfo_file
 
-  let &viminfofile = _viminfofile
+  let &mnvinfofile = _mnvinfofile
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_vimscript.vim b/uvim/src/testdir/test_mnvscript.mnv
index 49f34a578c..2d3887f28e 100644
--- a/uvim/src/testdir/test_vimscript.vim
+++ b/uvim/src/testdir/test_mnvscript.mnv
@@ -1,8 +1,8 @@
-" Test various aspects of the Vim script language.
-" Most of this was formerly in test49.vim (developed by Servatius Brandt
+" Test various aspects of the MNV script language.
+" Most of this was formerly in test49.mnv (developed by Servatius Brandt
 " <Servatius.Brandt@fujitsu-siemens.com>)
 
-source util/script_util.vim
+source util/script_util.mnv
 
 "-------------------------------------------------------------------------------
 " Test environment							    {{{1
@@ -17,13 +17,13 @@ endfunc
 
 com! -nargs=1	     Xout     call Xout(<args>)
 
-" Create a new instance of Vim and run the commands in 'test' and then 'verify'
+" Create a new instance of MNV and run the commands in 'test' and then 'verify'
 " The commands in 'test' are expected to store the test results in the Xtest.out
 " file. If the test passes successfully, then Xtest.out should be empty.
-func RunInNewVim(test, verify)
+func RunInNewMNV(test, verify)
   let init =<< trim END
     set cpo-=C            " support line-continuation in sourced script
-    source util/script_util.vim
+    source util/script_util.mnv
     XpathINIT
     XloopINIT
   END
@@ -31,11 +31,11 @@ func RunInNewVim(test, verify)
     call writefile(v:errors, 'Xtest.out')
     qall
   END
-  call writefile(init, 'Xtest.vim', 'D')
-  call writefile(a:test, 'Xtest.vim', 'a')
-  call writefile(a:verify, 'Xverify.vim', 'D')
-  call writefile(cleanup, 'Xverify.vim', 'a')
-  call RunVim([], [], "-S Xtest.vim -S Xverify.vim")
+  call writefile(init, 'Xtest.mnv', 'D')
+  call writefile(a:test, 'Xtest.mnv', 'a')
+  call writefile(a:verify, 'Xverify.mnv', 'D')
+  call writefile(cleanup, 'Xverify.mnv', 'a')
+  call RunMNV([], [], "-S Xtest.mnv -S Xverify.mnv")
   call assert_equal([], readfile('Xtest.out'))
   call delete('Xtest.out')
 endfunc
@@ -1085,7 +1085,7 @@ func Test_interrupt_while_if()
         call assert_report('should not get here')
       endif | call assert_report('should not get here')
       call assert_report('should not get here')
-    catch /^Vim:Interrupt$/
+    catch /^MNV:Interrupt$/
       Xpath 'd'
     endtry | Xpath 'e'
     Xpath 'f'
@@ -1093,7 +1093,7 @@ func Test_interrupt_while_if()
   let verify =<< trim [CODE]
     call assert_equal('abcdef', g:Xpath)
   [CODE]
-  call RunInNewVim(test, verify)
+  call RunInNewMNV(test, verify)
 endfunc
 
 func Test_interrupt_try()
@@ -1105,7 +1105,7 @@ func Test_interrupt_try()
         call assert_report('should not get here')
       endtry | call assert_report('should not get here')
       call assert_report('should not get here')
-    catch /^Vim:Interrupt$/
+    catch /^MNV:Interrupt$/
       Xpath 'b'
     endtry | Xpath 'c'
     Xpath 'd'
@@ -1113,7 +1113,7 @@ func Test_interrupt_try()
   let verify =<< trim [CODE]
     call assert_equal('abcd', g:Xpath)
   [CODE]
-  call RunInNewVim(test, verify)
+  call RunInNewMNV(test, verify)
 endfunc
 
 func Test_interrupt_func_while_if()
@@ -1140,7 +1140,7 @@ func Test_interrupt_func_while_if()
     Xpath 'd'
     try
       call F() | call assert_report('should not get here')
-    catch /^Vim:Interrupt$/
+    catch /^MNV:Interrupt$/
       Xpath 'e'
     endtry | Xpath 'f'
     Xpath 'g'
@@ -1148,7 +1148,7 @@ func Test_interrupt_func_while_if()
   let verify =<< trim [CODE]
     call assert_equal('dabcefg', g:Xpath)
   [CODE]
-  call RunInNewVim(test, verify)
+  call RunInNewMNV(test, verify)
 endfunc
 
 func Test_interrupt_func_try()
@@ -1165,7 +1165,7 @@ func Test_interrupt_func_try()
     Xpath 'b'
     try
       call G() | call assert_report('should not get here')
-    catch /^Vim:Interrupt$/
+    catch /^MNV:Interrupt$/
       Xpath 'c'
     endtry | Xpath 'd'
     Xpath 'e'
@@ -1173,7 +1173,7 @@ func Test_interrupt_func_try()
   let verify =<< trim [CODE]
     call assert_equal('bacde', g:Xpath)
   [CODE]
-  call RunInNewVim(test, verify)
+  call RunInNewMNV(test, verify)
 endfunc
 
 "-------------------------------------------------------------------------------
@@ -1203,7 +1203,7 @@ func Test_try_error_abort_1()
   let verify =<< trim [CODE]
     call assert_equal('ba', g:Xpath)
   [CODE]
-  call RunInNewVim(test, verify)
+  call RunInNewMNV(test, verify)
 endfunc
 
 func Test_try_error_abort_2()
@@ -1224,7 +1224,7 @@ func Test_try_error_abort_2()
   let verify =<< trim [CODE]
     call assert_equal('ba', g:Xpath)
   [CODE]
-  call RunInNewVim(test, verify)
+  call RunInNewMNV(test, verify)
 endfunc
 
 func Test_try_error_abort_3()
@@ -1239,7 +1239,7 @@ func Test_try_error_abort_3()
   let verify =<< trim [CODE]
     call assert_equal('a', g:Xpath)
   [CODE]
-  call RunInNewVim(test, verify)
+  call RunInNewMNV(test, verify)
 endfunc
 
 func Test_try_error_abort_4()
@@ -1256,7 +1256,7 @@ func Test_try_error_abort_4()
   let verify =<< trim [CODE]
     call assert_equal('a', g:Xpath)
   [CODE]
-  call RunInNewVim(test, verify)
+  call RunInNewMNV(test, verify)
 endfunc
 
 func Test_try_error_abort_5()
@@ -1275,7 +1275,7 @@ func Test_try_error_abort_5()
   let verify =<< trim [CODE]
     call assert_equal('a', g:Xpath)
   [CODE]
-  call RunInNewVim(test, verify)
+  call RunInNewMNV(test, verify)
 endfunc
 
 func Test_try_error_abort_6()
@@ -1293,7 +1293,7 @@ func Test_try_error_abort_6()
   let verify =<< trim [CODE]
     call assert_equal('abc', g:Xpath)
   [CODE]
-  call RunInNewVim(test, verify)
+  call RunInNewMNV(test, verify)
 endfunc
 
 "-------------------------------------------------------------------------------
@@ -1321,7 +1321,7 @@ func Test_error_after_try_1()
   let verify =<< trim [CODE]
     call assert_equal('abc', g:Xpath)
   [CODE]
-  call RunInNewVim(test, verify)
+  call RunInNewMNV(test, verify)
 endfunc
 
 func Test_error_after_try_2()
@@ -1340,7 +1340,7 @@ func Test_error_after_try_2()
   let verify =<< trim [CODE]
     call assert_equal('abc', g:Xpath)
   [CODE]
-  call RunInNewVim(test, verify)
+  call RunInNewMNV(test, verify)
 endfunc
 
 func Test_error_after_try_3()
@@ -1361,7 +1361,7 @@ func Test_error_after_try_3()
   let verify =<< trim [CODE]
     call assert_equal('abcd', g:Xpath)
   [CODE]
-  call RunInNewVim(test, verify)
+  call RunInNewMNV(test, verify)
 endfunc
 
 func Test_error_after_try_4()
@@ -1382,7 +1382,7 @@ func Test_error_after_try_4()
   let verify =<< trim [CODE]
     call assert_equal('abcd', g:Xpath)
   [CODE]
-  call RunInNewVim(test, verify)
+  call RunInNewMNV(test, verify)
 endfunc
 
 func Test_error_after_try_5()
@@ -1403,7 +1403,7 @@ func Test_error_after_try_5()
   let verify =<< trim [CODE]
     call assert_equal('abc', g:Xpath)
   [CODE]
-  call RunInNewVim(test, verify)
+  call RunInNewMNV(test, verify)
 endfunc
 
 func Test_error_after_try_6()
@@ -1426,7 +1426,7 @@ func Test_error_after_try_6()
   let verify =<< trim [CODE]
     call assert_equal('abcd', g:Xpath)
   [CODE]
-  call RunInNewVim(test, verify)
+  call RunInNewMNV(test, verify)
 endfunc
 
 func Test_error_after_try_7()
@@ -1449,7 +1449,7 @@ func Test_error_after_try_7()
   let verify =<< trim [CODE]
     call assert_equal('abcd', g:Xpath)
   [CODE]
-  call RunInNewVim(test, verify)
+  call RunInNewMNV(test, verify)
 endfunc
 
 "-------------------------------------------------------------------------------
@@ -1523,7 +1523,7 @@ func Test_finally_after_loop_ctrl_statement()
   let verify =<< trim [CODE]
     call assert_equal('fa2c2b3c3degh', g:Xpath)
   [CODE]
-  call RunInNewVim(test, verify)
+  call RunInNewMNV(test, verify)
 endfunc
 
 "-------------------------------------------------------------------------------
@@ -1565,7 +1565,7 @@ func Test_finally_after_error_in_func()
   let verify =<< trim [CODE]
     call assert_equal('ab', g:Xpath)
   [CODE]
-  call RunInNewVim(test, verify)
+  call RunInNewMNV(test, verify)
 endfunc
 
 func Test_finally_after_interrupt()
@@ -1581,7 +1581,7 @@ func Test_finally_after_interrupt()
     Xpath 'b'
     try
       call Interrupt()
-    catch /^Vim:Interrupt$/
+    catch /^MNV:Interrupt$/
       Xpath 'c'
       finish
     endtry
@@ -1604,7 +1604,7 @@ func Test_finally_after_interrupt()
   let verify =<< trim [CODE]
     call assert_equal('bac', g:Xpath)
   [CODE]
-  call RunInNewVim(test, verify)
+  call RunInNewMNV(test, verify)
 endfunc
 
 func Test_finally_after_throw()
@@ -1635,7 +1635,7 @@ func Test_finally_after_throw()
   let verify =<< trim [CODE]
     call assert_equal('ba', g:Xpath)
   [CODE]
-  call RunInNewVim(test, verify)
+  call RunInNewMNV(test, verify)
 endfunc
 
 "-------------------------------------------------------------------------------
@@ -1676,7 +1676,7 @@ func Test_catch_after_throw()
   let verify =<< trim [CODE]
     call assert_equal('abc', g:Xpath)
   [CODE]
-  call RunInNewVim(test, verify)
+  call RunInNewMNV(test, verify)
 endfunc
 
 "-------------------------------------------------------------------------------
@@ -1709,7 +1709,7 @@ func Test_endtry_after_throw()
   let verify =<< trim [CODE]
     call assert_equal('abc', g:Xpath)
   [CODE]
-  call RunInNewVim(test, verify)
+  call RunInNewMNV(test, verify)
 endfunc
 
 "-------------------------------------------------------------------------------
@@ -1858,7 +1858,7 @@ func Test_finally_after_error_1()
   let verify =<< trim [CODE]
     call assert_equal('eabcdf', g:Xpath)
   [CODE]
-  call RunInNewVim(test, verify)
+  call RunInNewMNV(test, verify)
 endfunc
 
 func Test_finally_after_error_2()
@@ -1890,7 +1890,7 @@ func Test_finally_after_error_2()
   let verify =<< trim [CODE]
     call assert_equal('eabf', g:Xpath)
   [CODE]
-  call RunInNewVim(test, verify)
+  call RunInNewMNV(test, verify)
 endfunc
 
 "-------------------------------------------------------------------------------
@@ -1962,14 +1962,14 @@ func Test_finally_on_interrupt()
         call assert_report('should not get here')
       endtry
       call assert_report('should not get here')
-    catch /^Vim:Interrupt$/
+    catch /^MNV:Interrupt$/
       Xpath 'o'
     endtry
   [CODE]
   let verify =<< trim [CODE]
     call assert_equal('cdefghijka1b1lma2b2no', g:Xpath)
   [CODE]
-  call RunInNewVim(test, verify)
+  call RunInNewMNV(test, verify)
 endfunc
 
 "-------------------------------------------------------------------------------
@@ -2044,7 +2044,7 @@ func Test_finally_after_throw_2()
   let verify =<< trim [CODE]
     call assert_equal('cdefghijka1b1lma2b2n', g:Xpath)
   [CODE]
-  call RunInNewVim(test, verify)
+  call RunInNewMNV(test, verify)
 endfunc
 
 "-------------------------------------------------------------------------------
@@ -2118,7 +2118,7 @@ func Test_finally_after_continue()
   let verify =<< trim [CODE]
     call assert_equal('a2ba3ca4da5ea6fga7hia8jk', g:Xpath)
   [CODE]
-  call RunInNewVim(test, verify)
+  call RunInNewMNV(test, verify)
 endfunc
 
 "-------------------------------------------------------------------------------
@@ -2192,7 +2192,7 @@ func Test_finally_discard_by_break()
   let verify =<< trim [CODE]
     call assert_equal('a2ba3ca4da5ea6fga7hia8jk', g:Xpath)
   [CODE]
-  call RunInNewVim(test, verify)
+  call RunInNewMNV(test, verify)
 endfunc
 
 "-------------------------------------------------------------------------------
@@ -2264,7 +2264,7 @@ func Test_finally_discard_by_return()
   let verify =<< trim [CODE]
     call assert_equal('abcdefghi', g:Xpath)
   [CODE]
-  call RunInNewVim(test, verify)
+  call RunInNewMNV(test, verify)
 endfunc
 
 "-------------------------------------------------------------------------------
@@ -2347,7 +2347,7 @@ func Test_finally_discard_by_finish()
   let verify =<< trim [CODE]
     call assert_equal('abcdefghi', g:Xpath)
   [CODE]
-  call RunInNewVim(test, verify)
+  call RunInNewMNV(test, verify)
 endfunc
 
 "-------------------------------------------------------------------------------
@@ -2441,7 +2441,7 @@ func Test_finally_discard_by_error()
   let verify =<< trim [CODE]
     call assert_equal('abcdefgh', g:Xpath)
   [CODE]
-  call RunInNewVim(test, verify)
+  call RunInNewMNV(test, verify)
 endfunc
 
 "-------------------------------------------------------------------------------
@@ -2533,14 +2533,14 @@ func Test_finally_discarded_by_interrupt()
         endtry
       endtry
       call assert_report('should not get here')
-    catch /^Vim:Interrupt$/
+    catch /^MNV:Interrupt$/
       Xpath 'A'
     endtry
   [CODE]
   let verify =<< trim [CODE]
     call assert_equal('abcdefghA', g:Xpath)
   [CODE]
-  call RunInNewVim(test, verify)
+  call RunInNewMNV(test, verify)
 endfunc
 
 "-------------------------------------------------------------------------------
@@ -2634,7 +2634,7 @@ func Test_finally_discard_by_throw()
   let verify =<< trim [CODE]
     call assert_equal('abcdefgh', g:Xpath)
   [CODE]
-  call RunInNewVim(test, verify)
+  call RunInNewMNV(test, verify)
 endfunc
 
 "-------------------------------------------------------------------------------
@@ -2792,7 +2792,7 @@ func Test_uncaught_exception_1()
     call assert_equal('E605: Exception not caught: arrgh', v:errmsg)
     call assert_equal('a', g:Xpath)
   [CODE]
-  call RunInNewVim(test, verify)
+  call RunInNewMNV(test, verify)
 endfunc
 
 func Test_uncaught_exception_2()
@@ -2812,7 +2812,7 @@ func Test_uncaught_exception_2()
     call assert_equal('E605: Exception not caught: oops', v:errmsg)
     call assert_equal('a', g:Xpath)
   [CODE]
-  call RunInNewVim(test, verify)
+  call RunInNewMNV(test, verify)
 endfunc
 
 func Test_uncaught_exception_3()
@@ -2840,7 +2840,7 @@ func Test_uncaught_exception_3()
     call assert_equal('E605: Exception not caught: brrr', v:errmsg)
     call assert_equal('abc', g:Xpath)
   [CODE]
-  call RunInNewVim(test, verify)
+  call RunInNewMNV(test, verify)
 endfunc
 
 func Test_uncaught_exception_4()
@@ -2862,7 +2862,7 @@ func Test_uncaught_exception_4()
     call assert_equal('E605: Exception not caught: brrr', v:errmsg)
     call assert_equal('ab', g:Xpath)
   [CODE]
-  call RunInNewVim(test, verify)
+  call RunInNewMNV(test, verify)
 endfunc
 
 func Test_uncaught_exception_5()
@@ -2878,14 +2878,14 @@ func Test_uncaught_exception_5()
         call assert_report('should not get here')
       endtry
       call assert_report('should not get here')
-    catch /^Vim:Interrupt$/
+    catch /^MNV:Interrupt$/
       Xpath 'b'
     endtry
   [CODE]
   let verify =<< trim [CODE]
     call assert_equal('ab', g:Xpath)
   [CODE]
-  call RunInNewVim(test, verify)
+  call RunInNewMNV(test, verify)
 endfunc
 
 func Test_uncaught_exception_6()
@@ -2904,7 +2904,7 @@ func Test_uncaught_exception_6()
     call assert_equal('a', g:Xpath)
     call assert_equal('E121: Undefined variable: novar', v:errmsg)
   [CODE]
-  call RunInNewVim(test, verify)
+  call RunInNewMNV(test, verify)
 endfunc
 
 func Test_uncaught_exception_7()
@@ -2924,7 +2924,7 @@ func Test_uncaught_exception_7()
     call assert_equal('a', g:Xpath)
     call assert_equal('E488: Trailing characters: #', v:errmsg)
   [CODE]
-  call RunInNewVim(test, verify)
+  call RunInNewMNV(test, verify)
 endfunc
 
 "-------------------------------------------------------------------------------
@@ -2942,7 +2942,7 @@ func Test_nested_if_else_errors()
     endif
   END
   call writefile(code, 'Xtest', 'D')
-  call AssertException(['source Xtest'], 'Vim(endif):E580: :endif without :if')
+  call AssertException(['source Xtest'], 'MNV(endif):E580: :endif without :if')
 
   " :endif without :if
   let code =<< trim END
@@ -2951,7 +2951,7 @@ func Test_nested_if_else_errors()
     endwhile
   END
   call writefile(code, 'Xtest')
-  call AssertException(['source Xtest'], 'Vim(endif):E580: :endif without :if')
+  call AssertException(['source Xtest'], 'MNV(endif):E580: :endif without :if')
 
   " :endif without :if
   let code =<< trim END
@@ -2961,7 +2961,7 @@ func Test_nested_if_else_errors()
     endtry
   END
   call writefile(code, 'Xtest')
-  call AssertException(['source Xtest'], 'Vim(endif):E580: :endif without :if')
+  call AssertException(['source Xtest'], 'MNV(endif):E580: :endif without :if')
 
   " :endif without :if
   let code =<< trim END
@@ -2970,7 +2970,7 @@ func Test_nested_if_else_errors()
     endtry
   END
   call writefile(code, 'Xtest')
-  call AssertException(['source Xtest'], 'Vim(endif):E580: :endif without :if')
+  call AssertException(['source Xtest'], 'MNV(endif):E580: :endif without :if')
 
   " :endif without :if
   let code =<< trim END
@@ -2981,14 +2981,14 @@ func Test_nested_if_else_errors()
     endtry
   END
   call writefile(code, 'Xtest')
-  call AssertException(['source Xtest'], 'Vim(endif):E580: :endif without :if')
+  call AssertException(['source Xtest'], 'MNV(endif):E580: :endif without :if')
 
   " :else without :if
   let code =<< trim END
     else
   END
   call writefile(code, 'Xtest')
-  call AssertException(['source Xtest'], 'Vim(else):E581: :else without :if')
+  call AssertException(['source Xtest'], 'MNV(else):E581: :else without :if')
 
   " :else without :if
   let code =<< trim END
@@ -2997,7 +2997,7 @@ func Test_nested_if_else_errors()
     endwhile
   END
   call writefile(code, 'Xtest')
-  call AssertException(['source Xtest'], 'Vim(else):E581: :else without :if')
+  call AssertException(['source Xtest'], 'MNV(else):E581: :else without :if')
 
   " :else without :if
   let code =<< trim END
@@ -3007,7 +3007,7 @@ func Test_nested_if_else_errors()
     endtry
   END
   call writefile(code, 'Xtest')
-  call AssertException(['source Xtest'], 'Vim(else):E581: :else without :if')
+  call AssertException(['source Xtest'], 'MNV(else):E581: :else without :if')
 
   " :else without :if
   let code =<< trim END
@@ -3016,7 +3016,7 @@ func Test_nested_if_else_errors()
     endtry
   END
   call writefile(code, 'Xtest')
-  call AssertException(['source Xtest'], 'Vim(else):E581: :else without :if')
+  call AssertException(['source Xtest'], 'MNV(else):E581: :else without :if')
 
   " :else without :if
   let code =<< trim END
@@ -3027,14 +3027,14 @@ func Test_nested_if_else_errors()
     endtry
   END
   call writefile(code, 'Xtest')
-  call AssertException(['source Xtest'], 'Vim(else):E581: :else without :if')
+  call AssertException(['source Xtest'], 'MNV(else):E581: :else without :if')
 
   " :elseif without :if
   let code =<< trim END
     elseif 1
   END
   call writefile(code, 'Xtest')
-  call AssertException(['source Xtest'], 'Vim(elseif):E582: :elseif without :if')
+  call AssertException(['source Xtest'], 'MNV(elseif):E582: :elseif without :if')
 
   " :elseif without :if
   let code =<< trim END
@@ -3043,7 +3043,7 @@ func Test_nested_if_else_errors()
     endwhile
   END
   call writefile(code, 'Xtest')
-  call AssertException(['source Xtest'], 'Vim(elseif):E582: :elseif without :if')
+  call AssertException(['source Xtest'], 'MNV(elseif):E582: :elseif without :if')
 
   " :elseif without :if
   let code =<< trim END
@@ -3053,7 +3053,7 @@ func Test_nested_if_else_errors()
     endtry
   END
   call writefile(code, 'Xtest')
-  call AssertException(['source Xtest'], 'Vim(elseif):E582: :elseif without :if')
+  call AssertException(['source Xtest'], 'MNV(elseif):E582: :elseif without :if')
 
   " :elseif without :if
   let code =<< trim END
@@ -3062,7 +3062,7 @@ func Test_nested_if_else_errors()
     endtry
   END
   call writefile(code, 'Xtest')
-  call AssertException(['source Xtest'], 'Vim(elseif):E582: :elseif without :if')
+  call AssertException(['source Xtest'], 'MNV(elseif):E582: :elseif without :if')
 
   " :elseif without :if
   let code =<< trim END
@@ -3073,7 +3073,7 @@ func Test_nested_if_else_errors()
     endtry
   END
   call writefile(code, 'Xtest')
-  call AssertException(['source Xtest'], 'Vim(elseif):E582: :elseif without :if')
+  call AssertException(['source Xtest'], 'MNV(elseif):E582: :elseif without :if')
 
   " multiple :else
   let code =<< trim END
@@ -3083,7 +3083,7 @@ func Test_nested_if_else_errors()
     endif
   END
   call writefile(code, 'Xtest')
-  call AssertException(['source Xtest'], 'Vim(else):E583: Multiple :else')
+  call AssertException(['source Xtest'], 'MNV(else):E583: Multiple :else')
 
   " :elseif after :else
   let code =<< trim END
@@ -3093,7 +3093,7 @@ func Test_nested_if_else_errors()
     endif
   END
   call writefile(code, 'Xtest')
-  call AssertException(['source Xtest'], 'Vim(elseif):E584: :elseif after :else')
+  call AssertException(['source Xtest'], 'MNV(elseif):E584: :elseif after :else')
 endfunc
 
 "-------------------------------------------------------------------------------
@@ -3114,7 +3114,7 @@ func Test_nested_while_error()
     endwhile
   END
   call writefile(code, 'Xtest')
-  call AssertException(['source Xtest'], 'Vim(endwhile):E588: :endwhile without :while')
+  call AssertException(['source Xtest'], 'MNV(endwhile):E588: :endwhile without :while')
 
   " :endwhile without :while
   let code =<< trim END
@@ -3123,7 +3123,7 @@ func Test_nested_while_error()
     endif
   END
   call writefile(code, 'Xtest', 'D')
-  call AssertException(['source Xtest'], 'Vim(endwhile):E588: :endwhile without :while')
+  call AssertException(['source Xtest'], 'MNV(endwhile):E588: :endwhile without :while')
 
   " Missing :endif
   let code =<< trim END
@@ -3132,7 +3132,7 @@ func Test_nested_while_error()
     endwhile
   END
   call writefile(code, 'Xtest')
-  call AssertException(['source Xtest'], 'Vim(endwhile):E171: Missing :endif')
+  call AssertException(['source Xtest'], 'MNV(endwhile):E171: Missing :endif')
 
   " :endwhile without :while
   let code =<< trim END
@@ -3142,7 +3142,7 @@ func Test_nested_while_error()
     endtry
   END
   call writefile(code, 'Xtest')
-  call AssertException(['source Xtest'], 'Vim(endwhile):E588: :endwhile without :while')
+  call AssertException(['source Xtest'], 'MNV(endwhile):E588: :endwhile without :while')
 
   " Missing :endtry
   let code =<< trim END
@@ -3152,7 +3152,7 @@ func Test_nested_while_error()
     endwhile
   END
   call writefile(code, 'Xtest')
-  call AssertException(['source Xtest'], 'Vim(endwhile):E600: Missing :endtry')
+  call AssertException(['source Xtest'], 'MNV(endwhile):E600: Missing :endtry')
 
   " Missing :endtry
   let code =<< trim END
@@ -3163,7 +3163,7 @@ func Test_nested_while_error()
     endwhile
   END
   call writefile(code, 'Xtest')
-  call AssertException(['source Xtest'], 'Vim(endwhile):E600: Missing :endtry')
+  call AssertException(['source Xtest'], 'MNV(endwhile):E600: Missing :endtry')
 
   " Missing :endif
   let code =<< trim END
@@ -3174,7 +3174,7 @@ func Test_nested_while_error()
     endwhile
   END
   call writefile(code, 'Xtest')
-  call AssertException(['source Xtest'], 'Vim(endwhile):E171: Missing :endif')
+  call AssertException(['source Xtest'], 'MNV(endwhile):E171: Missing :endif')
 
   " :endwhile without :while
   let code =<< trim END
@@ -3183,7 +3183,7 @@ func Test_nested_while_error()
     endtry
   END
   call writefile(code, 'Xtest')
-  call AssertException(['source Xtest'], 'Vim(endwhile):E588: :endwhile without :while')
+  call AssertException(['source Xtest'], 'MNV(endwhile):E588: :endwhile without :while')
 
   " :endwhile without :while
   let code =<< trim END
@@ -3194,7 +3194,7 @@ func Test_nested_while_error()
     endwhile
   END
   call writefile(code, 'Xtest')
-  call AssertException(['source Xtest'], 'Vim(endwhile):E588: :endwhile without :while')
+  call AssertException(['source Xtest'], 'MNV(endwhile):E588: :endwhile without :while')
 
   " :endwhile without :while
   let code =<< trim END
@@ -3205,7 +3205,7 @@ func Test_nested_while_error()
     endtry
   END
   call writefile(code, 'Xtest')
-  call AssertException(['source Xtest'], 'Vim(endwhile):E588: :endwhile without :while')
+  call AssertException(['source Xtest'], 'MNV(endwhile):E588: :endwhile without :while')
 
   " :endwhile without :while
   let code =<< trim END
@@ -3218,7 +3218,7 @@ func Test_nested_while_error()
     endwhile
   END
   call writefile(code, 'Xtest')
-  call AssertException(['source Xtest'], 'Vim(endwhile):E588: :endwhile without :while')
+  call AssertException(['source Xtest'], 'MNV(endwhile):E588: :endwhile without :while')
 endfunc
 
 "-------------------------------------------------------------------------------
@@ -3239,7 +3239,7 @@ func Test_nested_cont_break_error()
     continue
   END
   call writefile(code, 'Xtest', 'D')
-  call AssertException(['source Xtest'], 'Vim(continue):E586: :continue without :while or :for')
+  call AssertException(['source Xtest'], 'MNV(continue):E586: :continue without :while or :for')
 
   " :continue without :while
   let code =<< trim END
@@ -3248,7 +3248,7 @@ func Test_nested_cont_break_error()
     endif
   END
   call writefile(code, 'Xtest')
-  call AssertException(['source Xtest'], 'Vim(continue):E586: :continue without :while or :for')
+  call AssertException(['source Xtest'], 'MNV(continue):E586: :continue without :while or :for')
 
   " :continue without :while
   let code =<< trim END
@@ -3258,7 +3258,7 @@ func Test_nested_cont_break_error()
     endtry
   END
   call writefile(code, 'Xtest')
-  call AssertException(['source Xtest'], 'Vim(continue):E586: :continue without :while or :for')
+  call AssertException(['source Xtest'], 'MNV(continue):E586: :continue without :while or :for')
 
   " :continue without :while
   let code =<< trim END
@@ -3267,7 +3267,7 @@ func Test_nested_cont_break_error()
     endtry
   END
   call writefile(code, 'Xtest')
-  call AssertException(['source Xtest'], 'Vim(continue):E586: :continue without :while or :for')
+  call AssertException(['source Xtest'], 'MNV(continue):E586: :continue without :while or :for')
 
   " :continue without :while
   let code =<< trim END
@@ -3278,14 +3278,14 @@ func Test_nested_cont_break_error()
     endtry
   END
   call writefile(code, 'Xtest')
-  call AssertException(['source Xtest'], 'Vim(continue):E586: :continue without :while or :for')
+  call AssertException(['source Xtest'], 'MNV(continue):E586: :continue without :while or :for')
 
   " :break without :while
   let code =<< trim END
     break
   END
   call writefile(code, 'Xtest')
-  call AssertException(['source Xtest'], 'Vim(break):E587: :break without :while or :for')
+  call AssertException(['source Xtest'], 'MNV(break):E587: :break without :while or :for')
 
   " :break without :while
   let code =<< trim END
@@ -3294,7 +3294,7 @@ func Test_nested_cont_break_error()
     endif
   END
   call writefile(code, 'Xtest')
-  call AssertException(['source Xtest'], 'Vim(break):E587: :break without :while or :for')
+  call AssertException(['source Xtest'], 'MNV(break):E587: :break without :while or :for')
 
   " :break without :while
   let code =<< trim END
@@ -3304,7 +3304,7 @@ func Test_nested_cont_break_error()
     endtry
   END
   call writefile(code, 'Xtest')
-  call AssertException(['source Xtest'], 'Vim(break):E587: :break without :while or :for')
+  call AssertException(['source Xtest'], 'MNV(break):E587: :break without :while or :for')
 
   " :break without :while
   let code =<< trim END
@@ -3313,7 +3313,7 @@ func Test_nested_cont_break_error()
     endtry
   END
   call writefile(code, 'Xtest')
-  call AssertException(['source Xtest'], 'Vim(break):E587: :break without :while or :for')
+  call AssertException(['source Xtest'], 'MNV(break):E587: :break without :while or :for')
 
   " :break without :while
   let code =<< trim END
@@ -3324,7 +3324,7 @@ func Test_nested_cont_break_error()
     endtry
   END
   call writefile(code, 'Xtest')
-  call AssertException(['source Xtest'], 'Vim(break):E587: :break without :while or :for')
+  call AssertException(['source Xtest'], 'MNV(break):E587: :break without :while or :for')
 endfunc
 
 "-------------------------------------------------------------------------------
@@ -3345,7 +3345,7 @@ func Test_nested_endtry_error()
     endtry
   END
   call writefile(code, 'Xtest', 'D')
-  call AssertException(['source Xtest'], 'Vim(endtry):E602: :endtry without :try')
+  call AssertException(['source Xtest'], 'MNV(endtry):E602: :endtry without :try')
 
   " :endtry without :try
   let code =<< trim END
@@ -3354,7 +3354,7 @@ func Test_nested_endtry_error()
     endif
   END
   call writefile(code, 'Xtest')
-  call AssertException(['source Xtest'], 'Vim(endtry):E602: :endtry without :try')
+  call AssertException(['source Xtest'], 'MNV(endtry):E602: :endtry without :try')
 
   " :endtry without :try
   let code =<< trim END
@@ -3363,7 +3363,7 @@ func Test_nested_endtry_error()
     endwhile
   END
   call writefile(code, 'Xtest')
-  call AssertException(['source Xtest'], 'Vim(endtry):E602: :endtry without :try')
+  call AssertException(['source Xtest'], 'MNV(endtry):E602: :endtry without :try')
 
   " Missing :endif
   let code =<< trim END
@@ -3372,7 +3372,7 @@ func Test_nested_endtry_error()
     endtry
   END
   call writefile(code, 'Xtest')
-  call AssertException(['source Xtest'], 'Vim(endtry):E171: Missing :endif')
+  call AssertException(['source Xtest'], 'MNV(endtry):E171: Missing :endif')
 
   " Missing :endwhile
   let code =<< trim END
@@ -3381,7 +3381,7 @@ func Test_nested_endtry_error()
     endtry
   END
   call writefile(code, 'Xtest')
-  call AssertException(['source Xtest'], 'Vim(endtry):E170: Missing :endwhile')
+  call AssertException(['source Xtest'], 'MNV(endtry):E170: Missing :endwhile')
 
   " Missing :endif
   let code =<< trim END
@@ -3391,7 +3391,7 @@ func Test_nested_endtry_error()
     endtry
   END
   call writefile(code, 'Xtest')
-  call AssertException(['source Xtest'], 'Vim(endtry):E171: Missing :endif')
+  call AssertException(['source Xtest'], 'MNV(endtry):E171: Missing :endif')
 
   " Missing :endwhile
   let code =<< trim END
@@ -3401,7 +3401,7 @@ func Test_nested_endtry_error()
     endtry
   END
   call writefile(code, 'Xtest')
-  call AssertException(['source Xtest'], 'Vim(endtry):E170: Missing :endwhile')
+  call AssertException(['source Xtest'], 'MNV(endtry):E170: Missing :endwhile')
 
   " Missing :endif
   let code =<< trim END
@@ -3412,7 +3412,7 @@ func Test_nested_endtry_error()
     endtry
   END
   call writefile(code, 'Xtest')
-  call AssertException(['source Xtest'], 'Vim(endtry):E171: Missing :endif')
+  call AssertException(['source Xtest'], 'MNV(endtry):E171: Missing :endif')
 
   " Missing :endwhile
   let code =<< trim END
@@ -3423,7 +3423,7 @@ func Test_nested_endtry_error()
     endtry
   END
   call writefile(code, 'Xtest')
-  call AssertException(['source Xtest'], 'Vim(endtry):E170: Missing :endwhile')
+  call AssertException(['source Xtest'], 'MNV(endtry):E170: Missing :endwhile')
 endfunc
 
 "-------------------------------------------------------------------------------
@@ -3648,7 +3648,7 @@ func Test_exception_info_for_error()
         call assert_report('should not get here')
       catch /.*/
         Xpath 'b'
-        if v:exception !~ 'Vim(delfunction):'
+        if v:exception !~ 'MNV(delfunction):'
           call assert_report('should not get here')
         endif
         if v:throwpoint !~ '\<T\>'
@@ -3684,7 +3684,7 @@ func Test_exception_info_for_error()
         call assert_report('should not get here')
       catch /.*/
         Xpath 'f'
-        if v:exception != 'Vim:Interrupt'
+        if v:exception != 'MNV:Interrupt'
           call assert_report('should not get here')
         endif
         if v:throwpoint !~ 'function T'
@@ -3716,7 +3716,7 @@ func Test_exception_info_for_error()
   let verify =<< trim [CODE]
     call assert_equal('abcdefgh', g:Xpath)
   [CODE]
-  call RunInNewVim(test, verify)
+  call RunInNewMNV(test, verify)
 endfunc
 
 "-------------------------------------------------------------------------------
@@ -3770,7 +3770,7 @@ func Test_exception_info_on_discard()
           endtry
         catch /.*/
           let errcaught = 1
-          call assert_match('Vim:E492: Not an editor command:', v:exception)
+          call assert_match('MNV:E492: Not an editor command:', v:exception)
           call assert_match('line ' .. (lnum + 1), v:throwpoint)
         endtry
       finally
@@ -3795,7 +3795,7 @@ func Test_exception_info_on_discard()
           endtry
         catch /.*/
           let intcaught = 1
-          call assert_match('Vim:Interrupt', v:exception)
+          call assert_match('MNV:Interrupt', v:exception)
           call assert_match('line ' .. (lnum + 1), v:throwpoint)
         endtry
       finally
@@ -3822,7 +3822,7 @@ func Test_exception_info_on_discard()
           endtry
         catch /.*/
           let errcaught = 1
-          call assert_match('Vim(catch):E171: Missing :endif:', v:exception)
+          call assert_match('MNV(catch):E171: Missing :endif:', v:exception)
           call assert_match('line ' .. (lnum + 3), v:throwpoint)
         endtry
       finally
@@ -3880,7 +3880,7 @@ func Test_exception_info_on_discard()
           endtry
         catch /.*/
           let errcaught = 1
-          call assert_match('Vim:E492: Not an editor command:', v:exception)
+          call assert_match('MNV:E492: Not an editor command:', v:exception)
           call assert_match('line ' .. (lnum + 1), v:throwpoint)
         endtry
       finally
@@ -3905,7 +3905,7 @@ func Test_exception_info_on_discard()
           endtry
         catch /.*/
           let intcaught = 1
-          call assert_match('Vim:Interrupt', v:exception)
+          call assert_match('MNV:Interrupt', v:exception)
           call assert_match('line ' .. (lnum + 1), v:throwpoint)
         endtry
       finally
@@ -3933,7 +3933,7 @@ func Test_exception_info_on_discard()
           endtry
         catch /.*/
           let errcaught = 1
-          call assert_match('Vim(finally):E171: Missing :endif:', v:exception)
+          call assert_match('MNV(finally):E171: Missing :endif:', v:exception)
           call assert_match('line ' .. (lnum + 3), v:throwpoint)
         endtry
       finally
@@ -3958,7 +3958,7 @@ func Test_exception_info_on_discard()
           endtry
         catch /.*/
           let errcaught = 1
-          call assert_match('Vim(endtry):E171: Missing :endif:', v:exception)
+          call assert_match('MNV(endtry):E171: Missing :endif:', v:exception)
           call assert_match('line ' .. (lnum + 3), v:throwpoint)
         endtry
       finally
@@ -3974,7 +3974,7 @@ func Test_exception_info_on_discard()
   let verify =<< trim [CODE]
     call assert_equal('abcdefg', g:Xpath)
   [CODE]
-  call RunInNewVim(test, verify)
+  call RunInNewMNV(test, verify)
 endfunc
 
 "-------------------------------------------------------------------------------
@@ -3983,7 +3983,7 @@ endfunc
 "
 "	    A user exception can be rethrown after catching by throwing
 "	    v:exception.  An error or interrupt exception cannot be rethrown
-"	    because Vim exceptions cannot be faked.  A Vim exception using the
+"	    because MNV exceptions cannot be faked.  A MNV exception using the
 "	    value of v:exception can, however, be triggered by the :echoerr
 "	    command.
 "-------------------------------------------------------------------------------
@@ -4016,16 +4016,16 @@ func Test_rethrow_exception_2()
       Xpath 'a'
       write /n/o/n/w/r/i/t/a/b/l/e/_/f/i/l/e
       call assert_report('should not get here')
-    catch /^Vim(write):/
+    catch /^MNV(write):/
       let caught = 1
-      throw v:exception	" throw error: cannot fake Vim exception
+      throw v:exception	" throw error: cannot fake MNV exception
     catch /.*/
       call assert_report('should not get here')
     finally
       Xpath 'b'
       call assert_equal(1, caught)
     endtry
-  catch /^Vim(throw):/	" catches throw error
+  catch /^MNV(throw):/	" catches throw error
     let caught = caught + 1
   catch /.*/
     call assert_report('should not get here')
@@ -4043,10 +4043,10 @@ func Test_rethrow_exception_3()
     try
       Xpath 'a'
       asdf
-    catch /^Vim/		" catch error exception
+    catch /^MNV/		" catch error exception
       let caught = 1
-      " Trigger Vim error exception with value specified after :echoerr
-      let value = substitute(v:exception, '^Vim\((.*)\)\=:', '', "")
+      " Trigger MNV error exception with value specified after :echoerr
+      let value = substitute(v:exception, '^MNV\((.*)\)\=:', '', "")
       echoerr value
     catch /.*/
       call assert_report('should not get here')
@@ -4054,7 +4054,7 @@ func Test_rethrow_exception_3()
       Xpath 'b'
       call assert_equal(1, caught)
     endtry
-  catch /^Vim(echoerr):/
+  catch /^MNV(echoerr):/
     let caught = caught + 1
     call assert_match(value, v:exception)
   catch /.*/
@@ -4074,17 +4074,17 @@ func Test_rethrow_exception_3()
       Xpath 'a'
       let intcaught = 0
       call interrupt()
-    catch /^Vim:/		" catch interrupt exception
+    catch /^MNV:/		" catch interrupt exception
       let intcaught = 1
-      " Trigger Vim error exception with value specified after :echoerr
-      echoerr substitute(v:exception, '^Vim\((.*)\)\=:', '', "")
+      " Trigger MNV error exception with value specified after :echoerr
+      echoerr substitute(v:exception, '^MNV\((.*)\)\=:', '', "")
     catch /.*/
       call assert_report('should not get here')
     finally
       Xpath 'b'
       call assert_equal(1, intcaught)
     endtry
-  catch /^Vim(echoerr):/
+  catch /^MNV(echoerr):/
     let errcaught = 1
     call assert_match('Interrupt', v:exception)
   finally
@@ -4099,7 +4099,7 @@ endfunc
 "
 "	    When an interrupt occurs inside a :try/:endtry region, an
 "	    interrupt exception is thrown and can be caught.  Its value is
-"	    "Vim:Interrupt".  If the interrupt occurs after an error or a :throw
+"	    "MNV:Interrupt".  If the interrupt occurs after an error or a :throw
 "	    but before a matching :catch is reached, all following :catches of
 "	    that try block are ignored, but the interrupt exception can be
 "	    caught by the next surrounding try conditional.  An interrupt is
@@ -4115,7 +4115,7 @@ func Test_catch_intr_exception()
           Xpath 'a'
           call interrupt()
           call assert_report('should not get here')
-        catch /^Vim:Interrupt$/
+        catch /^MNV:Interrupt$/
           Xpath 'b'
         finally
           Xpath 'c'
@@ -4148,7 +4148,7 @@ func Test_catch_intr_exception()
             call interrupt()
             call assert_report('should not get here')
           endtry
-        catch /^Vim:Interrupt$/
+        catch /^MNV:Interrupt$/
           Xpath 'h'
         finally
           Xpath 'i'
@@ -4177,7 +4177,7 @@ func Test_catch_intr_exception()
           catch /.*/
             call assert_report('should not get here')
           endtry
-        catch /^Vim:Interrupt$/
+        catch /^MNV:Interrupt$/
           Xpath 'm'
         finally
           Xpath 'n'
@@ -4199,7 +4199,7 @@ func Test_catch_intr_exception()
         catch /do_not_catch/
           call interrupt()
           call assert_report('should not get here')
-        catch /^Vim:Interrupt$/
+        catch /^MNV:Interrupt$/
           Xpath 'q'
         finally
           Xpath 'r'
@@ -4217,16 +4217,16 @@ func Test_catch_intr_exception()
   let verify =<< trim [CODE]
     call assert_equal('abcdefghijklmnopqrst', g:Xpath)
   [CODE]
-  call RunInNewVim(test, verify)
+  call RunInNewMNV(test, verify)
 endfunc
 
 "-------------------------------------------------------------------------------
 " Test 62:  Catching error exceptions					    {{{1
 "
 "	    An error inside a :try/:endtry region is converted to an exception
-"	    and can be caught.  The error exception has a "Vim(cmdname):" prefix
-"	    where cmdname is the name of the failing command, or a "Vim:" prefix
-"	    if no command name is known.  The "Vim" prefixes cannot be faked.
+"	    and can be caught.  The error exception has a "MNV(cmdname):" prefix
+"	    where cmdname is the name of the failing command, or a "MNV:" prefix
+"	    if no command name is known.  The "MNV" prefixes cannot be faked.
 "-------------------------------------------------------------------------------
 
 func Test_catch_err_exception_1()
@@ -4236,10 +4236,10 @@ func Test_catch_err_exception_1()
       try
         let caught = 0
         unlet novar
-      catch /^Vim(unlet):/
+      catch /^MNV(unlet):/
         Xpath 'a'
         let caught = 1
-        let v:errmsg = substitute(v:exception, '^Vim(unlet):', '', "")
+        let v:errmsg = substitute(v:exception, '^MNV(unlet):', '', "")
       finally
         Xpath 'b'
         call assert_equal(1, caught)
@@ -4263,10 +4263,10 @@ func Test_catch_err_exception_2()
       try
         let caught = 0
         throw novar			" error in :throw
-      catch /^Vim(throw):/
+      catch /^MNV(throw):/
         Xpath 'a'
         let caught = 1
-        let v:errmsg = substitute(v:exception, '^Vim(throw):', '', "")
+        let v:errmsg = substitute(v:exception, '^MNV(throw):', '', "")
       finally
         Xpath 'b'
         call assert_equal(1, caught)
@@ -4289,15 +4289,15 @@ func Test_catch_err_exception_3()
     try
       try
         let caught = 0
-        throw "Vim:faked"		" error: cannot fake Vim exception
-      catch /^Vim(throw):/
+        throw "MNV:faked"		" error: cannot fake MNV exception
+      catch /^MNV(throw):/
         Xpath 'a'
         let caught = 1
-        let v:errmsg = substitute(v:exception, '^Vim(throw):', '', "")
+        let v:errmsg = substitute(v:exception, '^MNV(throw):', '', "")
       finally
         Xpath 'b'
         call assert_equal(1, caught)
-        call assert_match("E608: Cannot :throw exceptions with 'Vim' prefix",
+        call assert_match("E608: Cannot :throw exceptions with 'MNV' prefix",
               \ v:errmsg)
       endtry
     catch /.*/
@@ -4323,10 +4323,10 @@ func Test_catch_err_exception_4()
       try
         let caught = 0
         call F()
-      catch /^Vim(endfunction):/
+      catch /^MNV(endfunction):/
         Xpath 'a'
         let caught = 1
-        let v:errmsg = substitute(v:exception, '^Vim(endfunction):', '', "")
+        let v:errmsg = substitute(v:exception, '^MNV(endfunction):', '', "")
       finally
         Xpath 'b'
         call assert_equal(1, caught)
@@ -4356,10 +4356,10 @@ func Test_catch_err_exception_5()
       try
         let caught = 0
         ExecAsScript F
-      catch /^Vim:/
+      catch /^MNV:/
         Xpath 'a'
         let caught = 1
-        let v:errmsg = substitute(v:exception, '^Vim:', '', "")
+        let v:errmsg = substitute(v:exception, '^MNV:', '', "")
       finally
         Xpath 'b'
         call assert_equal(1, caught)
@@ -4390,10 +4390,10 @@ func Test_catch_err_exception_6()
       try
         let caught = 0
         call G()
-      catch /^Vim(call):/
+      catch /^MNV(call):/
         Xpath 'a'
         let caught = 1
-        let v:errmsg = substitute(v:exception, '^Vim(call):', '', "")
+        let v:errmsg = substitute(v:exception, '^MNV(call):', '', "")
       finally
         Xpath 'b'
         call assert_equal(1, caught)
@@ -4425,10 +4425,10 @@ func Test_catch_err_exception_7()
       try
         let caught = 0
         call H()
-      catch /^Vim(return):/
+      catch /^MNV(return):/
         Xpath 'a'
         let caught = 1
-        let v:errmsg = substitute(v:exception, '^Vim(return):', '', "")
+        let v:errmsg = substitute(v:exception, '^MNV(return):', '', "")
       finally
         Xpath 'b'
         call assert_equal(1, caught)
@@ -4439,7 +4439,7 @@ func Test_catch_err_exception_7()
     finally
       Xpath 'c'
       let &mfd = mfd_save
-      break		" discard error for $VIMNOERRTHROW
+      break		" discard error for $MNVNOERRTHROW
     endtry
     call assert_report('should not get here')
   endwhile
@@ -4492,10 +4492,10 @@ func Test_silent_exception()
           let caught = 0
           " This is not silent:
           call S(3)
-        catch /^Vim:/
+        catch /^MNV:/
           Xpath 'b'
           let caught = 1
-          let errmsg3 = substitute(v:exception, '^Vim:', '', "")
+          let errmsg3 = substitute(v:exception, '^MNV:', '', "")
           silent! call S(4)
         finally
           call assert_equal(1, caught)
@@ -4503,7 +4503,7 @@ func Test_silent_exception()
           call assert_match("E492: Not an editor command", errmsg3)
           silent! call S(5)
           " Break out of try conditionals that cover ":silent!".  This also
-          " discards the aborting error when $VIMNOERRTHROW is non-zero.
+          " discards the aborting error when $MNVNOERRTHROW is non-zero.
           break
         endtry
       catch /.*/
@@ -4572,7 +4572,7 @@ func Test_exception_after_error_1()
           if 1
           " Missing :endif
         endwhile	" throw error exception
-      catch /^Vim(/
+      catch /^MNV(/
         Xpath 'b'
         let caught = 1
       finally
@@ -4605,7 +4605,7 @@ func Test_exception_after_error_2()
         catch /.*/
           call assert_report('should not get here')
         endtry
-      catch /^Vim(/
+      catch /^MNV(/
         Xpath 'b'
         let caught = 1
       finally
@@ -4641,7 +4641,7 @@ func Test_exception_after_error_3()
         catch /.*/
           call assert_report('should not get here')
         endtry
-      catch /^Vim(/
+      catch /^MNV(/
         Xpath 'b'
         let caught = 1
       finally
@@ -4677,7 +4677,7 @@ func Test_exception_after_error_4()
         catch /.*/
           call assert_report('should not get here')
         endtry
-      catch /^Vim(/
+      catch /^MNV(/
         Xpath 'b'
         let caught = 1
       finally
@@ -4707,10 +4707,10 @@ func Test_exception_after_error_5()
         " Missing :endif
       catch /do_not_catch/ " ignore new error
         call assert_report('should not get here')
-      catch /^Vim(endif):/
+      catch /^MNV(endif):/
         Xpath 'b'
         let caught = 1
-      catch /^Vim(/
+      catch /^MNV(/
         call assert_report('should not get here')
       finally
         Xpath 'c'
@@ -4773,9 +4773,9 @@ func Test_catch_pattern_error()
         call assert_report('should not get here')
       catch /^ab$/	" checked, but original exception is discarded
         call assert_report('should not get here')
-      catch /^Vim(catch):/
+      catch /^MNV(catch):/
         Xpath 'c'
-        call assert_match('Vim(catch):E475: Invalid argument:', v:exception)
+        call assert_match('MNV(catch):E475: Invalid argument:', v:exception)
       finally
         Xpath 'd'
       endtry
@@ -4872,7 +4872,7 @@ func Test_stop_range_on_error()
   let verify =<< trim [CODE]
     call assert_equal('abcdef', g:Xpath)
   [CODE]
-  call RunInNewVim(test, verify)
+  call RunInNewMNV(test, verify)
 endfunc
 
 "-------------------------------------------------------------------------------
@@ -5209,8 +5209,8 @@ func Test_expr_eval_error()
         catch /asdf/
           " v:errmsg is not set when the error message is converted to an
           " exception.  Set it to the original error message.
-          let v:errmsg = substitute(v:exception, '^Vim:', '', "")
-        catch /^Vim\((\a\+)\)\=:/
+          let v:errmsg = substitute(v:exception, '^MNV:', '', "")
+        catch /^MNV\((\a\+)\)\=:/
           " An error exception has been thrown after the original error.
           let v:errmsg = ""
         finally
@@ -5249,9 +5249,9 @@ func Test_expr_eval_error()
           elseif t == 18
             let var = INT(t) + CONT(t)
           endif
-        catch /^Vim\((\a\+)\)\=:\(Interrupt\)\@!/
+        catch /^MNV\((\a\+)\)\=:\(Interrupt\)\@!/
           " An error exception has been triggered after the interrupt.
-          let v:errmsg = substitute(v:exception, '^Vim\((\a\+)\)\=:', '', "")
+          let v:errmsg = substitute(v:exception, '^MNV\((\a\+)\)\=:', '', "")
         finally
           call MSG(t)
           let t = t + 1
@@ -5288,9 +5288,9 @@ func Test_expr_eval_error()
           elseif t == 27
             let var = THR(t) + CONT(t)
           endif
-        catch /^Vim\((\a\+)\)\=:/
+        catch /^MNV\((\a\+)\)\=:/
           " An error exception has been triggered after the :throw.
-          let v:errmsg = substitute(v:exception, '^Vim\((\a\+)\)\=:', '', "")
+          let v:errmsg = substitute(v:exception, '^MNV\((\a\+)\)\=:', '', "")
         finally
           call MSG(t)
           let t = t + 1
@@ -5361,7 +5361,7 @@ func Test_expr_eval_error()
                       \ .. "c19c20c21c22c23c24c25c26c27d"
     call assert_equal(expected, g:Xpath)
   [CODE]
-  call RunInNewVim(test, verify)
+  call RunInNewMNV(test, verify)
 endfunc
 
 "-------------------------------------------------------------------------------
@@ -5450,7 +5450,7 @@ func Test_brace_expr_error()
   let verify =<< trim [CODE]
     call assert_equal('ca1b1ea2b2dfa3b3ga4hi', g:Xpath)
   [CODE]
-  call RunInNewVim(test, verify)
+  call RunInNewMNV(test, verify)
 endfunc
 
 "-------------------------------------------------------------------------------
@@ -5517,11 +5517,11 @@ func Test_expr_eval_error_msg()
           elseif t == 14
             let var = F{novar + CONT(t)}()
           endif
-        catch /^Vim\((\a\+)\)\=:/
+        catch /^MNV\((\a\+)\)\=:/
           Xloop 'a'
           " v:errmsg is not set when the error message is converted to an
           " exception.  Set it to the original error message.
-          let v:errmsg = substitute(v:exception, '^Vim\((\a\+)\)\=:', '', "")
+          let v:errmsg = substitute(v:exception, '^MNV\((\a\+)\)\=:', '', "")
         finally
           Xloop 'b'
           if t <= 8 && t != 3 && t != 7
@@ -5544,11 +5544,11 @@ func Test_expr_eval_error_msg()
         let v:errmsg = ""
         try
           execute "let var = " . a:expr
-        catch /^Vim\((\a\+)\)\=:/
+        catch /^MNV\((\a\+)\)\=:/
           Xloop 'c'
           " v:errmsg is not set when the error message is converted to an
           " exception.  Set it to the original error message.
-          let v:errmsg = substitute(v:exception, '^Vim\((\a\+)\)\=:', '', "")
+          let v:errmsg = substitute(v:exception, '^MNV\((\a\+)\)\=:', '', "")
         finally
           Xloop 'd'
           call MSG(a:n, a:enr, a:emsg)
@@ -5588,7 +5588,7 @@ func Test_expr_eval_error_msg()
                   \ .. "c21d21c22d22c23d23c24d24c25d25c26d26c27d27"
     call assert_equal(expected, g:Xpath)
   [CODE]
-  call RunInNewVim(test, verify)
+  call RunInNewMNV(test, verify)
 endfunc
 
 "-------------------------------------------------------------------------------
@@ -5637,7 +5637,7 @@ func Test_throw_multi_error()
         try
           let v:errmsg = ""
           call EXEC('echo novar')	" normal error
-        catch /^Vim\((\a\+)\)\=:/
+        catch /^MNV\((\a\+)\)\=:/
           Xpath 'b'
           call assert_match('E121: Undefined variable: novar', v:exception)
         finally
@@ -5653,7 +5653,7 @@ func Test_throw_multi_error()
         try
           let v:errmsg = ""
           call EXEC(cmd . ' novar #')		" normal plus syntax error
-        catch /^Vim\((\a\+)\)\=:/
+        catch /^MNV\((\a\+)\)\=:/
           Xloop 'e'
           if cmd =~ 'unlet'
             " TODO: should get error for 'novar'
@@ -5680,7 +5680,7 @@ func Test_throw_multi_error()
         try
           let v:errmsg = ""
           call EXEC(cmd . ' {novar}')		" normal plus syntax error
-        catch /^Vim\((\a\+)\)\=:/
+        catch /^MNV\((\a\+)\)\=:/
           Xloop 'h'
           call assert_match('E475: Invalid argument: {novar}', v:exception)
         finally
@@ -5703,7 +5703,7 @@ func Test_throw_multi_error()
   let verify =<< trim [CODE]
     call assert_equal('bcde1f1e2f2gh3i3h4i4j', g:Xpath)
   [CODE]
-  call RunInNewVim(test, verify)
+  call RunInNewMNV(test, verify)
 endfunc
 
 "-------------------------------------------------------------------------------
@@ -5753,7 +5753,7 @@ func Test_if_syntax_error()
           else
           elseif 1 ||| 2
           endif
-        catch /^Vim\((\a\+)\)\=:/
+        catch /^MNV\((\a\+)\)\=:/
           Xpath 'e'
           call assert_match('E584: :elseif after :else', v:exception)
         finally
@@ -5776,7 +5776,7 @@ func Test_if_syntax_error()
           else
           elseif 1 ||| 2
           endif
-        catch /^Vim\((\a\+)\)\=:/
+        catch /^MNV\((\a\+)\)\=:/
           Xpath 'h'
           call assert_match('E584: :elseif after :else', v:exception)
         finally
@@ -5796,7 +5796,7 @@ func Test_if_syntax_error()
         try
           let v:errmsg = ""
           elseif 1 ||| 2
-        catch /^Vim\((\a\+)\)\=:/
+        catch /^MNV\((\a\+)\)\=:/
           Xpath 'k'
           call assert_match('E582: :elseif without :if', v:exception)
         finally
@@ -5818,7 +5818,7 @@ func Test_if_syntax_error()
           while 1
               elseif 1 ||| 2
           endwhile
-        catch /^Vim\((\a\+)\)\=:/
+        catch /^MNV\((\a\+)\)\=:/
           Xpath 'n'
           call assert_match('E582: :elseif without :if', v:exception)
         finally
@@ -5837,7 +5837,7 @@ func Test_if_syntax_error()
   let verify =<< trim [CODE]
     call assert_equal('abcdefghijklmnopq', g:Xpath)
   [CODE]
-  call RunInNewVim(test, verify)
+  call RunInNewMNV(test, verify)
 endfunc
 
 "-------------------------------------------------------------------------------
@@ -5869,7 +5869,7 @@ func Test_discard_exception_after_error_1()
   let verify =<< trim [CODE]
     call assert_equal('ab', g:Xpath)
   [CODE]
-  call RunInNewVim(test, verify)
+  call RunInNewMNV(test, verify)
 endfunc
 
 " interrupt the code before the endtry is invoked
@@ -5896,7 +5896,7 @@ func Test_discard_exception_after_error_2()
     let caught_intr = 0
     debuggreedy
     call feedkeys(":source Xscript\<CR>quit\<CR>", "xt")
-  catch /^Vim:Interrupt$/
+  catch /^MNV:Interrupt$/
     call assert_match('Xscript, line 7', v:throwpoint)
     let caught_intr = 1
   endtry
@@ -5939,7 +5939,7 @@ func Test_ignore_catch_after_error_1()
   let verify =<< trim [CODE]
     call assert_equal('a', g:Xpath)
   [CODE]
-  call RunInNewVim(test, verify)
+  call RunInNewMNV(test, verify)
 endfunc
 
 func Test_ignore_catch_after_error_2()
@@ -5970,7 +5970,7 @@ func Test_ignore_catch_after_error_2()
   let verify =<< trim [CODE]
     call assert_equal('a', g:Xpath)
   [CODE]
-  call RunInNewVim(test, verify)
+  call RunInNewMNV(test, verify)
 endfunc
 
 " interrupt right before a catch is invoked in a script
@@ -6003,7 +6003,7 @@ func Test_ignore_catch_after_intr_1()
     let caught_intr = 0
     debuggreedy
     call feedkeys(":source Xscript\<CR>quit\<CR>", "xt")
-  catch /^Vim:Interrupt$/
+  catch /^MNV:Interrupt$/
     call assert_match('Xscript, line 6', v:throwpoint)
     let caught_intr = 1
   endtry
@@ -6042,7 +6042,7 @@ func Test_ignore_catch_after_intr_2()
     let caught_intr = 0
     debuggreedy
     call feedkeys(":call F()\<CR>quit\<CR>", "xt")
-  catch /^Vim:Interrupt$/
+  catch /^MNV:Interrupt$/
     call assert_match('\.F, line 6', v:throwpoint)
     let caught_intr = 1
   endtry
@@ -6084,7 +6084,7 @@ func Test_finally_after_error()
   let verify =<< trim [CODE]
     call assert_equal('abc', g:Xpath)
   [CODE]
-  call RunInNewVim(test, verify)
+  call RunInNewMNV(test, verify)
 endfunc
 
 " interrupt the code right before the finally is invoked
@@ -6113,7 +6113,7 @@ func Test_finally_after_intr()
     let caught_intr = 0
     debuggreedy
     call feedkeys(":source Xscript\<CR>quit\<CR>", "xt")
-  catch /^Vim:Interrupt$/
+  catch /^MNV:Interrupt$/
     call assert_match('Xscript, line 7', v:throwpoint)
     let caught_intr = 1
   endtry
@@ -6203,12 +6203,12 @@ func Test_autocmd_exception()
         try
           Xpath 'l'
           doautocmd User x3
-        catch /Vim:Interrupt/
+        catch /MNV:Interrupt/
           Xpath 'm'
         finally
           Xpath 'n'
           " ... but break loop for caught interrupt exception,
-          " or discard interrupt and break loop if $VIMNOINTTHROW
+          " or discard interrupt and break loop if $MNVNOINTTHROW
           break
         endtry
       endwhile
@@ -6233,7 +6233,7 @@ func Test_autocmd_exception()
         finally
           Xpath 's'
           " ... but break loop for caught error exception,
-          " or discard error and break loop if $VIMNOERRTHROW
+          " or discard error and break loop if $MNVNOERRTHROW
           break
         endtry
       endwhile
@@ -6242,12 +6242,12 @@ func Test_autocmd_exception()
         try
           Xpath 't'
           call U3()
-        catch /Vim:Interrupt/
+        catch /MNV:Interrupt/
           Xpath 'u'
         finally
           Xpath 'v'
           " ... but break loop for caught interrupt exception,
-          " or discard interrupt and break loop if $VIMNOINTTHROW
+          " or discard interrupt and break loop if $MNVNOINTTHROW
           break
         endtry
       endwhile
@@ -6259,7 +6259,7 @@ func Test_autocmd_exception()
   let verify =<< trim [CODE]
     call assert_equal('gahibjklcmnodpqerstfuvw', g:Xpath)
   [CODE]
-  call RunInNewVim(test, verify)
+  call RunInNewMNV(test, verify)
 endfunc
 
 "-------------------------------------------------------------------------------
@@ -6316,7 +6316,7 @@ func Test_autocmd_error_io_exception()
             au! BufWritePost * let post = 1
           aug END
           write /n/o/n/e/x/i/s/t/e/n/t
-        catch /^Vim(write):/
+        catch /^MNV(write):/
           Xpath 'a'
           call assert_match("E212: Can't open file for writing", v:exception)
         finally
@@ -6343,7 +6343,7 @@ func Test_autocmd_error_io_exception()
           aug END
           let tmpfile = tempname()
           exec "write" tmpfile
-        catch /^Vim\((write)\)\=:/
+        catch /^MNV\((write)\)\=:/
           Xpath 'd'
           call assert_match('E492: Not an editor command', v:exception)
         finally
@@ -6377,7 +6377,7 @@ func Test_autocmd_error_io_exception()
           aug END
           let caught = 0
           read /n/o/n/e/x/i/s/t/e/n/t
-        catch /^Vim(read):/
+        catch /^MNV(read):/
           Xpath 'g'
           call assert_match("E484: Can't open file", v:exception)
         finally
@@ -6409,7 +6409,7 @@ func Test_autocmd_error_io_exception()
               au! FileReadPost * let post = 1
             aug END
             exec "0read" infile
-          catch /^Vim\((read)\)\=:/
+          catch /^MNV\((read)\)\=:/
             Xpath 'k'
             call assert_match('E492: Not an editor command', v:exception)
           finally
@@ -6439,13 +6439,13 @@ func Test_autocmd_error_io_exception()
   let verify =<< trim [CODE]
     call assert_equal('abcdefghijklmn', g:Xpath)
   [CODE]
-  call RunInNewVim(test, verify)
+  call RunInNewMNV(test, verify)
 endfunc
 
 "-------------------------------------------------------------------------------
 " Test 87   using (expr) ? funcref : funcref				    {{{1
 "
-"	    Vim needs to correctly parse the funcref and even when it does
+"	    MNV needs to correctly parse the funcref and even when it does
 "	    not execute the funcref, it needs to consume the trailing ()
 "-------------------------------------------------------------------------------
 
@@ -6850,7 +6850,7 @@ func Test_script_lines()
 		    \ ])
 	call assert_report("Shouldn't be able to define function")
     catch
-	call assert_exception('Vim(function):E1145: Missing heredoc end marker: .')
+	call assert_exception('MNV(function):E1145: Missing heredoc end marker: .')
     endtry
 
     " :change
@@ -6870,7 +6870,7 @@ func Test_script_lines()
 		    \ ])
 	call assert_report("Shouldn't be able to define function")
     catch
-	call assert_exception('Vim(function):E1145: Missing heredoc end marker: .')
+	call assert_exception('MNV(function):E1145: Missing heredoc end marker: .')
     endtry
 
     " :insert
@@ -6890,7 +6890,7 @@ func Test_script_lines()
 		    \ ])
 	call assert_report("Shouldn't be able to define function")
     catch
-	call assert_exception('Vim(function):E1145: Missing heredoc end marker: .')
+	call assert_exception('MNV(function):E1145: Missing heredoc end marker: .')
     endtry
 
     " More test for :append, :change, :insert
@@ -7130,7 +7130,7 @@ func Test_compound_assignment_operators()
     let &scrolljump %= 5
     call assert_equal(1, &scrolljump)
     call assert_fails('let &scrolljump .= "j"', ['E734:', 'E734:'])
-    set scrolljump&vim
+    set scrolljump&mnv
 
     let &foldlevelstart = 2
     let &foldlevelstart -= 1
@@ -7325,7 +7325,7 @@ endfunc
 
 " Test for deep nesting of if/for/while/try statements              {{{1
 func Test_deep_nest()
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   let lines =<< trim [SCRIPT]
     " Deep nesting of if ... endif
@@ -7375,7 +7375,7 @@ func Test_deep_nest()
   [SCRIPT]
   call writefile(lines, 'Xscript', 'D')
 
-  let buf = RunVimInTerminal('-S Xscript', {'rows': 6})
+  let buf = RunMNVInTerminal('-S Xscript', {'rows': 6})
 
   " Deep nesting of if ... endif
   call term_sendkeys(buf, ":call Test1()\n")
@@ -7410,7 +7410,7 @@ func Test_deep_nest()
   "endfor
   "call assert_report(l)
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 " Test for errors in converting to float from various types         {{{1
@@ -7418,7 +7418,7 @@ func Test_float_conversion_errors()
   call assert_fails('let x = 4.0 % 2.0', 'E804:')
   call assert_fails('echo 1.1[0]', 'E806:')
   call assert_fails('echo sort([function("min"), 1], "f")', 'E891:')
-  call assert_fails('echo 3.2 == "vim"', 'E892:')
+  call assert_fails('echo 3.2 == "mnv"', 'E892:')
   call assert_fails('echo sort([[], 1], "f")', 'E893:')
   call assert_fails('echo sort([{}, 1], "f")', 'E894:')
   call assert_fails('echo 3.2 == v:true', 'E362:')
@@ -7507,16 +7507,16 @@ endfunc
 
 " Test using s: with a typed command              {{{1
 func Test_typed_script_var()
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
-  let buf = RunVimInTerminal('', {'rows': 6})
+  let buf = RunMNVInTerminal('', {'rows': 6})
 
   " Deep nesting of if ... endif
   call term_sendkeys(buf, ":echo get(s:, 'foo', 'x')\n")
   call TermWait(buf)
   call WaitForAssert({-> assert_match('^E116:', term_getline(buf, 5))})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 " Test for issue6776              {{{1
@@ -7592,10 +7592,10 @@ func Test_deeply_nested_source()
       so
       0
   END
-  call writefile(["vim9 silent! @0 \n/"] + lines, 'Xnested.vim', 'D')
+  call writefile(["mnv9 silent! @0 \n/"] + lines, 'Xnested.mnv', 'D')
 
   " this must not crash
-  let cmd = GetVimCommand() .. " -e -s -S Xnested.vim -c qa!"
+  let cmd = GetMNVCommand() .. " -e -s -S Xnested.mnv -c qa!"
   call system(cmd)
 endfunc
 
@@ -7622,26 +7622,26 @@ func Test_exception_silent()
     call assert_equal('acd', g:Xpath)
   END
 
-  call RunInNewVim(lines, verify)
+  call RunInNewMNV(lines, verify)
 endfunc
 
-" Test for an error message starting with "Vim E123: " {{{1
+" Test for an error message starting with "MNV E123: " {{{1
 func Test_skip_prefix_in_exception()
   let emsg = ''
   try
-    echoerr "Vim E123:"
+    echoerr "MNV E123:"
   catch
     let emsg = v:exception
   endtry
-  call assert_equal('Vim(echoerr):Vim E123:', emsg)
+  call assert_equal('MNV(echoerr):MNV E123:', emsg)
 
   let emsg = ''
   try
-    echoerr "Vim E123: abc"
+    echoerr "MNV E123: abc"
   catch
     let emsg = v:exception
   endtry
-  call assert_equal('Vim(echoerr):E123: abc', emsg)
+  call assert_equal('MNV(echoerr):E123: abc', emsg)
 endfunc
 
 " Test for try/except messages displayed with 'verbose' level set to 13 {{{1
@@ -7657,12 +7657,12 @@ func Test_verbose_try_except_messages()
   set verbose=0
   redir END
   let expected =<< trim END
-    Exception thrown: Vim(echoerr):foo
+    Exception thrown: MNV(echoerr):foo
 
-    Exception caught: Vim(echoerr):foo
+    Exception caught: MNV(echoerr):foo
 
-    Vim(echoerr):foo
-    Exception finished: Vim(echoerr):foo
+    MNV(echoerr):foo
+    Exception finished: MNV(echoerr):foo
   END
   call assert_equal(expected, msgs->split("\n"))
 endfunc
@@ -7704,5 +7704,5 @@ endfunc
 
 "-------------------------------------------------------------------------------
 " Modelines								    {{{1
-" vim: ts=8 sw=2 sts=2 expandtab tw=80 fdm=marker
+" mnv: ts=8 sw=2 sts=2 expandtab tw=80 fdm=marker
 "-------------------------------------------------------------------------------
diff --git a/uvim/src/testdir/test_modeless.vim b/uvim/src/testdir/test_modeless.mnv
index d21df62ab4..4cd2ac3cdf 100644
--- a/uvim/src/testdir/test_modeless.vim
+++ b/uvim/src/testdir/test_modeless.mnv
@@ -4,7 +4,7 @@
 CheckNotGui
 CheckUnix
 
-source util/mouse.vim
+source util/mouse.mnv
 
 " Test for modeless characterwise selection (single click)
 func Test_modeless_characterwise_selection()
@@ -415,4 +415,4 @@ func Test_modeless_line_selection()
   close!
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_modeline.vim b/uvim/src/testdir/test_modeline.mnv
index 79fc7d14d5..7680e88f69 100644
--- a/uvim/src/testdir/test_modeline.vim
+++ b/uvim/src/testdir/test_modeline.mnv
@@ -8,19 +8,19 @@ func Test_modeline_invalid()
   call assert_fails('split Xmodeline', 'E518:')
 
   " Missing end colon (ignored).
-  call writefile(['// vim: set ts=2'], 'Xmodeline')
+  call writefile(['// mnv: set ts=2'], 'Xmodeline')
   edit Xmodeline_version
   call assert_equal(8, &ts)
   bwipe!
 
   " Missing colon at beginning (ignored).
-  call writefile(['// vim set ts=2:'], 'Xmodeline')
+  call writefile(['// mnv set ts=2:'], 'Xmodeline')
   edit Xmodeline_version
   call assert_equal(8, &ts)
   bwipe!
 
-  " Missing space after vim (ignored).
-  call writefile(['// vim:ts=2:'], 'Xmodeline')
+  " Missing space after mnv (ignored).
+  call writefile(['// mnv:ts=2:'], 'Xmodeline')
   edit Xmodeline_version
   call assert_equal(8, &ts)
   bwipe!
@@ -30,7 +30,7 @@ func Test_modeline_invalid()
 endfunc
 
 func Test_modeline_filetype()
-  call writefile(['vim: set ft=c :', 'nothing'], 'Xmodeline_filetype', 'D')
+  call writefile(['mnv: set ft=c :', 'nothing'], 'Xmodeline_filetype', 'D')
   let modeline = &modeline
   set modeline
   filetype plugin on
@@ -45,7 +45,7 @@ func Test_modeline_filetype()
 endfunc
 
 func Test_modeline_syntax()
-  call writefile(['vim: set syn=c :', 'nothing'], 'Xmodeline_syntax', 'D')
+  call writefile(['mnv: set syn=c :', 'nothing'], 'Xmodeline_syntax', 'D')
   let modeline = &modeline
   set modeline
   syntax enable
@@ -60,7 +60,7 @@ endfunc
 
 func Test_modeline_keymap()
   CheckFeature keymap
-  call writefile(['vim: set keymap=greek :', 'nothing'], 'Xmodeline_keymap', 'D')
+  call writefile(['mnv: set keymap=greek :', 'nothing'], 'Xmodeline_keymap', 'D')
   let modeline = &modeline
   set modeline
   split Xmodeline_keymap
@@ -76,66 +76,66 @@ func Test_modeline_version()
   let modeline = &modeline
   set modeline
 
-  " Test with vim:{vers}: (version {vers} or later).
-  call writefile(['// vim' .. v:version .. ': ts=2:'], 'Xmodeline_version', 'D')
+  " Test with mnv:{vers}: (version {vers} or later).
+  call writefile(['// mnv' .. v:version .. ': ts=2:'], 'Xmodeline_version', 'D')
   edit Xmodeline_version
   call assert_equal(2, &ts)
   bwipe!
 
-  call writefile(['// vim' .. (v:version - 100) .. ': ts=2:'], 'Xmodeline_version')
+  call writefile(['// mnv' .. (v:version - 100) .. ': ts=2:'], 'Xmodeline_version')
   edit Xmodeline_version
   call assert_equal(2, &ts)
   bwipe!
 
-  call writefile(['// vim' .. (v:version + 100) .. ': ts=2:'], 'Xmodeline_version')
+  call writefile(['// mnv' .. (v:version + 100) .. ': ts=2:'], 'Xmodeline_version')
   edit Xmodeline_version
   call assert_equal(8, &ts)
   bw!
 
-  " Test with vim>{vers}: (version after {vers}).
-  call writefile(['// vim>' .. v:version .. ': ts=2:'], 'Xmodeline_version')
+  " Test with mnv>{vers}: (version after {vers}).
+  call writefile(['// mnv>' .. v:version .. ': ts=2:'], 'Xmodeline_version')
   edit Xmodeline_version
   call assert_equal(8, &ts)
   bwipe!
 
-  call writefile(['// vim>' .. (v:version - 100) .. ': ts=2:'], 'Xmodeline_version')
+  call writefile(['// mnv>' .. (v:version - 100) .. ': ts=2:'], 'Xmodeline_version')
   edit Xmodeline_version
   call assert_equal(2, &ts)
   bwipe!
 
-  call writefile(['// vim>' .. (v:version + 100) .. ': ts=2:'], 'Xmodeline_version')
+  call writefile(['// mnv>' .. (v:version + 100) .. ': ts=2:'], 'Xmodeline_version')
   edit Xmodeline_version
   call assert_equal(8, &ts)
   bwipe!
 
-  " Test with vim<{vers}: (version before {vers}).
-  call writefile(['// vim<' .. v:version .. ': ts=2:'], 'Xmodeline_version')
+  " Test with mnv<{vers}: (version before {vers}).
+  call writefile(['// mnv<' .. v:version .. ': ts=2:'], 'Xmodeline_version')
   edit Xmodeline_version
   call assert_equal(8, &ts)
   bwipe!
 
-  call writefile(['// vim<' .. (v:version - 100) .. ': ts=2:'], 'Xmodeline_version')
+  call writefile(['// mnv<' .. (v:version - 100) .. ': ts=2:'], 'Xmodeline_version')
   edit Xmodeline_version
   call assert_equal(8, &ts)
   bwipe!
 
-  call writefile(['// vim<' .. (v:version + 100) .. ': ts=2:'], 'Xmodeline_version')
+  call writefile(['// mnv<' .. (v:version + 100) .. ': ts=2:'], 'Xmodeline_version')
   edit Xmodeline_version
   call assert_equal(2, &ts)
   bwipe!
 
-  " Test with vim={vers}: (version {vers} only).
-  call writefile(['// vim=' .. v:version .. ': ts=2:'], 'Xmodeline_version')
+  " Test with mnv={vers}: (version {vers} only).
+  call writefile(['// mnv=' .. v:version .. ': ts=2:'], 'Xmodeline_version')
   edit Xmodeline_version
   call assert_equal(2, &ts)
   bwipe!
 
-  call writefile(['// vim=' .. (v:version - 100) .. ': ts=2:'], 'Xmodeline_version')
+  call writefile(['// mnv=' .. (v:version - 100) .. ': ts=2:'], 'Xmodeline_version')
   edit Xmodeline_version
   call assert_equal(8, &ts)
   bwipe!
 
-  call writefile(['// vim=' .. (v:version + 100) .. ': ts=2:'], 'Xmodeline_version')
+  call writefile(['// mnv=' .. (v:version + 100) .. ': ts=2:'], 'Xmodeline_version')
   edit Xmodeline_version
   call assert_equal(8, &ts)
   bwipe!
@@ -147,7 +147,7 @@ func Test_modeline_colon()
   let modeline = &modeline
   set modeline
 
-  call writefile(['// vim: set showbreak=\: ts=2: sw=2'], 'Xmodeline_colon', 'D')
+  call writefile(['// mnv: set showbreak=\: ts=2: sw=2'], 'Xmodeline_colon', 'D')
   edit Xmodeline_colon
 
   " backlash colon should become colon.
@@ -168,7 +168,7 @@ func s:modeline_fails(what, text, error)
     return
   endif
   let fname = "Xmodeline_fails_" . a:what
-  call writefile(['vim: set ' . a:text . ' :', 'nothing'], fname, 'D')
+  call writefile(['mnv: set ' . a:text . ' :', 'nothing'], fname, 'D')
   let modeline = &modeline
   set modeline
   filetype plugin on
@@ -248,8 +248,8 @@ func Test_modeline_fails_always()
   call s:modeline_fails('tcldll', 'tcldll=Something()', 'E520:')
   call s:modeline_fails('titleold', 'titleold=Something()', 'E520:')
   call s:modeline_fails('viewdir', 'viewdir=Something()', 'E520:')
-  call s:modeline_fails('viminfo', 'viminfo=Something()', 'E520:')
-  call s:modeline_fails('viminfofile', 'viminfofile=Something()', 'E520:')
+  call s:modeline_fails('mnvinfo', 'mnvinfo=Something()', 'E520:')
+  call s:modeline_fails('mnvinfofile', 'mnvinfofile=Something()', 'E520:')
   call s:modeline_fails('winptydll', 'winptydll=Something()', 'E520:')
   call s:modeline_fails('undodir', 'undodir=Something()', 'E520:')
   " only check a few terminal options
@@ -282,7 +282,7 @@ func Test_modeline_setoption_verbose()
   set modeline
 
   let lines =<< trim END
-  1 vim:ts=2
+  1 mnv:ts=2
   2 two
   3 three
   4 four
@@ -301,7 +301,7 @@ func Test_modeline_setoption_verbose()
   1 one
   2 two
   3 three
-  4 vim:ts=4
+  4 mnv:ts=4
   5 five
   6 six
   7 seven
@@ -321,7 +321,7 @@ func Test_modeline_setoption_verbose()
   5 five
   6 six
   7 seven
-  8 vim:ts=8
+  8 mnv:ts=8
   END
   call writefile(lines, 'Xmodeline')
   edit Xmodeline
@@ -341,14 +341,14 @@ func Test_modeline_default()
   call assert_equal(IsRoot() ? 0 : 1, &modeline)
   set compatible&vi
   call assert_false(&modeline)
-  set compatible&vim
+  set compatible&mnv
   call assert_equal(IsRoot() ? 0 : 1, &modeline)
   set compatible& modeline&
 endfunc
 
 " Some options cannot be set from the modeline when 'diff' option is set
 func Test_modeline_diff_buffer()
-  call writefile(['vim: diff foldmethod=marker wrap'], 'Xmdifile', 'D')
+  call writefile(['mnv: diff foldmethod=marker wrap'], 'Xmdifile', 'D')
   set foldmethod& nowrap
   new Xmdifile
   call assert_equal('manual', &foldmethod)
@@ -359,7 +359,7 @@ endfunc
 
 func Test_modeline_disable()
   set modeline
-  call writefile(['vim: sw=2', 'vim: nomodeline', 'vim: sw=3'], 'Xmodeline_disable', 'D')
+  call writefile(['mnv: sw=2', 'mnv: nomodeline', 'mnv: sw=3'], 'Xmodeline_disable', 'D')
   edit Xmodeline_disable
   call assert_equal(2, &sw)
 endfunc
@@ -370,7 +370,7 @@ func Test_modeline_nowrap_lcs_extends()
         \ 'aaa',
         \ 'bbb',
         \ 'ccc                    evil',
-        \ 'ddd                    vim: nowrap',
+        \ 'ddd                    mnv: nowrap',
         \ ], 'Xmodeline_nowrap', 'D')
   set noequalalways
   11new | 20vsplit
@@ -440,7 +440,7 @@ func Test_modeline_nowrap_lcs_extends()
         \ "aa\ta",
         \ "bb\tb",
         \ "cc\tc              evil",
-        \ "dd\td              vim: nowrap lcs=tab\\:<->",
+        \ "dd\td              mnv: nowrap lcs=tab\\:<->",
         \ ], 'Xmodeline_nowrap')
   let expect_insecure = [
         \ 'aa<---->a           ',
@@ -464,7 +464,7 @@ func Test_modeline_nowrap_lcs_extends()
         \ "aa\ta",
         \ "bb\tb",
         \ "cc\tc              evil",
-        \ "dd\td              vim: nowrap lcs=tab\\:<->",
+        \ "dd\td              mnv: nowrap lcs=tab\\:<->",
         \ ], 'Xmodeline_nowrap')
   call Check_modeline_nowrap(expect_insecure, expect_secure, 'setlocal')
   call Check_modeline_nowrap(expect_insecure, expect_secure, 'set')
@@ -493,4 +493,4 @@ func Test_modeline_nowrap_lcs_extends()
   set equalalways&
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_move.vim b/uvim/src/testdir/test_move.mnv
index d0b68f731d..852f1470d6 100644
--- a/uvim/src/testdir/test_move.vim
+++ b/uvim/src/testdir/test_move.mnv
@@ -1,6 +1,6 @@
 " Test the ":move" command.
 
-source util/screendump.vim
+source util/screendump.mnv
 
 func Test_move()
   enew!
@@ -47,13 +47,13 @@ endfunc
 
 func Test_move_undo()
   CheckScreendump
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   let lines =<< trim END
       call setline(1, ['First', 'Second', 'Third', 'Fourth'])
   END
-  call writefile(lines, 'Xtest_move_undo.vim', 'D')
-  let buf = RunVimInTerminal('-S Xtest_move_undo.vim', #{rows: 10, cols: 60, statusoff: 2})
+  call writefile(lines, 'Xtest_move_undo.mnv', 'D')
+  let buf = RunMNVInTerminal('-S Xtest_move_undo.mnv', #{rows: 10, cols: 60, statusoff: 2})
 
   call term_sendkeys(buf, "gg:move +1\<CR>")
   call VerifyScreenDump(buf, 'Test_move_undo_1', {})
@@ -63,8 +63,8 @@ func Test_move_undo()
   call term_sendkeys(buf, ":\<Esc>")
   call VerifyScreenDump(buf, 'Test_move_undo_2', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_mswin_event.vim b/uvim/src/testdir/test_mswin_event.mnv
index 96d1247db6..3f43d30d2b 100644
--- a/uvim/src/testdir/test_mswin_event.vim
+++ b/uvim/src/testdir/test_mswin_event.mnv
@@ -2,7 +2,7 @@
 " Most of this works the same in Windows GUI as well as Windows console.
 
 CheckMSWindows
-source util/mouse.vim
+source util/mouse.mnv
 
 " Helper function for sending a grouped sequence of low level key presses
 " The modifier key(s) can be included as VK Key Codes in the sequence
@@ -35,11 +35,11 @@ func SendKey(key)
   call SendKeyWithModifiers(a:key, 0)
 endfunc
 
-" getcharstr(0) but catch Vim:Interrupt
+" getcharstr(0) but catch MNV:Interrupt
 func Getcharstr()
   try
     let ch = getcharstr(0)
-  catch /^Vim:Interrupt$/
+  catch /^MNV:Interrupt$/
     let ch = "\<c-c>"
   endtry
   return ch
@@ -53,7 +53,7 @@ func SendKeyStr(keystring)
   endfor
 endfunc
 
-" This tells Vim to execute the buffered keys as user commands,
+" This tells MNV to execute the buffered keys as user commands,
 " ie. same as feekdeys with mode X would do.
 func ExecuteBufferedKeys()
   if has('gui_running')
@@ -169,7 +169,7 @@ let s:VK = {
   let s:MOD_MASK_CTRL  = 0x04
   let s:MOD_MASK_ALT   = 0x08
 
-  let s:vim_key_modifiers = [
+  let s:mnv_key_modifiers = [
     \ ["",       0,   []],
     \ ["S-",     2,   [s:VK.LSHIFT]],
     \ ["C-",     4,   [s:VK.LCONTROL]],
@@ -522,9 +522,9 @@ func Test_mswin_event_function_keys()
   while getchar(0)
   endwhile
 
-  for [mod_str, vim_mod_mask, mod_keycodes] in s:vim_key_modifiers
+  for [mod_str, mnv_mod_mask, mod_keycodes] in s:mnv_key_modifiers
     for n in range(1, 12)
-      let expected_mod_mask = vim_mod_mask
+      let expected_mod_mask = mnv_mod_mask
       let kstr = $"{mod_str}F{n}"
       if !has('gui_running') || (has('gui_running') && n != 10
                                              \  && index(gui_nogo, kstr) == -1)
@@ -532,7 +532,7 @@ func Test_mswin_event_function_keys()
         " flush out the typeahead buffer
         while getchar(0)
         endwhile
-        call SendKeyWithModifiers(111+n, vim_mod_mask)
+        call SendKeyWithModifiers(111+n, mnv_mod_mask)
         let ch = Getcharstr()
         let mod_mask = getcharmod()
         call assert_equal(keycode, $"{ch}", $"key = {kstr}")
@@ -595,9 +595,9 @@ func Test_mswin_event_movement_keys()
   while getchar(0)
   endwhile
 
-  for [mod_str, vim_mod_mask, mod_keycodes] in s:vim_key_modifiers
+  for [mod_str, mnv_mod_mask, mod_keycodes] in s:mnv_key_modifiers
     for [kcode, kname] in movement_keys
-      let exp_mod_mask = vim_mod_mask
+      let exp_mod_mask = mnv_mod_mask
       let kstr = $"{mod_str}{kname}"
       let chstr_eval = eval('"\<' .. kstr .. '>"')
 
@@ -1018,4 +1018,4 @@ func Test_mswin_event_error_handling()
 endfunc
 
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_mzscheme.vim b/uvim/src/testdir/test_mzscheme.mnv
index a6f57a893c..44b43550e4 100644
--- a/uvim/src/testdir/test_mzscheme.vim
+++ b/uvim/src/testdir/test_mzscheme.mnv
@@ -8,10 +8,10 @@ func MzRequire()
   redir END
   if strpart(l:mzversion, 1, 1) < "4"
     " MzScheme versions < 4.x:
-    mz (require (prefix vim- vimext))
+    mz (require (prefix mnv- mnvext))
   else
     " newer versions:
-    mz (require (prefix-in vim- 'vimext))
+    mz (require (prefix-in mnv- 'mnvext))
     mz (require r5rs)
   endif
 endfunc
@@ -32,7 +32,7 @@ func Test_mzscheme()
 
   call cursor(1, 1)
   " change buffer contents
-  mz (vim-set-buff-line (vim-eval "line('.')") "1 changed line 1")
+  mz (mnv-set-buff-line (mnv-eval "line('.')") "1 changed line 1")
   call assert_equal('1 changed line 1', getline(1))
 
   " scalar test
@@ -50,12 +50,12 @@ func Test_mzscheme()
   call assert_equal(l2[2], l2)
 
   " funcrefs
-  mz (define vim:max (vim-eval "function('max')"))
-  mz (define m (vim:max '(1 100 8)))
+  mz (define mnv:max (mnv-eval "function('max')"))
+  mz (define m (mnv:max '(1 100 8)))
   let m = mzeval('m')
   call assert_equal(100, m)
 
   close!
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_nested_function.vim b/uvim/src/testdir/test_nested_function.mnv
index 9b8f564365..82ae7de942 100644
--- a/uvim/src/testdir/test_nested_function.vim
+++ b/uvim/src/testdir/test_nested_function.mnv
@@ -65,4 +65,4 @@ func Test_max_nesting()
   set mfd&
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_netbeans.vim b/uvim/src/testdir/test_netbeans.mnv
index d1be5066ef..b173c01ee9 100644
--- a/uvim/src/testdir/test_netbeans.vim
+++ b/uvim/src/testdir/test_netbeans.mnv
@@ -13,7 +13,7 @@ func s:run_server(testfunc, ...)
 endfunc
 
 " Wait for an exception (error) to be thrown. This is used to check whether a
-" message from the netbeans server causes an error. It takes some time for Vim
+" message from the netbeans server causes an error. It takes some time for MNV
 " to process a netbeans message. So a sleep is used below to account for this.
 func WaitForError(errcode)
   let save_exception = ''
@@ -31,7 +31,7 @@ endfunc
 " Read the "Xnetbeans" file and filter out geometry messages.
 func ReadXnetbeans()
   let l = readfile("Xnetbeans")
-  " Xnetbeans may include '0:geometry=' messages in the GUI Vim if the window
+  " Xnetbeans may include '0:geometry=' messages in the GUI MNV if the window
   " position, size, or z order are changed.  Remove these messages because
   " these messages will break the assert for the output.
   return filter(l, 'v:val !~ "^0:geometry="')
@@ -410,7 +410,7 @@ func Nb_basic(port)
   call assert_equal('send: 2:stopDocumentListen!59', l[-1])
   let g:last += 3
 
-  " Wait for vim to process the previous netbeans message
+  " Wait for mnv to process the previous netbeans message
   sleep 1m
 
   " modify the buffer and make sure that the netbeans server is not notified
@@ -475,7 +475,7 @@ func Nb_basic(port)
   call WaitFor('len(ReadXnetbeans()) >= (g:last + 3)')
   let l = ReadXnetbeans()
   call assert_equal('send: 3:create!66', l[-1])
-  " Wait for vim to process the previous netbeans message
+  " Wait for mnv to process the previous netbeans message
   sleep 10m
   call assert_equal(bufcount + 1, len(getbufinfo()))
   let g:last += 3
@@ -871,13 +871,13 @@ func Test_nb_file_auth()
   call s:run_server('Nb_file_auth')
 endfunc
 
-" Test for quitting Vim with an open netbeans connection
+" Test for quitting MNV with an open netbeans connection
 func Nb_quit_with_conn(port)
   call delete("Xnetbeans")
   call writefile([], "Xnetbeans", 'D')
   let after =<< trim END
-    source util/shared.vim
-    set cpo&vim
+    source util/shared.mnv
+    set cpo&mnv
 
     func ReadXnetbeans()
       let l = readfile("Xnetbeans")
@@ -911,7 +911,7 @@ func Nb_quit_with_conn(port)
       qall!
     endtry
   END
-  if RunVim(['let g:port = ' .. a:port], after, '')
+  if RunMNV(['let g:port = ' .. a:port], after, '')
     call WaitFor('len(ReadXnetbeans()) >= 9')
     let l = ReadXnetbeans()
     call assert_equal('1:unmodified=16', l[-3])
@@ -921,7 +921,7 @@ func Nb_quit_with_conn(port)
 endfunc
 
 func Test_nb_quit_with_conn()
-  " Exiting Vim with a netbeans connection doesn't work properly on
+  " Exiting MNV with a netbeans connection doesn't work properly on
   " MS-Windows.
   CheckUnix
   call s:run_server('Nb_quit_with_conn')
@@ -1024,4 +1024,4 @@ func Test_nb_specialKeys_overflow()
   call s:run_server('Nb_specialKeys_overflow')
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_netbeans.py b/uvim/src/testdir/test_netbeans.py
index 585886fb40..d95d3b0745 100644
--- a/uvim/src/testdir/test_netbeans.py
+++ b/uvim/src/testdir/test_netbeans.py
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 #
-# Server that will communicate with Vim through the netbeans interface.
-# Used by test_netbeans.vim.
+# Server that will communicate with MNV through the netbeans interface.
+# Used by test_netbeans.mnv.
 #
 # This requires Python 2.6 or later.
 
@@ -22,7 +22,7 @@ except ImportError:
 class ThreadedTCPRequestHandler(socketserver.BaseRequestHandler):
 
     def process_msgs(self, msgbuf):
-        # Process all the received netbeans commands/responses/events from Vim.
+        # Process all the received netbeans commands/responses/events from MNV.
         # Each one is separated by a newline character. If a partial command
         # is received, process it later after the rest of it is received.
         while True:
diff --git a/uvim/src/testdir/test_normal.vim b/uvim/src/testdir/test_normal.mnv
index 4f435610bd..f1fc5ab010 100644
--- a/uvim/src/testdir/test_normal.vim
+++ b/uvim/src/testdir/test_normal.mnv
@@ -1,7 +1,7 @@
 " Test for various Normal mode commands
 
-import './util/vim9.vim' as v9
-source util/screendump.vim
+import './util/mnv9.mnv' as v9
+source util/screendump.mnv
 
 func Setup_NewWindow()
   10new
@@ -687,7 +687,7 @@ func Test_opfunc_callback()
   call assert_equal(['char'], g:OpFunc3Args)
   delfunc s:OpFunc3
 
-  " Using Vim9 lambda expression in legacy context should fail
+  " Using MNV9 lambda expression in legacy context should fail
   set opfunc=(a)\ =>\ OpFunc1(24,\ a)
   let g:OpFunc1Args = []
   call assert_fails('normal! g@l', 'E117:')
@@ -706,16 +706,16 @@ func Test_opfunc_callback()
   delfunc SetOpFunc
   delfunc OperatorExecute
 
-  " Vim9 tests
+  " MNV9 tests
   let lines =<< trim END
-    vim9script
+    mnv9script
 
-    def g:Vim9opFunc(val: number, type: string): void
+    def g:MNV9opFunc(val: number, type: string): void
       g:OpFunc1Args = [val, type]
     enddef
 
     # Test for using a def function with opfunc
-    set opfunc=function('g:Vim9opFunc',\ [60])
+    set opfunc=function('g:MNV9opFunc',\ [60])
     g:OpFunc1Args = []
     normal! g@l
     assert_equal([60, 'char'], g:OpFunc1Args)
@@ -745,8 +745,8 @@ func Test_opfunc_callback()
     call writefile([execute('messages')], 'Xtest.out')
     qall
   END
-  call writefile(cleanup, 'Xverify.vim', 'D')
-  call RunVim([], [], "-c \"set opfunc=s:abc\" -S Xverify.vim")
+  call writefile(cleanup, 'Xverify.mnv', 'D')
+  call RunMNV([], [], "-c \"set opfunc=s:abc\" -S Xverify.mnv")
   call assert_match('E81: Using <SID> not in a', readfile('Xtest.out')[0])
   call delete('Xtest.out')
 
@@ -1333,7 +1333,7 @@ func Test_scroll_in_ex_mode()
       qa!
   END
   call writefile(lines, 'Xscript', 'D')
-  call assert_equal(1, RunVim([], [], '--clean -X -Z -e -s -S Xscript'))
+  call assert_equal(1, RunMNV([], [], '--clean -X -Z -e -s -S Xscript'))
   call assert_equal(['done'], readfile('Xdone'))
 
   call delete('Xdone')
@@ -1349,7 +1349,7 @@ func Test_scroll_and_paste_in_ex_mode()
       qa!
   END
   call writefile(lines, 'Xscript', 'D')
-  call assert_equal(1, RunVim([], [], '-u NONE -i NONE -n -X -Z -e -s -S Xscript'))
+  call assert_equal(1, RunMNV([], [], '-u NONE -i NONE -n -X -Z -e -s -S Xscript'))
   call assert_equal(['done'], readfile('Xdone'))
 
   call delete('Xdone')
@@ -1552,7 +1552,7 @@ func Test_normal18_z_fold()
   set nofoldenable
   50
   " There most likely is a bug somewhere:
-  " https://groups.google.com/d/msg/vim_dev/v2EkfJ_KQjI/u-Cvv94uCAAJ
+  " https://groups.google.com/d/msg/mnv_dev/v2EkfJ_KQjI/u-Cvv94uCAAJ
   " TODO: Should this only close the inner most fold or both folds?
   norm! zc
   call assert_equal(1, &foldenable)
@@ -1766,7 +1766,7 @@ func Test_normal20_exmode()
   CheckNotMSWindows
   call writefile(['1a', 'foo', 'bar', '.', 'w! Xn20file2', 'q!'], 'Xn20script', 'D')
   call writefile(['1', '2'], 'Xn20file', 'D')
-  call system(GetVimCommand() .. ' -e -s < Xn20script Xn20file')
+  call system(GetMNVCommand() .. ' -e -s < Xn20script Xn20file')
   let a = readfile('Xn20file2')
   call assert_equal(['1', 'foo', 'bar', '2'], a)
 
@@ -1813,12 +1813,12 @@ func Test_normal22_zet()
   " let &shell = 'sh'
   call writefile(['1', '2'], 'Xn22file', 'D')
   let args = ' -N -i NONE --noplugins -X --not-a-term'
-  call system(GetVimCommand() .. args .. ' -c "%d" -c ":norm! ZZ" Xn22file')
+  call system(GetMNVCommand() .. args .. ' -c "%d" -c ":norm! ZZ" Xn22file')
   let a = readfile('Xn22file')
   call assert_equal([], a)
   " Test for ZQ
   call writefile(['1', '2'], 'Xn22file')
-  call system(GetVimCommand() . args . ' -c "%d" -c ":norm! ZQ" Xn22file')
+  call system(GetMNVCommand() . args . ' -c "%d" -c ":norm! ZQ" Xn22file')
   let a = readfile('Xn22file')
   call assert_equal(['1', '2'], a)
 
@@ -3028,8 +3028,8 @@ func Test_normal39_cw()
 
   call setline(1, 'one; two')
   call cursor(1, 1)
-  call feedkeys('cwvim', 'xt')
-  call assert_equal('vim; two', getline(1))
+  call feedkeys('cwmnv', 'xt')
+  call assert_equal('mnv; two', getline(1))
   call feedkeys('0cWone', 'xt')
   call assert_equal('one two', getline(1))
   "When cursor is at the end of a word 'ce' will change until the end of the
@@ -3397,12 +3397,12 @@ func Test_message_when_using_ctrl_c()
   %bwipe!
 
   exe "normal \<C-C>"
-  call assert_match("Type  :qa  and press <Enter> to exit Vim", Screenline(&lines))
+  call assert_match("Type  :qa  and press <Enter> to exit MNV", Screenline(&lines))
 
   new
   cal setline(1, 'hi!')
   exe "normal \<C-C>"
-  call assert_match("Type  :qa!  and press <Enter> to abandon all changes and exit Vim", Screenline(&lines))
+  call assert_match("Type  :qa!  and press <Enter> to abandon all changes and exit MNV", Screenline(&lines))
 
   bwipe!
 endfunc
@@ -3410,7 +3410,7 @@ endfunc
 func Test_mode_updated_after_ctrl_c()
   CheckScreendump
 
-  let buf = RunVimInTerminal('', {'rows': 5})
+  let buf = RunMNVInTerminal('', {'rows': 5})
   call term_sendkeys(buf, "i")
   call term_sendkeys(buf, "\<C-O>")
   " wait a moment so that the "-- (insert) --" message is displayed
@@ -3418,7 +3418,7 @@ func Test_mode_updated_after_ctrl_c()
   call term_sendkeys(buf, "\<C-C>")
   call VerifyScreenDump(buf, 'Test_mode_updated_1', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 " Test for '[m', ']m', '[M' and ']M'
@@ -3573,7 +3573,7 @@ func Test_normal_gk_gj()
   put =[repeat('x',90)..' {{{1', 'x {{{1']
   norm! gk
   " In a 80 column wide terminal the window will be only 78 char
-  " (because Vim will leave space for the other window),
+  " (because MNV will leave space for the other window),
   " but if the terminal is larger, it will be 80 chars, so verify the
   " cursor column correctly.
   call assert_equal(winwidth(0)+1, col('.'))
@@ -3961,7 +3961,7 @@ func Test_mouse_shape_after_failed_change()
   CheckCanRunGui
 
   let lines =<< trim END
-    vim9script
+    mnv9script
     set mouseshape+=o:busy
     setlocal nomodifiable
     var mouse_shapes = []
@@ -3981,8 +3981,8 @@ func Test_mouse_shape_after_failed_change()
       })
     })
   END
-  call writefile(lines, 'Xmouseshape.vim', 'D')
-  call RunVim([], [], "-g -S Xmouseshape.vim")
+  call writefile(lines, 'Xmouseshape.mnv', 'D')
+  call RunMNV([], [], "-g -S Xmouseshape.mnv")
   call WaitForAssert({-> assert_equal(['busy', 'arrow'], readfile('Xmouseshapes'))}, 300)
 
   call delete('Xmouseshapes')
@@ -3994,7 +3994,7 @@ func Test_mouse_shape_after_cancelling_gr()
   CheckCanRunGui
 
   let lines =<< trim END
-    vim9script
+    mnv9script
     var mouse_shapes = []
 
     feedkeys('gr')
@@ -4012,8 +4012,8 @@ func Test_mouse_shape_after_cancelling_gr()
       })
     })
   END
-  call writefile(lines, 'Xmouseshape.vim', 'D')
-  call RunVim([], [], "-g -S Xmouseshape.vim")
+  call writefile(lines, 'Xmouseshape.mnv', 'D')
+  call RunMNV([], [], "-g -S Xmouseshape.mnv")
   call WaitForAssert({-> assert_equal(['beam', 'arrow'], readfile('Xmouseshapes'))}, 300)
 
   call delete('Xmouseshapes')
@@ -4030,11 +4030,11 @@ func Test_normal_j_below_botline()
     norm Lj
   END
   call writefile(lines, 'XNormalJBelowBotline', 'D')
-  let buf = RunVimInTerminal('-S XNormalJBelowBotline', #{rows: 19, cols: 40})
+  let buf = RunMNVInTerminal('-S XNormalJBelowBotline', #{rows: 19, cols: 40})
 
   call VerifyScreenDump(buf, 'Test_normal_j_below_botline', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 " Test for r (replace) command with CTRL_V and CTRL_Q
@@ -4400,7 +4400,7 @@ func Test_scroll_longline_winwidth()
 endfunc
 
 func Test_pos_percentage_in_turkish_locale()
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
   CheckNotMac
   defer execute(':lang C')
   if !filereadable('../po/tr.mo')
@@ -4408,28 +4408,28 @@ func Test_pos_percentage_in_turkish_locale()
   endif
 
   try
-    let dir = expand('$VIMRUNTIME/lang/tr/')
-    let target = expand('$VIMRUNTIME/lang/tr/LC_MESSAGES/')
+    let dir = expand('$MNVRUNTIME/lang/tr/')
+    let target = expand('$MNVRUNTIME/lang/tr/LC_MESSAGES/')
     let tr = '../po/tr.mo'
     call mkdir(dir, 'R')
     call mkdir(target, '')
-    call filecopy(tr, target .. 'vim.mo')
+    call filecopy(tr, target .. 'mnv.mo')
     lang tr_TR.UTF-8
-    let buf = RunVimInTerminal('', {'rows': 5, 'cols': 40})
+    let buf = RunMNVInTerminal('', {'rows': 5, 'cols': 40})
     call term_sendkeys(buf, ":lang tr_TR.UTF-8\<cr>")
     call term_sendkeys(buf, ":put =range(1,40)\<cr>")
     call term_sendkeys(buf, ":5\<cr>")
     call WaitForAssert({-> assert_match('%8$', term_getline(buf, 5))})
 
-    call StopVimInTerminal(buf)
+    call StopMNVInTerminal(buf)
   catch /E197:/
     " can't use Turkish locale
     throw 'Skipped: Turkish locale not available'
   endtry
 endfunc
 
-" This test simulates the problem with gvim on Windows, observed when
-" Test_normal11_showcmd in test_normal.vim is executed consecutively after
+" This test simulates the problem with gmnv on Windows, observed when
+" Test_normal11_showcmd in test_normal.mnv is executed consecutively after
 " Test_mouse_shape_after_failed_change.
 "
 " The problem occurred because WM_SETFOCUS was processed slowly, and typebuf
@@ -4440,7 +4440,7 @@ func Test_win32_gui_setfocus_prevent_showcmd()
     throw 'Skipped: Windows GUI regression test'
   endif
 
-  " WM_SETFOCUS event occurs when finish to execute filter command in gvim
+  " WM_SETFOCUS event occurs when finish to execute filter command in gmnv
   exe 'silent !echo foo'
 
   set showcmd
@@ -4458,4 +4458,4 @@ func Test_win32_gui_setfocus_prevent_showcmd()
   call feedkeys("\<C-V>", 'xt')
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab nofoldenable
+" mnv: shiftwidth=2 sts=2 expandtab nofoldenable
diff --git a/uvim/src/testdir/test_number.vim b/uvim/src/testdir/test_number.mnv
index bac01d142d..4a29bd175f 100644
--- a/uvim/src/testdir/test_number.vim
+++ b/uvim/src/testdir/test_number.mnv
@@ -1,6 +1,6 @@
 " Test for 'number' and 'relativenumber'
 
-source util/screendump.vim
+source util/screendump.mnv
 
 func s:screen_lines(start, end) abort
   return ScreenLines([a:start, a:end], 8)
@@ -273,7 +273,7 @@ func Test_relativenumber_colors()
   [CODE]
   call writefile(lines, 'XTest_relnr', 'D')
 
-  let buf = RunVimInTerminal('-S XTest_relnr', {'rows': 10, 'cols': 50})
+  let buf = RunMNVInTerminal('-S XTest_relnr', {'rows': 10, 'cols': 50})
   " Default colors
   call VerifyScreenDump(buf, 'Test_relnr_colors_1', {})
 
@@ -287,7 +287,7 @@ func Test_relativenumber_colors()
   call VerifyScreenDump(buf, 'Test_relnr_colors_4', {})
 
   " clean up
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_relativenumber_colors_wrapped()
@@ -304,7 +304,7 @@ func Test_relativenumber_colors_wrapped()
   [CODE]
   call writefile(lines, 'XTest_relnr_wrap', 'D')
 
-  let buf = RunVimInTerminal('-S XTest_relnr_wrap', {'rows': 20, 'cols': 50})
+  let buf = RunMNVInTerminal('-S XTest_relnr_wrap', {'rows': 20, 'cols': 50})
 
   call VerifyScreenDump(buf, 'Test_relnr_colors_wrapped_1', {})
   call term_sendkeys(buf, "k")
@@ -317,7 +317,7 @@ func Test_relativenumber_colors_wrapped()
   call VerifyScreenDump(buf, 'Test_relnr_colors_wrapped_5', {})
 
   " clean up
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_relativenumber_callback()
@@ -337,11 +337,11 @@ func Test_relativenumber_callback()
   END
   call writefile(lines, 'Xrnu_timer', 'D')
 
-  let buf = RunVimInTerminal('-S Xrnu_timer', #{rows: 8})
+  let buf = RunMNVInTerminal('-S Xrnu_timer', #{rows: 8})
   call TermWait(buf, 310)
   call VerifyScreenDump(buf, 'Test_relativenumber_callback_1', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 " Test that line numbers below inserted/deleted lines are updated.
@@ -355,7 +355,7 @@ func Test_number_insert_delete_lines()
   END
   call writefile(lines, 'Xnumber_insert_delete_lines', 'D')
 
-  let buf = RunVimInTerminal('-S Xnumber_insert_delete_lines', #{rows: 8})
+  let buf = RunMNVInTerminal('-S Xnumber_insert_delete_lines', #{rows: 8})
   call VerifyScreenDump(buf, 'Test_number_insert_delete_lines_1', {})
   call term_sendkeys(buf, "dd")
   call VerifyScreenDump(buf, 'Test_number_insert_delete_lines_2', {})
@@ -366,7 +366,7 @@ func Test_number_insert_delete_lines()
   call term_sendkeys(buf, "P")
   call VerifyScreenDump(buf, 'Test_number_insert_delete_lines_1', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 " Test for displaying line numbers with 'rightleft'
@@ -402,4 +402,4 @@ func Test_number_no_text_virtual_edit()
   bwipe!
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_options.vim b/uvim/src/testdir/test_options.mnv
index d33c062528..27ce89396d 100644
--- a/uvim/src/testdir/test_options.vim
+++ b/uvim/src/testdir/test_options.mnv
@@ -21,7 +21,7 @@ func Test_whichwrap()
   set whichwrap=h,h,h
   call assert_equal('h', &whichwrap)
 
-  " For compatibility with Vim 3.0 and before, number values are also
+  " For compatibility with MNV 3.0 and before, number values are also
   " supported for 'whichwrap'
   set whichwrap=1
   call assert_equal('b', &whichwrap)
@@ -40,7 +40,7 @@ func Test_whichwrap()
 endfunc
 
 func Test_isfname()
-  " This used to cause Vim to access uninitialized memory.
+  " This used to cause MNV to access uninitialized memory.
   set isfname=
   call assert_equal("~X", expand("~X"))
   set isfname&
@@ -304,7 +304,7 @@ func Test_set_completion()
   call feedkeys(":setglobal di\<C-A>\<C-B>\"\<CR>", 'tx')
   call assert_equal('"setglobal dictionary diff diffanchors diffexpr diffopt digraph directory display', @:)
 
-  " Expand boolean options. When doing :set no<Tab> Vim prefixes the option
+  " Expand boolean options. When doing :set no<Tab> MNV prefixes the option
   " names with "no".
   call feedkeys(":set nodi\<C-A>\<C-B>\"\<CR>", 'tx')
   call assert_equal('"set nodiff nodigraph', @:)
@@ -346,7 +346,7 @@ func Test_set_completion()
   " Expand directories.
   call feedkeys(":set cdpath=./\<C-A>\<C-B>\"\<CR>", 'tx')
   call assert_match(' ./samples/ ', @:)
-  call assert_notmatch(' ./util/summarize.vim ', @:)
+  call assert_notmatch(' ./util/summarize.mnv ', @:)
   set cdpath&
 
   " Expand files and directories.
@@ -438,9 +438,9 @@ func Test_set_completion()
 
   " Expand options for 'spellsuggest'
   call feedkeys(":set spellsuggest=file:test_options.v\<Tab>\<C-B>\"\<CR>", 'xt')
-  call assert_equal("\"set spellsuggest=file:test_options.vim", @:)
+  call assert_equal("\"set spellsuggest=file:test_options.mnv", @:)
   call feedkeys(":set spellsuggest=best,file:test_options.v\<Tab>\<C-B>\"\<CR>", 'xt')
-  call assert_equal("\"set spellsuggest=best,file:test_options.vim", @:)
+  call assert_equal("\"set spellsuggest=best,file:test_options.mnv", @:)
 
   " Expanding value for 'key' is disallowed
   if exists('+key')
@@ -891,7 +891,7 @@ func Test_set_option_errors()
   call assert_fails('set tabline=%)', 'E542:')
 
   if has('cursorshape')
-    " This invalid value for 'guicursor' used to cause Vim to crash.
+    " This invalid value for 'guicursor' used to cause MNV to crash.
     call assert_fails('set guicursor=i-ci,r-cr:h', 'E545:')
     call assert_fails('set guicursor=i-ci', 'E545:')
     call assert_fails('set guicursor=x', 'E545:')
@@ -1006,7 +1006,7 @@ endfunc
 
 func CheckWasSet(name)
   let verb_cm = execute('verbose set ' .. a:name .. '?')
-  call assert_match('Last set from.*test_options.vim', verb_cm)
+  call assert_match('Last set from.*test_options.mnv', verb_cm)
 endfunc
 func CheckWasNotSet(name)
   let verb_cm = execute('verbose set ' .. a:name .. '?')
@@ -1050,8 +1050,8 @@ func Test_set_ttytype()
   CheckUnix
   CheckNotGui
 
-  " Setting 'ttytype' used to cause a double-free when exiting vim and
-  " when vim is compiled with -DEXITFREE.
+  " Setting 'ttytype' used to cause a double-free when exiting mnv and
+  " when mnv is compiled with -DEXITFREE.
   set ttytype=ansi
   call assert_equal('ansi', &ttytype)
   call assert_equal(&ttytype, &term)
@@ -1183,7 +1183,7 @@ func Test_backupskip()
       qall
   [CODE]
   call writefile(after, 'Xafter', 'D')
-  let cmd = GetVimProg() . ' --not-a-term -S Xafter --cmd "set enc=utf8"'
+  let cmd = GetMNVProg() . ' --not-a-term -S Xafter --cmd "set enc=utf8"'
 
   let saveenv = {}
   for var in ['TMPDIR', 'TMP', 'TEMP']
@@ -1601,7 +1601,7 @@ func Test_opt_default_cdpath()
   else
     let $CDPATH='/path/to/dir1;/path/to/dir2'
   endif
-  if RunVim([], after, '')
+  if RunMNV([], after, '')
     call assert_equal([], readfile('Xtestout'))
     call delete('Xtestout')
   endif
@@ -2213,7 +2213,7 @@ func Test_opt_winminheight()
 endfunc
 
 func Test_opt_winminheight_term()
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   " The tabline should be taken into account.
   let lines =<< trim END
@@ -2224,15 +2224,15 @@ func Test_opt_winminheight_term()
     below sp
   END
   call writefile(lines, 'Xwinminheight', 'D')
-  let buf = RunVimInTerminal('-S Xwinminheight', #{rows: 11})
+  let buf = RunMNVInTerminal('-S Xwinminheight', #{rows: 11})
   call term_sendkeys(buf, ":set wmh=1\n")
   call WaitForAssert({-> assert_match('E36: Not enough room', term_getline(buf, 11))})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_opt_winminheight_term_tabs()
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   " The tabline should be taken into account.
   let lines =<< trim END
@@ -2244,11 +2244,11 @@ func Test_opt_winminheight_term_tabs()
     tabnew
   END
   call writefile(lines, 'Xwinminheight', 'D')
-  let buf = RunVimInTerminal('-S Xwinminheight', #{rows: 11})
+  let buf = RunMNVInTerminal('-S Xwinminheight', #{rows: 11})
   call term_sendkeys(buf, ":set wmh=1\n")
   call WaitForAssert({-> assert_match('E36: Not enough room', term_getline(buf, 11))})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 " Test for the 'winminwidth' option
@@ -2272,54 +2272,54 @@ endfunc
 
 " Test that resetting laststatus does change scroll option
 func Test_opt_reset_scroll()
-  CheckRunVimInTerminal
-  let vimrc =<< trim [CODE]
+  CheckRunMNVInTerminal
+  let mnvrc =<< trim [CODE]
     set scroll=2
     set laststatus=2
   [CODE]
-  call writefile(vimrc, 'Xscroll', 'D')
-  let buf = RunVimInTerminal('-S Xscroll', {'rows': 16, 'cols': 45})
+  call writefile(mnvrc, 'Xscroll', 'D')
+  let buf = RunMNVInTerminal('-S Xscroll', {'rows': 16, 'cols': 45})
   call term_sendkeys(buf, ":verbose set scroll?\n")
   call WaitForAssert({-> assert_match('Last set.*window size', term_getline(buf, 15))})
   call assert_match('^\s*scroll=7$', term_getline(buf, 14))
 
   " clean up
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
-" Check that VIM_POSIX env variable influences default value of 'cpo' and 'shm'
-func Test_VIM_POSIX()
-  let saved_VIM_POSIX = getenv("VIM_POSIX")
+" Check that MNV_POSIX env variable influences default value of 'cpo' and 'shm'
+func Test_MNV_POSIX()
+  let saved_MNV_POSIX = getenv("MNV_POSIX")
 
-  call setenv('VIM_POSIX', "1")
+  call setenv('MNV_POSIX', "1")
   let after =<< trim [CODE]
-    call writefile([&cpo, &shm], 'X_VIM_POSIX')
+    call writefile([&cpo, &shm], 'X_MNV_POSIX')
     qall
   [CODE]
-  if RunVim([], after, '')
+  if RunMNV([], after, '')
     call assert_equal(['aAbBcCdDeEfFgHiIjJkKlLmMnoOpPqrRsStuvwWxXyZz$!%*-+<>#{|&/\.;~',
-          \            'AS'], readfile('X_VIM_POSIX'))
+          \            'AS'], readfile('X_MNV_POSIX'))
   endif
 
-  call setenv('VIM_POSIX', v:null)
+  call setenv('MNV_POSIX', v:null)
   let after =<< trim [CODE]
-    call writefile([&cpo, &shm], 'X_VIM_POSIX')
+    call writefile([&cpo, &shm], 'X_MNV_POSIX')
     qall
   [CODE]
-  if RunVim([], after, '')
+  if RunMNV([], after, '')
     call assert_equal(['aAbBcCdDeEfFgHiIjJkKlLmMnoOpPqrRsStuvwWxXyZz$!%*-+<>;',
-          \            'S'], readfile('X_VIM_POSIX'))
+          \            'S'], readfile('X_MNV_POSIX'))
   endif
 
-  call delete('X_VIM_POSIX')
-  call setenv('VIM_POSIX', saved_VIM_POSIX)
+  call delete('X_MNV_POSIX')
+  call setenv('MNV_POSIX', saved_MNV_POSIX)
 endfunc
 
-" Test for setting an option to a Vi or Vim default
+" Test for setting an option to a Vi or MNV default
 func Test_opt_default()
   set formatoptions&vi
   call assert_equal('vt', &formatoptions)
-  set formatoptions&vim
+  set formatoptions&mnv
   call assert_equal('tcq', &formatoptions)
 
   call assert_equal('ucs-bom,utf-8,default,latin1', &fencs)
@@ -2486,7 +2486,7 @@ func Test_endoffile_default()
     call writefile([execute('set eof?')], 'Xtestout')
     qall!
   [CODE]
-  if RunVim([], after, '')
+  if RunMNV([], after, '')
     call assert_equal(["\nnoendoffile"], readfile('Xtestout'))
   endif
   call delete('Xtestout')
@@ -2517,7 +2517,7 @@ func Test_set_min_lines_columns()
     call writefile(msg, 'XResultsetminlines')
     qall!
   END
-  if RunVim([], after, '')
+  if RunMNV([], after, '')
     call assert_equal(['E594: Need at least 12 columns',
           \ 'E594: Need at least 12 columns: columns=0',
           \ 'E594: Need at least 12 columns',
@@ -2711,7 +2711,7 @@ endfunc
 
 func GetGlobalLocalWindowOptions()
   new
-  sil! r $VIMRUNTIME/doc/options.txt
+  sil! r $MNVRUNTIME/doc/options.txt
   " Filter for global or local to window
   v/^'.*'.*\n.*global or local to window |global-local/d
   " get option value and type
@@ -2793,7 +2793,7 @@ func Test_paste_depending_options()
     set textwidth=80
     set wrapmargin=10
 
-    source Xvimrc_paste2
+    source Xmnvrc_paste2
 
     redir > Xoutput_paste
     verbose set expandtab?
@@ -2804,19 +2804,19 @@ func Test_paste_depending_options()
     qall!
   [CODE]
 
-  call writefile(lines, 'Xvimrc_paste', 'D')
-  call writefile(['set paste'], 'Xvimrc_paste2', 'D')
-  if !RunVim([], lines, '--clean')
+  call writefile(lines, 'Xmnvrc_paste', 'D')
+  call writefile(['set paste'], 'Xmnvrc_paste2', 'D')
+  if !RunMNV([], lines, '--clean')
     return
   endif
 
   let result = readfile('Xoutput_paste')->filter('!empty(v:val)')
   call assert_equal('noexpandtab', result[0])
-  call assert_match("^\tLast set from .*Xvimrc_paste2 line 1$", result[1])
+  call assert_match("^\tLast set from .*Xmnvrc_paste2 line 1$", result[1])
   call assert_equal('noexpandtab', result[2])
-  call assert_match("^\tLast set from .*Xvimrc_paste2 line 1$", result[3])
+  call assert_match("^\tLast set from .*Xmnvrc_paste2 line 1$", result[3])
   call assert_equal('noexpandtab', result[4])
-  call assert_match("^\tLast set from .*Xvimrc_paste2 line 1$", result[5])
+  call assert_match("^\tLast set from .*Xmnvrc_paste2 line 1$", result[5])
 
   call delete('Xoutput_paste')
 endfunc
@@ -2828,7 +2828,7 @@ func Test_binary_depending_options()
     " set binary test
     set expandtab
 
-    source Xvimrc_bin2
+    source Xmnvrc_bin2
 
     redir > Xoutput_bin
     verbose set expandtab?
@@ -2839,19 +2839,19 @@ func Test_binary_depending_options()
     qall!
   [CODE]
 
-  call writefile(lines, 'Xvimrc_bin', 'D')
-  call writefile(['set binary'], 'Xvimrc_bin2', 'D')
-  if !RunVim([], lines, '--clean')
+  call writefile(lines, 'Xmnvrc_bin', 'D')
+  call writefile(['set binary'], 'Xmnvrc_bin2', 'D')
+  if !RunMNV([], lines, '--clean')
     return
   endif
 
   let result = readfile('Xoutput_bin')->filter('!empty(v:val)')
   call assert_equal('noexpandtab', result[0])
-  call assert_match("^\tLast set from .*Xvimrc_bin2 line 1$", result[1])
+  call assert_match("^\tLast set from .*Xmnvrc_bin2 line 1$", result[1])
   call assert_equal('noexpandtab', result[2])
-  call assert_match("^\tLast set from .*Xvimrc_bin2 line 1$", result[3])
+  call assert_match("^\tLast set from .*Xmnvrc_bin2 line 1$", result[3])
   call assert_equal('noexpandtab', result[4])
-  call assert_match("^\tLast set from .*Xvimrc_bin2 line 1$", result[5])
+  call assert_match("^\tLast set from .*Xmnvrc_bin2 line 1$", result[5])
 
   call delete('Xoutput_bin')
 endfunc
@@ -3092,4 +3092,4 @@ func Test_comma_option_key_value()
   set lcs&
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_options_all.mnv b/uvim/src/testdir/test_options_all.mnv
new file mode 100644
index 0000000000..eaf4f4ed33
--- /dev/null
+++ b/uvim/src/testdir/test_options_all.mnv
@@ -0,0 +1,13 @@
+" Test for options
+
+" opt_test.mnv is generated from src/optiondefs.h and runtime/doc/options.txt
+" using util/gen_opt_test.mnv
+if filereadable('opt_test.mnv')
+  source opt_test.mnv
+else
+  func Test_set_values()
+    throw 'Skipped: opt_test.mnv does not exist'
+  endfunc
+endif
+
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_options_all.vim b/uvim/src/testdir/test_options_all.vim
deleted file mode 100644
index e6da82b3b9..0000000000
--- a/uvim/src/testdir/test_options_all.vim
+++ /dev/null
@@ -1,13 +0,0 @@
-" Test for options
-
-" opt_test.vim is generated from src/optiondefs.h and runtime/doc/options.txt
-" using util/gen_opt_test.vim
-if filereadable('opt_test.vim')
-  source opt_test.vim
-else
-  func Test_set_values()
-    throw 'Skipped: opt_test.vim does not exist'
-  endfunc
-endif
-
-" vim: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_packadd.vim b/uvim/src/testdir/test_packadd.mnv
index cd7126a9db..f7a666325a 100644
--- a/uvim/src/testdir/test_packadd.vim
+++ b/uvim/src/testdir/test_packadd.mnv
@@ -20,7 +20,7 @@ func Test_packadd()
   call mkdir(s:plugdir . '/ftdetect', 'p')
   call mkdir(s:plugdir . '/after', 'p')
 
-  " This used to crash Vim
+  " This used to crash MNV
   let &rtp = 'nosuchdir,' . s:plugdir . '/after'
   packadd mytest
   " plugdir should be inserted before plugdir/after
@@ -38,15 +38,15 @@ func Test_packadd()
     endif
   endfor
 
-  exe 'split ' . s:plugdir . '/plugin/test.vim'
+  exe 'split ' . s:plugdir . '/plugin/test.mnv'
   call setline(1, 'let g:plugin_works = 42')
   wq
 
-  exe 'split ' . s:plugdir . '/plugin/also/loaded.vim'
+  exe 'split ' . s:plugdir . '/plugin/also/loaded.mnv'
   call setline(1, 'let g:plugin_also_works = 77')
   wq
 
-  exe 'split ' . s:plugdir . '/ftdetect/test.vim'
+  exe 'split ' . s:plugdir . '/ftdetect/test.mnv'
   call setline(1, 'let g:ftdetect_works = 17')
   wq
 
@@ -86,7 +86,7 @@ func Test_packadd_start()
   let rtp = &rtp
   filetype on
 
-  exe 'split ' . plugdir . '/plugin/test.vim'
+  exe 'split ' . plugdir . '/plugin/test.mnv'
   call setline(1, 'let g:plugin_works = 24')
   wq
 
@@ -103,7 +103,7 @@ func Test_packadd_noload()
   set rtp&
   let rtp = &rtp
 
-  exe 'split ' . s:plugdir . '/plugin/test.vim'
+  exe 'split ' . s:plugdir . '/plugin/test.mnv'
   call setline(1, 'let g:plugin_works = 42')
   wq
   let g:plugin_works = 0
@@ -132,7 +132,7 @@ func Test_packadd_symlink_dir()
   let s:plugdir = top2_dir . '/pack/mine/opt/mytest'
   call mkdir(s:plugdir . '/plugin', 'p')
 
-  exe 'split ' . s:plugdir . '/plugin/test.vim'
+  exe 'split ' . s:plugdir . '/plugin/test.mnv'
   call setline(1, 'let g:plugin_works = 44')
   wq
   let g:plugin_works = 0
@@ -166,7 +166,7 @@ func Test_packadd_symlink_dir2()
   let s:plugdir = top2_dir . '/pack/mine/opt/mytest'
   call mkdir(s:plugdir . '/plugin', 'p')
 
-  exe 'split ' . s:plugdir . '/plugin/test.vim'
+  exe 'split ' . s:plugdir . '/plugin/test.mnv'
   call setline(1, 'let g:plugin_works = 48')
   wq
   let g:plugin_works = 0
@@ -217,24 +217,24 @@ func Test_packloadall()
   call mkdir(fooplugindir, 'p')
   call writefile(['let g:plugin_foo_number = 1234',
 	\ 'let g:plugin_foo_auto = bbb#value',
-	\ 'let g:plugin_extra_auto = extra#value'], fooplugindir . '/bar.vim')
+	\ 'let g:plugin_extra_auto = extra#value'], fooplugindir . '/bar.mnv')
   let fooautodir = &packpath . '/pack/mine/start/foo/autoload'
   call mkdir(fooautodir, 'p')
-  call writefile(['let bar#value = 77'], fooautodir . '/bar.vim')
+  call writefile(['let bar#value = 77'], fooautodir . '/bar.mnv')
 
   " plugin aaa with an autoload directory
   let aaaplugindir = &packpath . '/pack/mine/start/aaa/plugin'
   call mkdir(aaaplugindir, 'p')
   call writefile(['let g:plugin_aaa_number = 333',
-	\ 'let g:plugin_aaa_auto = bar#value'], aaaplugindir . '/bbb.vim')
+	\ 'let g:plugin_aaa_auto = bar#value'], aaaplugindir . '/bbb.mnv')
   let aaaautodir = &packpath . '/pack/mine/start/aaa/autoload'
   call mkdir(aaaautodir, 'p')
-  call writefile(['let bbb#value = 55'], aaaautodir . '/bbb.vim')
+  call writefile(['let bbb#value = 55'], aaaautodir . '/bbb.mnv')
 
   " plugin extra with only an autoload directory
   let extraautodir = &packpath . '/pack/mine/start/extra/autoload'
   call mkdir(extraautodir, 'p')
-  call writefile(['let extra#value = 99'], extraautodir . '/extra.vim')
+  call writefile(['let extra#value = 99'], extraautodir . '/extra.mnv')
 
   packloadall
   call assert_equal(1234, g:plugin_foo_number)
@@ -244,7 +244,7 @@ func Test_packloadall()
   call assert_equal(77, g:plugin_aaa_auto)
 
   " only works once
-  call writefile(['let g:plugin_bar_number = 4321'], fooplugindir . '/bar2.vim')
+  call writefile(['let g:plugin_bar_number = 4321'], fooplugindir . '/bar2.mnv')
   packloadall
   call assert_false(exists('g:plugin_bar_number'))
 
@@ -257,7 +257,7 @@ func Test_start_autoload()
   " plugin foo with an autoload directory
   let autodir = &packpath .. '/pack/mine/start/foo/autoload'
   call mkdir(autodir, 'p')
-  let fname = autodir .. '/foobar.vim'
+  let fname = autodir .. '/foobar.mnv'
   call writefile(['func foobar#test()',
 	\ '  return 1666',
 	\ 'endfunc'], fname)
@@ -291,9 +291,9 @@ func Test_colorscheme()
   call mkdir(colordirrun, 'p')
   call mkdir(colordirstart, 'p')
   call mkdir(colordiropt, 'p')
-  call writefile(['let g:found_one = 1'], colordirrun . '/one.vim')
-  call writefile(['let g:found_two = 1'], colordirstart . '/two.vim')
-  call writefile(['let g:found_three = 1'], colordiropt . '/three.vim')
+  call writefile(['let g:found_one = 1'], colordirrun . '/one.mnv')
+  call writefile(['let g:found_two = 1'], colordirstart . '/two.mnv')
+  call writefile(['let g:found_three = 1'], colordiropt . '/three.mnv')
   exe 'set rtp=' . &packpath . '/runtime'
 
   colorscheme one
@@ -311,9 +311,9 @@ func Test_colorscheme_completion()
   call mkdir(colordirrun, 'p')
   call mkdir(colordirstart, 'p')
   call mkdir(colordiropt, 'p')
-  call writefile(['let g:found_one = 1'], colordirrun . '/one.vim')
-  call writefile(['let g:found_two = 1'], colordirstart . '/two.vim')
-  call writefile(['let g:found_three = 1'], colordiropt . '/three.vim')
+  call writefile(['let g:found_one = 1'], colordirrun . '/one.mnv')
+  call writefile(['let g:found_two = 1'], colordirstart . '/two.mnv')
+  call writefile(['let g:found_three = 1'], colordiropt . '/three.mnv')
   exe 'set rtp=' . &packpath . '/runtime'
 
   let li=[]
@@ -334,79 +334,79 @@ func Test_runtime()
   call mkdir(rundir, 'p')
   call mkdir(startdir, 'p')
   call mkdir(optdir, 'p')
-  call writefile(['let g:sequence .= "run"'], rundir . '/bar.vim')
-  call writefile(['let g:sequence .= "start"'], startdir . '/bar.vim')
-  call writefile(['let g:sequence .= "foostart"'], startdir . '/foo.vim')
-  call writefile(['let g:sequence .= "opt"'], optdir . '/bar.vim')
-  call writefile(['let g:sequence .= "xxxopt"'], optdir . '/xxx.vim')
+  call writefile(['let g:sequence .= "run"'], rundir . '/bar.mnv')
+  call writefile(['let g:sequence .= "start"'], startdir . '/bar.mnv')
+  call writefile(['let g:sequence .= "foostart"'], startdir . '/foo.mnv')
+  call writefile(['let g:sequence .= "opt"'], optdir . '/bar.mnv')
+  call writefile(['let g:sequence .= "xxxopt"'], optdir . '/xxx.mnv')
   exe 'set rtp=' . &packpath . '/runtime'
 
   let g:sequence = ''
-  runtime extra/bar.vim
+  runtime extra/bar.mnv
   call assert_equal('run', g:sequence)
   let g:sequence = ''
-  runtime NoSuchFile extra/bar.vim
+  runtime NoSuchFile extra/bar.mnv
   call assert_equal('run', g:sequence)
 
   let g:sequence = ''
-  runtime START extra/bar.vim
+  runtime START extra/bar.mnv
   call assert_equal('start', g:sequence)
   let g:sequence = ''
-  runtime START NoSuchFile extra/bar.vim extra/foo.vim
+  runtime START NoSuchFile extra/bar.mnv extra/foo.mnv
   call assert_equal('start', g:sequence)
   let g:sequence = ''
-  runtime START NoSuchFile extra/foo.vim extra/bar.vim
+  runtime START NoSuchFile extra/foo.mnv extra/bar.mnv
   call assert_equal('foostart', g:sequence)
   let g:sequence = ''
-  runtime! START NoSuchFile extra/bar.vim extra/foo.vim
+  runtime! START NoSuchFile extra/bar.mnv extra/foo.mnv
   call assert_equal('startfoostart', g:sequence)
 
   let g:sequence = ''
-  runtime OPT extra/bar.vim
+  runtime OPT extra/bar.mnv
   call assert_equal('opt', g:sequence)
   let g:sequence = ''
-  runtime OPT NoSuchFile extra/bar.vim extra/xxx.vim
+  runtime OPT NoSuchFile extra/bar.mnv extra/xxx.mnv
   call assert_equal('opt', g:sequence)
   let g:sequence = ''
-  runtime OPT NoSuchFile extra/xxx.vim extra/bar.vim
+  runtime OPT NoSuchFile extra/xxx.mnv extra/bar.mnv
   call assert_equal('xxxopt', g:sequence)
   let g:sequence = ''
-  runtime! OPT NoSuchFile extra/bar.vim extra/xxx.vim
+  runtime! OPT NoSuchFile extra/bar.mnv extra/xxx.mnv
   call assert_equal('optxxxopt', g:sequence)
 
   let g:sequence = ''
-  runtime PACK extra/bar.vim
+  runtime PACK extra/bar.mnv
   call assert_equal('start', g:sequence)
   let g:sequence = ''
-  runtime! PACK extra/bar.vim
+  runtime! PACK extra/bar.mnv
   call assert_equal('startopt', g:sequence)
   let g:sequence = ''
-  runtime PACK extra/xxx.vim
+  runtime PACK extra/xxx.mnv
   call assert_equal('xxxopt', g:sequence)
   let g:sequence = ''
-  runtime PACK extra/xxx.vim extra/foo.vim extra/bar.vim
+  runtime PACK extra/xxx.mnv extra/foo.mnv extra/bar.mnv
   call assert_equal('foostart', g:sequence)
   let g:sequence = ''
-  runtime! PACK extra/bar.vim extra/xxx.vim extra/foo.vim
+  runtime! PACK extra/bar.mnv extra/xxx.mnv extra/foo.mnv
   call assert_equal('startfoostartoptxxxopt', g:sequence)
 
   let g:sequence = ''
-  runtime ALL extra/bar.vim
+  runtime ALL extra/bar.mnv
   call assert_equal('run', g:sequence)
   let g:sequence = ''
-  runtime ALL extra/foo.vim
+  runtime ALL extra/foo.mnv
   call assert_equal('foostart', g:sequence)
   let g:sequence = ''
-  runtime! ALL extra/xxx.vim
+  runtime! ALL extra/xxx.mnv
   call assert_equal('xxxopt', g:sequence)
   let g:sequence = ''
-  runtime! ALL extra/bar.vim
+  runtime! ALL extra/bar.mnv
   call assert_equal('runstartopt', g:sequence)
   let g:sequence = ''
-  runtime ALL extra/xxx.vim extra/foo.vim extra/bar.vim
+  runtime ALL extra/xxx.mnv extra/foo.mnv extra/bar.mnv
   call assert_equal('run', g:sequence)
   let g:sequence = ''
-  runtime! ALL extra/bar.vim extra/xxx.vim extra/foo.vim
+  runtime! ALL extra/bar.mnv extra/xxx.mnv extra/foo.mnv
   call assert_equal('runstartfoostartoptxxxopt', g:sequence)
 endfunc
 
@@ -417,16 +417,16 @@ func Test_runtime_completion()
   call mkdir(rundir . '/Arunbaz', 'p')
   call mkdir(startdir . '/Astartbaz', 'p')
   call mkdir(optdir . '/Aoptbaz', 'p')
-  call writefile([], rundir . '/../Arunfoo.vim')
-  call writefile([], rundir . '/Arunbar.vim')
+  call writefile([], rundir . '/../Arunfoo.mnv')
+  call writefile([], rundir . '/Arunbar.mnv')
   call writefile([], rundir . '/Aunrelated')
   call writefile([], rundir . '/../Aunrelated')
-  call writefile([], startdir . '/../Astartfoo.vim')
-  call writefile([], startdir . '/Astartbar.vim')
+  call writefile([], startdir . '/../Astartfoo.mnv')
+  call writefile([], startdir . '/Astartbar.mnv')
   call writefile([], startdir . '/Aunrelated')
   call writefile([], startdir . '/../Aunrelated')
-  call writefile([], optdir . '/../Aoptfoo.vim')
-  call writefile([], optdir . '/Aoptbar.vim')
+  call writefile([], optdir . '/../Aoptfoo.mnv')
+  call writefile([], optdir . '/Aoptbar.mnv')
   call writefile([], optdir . '/Aunrelated')
   call writefile([], optdir . '/../Aunrelated')
   exe 'set rtp=' . &packpath . '/runtime'
@@ -438,7 +438,7 @@ func Test_runtime_completion()
   endfunc
 
   call Check_runtime_completion('', '',
-        \ ['Aextra/', 'Arunfoo.vim', 'START', 'OPT', 'PACK', 'ALL'])
+        \ ['Aextra/', 'Arunfoo.mnv', 'START', 'OPT', 'PACK', 'ALL'])
   call Check_runtime_completion('S', '',
         \ ['START'])
   call Check_runtime_completion('O', '',
@@ -446,73 +446,73 @@ func Test_runtime_completion()
   call Check_runtime_completion('P', '',
         \ ['PACK'])
   call Check_runtime_completion('A', '',
-        \ ['Aextra/', 'Arunfoo.vim', 'ALL'])
-  call Check_runtime_completion('Other.vim ', 'Other.vim ',
-        \ ['Aextra/', 'Arunfoo.vim'])
+        \ ['Aextra/', 'Arunfoo.mnv', 'ALL'])
+  call Check_runtime_completion('Other.mnv ', 'Other.mnv ',
+        \ ['Aextra/', 'Arunfoo.mnv'])
   call Check_runtime_completion('Aextra/', '',
-        \ ['Aextra/Arunbar.vim', 'Aextra/Arunbaz/'])
-  call Check_runtime_completion('Other.vim Aextra/', 'Other.vim ',
-        \ ['Aextra/Arunbar.vim', 'Aextra/Arunbaz/'])
+        \ ['Aextra/Arunbar.mnv', 'Aextra/Arunbaz/'])
+  call Check_runtime_completion('Other.mnv Aextra/', 'Other.mnv ',
+        \ ['Aextra/Arunbar.mnv', 'Aextra/Arunbaz/'])
 
   call Check_runtime_completion('START ', 'START ',
-        \ ['Aextra/', 'Astartfoo.vim'])
-  call Check_runtime_completion('START Other.vim ', 'START Other.vim ',
-        \ ['Aextra/', 'Astartfoo.vim'])
+        \ ['Aextra/', 'Astartfoo.mnv'])
+  call Check_runtime_completion('START Other.mnv ', 'START Other.mnv ',
+        \ ['Aextra/', 'Astartfoo.mnv'])
   call Check_runtime_completion('START A', 'START ',
-        \ ['Aextra/', 'Astartfoo.vim'])
-  call Check_runtime_completion('START Other.vim A', 'START Other.vim ',
-        \ ['Aextra/', 'Astartfoo.vim'])
+        \ ['Aextra/', 'Astartfoo.mnv'])
+  call Check_runtime_completion('START Other.mnv A', 'START Other.mnv ',
+        \ ['Aextra/', 'Astartfoo.mnv'])
   call Check_runtime_completion('START Aextra/', 'START ',
-        \ ['Aextra/Astartbar.vim', 'Aextra/Astartbaz/'])
-  call Check_runtime_completion('START Other.vim Aextra/', 'START Other.vim ',
-        \ ['Aextra/Astartbar.vim', 'Aextra/Astartbaz/'])
+        \ ['Aextra/Astartbar.mnv', 'Aextra/Astartbaz/'])
+  call Check_runtime_completion('START Other.mnv Aextra/', 'START Other.mnv ',
+        \ ['Aextra/Astartbar.mnv', 'Aextra/Astartbaz/'])
 
   call Check_runtime_completion('OPT ', 'OPT ',
-        \ ['Aextra/', 'Aoptfoo.vim'])
-  call Check_runtime_completion('OPT Other.vim ', 'OPT Other.vim ',
-        \ ['Aextra/', 'Aoptfoo.vim'])
+        \ ['Aextra/', 'Aoptfoo.mnv'])
+  call Check_runtime_completion('OPT Other.mnv ', 'OPT Other.mnv ',
+        \ ['Aextra/', 'Aoptfoo.mnv'])
   call Check_runtime_completion('OPT A', 'OPT ',
-        \ ['Aextra/', 'Aoptfoo.vim'])
-  call Check_runtime_completion('OPT Other.vim A', 'OPT Other.vim ',
-        \ ['Aextra/', 'Aoptfoo.vim'])
+        \ ['Aextra/', 'Aoptfoo.mnv'])
+  call Check_runtime_completion('OPT Other.mnv A', 'OPT Other.mnv ',
+        \ ['Aextra/', 'Aoptfoo.mnv'])
   call Check_runtime_completion('OPT Aextra/', 'OPT ',
-        \ ['Aextra/Aoptbar.vim', 'Aextra/Aoptbaz/'])
-  call Check_runtime_completion('OPT Other.vim Aextra/', 'OPT Other.vim ',
-        \ ['Aextra/Aoptbar.vim', 'Aextra/Aoptbaz/'])
+        \ ['Aextra/Aoptbar.mnv', 'Aextra/Aoptbaz/'])
+  call Check_runtime_completion('OPT Other.mnv Aextra/', 'OPT Other.mnv ',
+        \ ['Aextra/Aoptbar.mnv', 'Aextra/Aoptbaz/'])
 
   call Check_runtime_completion('PACK ', 'PACK ',
-        \ ['Aextra/', 'Aoptfoo.vim', 'Astartfoo.vim'])
-  call Check_runtime_completion('PACK Other.vim ', 'PACK Other.vim ',
-        \ ['Aextra/', 'Aoptfoo.vim', 'Astartfoo.vim'])
+        \ ['Aextra/', 'Aoptfoo.mnv', 'Astartfoo.mnv'])
+  call Check_runtime_completion('PACK Other.mnv ', 'PACK Other.mnv ',
+        \ ['Aextra/', 'Aoptfoo.mnv', 'Astartfoo.mnv'])
   call Check_runtime_completion('PACK A', 'PACK ',
-        \ ['Aextra/', 'Aoptfoo.vim', 'Astartfoo.vim'])
-  call Check_runtime_completion('PACK Other.vim A', 'PACK Other.vim ',
-        \ ['Aextra/', 'Aoptfoo.vim', 'Astartfoo.vim'])
+        \ ['Aextra/', 'Aoptfoo.mnv', 'Astartfoo.mnv'])
+  call Check_runtime_completion('PACK Other.mnv A', 'PACK Other.mnv ',
+        \ ['Aextra/', 'Aoptfoo.mnv', 'Astartfoo.mnv'])
   call Check_runtime_completion('PACK Aextra/', 'PACK ',
-        \ ['Aextra/Aoptbar.vim', 'Aextra/Aoptbaz/',
-        \ 'Aextra/Astartbar.vim', 'Aextra/Astartbaz/'])
-  call Check_runtime_completion('PACK Other.vim Aextra/', 'PACK Other.vim ',
-        \ ['Aextra/Aoptbar.vim', 'Aextra/Aoptbaz/',
-        \ 'Aextra/Astartbar.vim', 'Aextra/Astartbaz/'])
+        \ ['Aextra/Aoptbar.mnv', 'Aextra/Aoptbaz/',
+        \ 'Aextra/Astartbar.mnv', 'Aextra/Astartbaz/'])
+  call Check_runtime_completion('PACK Other.mnv Aextra/', 'PACK Other.mnv ',
+        \ ['Aextra/Aoptbar.mnv', 'Aextra/Aoptbaz/',
+        \ 'Aextra/Astartbar.mnv', 'Aextra/Astartbaz/'])
 
   call Check_runtime_completion('ALL ', 'ALL ',
-        \ ['Aextra/', 'Aoptfoo.vim', 'Arunfoo.vim', 'Astartfoo.vim'])
-  call Check_runtime_completion('ALL Other.vim ', 'ALL Other.vim ',
-        \ ['Aextra/', 'Aoptfoo.vim', 'Arunfoo.vim', 'Astartfoo.vim'])
+        \ ['Aextra/', 'Aoptfoo.mnv', 'Arunfoo.mnv', 'Astartfoo.mnv'])
+  call Check_runtime_completion('ALL Other.mnv ', 'ALL Other.mnv ',
+        \ ['Aextra/', 'Aoptfoo.mnv', 'Arunfoo.mnv', 'Astartfoo.mnv'])
   call Check_runtime_completion('ALL A', 'ALL ',
-        \ ['Aextra/', 'Aoptfoo.vim', 'Arunfoo.vim', 'Astartfoo.vim'])
-  call Check_runtime_completion('ALL Other.vim A', 'ALL Other.vim ',
-        \ ['Aextra/', 'Aoptfoo.vim', 'Arunfoo.vim', 'Astartfoo.vim'])
+        \ ['Aextra/', 'Aoptfoo.mnv', 'Arunfoo.mnv', 'Astartfoo.mnv'])
+  call Check_runtime_completion('ALL Other.mnv A', 'ALL Other.mnv ',
+        \ ['Aextra/', 'Aoptfoo.mnv', 'Arunfoo.mnv', 'Astartfoo.mnv'])
   call Check_runtime_completion('ALL Aextra/', 'ALL ',
-        \ ['Aextra/Aoptbar.vim', 'Aextra/Aoptbaz/',
-        \ 'Aextra/Arunbar.vim', 'Aextra/Arunbaz/',
-        \ 'Aextra/Astartbar.vim', 'Aextra/Astartbaz/'])
-  call Check_runtime_completion('ALL Other.vim Aextra/', 'ALL Other.vim ',
-        \ ['Aextra/Aoptbar.vim', 'Aextra/Aoptbaz/',
-        \ 'Aextra/Arunbar.vim', 'Aextra/Arunbaz/',
-        \ 'Aextra/Astartbar.vim', 'Aextra/Astartbaz/'])
+        \ ['Aextra/Aoptbar.mnv', 'Aextra/Aoptbaz/',
+        \ 'Aextra/Arunbar.mnv', 'Aextra/Arunbaz/',
+        \ 'Aextra/Astartbar.mnv', 'Aextra/Astartbaz/'])
+  call Check_runtime_completion('ALL Other.mnv Aextra/', 'ALL Other.mnv ',
+        \ ['Aextra/Aoptbar.mnv', 'Aextra/Aoptbaz/',
+        \ 'Aextra/Arunbar.mnv', 'Aextra/Arunbaz/',
+        \ 'Aextra/Astartbar.mnv', 'Aextra/Astartbaz/'])
 
   delfunc Check_runtime_completion
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_partial.vim b/uvim/src/testdir/test_partial.mnv
index a6ba84a7b6..3775a808d0 100644
--- a/uvim/src/testdir/test_partial.vim
+++ b/uvim/src/testdir/test_partial.mnv
@@ -239,9 +239,9 @@ func Test_bind_in_python()
   let g:d = {}
   function g:d.test2()
   endfunction
-  python import vim
+  python import mnv
   try
-    call assert_equal(pyeval('vim.bindeval("g:d.test2")'), g:d.test2)
+    call assert_equal(pyeval('mnv.bindeval("g:d.test2")'), g:d.test2)
   catch
     call assert_true(v:false, v:exception)
   endtry
@@ -440,4 +440,4 @@ func Test_non_callable_type_as_method()
   call assert_fails('echo 30->d.Fn()', 'E1085: Not a callable type: d.Fn')
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_paste.vim b/uvim/src/testdir/test_paste.mnv
index bd87e3be7e..0b4af68cfc 100644
--- a/uvim/src/testdir/test_paste.vim
+++ b/uvim/src/testdir/test_paste.mnv
@@ -215,15 +215,15 @@ func Test_pastetoggle()
 endfunc
 
 func Test_pastetoggle_timeout_no_typed_after_mapped()
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   let lines =<< trim END
     set pastetoggle=abc
     set ttimeoutlen=10000
     imap d a
   END
-  call writefile(lines, 'Xpastetoggle_no_typed_after_mapped.vim', 'D')
-  let buf = RunVimInTerminal('-S Xpastetoggle_no_typed_after_mapped.vim', #{rows: 8})
+  call writefile(lines, 'Xpastetoggle_no_typed_after_mapped.mnv', 'D')
+  let buf = RunMNVInTerminal('-S Xpastetoggle_no_typed_after_mapped.mnv', #{rows: 8})
   call TermWait(buf)
   call term_sendkeys(buf, ":call feedkeys('id', 't')\<CR>")
   call term_wait(buf, 200)
@@ -231,19 +231,19 @@ func Test_pastetoggle_timeout_no_typed_after_mapped()
   " 'ttimeoutlen' should NOT apply
   call WaitForAssert({-> assert_match('^-- INSERT --', term_getline(buf, 8))})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_pastetoggle_timeout_typed_after_mapped()
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   let lines =<< trim END
     set pastetoggle=abc
     set ttimeoutlen=10000
     imap d a
   END
-  call writefile(lines, 'Xpastetoggle_typed_after_mapped.vim', 'D')
-  let buf = RunVimInTerminal('-S Xpastetoggle_typed_after_mapped.vim', #{rows: 8})
+  call writefile(lines, 'Xpastetoggle_typed_after_mapped.mnv', 'D')
+  let buf = RunMNVInTerminal('-S Xpastetoggle_typed_after_mapped.mnv', #{rows: 8})
   call TermWait(buf)
   call term_sendkeys(buf, ":call feedkeys('idb', 't')\<CR>")
   call term_wait(buf, 200)
@@ -251,19 +251,19 @@ func Test_pastetoggle_timeout_typed_after_mapped()
   " 'ttimeoutlen' should apply
   call WaitForAssert({-> assert_match('^-- INSERT (paste) --', term_getline(buf, 8))})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_pastetoggle_timeout_typed_after_noremap()
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   let lines =<< trim END
     set pastetoggle=abc
     set ttimeoutlen=10000
     inoremap d a
   END
-  call writefile(lines, 'Xpastetoggle_typed_after_noremap.vim', 'D')
-  let buf = RunVimInTerminal('-S Xpastetoggle_typed_after_noremap.vim', #{rows: 8})
+  call writefile(lines, 'Xpastetoggle_typed_after_noremap.mnv', 'D')
+  let buf = RunMNVInTerminal('-S Xpastetoggle_typed_after_noremap.mnv', #{rows: 8})
   call TermWait(buf)
   call term_sendkeys(buf, ":call feedkeys('idb', 't')\<CR>")
   call term_wait(buf, 200)
@@ -271,7 +271,7 @@ func Test_pastetoggle_timeout_typed_after_noremap()
   " 'ttimeoutlen' should apply
   call WaitForAssert({-> assert_match('^-- INSERT (paste) --', term_getline(buf, 8))})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 " Test for restoring option values when 'paste' is disabled
@@ -331,4 +331,4 @@ func Test_paste_opt_restore()
   endif
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_perl.vim b/uvim/src/testdir/test_perl.mnv
index 7f44b7f7c4..0fc62d60bf 100644
--- a/uvim/src/testdir/test_perl.vim
+++ b/uvim/src/testdir/test_perl.mnv
@@ -7,19 +7,19 @@ perl $SIG{__WARN__} = sub { die "Unexpected warnings from perl: @_" };
 
 func Test_change_buffer()
   call setline(line('$'), ['1 line 1'])
-  perl VIM::DoCommand("normal /^1\n")
-  perl $curline = VIM::Eval("line('.')")
+  perl MNV::DoCommand("normal /^1\n")
+  perl $curline = MNV::Eval("line('.')")
   perl $curbuf->Set($curline, "1 changed line 1")
   call assert_equal('1 changed line 1', getline('$'))
 endfunc
 
 func Test_evaluate_list()
   call setline(line('$'), ['2 line 2'])
-  perl VIM::DoCommand("normal /^2\n")
-  perl $curline = VIM::Eval("line('.')")
+  perl MNV::DoCommand("normal /^2\n")
+  perl $curline = MNV::Eval("line('.')")
   let l = ["abc", "def"]
   perl << EOF
-  $l = VIM::Eval("l");
+  $l = MNV::Eval("l");
   $curbuf->Append($curline, $l);
 EOF
   normal j
@@ -27,11 +27,11 @@ EOF
   call assert_equal('abc/def/', getline('$'))
 endfunc
 
-funct Test_VIM_Blob()
-  call assert_equal('0z',         perleval('VIM::Blob("")'))
-  call assert_equal('0z31326162', 'VIM::Blob("12ab")'->perleval())
-  call assert_equal('0z00010203', perleval('VIM::Blob("\x00\x01\x02\x03")'))
-  call assert_equal('0z8081FEFF', perleval('VIM::Blob("\x80\x81\xfe\xff")'))
+funct Test_MNV_Blob()
+  call assert_equal('0z',         perleval('MNV::Blob("")'))
+  call assert_equal('0z31326162', 'MNV::Blob("12ab")'->perleval())
+  call assert_equal('0z00010203', perleval('MNV::Blob("\x00\x01\x02\x03")'))
+  call assert_equal('0z8081FEFF', perleval('MNV::Blob("\x80\x81\xfe\xff")'))
 endfunc
 
 func Test_buffer_Delete()
@@ -53,7 +53,7 @@ func Test_buffer_Append()
   call assert_equal(['5', '6', '7', '', '1', '2', '3', '4'], getline(1, '$'))
 
   perl $curbuf->Append(0)
-  call assert_match('^Usage: VIBUF::Append(vimbuf, lnum, @lines) at .* line 1\.$',
+  call assert_match('^Usage: VIBUF::Append(mnvbuf, lnum, @lines) at .* line 1\.$',
         \           GetMessages()[-1])
 
   bwipe!
@@ -67,7 +67,7 @@ func Test_buffer_Set()
   call assert_equal(['1', 'a', 'b', 'A', 'B'], getline(1, '$'))
 
   perl $curbuf->Set(0)
-  call assert_match('^Usage: VIBUF::Set(vimbuf, lnum, @lines) at .* line 1\.$',
+  call assert_match('^Usage: VIBUF::Set(mnvbuf, lnum, @lines) at .* line 1\.$',
         \           GetMessages()[-1])
 
   bwipe!
@@ -105,7 +105,7 @@ func Test_window_Cursor()
   call setline(1, ['line1', 'line2'])
   perl $curwin->Cursor(2, 3)
   call assert_equal('2:3', perleval('join(":", $curwin->Cursor())'))
-  " Col is numbered from 0 in Perl, and from 1 in Vim script.
+  " Col is numbered from 0 in Perl, and from 1 in MNV script.
   call assert_equal([0, 2, 4, 0], getpos('.'))
   bwipe!
 endfunc
@@ -117,28 +117,28 @@ func Test_window_SetHeight()
   bwipe!
 endfunc
 
-func Test_VIM_Windows()
+func Test_MNV_Windows()
   new
-  " VIM::Windows() without argument in scalar and list context.
-  perl $winnr = VIM::Windows()
-  perl @winlist = VIM::Windows()
+  " MNV::Windows() without argument in scalar and list context.
+  perl $winnr = MNV::Windows()
+  perl @winlist = MNV::Windows()
   perl $curbuf->Append(0, $winnr, scalar(@winlist))
   call assert_equal(['2', '2', ''], getline(1, '$'))
 
-  " VIM::Windows() with window number argument.
-  perl VIM::Windows(VIM::Eval('winnr()'))->Buffer()->Set(1, 'bar')
+  " MNV::Windows() with window number argument.
+  perl MNV::Windows(MNV::Eval('winnr()'))->Buffer()->Set(1, 'bar')
   call assert_equal('bar', getline(1))
   bwipe!
 endfunc
 
-func Test_VIM_Buffers()
+func Test_MNV_Buffers()
   new Xbar
-  " VIM::Buffers() without argument in scalar and list context.
-  perl $nbuf = VIM::Buffers()
-  perl @buflist = VIM::Buffers()
+  " MNV::Buffers() without argument in scalar and list context.
+  perl $nbuf = MNV::Buffers()
+  perl @buflist = MNV::Buffers()
 
-  " VIM::Buffers() with argument.
-  perl $mybuf = (VIM::Buffers('Xbar'))[0]
+  " MNV::Buffers() with argument.
+  perl $mybuf = (MNV::Buffers('Xbar'))[0]
   perl $mybuf->Append(0, $nbuf, scalar(@buflist))
   call assert_equal(['2', '2', ''], getline(1, '$'))
   bwipe!
@@ -166,7 +166,7 @@ func Test_perleval()
   try
     sandbox call perleval('2')
     call assert_report('perleval did not fail in the sandbox')
-  catch /^Vim\%((\S\+)\)\=:E48:/
+  catch /^MNV\%((\S\+)\)\=:E48:/
   endtry
 
   call assert_equal('abc', perleval('"abc"'))
@@ -189,7 +189,7 @@ func Test_perleval()
   call assert_true(<SID>catch_peval('{"\0" , 0}') =~ 'Malformed key Dictionary')
   call assert_true(<SID>catch_peval('{"foo\0bar" , 0}') =~ 'Malformed key Dictionary')
 
-  call assert_equal('*VIM', perleval('"*VIM"'))
+  call assert_equal('*MNV', perleval('"*MNV"'))
   call assert_true(perleval('\\0') =~ 'SCALAR(0x\x\+)')
 
   " typeglob
@@ -217,19 +217,19 @@ func Test_perldo()
 
   " Check deleting lines does not trigger ml_get error.
   call setline(1, ['one', 'two', 'three'])
-  perldo VIM::DoCommand("%d_")
+  perldo MNV::DoCommand("%d_")
   call assert_equal([''], getline(1, '$'))
 
   call setline(1, ['one', 'two', 'three'])
-  perldo VIM::DoCommand("1,2d_")
+  perldo MNV::DoCommand("1,2d_")
   call assert_equal(['three'], getline(1, '$'))
 
   call setline(1, ['one', 'two', 'three'])
-  perldo VIM::DoCommand("2,3d_"); $_ = "REPLACED"
+  perldo MNV::DoCommand("2,3d_"); $_ = "REPLACED"
   call assert_equal(['REPLACED'], getline(1, '$'))
 
   call setline(1, ['one', 'two', 'three'])
-  2,3perldo VIM::DoCommand("1,2d_"); $_ = "REPLACED"
+  2,3perldo MNV::DoCommand("1,2d_"); $_ = "REPLACED"
   call assert_equal(['three'], getline(1, '$'))
 
   bwipe!
@@ -245,30 +245,30 @@ func Test_perldo()
   new
   let wincount = winnr('$')
   call setline(1, ['one', 'two', 'three'])
-  perldo VIM::DoCommand("new")
+  perldo MNV::DoCommand("new")
   call assert_equal(wincount + 1, winnr('$'))
   %bwipe!
 endfunc
 
-func Test_VIM_package()
-  perl VIM::DoCommand('let l:var = "foo"')
+func Test_MNV_package()
+  perl MNV::DoCommand('let l:var = "foo"')
   call assert_equal(l:var, 'foo')
 
   set noet
-  perl VIM::SetOption('et')
+  perl MNV::SetOption('et')
   call assert_true(&et)
 endfunc
 
 func Test_stdio()
   redir =>l:out
   perl << trim EOF
-    VIM::Msg("VIM::Msg");
-    VIM::Msg("VIM::Msg Error", "Error");
+    MNV::Msg("MNV::Msg");
+    MNV::Msg("MNV::Msg Error", "Error");
     print "STDOUT";
     print STDERR "STDERR";
   EOF
   redir END
-  call assert_equal(['VIM::Msg', 'VIM::Msg Error', 'STDOUT', 'STDERR'], split(l:out, "\n"))
+  call assert_equal(['MNV::Msg', 'MNV::Msg Error', 'STDOUT', 'STDERR'], split(l:out, "\n"))
 endfunc
 
 " Run first to get a clean namespace
@@ -284,39 +284,39 @@ func Test_000_SvREFCNT()
   my $num = 0;
   for ( 0 .. 100 ) {
       if ( ++$num >= 8 ) { $num = 0 }
-      VIM::DoCommand("buffer X$num");
+      MNV::DoCommand("buffer X$num");
       $b = $curbuf;
   }
 
-  VIM::DoCommand("buffer t");
+  MNV::DoCommand("buffer t");
 
   $b = $curbuf      for 0 .. 100;
   $w = $curwin      for 0 .. 100;
-  () = VIM::Buffers for 0 .. 100;
-  () = VIM::Windows for 0 .. 100;
+  () = MNV::Buffers for 0 .. 100;
+  () = MNV::Windows for 0 .. 100;
 
-  VIM::DoCommand('bw! t');
+  MNV::DoCommand('bw! t');
   if (exists &Internals::SvREFCNT) {
       my $cb = Internals::SvREFCNT($$b);
       my $cw = Internals::SvREFCNT($$w);
-      VIM::Eval("assert_equal(2, $cb, 'T1')");
-      VIM::Eval("assert_equal(2, $cw, 'T2')");
+      MNV::Eval("assert_equal(2, $cb, 'T1')");
+      MNV::Eval("assert_equal(2, $cw, 'T2')");
       my $strongref;
-      foreach ( VIM::Buffers, VIM::Windows ) {
-	  VIM::DoCommand("%bw!");
+      foreach ( MNV::Buffers, MNV::Windows ) {
+	  MNV::DoCommand("%bw!");
 	  my $c = Internals::SvREFCNT($_);
-	  VIM::Eval("assert_equal(2, $c, 'T3')");
+	  MNV::Eval("assert_equal(2, $c, 'T3')");
 	  $c = Internals::SvREFCNT($$_);
 	  next if $c == 2 && !$strongref++;
-	  VIM::Eval("assert_equal(1, $c, 'T4')");
+	  MNV::Eval("assert_equal(1, $c, 'T4')");
       }
       $cb = Internals::SvREFCNT($$curbuf);
       $cw = Internals::SvREFCNT($$curwin);
-      VIM::Eval("assert_equal(3, $cb, 'T5')");
-      VIM::Eval("assert_equal(3, $cw, 'T6')");
+      MNV::Eval("assert_equal(3, $cb, 'T5')");
+      MNV::Eval("assert_equal(3, $cw, 'T6')");
   }
-  VIM::Eval("assert_false($$b)");
-  VIM::Eval("assert_false($$w)");
+  MNV::Eval("assert_false($$b)");
+  MNV::Eval("assert_false($$w)");
 --perl
   %bw!
 endfunc
@@ -328,7 +328,7 @@ func Test_stack_usage_fix()
      eval [0, 0]->map({ -> perleval("push@_,0..4096;0") })
      q!
 CODE
-   call RunVim([], script, '')
+   call RunMNV([], script, '')
 endfunc
 
 func Test_set_cursor()
@@ -347,22 +347,22 @@ endfunc
 " Test for various heredoc syntax
 func Test_perl_heredoc()
   perl << END
-VIM::DoCommand('let s = "A"')
+MNV::DoCommand('let s = "A"')
 END
   perl <<
-VIM::DoCommand('let s ..= "B"')
+MNV::DoCommand('let s ..= "B"')
 .
   perl << trim END
-    VIM::DoCommand('let s ..= "C"')
+    MNV::DoCommand('let s ..= "C"')
   END
   perl << trim
-    VIM::DoCommand('let s ..= "D"')
+    MNV::DoCommand('let s ..= "D"')
   .
   perl << trim eof
-    VIM::DoCommand('let s ..= "E"')
+    MNV::DoCommand('let s ..= "E"')
   eof
   perl << trimm
-VIM::DoCommand('let s ..= "F"')
+MNV::DoCommand('let s ..= "F"')
 trimm
   call assert_equal('ABCDEF', s)
 endfunc
@@ -374,8 +374,8 @@ func Test_perl_in_sandbox()
   try
     sandbox perldo print "hello sandbox"
     call assert_report('perldo in the sandbox')
-  catch /^Vim\%((\S\+)\)\=:E48:/
+  catch /^MNV\%((\S\+)\)\=:E48:/
   endtry
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_plugin_comment.vim b/uvim/src/testdir/test_plugin_comment.mnv
index befae9a4d2..4e2358aaf7 100644
--- a/uvim/src/testdir/test_plugin_comment.vim
+++ b/uvim/src/testdir/test_plugin_comment.mnv
@@ -1,52 +1,52 @@
 " Test for the comment package
 
-CheckRunVimInTerminal
+CheckRunMNVInTerminal
 func Test_basic_comment()
   let lines =<< trim END
-    vim9script
+    mnv9script
 
     def Hello()
       echo "Hello"
     enddef
   END
 
-  let input_file = "test_basic_comment_input.vim"
+  let input_file = "test_basic_comment_input.mnv"
   call writefile(lines, input_file, "D")
 
-  let buf = RunVimInTerminal('-c "packadd comment" ' .. input_file, {})
+  let buf = RunMNVInTerminal('-c "packadd comment" ' .. input_file, {})
   call term_sendkeys(buf, "gcc")
   call term_sendkeys(buf, "2jgcip")
-  let output_file = "comment_basic_test.vim"
+  let output_file = "comment_basic_test.mnv"
   call term_sendkeys(buf, $":w {output_file}\<CR>")
   defer delete(output_file)
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
   let result = readfile(output_file)
-  call assert_equal(["# vim9script", "", "# def Hello()", '#   echo "Hello"', "# enddef"], result)
+  call assert_equal(["# mnv9script", "", "# def Hello()", '#   echo "Hello"', "# enddef"], result)
 endfunc
 
 func Test_basic_uncomment()
   let lines =<< trim END
-    vim9script
+    mnv9script
 
     # def Hello()
     #   echo "Hello"
     # enddef
   END
 
-  let input_file = "test_basic_uncomment_input.vim"
+  let input_file = "test_basic_uncomment_input.mnv"
   call writefile(lines, input_file, "D")
 
-  let buf = RunVimInTerminal('-c "packadd comment" ' .. input_file, {})
+  let buf = RunMNVInTerminal('-c "packadd comment" ' .. input_file, {})
   call term_sendkeys(buf, "gcc")
   call term_sendkeys(buf, "2jgcip")
-  let output_file = "uncomment_basic_test.vim"
+  let output_file = "uncomment_basic_test.mnv"
   call term_sendkeys(buf, $":w {output_file}\<CR>")
   defer delete(output_file)
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
   let result = readfile(output_file)
-  call assert_equal(["# vim9script", "", "def Hello()", '  echo "Hello"', "enddef"], result)
+  call assert_equal(["# mnv9script", "", "def Hello()", '  echo "Hello"', "enddef"], result)
 endfunc
 
 func Test_backward_slash_uncomment()
@@ -58,13 +58,13 @@ func Test_backward_slash_uncomment()
   let input_file = "Test_backward_slash_uncomment_input.mom"
   call writefile(lines, input_file, "D")
 
-  let buf = RunVimInTerminal('-c "packadd comment" -c "set ft=nroff" ' .. input_file, {})
+  let buf = RunMNVInTerminal('-c "packadd comment" -c "set ft=nroff" ' .. input_file, {})
   call term_sendkeys(buf, "gcc")
   let output_file = "backward_slash_uncomment_test.mom"
   call term_sendkeys(buf, $":w {output_file}\<CR>")
   defer delete(output_file)
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
   let result = readfile(output_file)
   call assert_equal([".TL Test backward slash uncomment"], result)
 endfunc
@@ -77,13 +77,13 @@ func Test_caseinsensitive_uncomment()
   let input_file = "test_caseinsensitive_uncomment_input.bat"
   call writefile(lines, input_file, "D")
 
-  let buf = RunVimInTerminal('-c "packadd comment" ' .. input_file, {})
+  let buf = RunMNVInTerminal('-c "packadd comment" ' .. input_file, {})
   call term_sendkeys(buf, "gcc")
   let output_file = "comment_testinsensitive_uncomment_test.bat"
   call term_sendkeys(buf, $":w {output_file}\<CR>")
   defer delete(output_file)
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
   let result = readfile(output_file)
   call assert_equal(['echo "Hello"'], result)
 endfunc
@@ -96,13 +96,13 @@ func Test_bothends_comment()
   let input_file = "test_bothends_comment_input.c"
   call writefile(lines, input_file, "D")
 
-  let buf = RunVimInTerminal('-c "packadd comment" ' .. input_file, {})
+  let buf = RunMNVInTerminal('-c "packadd comment" ' .. input_file, {})
   call term_sendkeys(buf, "gcc")
   let output_file = "comment_bothends_test.c"
   call term_sendkeys(buf, $":w {output_file}\<CR>")
   defer delete(output_file)
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
   let result = readfile(output_file)
   call assert_equal(["/* int main() {} */"], result)
 endfunc
@@ -117,13 +117,13 @@ func Test_bothends_uncomment()
   let input_file = "test_bothends_uncomment_input.c"
   call writefile(lines, input_file, "D")
 
-  let buf = RunVimInTerminal('-c "packadd comment" ' .. input_file, {})
+  let buf = RunMNVInTerminal('-c "packadd comment" ' .. input_file, {})
   call term_sendkeys(buf, "gcip")
   let output_file = "uncomment_bothends_test.c"
   call term_sendkeys(buf, $":w {output_file}\<CR>")
   defer delete(output_file)
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
   let result = readfile(output_file)
   call assert_equal(["int main() {", "  return 0;", "}"], result)
 endfunc
@@ -138,13 +138,13 @@ func Test_mixed_comment()
   let input_file = "test_mixed_comment_input.py"
   call writefile(lines, input_file, "D")
 
-  let buf = RunVimInTerminal('-c "packadd comment" ' .. input_file, {})
+  let buf = RunMNVInTerminal('-c "packadd comment" ' .. input_file, {})
   call term_sendkeys(buf, "gcG")
   let output_file = "comment_mixed_test.py"
   call term_sendkeys(buf, $":w {output_file}\<CR>")
   defer delete(output_file)
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
   let result = readfile(output_file)
   call assert_equal(["# for x in range(10):", "#   # print(x)", "#   # print(x*x)"], result)
 endfunc
@@ -159,13 +159,13 @@ func Test_mixed_comment2()
   let input_file = "test_mixed_comment_input2.py"
   call writefile(lines, input_file, "D")
 
-  let buf = RunVimInTerminal('-c "packadd comment" ' .. input_file, {})
+  let buf = RunMNVInTerminal('-c "packadd comment" ' .. input_file, {})
   call term_sendkeys(buf, "gcG")
   let output_file = "comment_mixed_test2.py"
   call term_sendkeys(buf, $":w {output_file}\<CR>")
   defer delete(output_file)
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
   let result = readfile(output_file)
   call assert_equal(["# # for x in range(10):", "#   print(x)", "#   # print(x*x)"], result)
 endfunc
@@ -176,13 +176,13 @@ func Test_mixed_indent_comment()
   let input_file = "test_mixed_indent_comment_input.c"
   call writefile(lines, input_file, "D")
 
-  let buf = RunVimInTerminal('-c "packadd comment" ' .. input_file, {})
+  let buf = RunMNVInTerminal('-c "packadd comment" ' .. input_file, {})
   call term_sendkeys(buf, "gcip")
   let output_file = "comment_mixed_indent_test.c"
   call term_sendkeys(buf, $":w {output_file}\<CR>")
   defer delete(output_file)
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
   let result = readfile(output_file)
   call assert_equal(["/* int main() { */", "\t/* if 1 { */", "\t  /* return 0; */",  "\t/* } */", "    /* return 1; */", "/* } */"], result)
 endfunc
@@ -197,13 +197,13 @@ func Test_buffer_first_col_comment()
   let input_file = "test_first_col_comment_input.py"
   call writefile(lines, input_file, "D")
 
-  let buf = RunVimInTerminal('-c "packadd comment" -c "let b:comment_first_col=1" ' .. input_file, {})
+  let buf = RunMNVInTerminal('-c "packadd comment" -c "let b:comment_first_col=1" ' .. input_file, {})
   call term_sendkeys(buf, "jgcc")
   let output_file = "comment_first_col_test.py"
   call term_sendkeys(buf, $":w {output_file}\<CR>")
   defer delete(output_file)
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
   let result = readfile(output_file)
   call assert_equal(["def Hello():", '#   print("Hello")', "  pass"], result)
 endfunc
@@ -218,13 +218,13 @@ func Test_global_first_col_comment()
   let input_file = "test_first_col_comment_input.py"
   call writefile(lines, input_file, "D")
 
-  let buf = RunVimInTerminal('-c "packadd comment" -c "let g:comment_first_col=1" ' .. input_file, {})
+  let buf = RunMNVInTerminal('-c "packadd comment" -c "let g:comment_first_col=1" ' .. input_file, {})
   call term_sendkeys(buf, "jgcj")
   let output_file = "comment_first_col_test.py"
   call term_sendkeys(buf, $":w {output_file}\<CR>")
   defer delete(output_file)
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
   let result = readfile(output_file)
   call assert_equal(["def Hello():", '#   print("Hello")', "#   pass"], result)
 endfunc
@@ -246,13 +246,13 @@ func Test_textobj_icomment()
   let input_file = "test_textobj_icomment_input.py"
   call writefile(lines, input_file, "D")
 
-  let buf = RunVimInTerminal('-c "packadd comment" ' .. input_file, {})
+  let buf = RunMNVInTerminal('-c "packadd comment" ' .. input_file, {})
   call term_sendkeys(buf, "dic..")
   let output_file = "comment_textobj_icomment.py"
   call term_sendkeys(buf, $":w {output_file}\<CR>")
   defer delete(output_file)
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
   let result = readfile(output_file)
   call assert_equal(["for x in range(10):", "  print(x) ", "  print(x*x*x*x) ", "  print(x*x*x*x*x) ", "", "  print(x*x*x*x*x)"], result)
 endfunc
@@ -274,13 +274,13 @@ func Test_textobj_icomment2()
   let input_file = "test_textobj_icomment2_input.c"
   call writefile(lines, input_file, "D")
 
-  let buf = RunVimInTerminal('-c "packadd comment" ' .. input_file, {})
+  let buf = RunMNVInTerminal('-c "packadd comment" ' .. input_file, {})
   call term_sendkeys(buf, "dic..")
   let output_file = "comment_textobj_icomment2.c"
   call term_sendkeys(buf, $":w {output_file}\<CR>")
   defer delete(output_file)
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
   let result = readfile(output_file)
   call assert_equal(["#include <stdio.h>", "", "int main() {", "    printf(\"hello\");  printf(\" world\\n\");", "    ", "", "    return 0;", "}"], result)
 endfunc
@@ -298,13 +298,13 @@ func Test_textobj_icomment3()
   let input_file = "test_textobj_icomment3_input.c"
   call writefile(lines, input_file, "D")
 
-  let buf = RunVimInTerminal('-c "packadd comment" ' .. input_file, {})
+  let buf = RunMNVInTerminal('-c "packadd comment" ' .. input_file, {})
   call term_sendkeys(buf, "jjjdic")
   let output_file = "comment_textobj_icomment3.c"
   call term_sendkeys(buf, $":w {output_file}\<CR>")
   defer delete(output_file)
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
   let result = readfile(output_file)
   call assert_equal(["#include <stdio.h>", "", "int main() {", "    printf(\"hello\");printf(\" world\\n\");",  "    return 0;", "}"], result)
 endfunc
@@ -326,13 +326,13 @@ func Test_textobj_acomment()
   let input_file = "test_textobj_acomment_input.py"
   call writefile(lines, input_file, "D")
 
-  let buf = RunVimInTerminal('-c "packadd comment" ' .. input_file, {})
+  let buf = RunMNVInTerminal('-c "packadd comment" ' .. input_file, {})
   call term_sendkeys(buf, "dac..")
   let output_file = "comment_textobj_acomment.py"
   call term_sendkeys(buf, $":w {output_file}\<CR>")
   defer delete(output_file)
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
   let result = readfile(output_file)
   call assert_equal(["for x in range(10):", "  print(x)", "  print(x*x*x*x)", "  print(x*x*x*x*x)", "", "  print(x*x*x*x*x)"], result)
 endfunc
@@ -354,13 +354,13 @@ func Test_textobj_acomment2()
   let input_file = "test_textobj_acomment2_input.c"
   call writefile(lines, input_file, "D")
 
-  let buf = RunVimInTerminal('-c "packadd comment" ' .. input_file, {})
+  let buf = RunMNVInTerminal('-c "packadd comment" ' .. input_file, {})
   call term_sendkeys(buf, "dac.")
   let output_file = "comment_textobj_acomment2.c"
   call term_sendkeys(buf, $":w {output_file}\<CR>")
   defer delete(output_file)
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
   let result = readfile(output_file)
   call assert_equal(["#include <stdio.h>", "", "int main() {", "    printf(\"hello\");printf(\" world\\n\");", "    return 0;", "}"], result)
 endfunc
@@ -378,13 +378,13 @@ func Test_textobj_acomment3()
   let input_file = "test_textobj_acomment3_input.c"
   call writefile(lines, input_file, "D")
 
-  let buf = RunVimInTerminal('-c "packadd comment" ' .. input_file, {})
+  let buf = RunMNVInTerminal('-c "packadd comment" ' .. input_file, {})
   call term_sendkeys(buf, "jjjdac")
   let output_file = "comment_textobj_acomment3.c"
   call term_sendkeys(buf, $":w {output_file}\<CR>")
   defer delete(output_file)
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
   let result = readfile(output_file)
   call assert_equal(["#include <stdio.h>", "", "int main() {", "    printf(\"hello\");printf(\" world\\n\");",  "    return 0;", "}"], result)
 endfunc
@@ -399,13 +399,13 @@ func Test_textobj_firstline_comment()
   let input_file = "test_textobj_firstlinecomment_input.c"
   call writefile(lines, input_file, "D")
 
-  let buf = RunVimInTerminal('-c "packadd comment" ' .. input_file, {})
+  let buf = RunMNVInTerminal('-c "packadd comment" ' .. input_file, {})
   call term_sendkeys(buf, "dac")
   let output_file = "comment_textobj_firstline_comment.c"
   call term_sendkeys(buf, $":w {output_file}\<CR>")
   defer delete(output_file)
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
   let result = readfile(output_file)
   call assert_equal(["int main() {}"], result)
 endfunc
@@ -419,13 +419,13 @@ func Test_textobj_noleading_space_comment()
   let input_file = "test_textobj_noleading_space_input.c"
   call writefile(lines, input_file, "D")
 
-  let buf = RunVimInTerminal('-c "packadd comment" ' .. input_file, {})
+  let buf = RunMNVInTerminal('-c "packadd comment" ' .. input_file, {})
   call term_sendkeys(buf, "dacdic")
   let output_file = "comment_textobj_noleading_space_comment.c"
   call term_sendkeys(buf, $":w {output_file}\<CR>")
   defer delete(output_file)
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
   let result = readfile(output_file)
   call assert_equal(["int main() {", "}"], result)
 endfunc
@@ -439,13 +439,13 @@ func Test_textobj_noleading_space_comment2()
   let input_file = "test_textobj_noleading_space_input2.c"
   call writefile(lines, input_file, "D")
 
-  let buf = RunVimInTerminal('-c "packadd comment" ' .. input_file, {})
+  let buf = RunMNVInTerminal('-c "packadd comment" ' .. input_file, {})
   call term_sendkeys(buf, "dac.")
   let output_file = "comment_textobj_noleading_space_comment2.c"
   call term_sendkeys(buf, $":w {output_file}\<CR>")
   defer delete(output_file)
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
   let result = readfile(output_file)
   call assert_equal(["int main() {", "}"], result)
 endfunc
@@ -456,13 +456,13 @@ func Test_textobj_trailing_spaces_comment()
   let input_file = "test_textobj_trailing_spaces_input.py"
   call writefile(lines, input_file, "D")
 
-  let buf = RunVimInTerminal('-c "packadd comment" ' .. input_file, {})
+  let buf = RunMNVInTerminal('-c "packadd comment" ' .. input_file, {})
   call term_sendkeys(buf, "jdac")
   let output_file = "comment_textobj_trailing_spaces_comment.py"
   call term_sendkeys(buf, $":w {output_file}\<CR>")
   defer delete(output_file)
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
   let result = readfile(output_file)
   call assert_equal(['print("!")'], result)
 endfunc
@@ -473,13 +473,13 @@ func Test_textobj_trailing_spaces_last_comment()
   let input_file = "test_textobj_trailing_spaces_last_input.py"
   call writefile(lines, input_file, "D")
 
-  let buf = RunVimInTerminal('-c "packadd comment" ' .. input_file, {})
+  let buf = RunMNVInTerminal('-c "packadd comment" ' .. input_file, {})
   call term_sendkeys(buf, "jdac")
   let output_file = "comment_textobj_trailing_spaces_last_comment.py"
   call term_sendkeys(buf, $":w {output_file}\<CR>")
   defer delete(output_file)
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
   let result = readfile(output_file)
   call assert_equal([], result)
 endfunc
@@ -494,13 +494,13 @@ func Test_textobj_last_line_empty_comment()
   let input_file = "test_textobj_last_line_empty_input.py"
   call writefile(lines, input_file, "D")
 
-  let buf = RunVimInTerminal('-c "packadd comment" ' .. input_file, {})
+  let buf = RunMNVInTerminal('-c "packadd comment" ' .. input_file, {})
   call term_sendkeys(buf, "dac")
   let output_file = "comment_textobj_last_line_empty_comment.py"
   call term_sendkeys(buf, $":w {output_file}\<CR>")
   defer delete(output_file)
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
   let result = readfile(output_file)
   call assert_equal([], result)
 endfunc
@@ -516,13 +516,13 @@ func Test_textobj_cursor_on_leading_space_comment()
   let input_file = "test_textobj_cursor_on_leading_space_comment_input.c"
   call writefile(lines, input_file, "D")
 
-  let buf = RunVimInTerminal('-c "packadd comment" ' .. input_file, {})
+  let buf = RunMNVInTerminal('-c "packadd comment" ' .. input_file, {})
   call term_sendkeys(buf, "jjdac")
   let output_file = "comment_textobj_cursor_on_leading_space_comment.c"
   call term_sendkeys(buf, $":w {output_file}\<CR>")
   defer delete(output_file)
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
   let result = readfile(output_file)
   call assert_equal(["int main() {", "}"], result)
 endfunc
@@ -539,13 +539,13 @@ func Test_textobj_conseq_comment()
   let input_file = "test_textobj_conseq_comment_input.c"
   call writefile(lines, input_file, "D")
 
-  let buf = RunVimInTerminal('-c "packadd comment" ' .. input_file, {})
+  let buf = RunMNVInTerminal('-c "packadd comment" ' .. input_file, {})
   call term_sendkeys(buf, "dac")
   let output_file = "comment_textobj_conseq_comment.c"
   call term_sendkeys(buf, $":w {output_file}\<CR>")
   defer delete(output_file)
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
   let result = readfile(output_file)
   call assert_equal(["int main() {", "    printf(\"hello\");", "    printf(\"world\");", "}"], result)
 endfunc
@@ -563,13 +563,13 @@ func Test_textobj_conseq_comment2()
   let input_file = "test_textobj_conseq_comment_input2.c"
   call writefile(lines, input_file, "D")
 
-  let buf = RunVimInTerminal('-c "packadd comment" ' .. input_file, {})
+  let buf = RunMNVInTerminal('-c "packadd comment" ' .. input_file, {})
   call term_sendkeys(buf, "dac")
   let output_file = "comment_textobj_conseq_comment2.c"
   call term_sendkeys(buf, $":w {output_file}\<CR>")
   defer delete(output_file)
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
   let result = readfile(output_file)
   call assert_equal(["int main() {", "    printf(\"hello\");", "", "    // world", "    printf(\"world\");", "}"], result)
 endfunc
@@ -579,17 +579,17 @@ func Test_inline_comment()
     echo "Hello" This should be a comment
   END
 
-  let input_file = "test_inline_comment_input.vim"
+  let input_file = "test_inline_comment_input.mnv"
   call writefile(lines, input_file, "D")
 
-  let buf = RunVimInTerminal('-c "packadd comment" -c "nnoremap <expr> gC comment#Toggle()..''$''" ' .. input_file, {})
+  let buf = RunMNVInTerminal('-c "packadd comment" -c "nnoremap <expr> gC comment#Toggle()..''$''" ' .. input_file, {})
   call term_sendkeys(buf, "fTgC")
 
-  let output_file = "comment_inline_test.vim"
+  let output_file = "comment_inline_test.mnv"
   call term_sendkeys(buf, $":w {output_file}\<CR>")
   defer delete(output_file)
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
   let result = readfile(output_file)
   call assert_equal(['echo "Hello" " This should be a comment'], result)
 endfunc
@@ -599,17 +599,17 @@ func Test_inline_uncomment()
     echo "Hello" " This should be a comment
   END
 
-  let input_file = "test_inline_uncomment_input.vim"
+  let input_file = "test_inline_uncomment_input.mnv"
   call writefile(lines, input_file, "D")
 
-  let buf = RunVimInTerminal('-c "packadd comment" -c "nnoremap <expr> gC comment#Toggle()..''$''" ' .. input_file, {})
+  let buf = RunMNVInTerminal('-c "packadd comment" -c "nnoremap <expr> gC comment#Toggle()..''$''" ' .. input_file, {})
   call term_sendkeys(buf, '$F"gC')
 
-  let output_file = "uncomment_inline_test.vim"
+  let output_file = "uncomment_inline_test.mnv"
   call term_sendkeys(buf, $":w {output_file}\<CR>")
   defer delete(output_file)
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
   let result = readfile(output_file)
   call assert_equal(['echo "Hello" This should be a comment'], result)
 endfunc
@@ -622,14 +622,14 @@ func Test_textobj_selection_exclusive_inline_comment()
   let input_file = "test_selection_exclusive_inline_comment_input.py"
   call writefile(lines, input_file, "D")
 
-  let buf = RunVimInTerminal('-c "set selection=exclusive" -c "packadd comment" ' .. input_file, {})
+  let buf = RunMNVInTerminal('-c "set selection=exclusive" -c "packadd comment" ' .. input_file, {})
   call term_sendkeys(buf, "dac")
 
   let output_file = "test_selection_exclusive_inline_comment.py"
   call term_sendkeys(buf, $":w {output_file}\<CR>")
   defer delete(output_file)
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
   let result = readfile(output_file)
   call assert_equal(['print("Hello")'], result)
 endfunc
diff --git a/uvim/src/testdir/test_plugin_glvs.vim b/uvim/src/testdir/test_plugin_glvs.mnv
index 1970826ce6..3f8926e752 100644
--- a/uvim/src/testdir/test_plugin_glvs.vim
+++ b/uvim/src/testdir/test_plugin_glvs.mnv
@@ -1,55 +1,55 @@
-" Tests for GetLatestVimScripts plugin
+" Tests for GetLatestMNVScripts plugin
 
-" vim feature
+" mnv feature
 set nocp
-set cpo&vim
+set cpo&mnv
 
 " constants
-const s:dotvim= has("win32") ? "vimfiles" : ".vim"
-const s:scriptdir = $"{$HOME}/{s:dotvim}/GetLatest"
-const s:vimdir = expand("<script>:h:h:h")
+const s:dotmnv= has("win32") ? "mnvfiles" : ".mnv"
+const s:scriptdir = $"{$HOME}/{s:dotmnv}/GetLatest"
+const s:mnvdir = expand("<script>:h:h:h")
 const s:packages = {
     \ 'vmb': {
-        \ 'spec': '4979 1 :AutoInstall: AnsiEsc.vim',
-        \ 'files': ['plugin/AnsiEscPlugin.vim', 'autoload/AnsiEsc.vim']
+        \ 'spec': '4979 1 :AutoInstall: AnsiEsc.mnv',
+        \ 'files': ['plugin/AnsiEscPlugin.mnv', 'autoload/AnsiEsc.mnv']
         \ },
-    \ 'vim.bz2': {
-        \ 'spec': '514 1 :AutoInstall: mrswin.vim',
-        \ 'files': ['plugin/mrswin.vim']
+    \ 'mnv.bz2': {
+        \ 'spec': '514 1 :AutoInstall: mrswin.mnv',
+        \ 'files': ['plugin/mrswin.mnv']
         \ },
     \ 'vba.gz': {
-        \ 'spec': '120 1 :AutoInstall: Decho.vim',
+        \ 'spec': '120 1 :AutoInstall: Decho.mnv',
         \ 'package': 'GetLatest/Installed/Decho.vba',
-        \ 'files': ['plugin/Decho.vim', 'syntax/Decho.vim']
+        \ 'files': ['plugin/Decho.mnv', 'syntax/Decho.mnv']
         \ },
     \ 'tar.xz': {
         \ 'spec': '5632 1 :AutoInstall: dumpx',
         \ 'package': 'GetLatest/Installed/dumpx.tar',
-        \ 'files': ['dumpx/plugin/dumpx.vim', 'dumpx/doc/dumpx.txt']
+        \ 'files': ['dumpx/plugin/dumpx.mnv', 'dumpx/doc/dumpx.txt']
         \ }
     \ }
 
-" Before each test recreate the .vim dir structure expected by GLVS and load the plugin
+" Before each test recreate the .mnv dir structure expected by GLVS and load the plugin
 func SetUp()
 
     " add the required GetLatest dir (note $HOME is a dummy)
     call mkdir(s:scriptdir, "p")
-    let &runtimepath = $"{$HOME}/{s:dotvim},{s:vimdir}/runtime"
+    let &runtimepath = $"{$HOME}/{s:dotmnv},{s:mnvdir}/runtime"
 
     " add plugin dir
-    call mkdir($"{$HOME}/{s:dotvim}/plugin")
+    call mkdir($"{$HOME}/{s:dotmnv}/plugin")
 
     " doc file is required for the packages which use :helptags
-    let docdir = $"{$HOME}/{s:dotvim}/doc"
+    let docdir = $"{$HOME}/{s:dotmnv}/doc"
     call mkdir(docdir, "p")
     exe $"split {docdir}/tags"
     w!
     bwipe!
 
-    " load required plugins, getscript.vim would be loaded manually by the test
+    " load required plugins, getscript.mnv would be loaded manually by the test
     " (instead of relying on autoload) because set up depends on shell selection
-    runtime plugin/vimballPlugin.vim
-    runtime plugin/getscriptPlugin.vim
+    runtime plugin/mnvballPlugin.mnv
+    runtime plugin/getscriptPlugin.mnv
 endfunc
 
 func CheckTool(tool)
@@ -61,11 +61,11 @@ func CheckTool(tool)
 
         if a:tool == 'bunzip2'
           if executable('bunzip2')
-              let g:GetLatestVimScripts_bunzip2= "bunzip2"
+              let g:GetLatestMNVScripts_bunzip2= "bunzip2"
           elseif executable('7z')
-              let g:GetLatestVimScripts_bunzip2= "7z x"
+              let g:GetLatestMNVScripts_bunzip2= "7z x"
           elseif exists('git_path')
-              let g:GetLatestVimScripts_bunzip2= $'{git_path}\usr\bin\bunzip2'
+              let g:GetLatestMNVScripts_bunzip2= $'{git_path}\usr\bin\bunzip2'
           else
               throw "Skipped: Missing tool to decompress .bz2 files"
           endif
@@ -73,11 +73,11 @@ func CheckTool(tool)
 
         if a:tool == 'gunzip'
           if executable('gunzip')
-              let g:GetLatestVimScripts_gunzip= "gunzip"
+              let g:GetLatestMNVScripts_gunzip= "gunzip"
           elseif executable('7z')
-              let g:GetLatestVimScripts_gunzip="7z e"
+              let g:GetLatestMNVScripts_gunzip="7z e"
           elseif exists('git_path')
-              let g:GetLatestVimScripts_gunzip= $'{git_path}\usr\bin\gunzip'
+              let g:GetLatestMNVScripts_gunzip= $'{git_path}\usr\bin\gunzip'
           else
               throw "Skipped: Missing tool to decompress .gz files"
           endif
@@ -85,11 +85,11 @@ func CheckTool(tool)
 
         if a:tool == 'unxz'
           if executable('unxz')
-              let g:GetLatestVimScripts_unxz= "unxz"
+              let g:GetLatestMNVScripts_unxz= "unxz"
           elseif executable('7z')
-              let g:GetLatestVimScripts_unxz="7z x"
+              let g:GetLatestMNVScripts_unxz="7z x"
           elseif exists('git_path')
-              let g:GetLatestVimScripts_unxz= $'{git_path}\mingw64\bin\unxz'
+              let g:GetLatestMNVScripts_unxz= $'{git_path}\mingw64\bin\unxz'
           else
               throw "Skipped: Missing tool to decompress .xz files"
           endif
@@ -98,7 +98,7 @@ func CheckTool(tool)
         " Mac or Unix
         if a:tool == 'bunzip2'
             if executable('bunzip2')
-                let g:GetLatestVimScripts_bunzip2= "bunzip2"
+                let g:GetLatestMNVScripts_bunzip2= "bunzip2"
             else
               throw "Skipped: Missing tool to decompress .bz2 files"
             endif
@@ -106,7 +106,7 @@ func CheckTool(tool)
 
         if a:tool == 'gunzip'
             if executable('gunzip')
-                let g:GetLatestVimScripts_gunzip= "gunzip"
+                let g:GetLatestMNVScripts_gunzip= "gunzip"
             else
                 throw "Skipped: Missing tool to decompress .bz2 files"
             endif
@@ -114,7 +114,7 @@ func CheckTool(tool)
 
         if a:tool == 'unxz'
             if executable('unxz')
-                let g:GetLatestVimScripts_unxz= "unxz"
+                let g:GetLatestMNVScripts_unxz= "unxz"
             else
                 throw "Skipped: Missing tool to decompress .xz files"
             endif
@@ -122,15 +122,15 @@ func CheckTool(tool)
    endif
 endfunc
 
-" After each test remove the contents of the .vim dir and reset the script
+" After each test remove the contents of the .mnv dir and reset the script
 func TearDown()
-    call delete($"{$HOME}/{s:dotvim}", "rf")
+    call delete($"{$HOME}/{s:dotmnv}", "rf")
 
-    " getscript.vim include guard
+    " getscript.mnv include guard
     unlet! g:loaded_getscript g:loaded_getscriptPlugin
     " remove all globals (shell dependents)
     let script_globals = keys(g:)
-    call filter(script_globals, 'v:val =~ "GetLatestVimScripts_"')
+    call filter(script_globals, 'v:val =~ "GetLatestMNVScripts_"')
     if len(script_globals)
         call map(script_globals, '"g:" . v:val')
         exe "unlet " . script_globals->join()
@@ -166,12 +166,12 @@ func SetShell(shell)
     endif
 
     " reload script to force new shell options
-    runtime autoload/getscript.vim
+    runtime autoload/getscript.mnv
 endfunc
 
 func SelectScript(package)
     " add the corresponding file
-    exe $"split {s:scriptdir}/GetLatestVimScripts.dat"
+    exe $"split {s:scriptdir}/GetLatestMNVScripts.dat"
     let scripts =<< trim END
         ScriptID SourceID Filename
         --------------------------
@@ -188,13 +188,13 @@ func ValidateInstall(package)
 
     " check if installation work out
     if s:packages[a:package]->has_key('package')
-        let check = filereadable($"{$HOME}/{s:dotvim}/".s:packages[a:package]['package'])
+        let check = filereadable($"{$HOME}/{s:dotmnv}/".s:packages[a:package]['package'])
         call assert_true(check, "The plugin was not downloaded")
     endif
 
     call assert_true(s:packages[a:package]->has_key('files'), "This package lacks validation files")
     for file in s:packages[a:package]['files']
-        let check = filereadable($"{$HOME}/{s:dotvim}/".file)
+        let check = filereadable($"{$HOME}/{s:dotmnv}/".file)
         call assert_true(check, "The plugin was not installed")
     endfor
 endfunc
@@ -240,49 +240,49 @@ func Test_glvs_powershell_vmb()
     call ValidateInstall('vmb')
 endfunc
 
-func Test_glvs_default_vim_bz2()
+func Test_glvs_default_mnv_bz2()
     call CheckTool('bunzip2')
 
     " select different shells
     call SetShell('default')
 
     " add the corresponding script
-    call SelectScript('vim.bz2')
+    call SelectScript('mnv.bz2')
 
     " load the plugins specified
     GLVS
 
-    call ValidateInstall('vim.bz2')
+    call ValidateInstall('mnv.bz2')
 endfunc
 
-func Test_glvs_powershell_vim_bz2()
+func Test_glvs_powershell_mnv_bz2()
     call CheckTool('bunzip2')
 
     " select different shells
     call SetShell('powershell')
 
     " add the corresponding script
-    call SelectScript('vim.bz2')
+    call SelectScript('mnv.bz2')
 
     " load the plugins specified
     GLVS
 
-    call ValidateInstall('vim.bz2')
+    call ValidateInstall('mnv.bz2')
 endfunc
 
-func Test_glvs_pwsh_vim_bz2()
+func Test_glvs_pwsh_mnv_bz2()
     call CheckTool('bunzip2')
 
     " select different shells
     call SetShell('pwsh')
 
     " add the corresponding script
-    call SelectScript('vim.bz2')
+    call SelectScript('mnv.bz2')
 
     " load the plugins specified
     GLVS
 
-    call ValidateInstall('vim.bz2')
+    call ValidateInstall('mnv.bz2')
 endfunc
 
 func Test_glvs_default_vba_gz()
@@ -375,4 +375,4 @@ func Test_glvs_pwsh_tar_xz()
     call ValidateInstall('tar.xz')
 endfunc
 
-" vim: set sw=4 ts=4 et:
+" mnv: set sw=4 ts=4 et:
diff --git a/uvim/src/testdir/test_plugin_helpcurwin.vim b/uvim/src/testdir/test_plugin_helpcurwin.mnv
index c2b4f79547..c2b4f79547 100644
--- a/uvim/src/testdir/test_plugin_helpcurwin.vim
+++ b/uvim/src/testdir/test_plugin_helpcurwin.mnv
diff --git a/uvim/src/testdir/test_plugin_helptoc.vim b/uvim/src/testdir/test_plugin_helptoc.mnv
index 6d311aecd8..3039e7bbba 100644
--- a/uvim/src/testdir/test_plugin_helptoc.vim
+++ b/uvim/src/testdir/test_plugin_helptoc.mnv
@@ -1,6 +1,6 @@
 " Test for the HelpTOC package
 
-source util/screendump.vim
+source util/screendump.mnv
 
 func Test_helptoc_markdown_with_comments()
   CheckScreendump
@@ -12,8 +12,8 @@ func Test_helptoc_markdown_with_comments()
           \ '',
           \ 'Some text.',
           \ '',
-          \ '```vim',
-          \ '# This is a Vim9Script comment',
+          \ '```mnv',
+          \ '# This is a MNV9Script comment',
           \ 'def MyFunc()',
           \ '  # Another comment',
           \ 'enddef',
@@ -28,13 +28,13 @@ func Test_helptoc_markdown_with_comments()
           \])
   END
 
-  let input_file = "Xhelptoc.vim"
+  let input_file = "Xhelptoc.mnv"
   call writefile(lines, input_file, "D")
 
-  let buf = RunVimInTerminal($"-S {input_file}", {})
+  let buf = RunMNVInTerminal($"-S {input_file}", {})
   call term_sendkeys(buf, ":HelpToc\<cr>")
   call WaitFor({-> term_getline(buf, 1) =~ 'press ? for help'})
   call VerifyScreenDump(buf, 'Test_helptoc_markdown_01', {})
   call term_sendkeys(buf, ":qa!\<cr>")
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
diff --git a/uvim/src/testdir/test_plugin_man.vim b/uvim/src/testdir/test_plugin_man.mnv
index f3af477441..c445cc8d0d 100644
--- a/uvim/src/testdir/test_plugin_man.vim
+++ b/uvim/src/testdir/test_plugin_man.mnv
@@ -1,6 +1,6 @@
 " Test specifically for the Man filetype plugin.
 
-runtime ftplugin/man.vim
+runtime ftplugin/man.mnv
 
 func Test_g_ft_man_open_mode()
   vnew
@@ -10,9 +10,9 @@ func Test_g_ft_man_open_mode()
 
   " split horizontally
   let wincnt = winnr('$')
-  Man vim
+  Man mnv
   if wincnt == winnr('$')
-    " Vim manual page cannot be found.
+    " MNV manual page cannot be found.
     return
   endif
 
@@ -24,7 +24,7 @@ func Test_g_ft_man_open_mode()
 
   " split horizontally
   let g:ft_man_open_mode = "horz"
-  Man vim
+  Man mnv
   call assert_inrange(l:w - 2, l:w + 2, winwidth(1))
   call assert_true(l:h > winheight(1))
   call assert_equal(1, tabpagenr('$'))
@@ -33,7 +33,7 @@ func Test_g_ft_man_open_mode()
 
   " split vertically
   let g:ft_man_open_mode = "vert"
-  Man vim
+  Man mnv
   call assert_true(l:w > winwidth(1))
   call assert_equal(l:h, winheight(1))
   call assert_equal(1, tabpagenr('$'))
@@ -42,7 +42,7 @@ func Test_g_ft_man_open_mode()
 
   " separate tab
   let g:ft_man_open_mode = "tab"
-  Man vim
+  Man mnv
   call assert_inrange(l:w - 2, l:w + 2, winwidth(1))
   call assert_inrange(l:h - 1, l:h + 1, winheight(1))
   call assert_equal(2, tabpagenr('$'))
@@ -54,9 +54,9 @@ endfunc
 
 func Test_nomodifiable()
   let wincnt = winnr('$')
-  Man vim
+  Man mnv
   if wincnt == winnr('$')
-    " Vim manual page cannot be found.
+    " MNV manual page cannot be found.
     return
   endif
   call assert_false(&l:modifiable)
@@ -70,9 +70,9 @@ func Test_buffer_count_hidden()
   call assert_equal(1, len(getbufinfo()))
 
   let wincnt = winnr('$')
-  Man vim
+  Man mnv
   if wincnt == winnr('$')
-    " Vim manual page cannot be found.
+    " MNV manual page cannot be found.
     return
   endif
 
@@ -80,7 +80,7 @@ func Test_buffer_count_hidden()
   call assert_equal(2, len(getbufinfo()))
   q
 
-  Man vim
+  Man mnv
 
   call assert_equal(1, len(getbufinfo({'buflisted':1})))
   call assert_equal(2, len(getbufinfo()))
@@ -95,9 +95,9 @@ func Test_local_options()
   set foldcolumn=1 number
 
   let wincnt = winnr('$')
-  Man vim
+  Man mnv
   if wincnt == winnr('$')
-    " Vim manual page cannot be found.
+    " MNV manual page cannot be found.
     return
   endif
 
@@ -121,9 +121,9 @@ func Test_keep_unnamed_register()
   let @" = '---'
 
   let wincnt = winnr('$')
-  Man vim
+  Man mnv
   if wincnt == winnr('$')
-    " Vim manual page cannot be found.
+    " MNV manual page cannot be found.
     return
   endif
 
@@ -146,4 +146,4 @@ func Test_Man_uses_shellescape()
 endfunc
 
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_plugin_matchparen.vim b/uvim/src/testdir/test_plugin_matchparen.mnv
index a05fc5ddd2..90e4485b01 100644
--- a/uvim/src/testdir/test_plugin_matchparen.vim
+++ b/uvim/src/testdir/test_plugin_matchparen.mnv
@@ -4,14 +4,14 @@ if !has('gui_running') && has('unix')
   set term=ansi
 endif
 
-source util/screendump.vim
+source util/screendump.mnv
 
 " Test for scrolling that modifies buffer during visual block
 func Test_visual_block_scroll()
   CheckScreendump
 
   let lines =<< trim END
-    source $VIMRUNTIME/plugin/matchparen.vim
+    source $MNVRUNTIME/plugin/matchparen.mnv
     set scrolloff=1
     call setline(1, ['a', 'b', 'c', 'd', 'e', '', '{', '}', '{', 'f', 'g', '}'])
     call cursor(5, 1)
@@ -20,12 +20,12 @@ func Test_visual_block_scroll()
   let filename = 'Xvisualblockmodifiedscroll'
   call writefile(lines, filename, 'D')
 
-  let buf = RunVimInTerminal('-S '.filename, #{rows: 7})
+  let buf = RunMNVInTerminal('-S '.filename, #{rows: 7})
   call term_sendkeys(buf, "V\<C-D>\<C-D>")
 
   call VerifyScreenDump(buf, 'Test_display_visual_block_scroll', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 " Test for clearing paren highlight when switching buffers
@@ -33,7 +33,7 @@ func Test_matchparen_clear_highlight()
   CheckScreendump
 
   let lines =<< trim END
-    source $VIMRUNTIME/plugin/matchparen.vim
+    source $MNVRUNTIME/plugin/matchparen.mnv
     set hidden
     call setline(1, ['()'])
     normal 0
@@ -44,7 +44,7 @@ func Test_matchparen_clear_highlight()
     endfunc
   END
   call writefile(lines, 'XMatchparenClear', 'D')
-  let buf = RunVimInTerminal('-S XMatchparenClear', #{rows: 5})
+  let buf = RunMNVInTerminal('-S XMatchparenClear', #{rows: 5})
   call VerifyScreenDump(buf, 'Test_matchparen_clear_highlight_1', {})
 
   call term_sendkeys(buf, ":call OtherBuffer()\<CR>:\<Esc>")
@@ -56,7 +56,7 @@ func Test_matchparen_clear_highlight()
   call term_sendkeys(buf, "\<C-^>:\<Esc>")
   call VerifyScreenDump(buf, 'Test_matchparen_clear_highlight_2', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 " Test for matchparen highlight when switching buffer in win_execute()
@@ -64,7 +64,7 @@ func Test_matchparen_win_execute()
   CheckScreendump
 
   let lines =<< trim END
-    source $VIMRUNTIME/plugin/matchparen.vim
+    source $MNVRUNTIME/plugin/matchparen.mnv
     let s:win = win_getid()
     call setline(1, '{}')
     split
@@ -74,14 +74,14 @@ func Test_matchparen_win_execute()
     endfunc
   END
   call writefile(lines, 'XMatchparenWinExecute', 'D')
-  let buf = RunVimInTerminal('-S XMatchparenWinExecute', #{rows: 5})
+  let buf = RunMNVInTerminal('-S XMatchparenWinExecute', #{rows: 5})
   call VerifyScreenDump(buf, 'Test_matchparen_win_execute_1', {})
 
   " Switching buffer away and back shouldn't change matchparen highlight.
   call term_sendkeys(buf, ":call SwitchBuf()\<CR>:\<Esc>")
   call VerifyScreenDump(buf, 'Test_matchparen_win_execute_1', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 " Test for scrolling that modifies buffer during visual block
@@ -89,7 +89,7 @@ func Test_matchparen_pum_clear()
   CheckScreendump
 
   let lines =<< trim END
-    source $VIMRUNTIME/plugin/matchparen.vim
+    source $MNVRUNTIME/plugin/matchparen.mnv
     set completeopt=menuone
     call setline(1, ['aa', 'aaa', 'aaaa', '(a)'])
     call cursor(4, 3)
@@ -98,12 +98,12 @@ func Test_matchparen_pum_clear()
   let filename = 'Xmatchparen'
   call writefile(lines, filename, 'D')
 
-  let buf = RunVimInTerminal('-S '.filename, #{rows: 10})
+  let buf = RunMNVInTerminal('-S '.filename, #{rows: 10})
   call term_sendkeys(buf, "i\<C-N>\<C-N>")
 
   call VerifyScreenDump(buf, 'Test_matchparen_pum_clear_1', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 " Test that matchparen works with multibyte chars in 'matchpairs'
@@ -111,13 +111,13 @@ func Test_matchparen_mbyte()
   CheckScreendump
 
   let lines =<< trim END
-    source $VIMRUNTIME/plugin/matchparen.vim
+    source $MNVRUNTIME/plugin/matchparen.mnv
     call setline(1, ['aaaaaaaa（', 'bbbb）cc'])
     set matchpairs+=（:）
   END
 
   call writefile(lines, 'XmatchparenMbyte', 'D')
-  let buf = RunVimInTerminal('-S XmatchparenMbyte', #{rows: 10})
+  let buf = RunMNVInTerminal('-S XmatchparenMbyte', #{rows: 10})
   call VerifyScreenDump(buf, 'Test_matchparen_mbyte_1', {})
   call term_sendkeys(buf, "$")
   call VerifyScreenDump(buf, 'Test_matchparen_mbyte_2', {})
@@ -134,7 +134,7 @@ func Test_matchparen_mbyte()
   call term_sendkeys(buf, "\<C-W>")
   call VerifyScreenDump(buf, 'Test_matchparen_mbyte_8', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 " Test for ignoring certain parenthesis
@@ -142,7 +142,7 @@ func Test_matchparen_ignore_sh_case()
   CheckScreendump
 
   let lines =<< trim END
-    source $VIMRUNTIME/plugin/matchparen.vim
+    source $MNVRUNTIME/plugin/matchparen.mnv
     set ft=sh
     call setline(1, [
           \ '#!/bin/sh',
@@ -164,7 +164,7 @@ func Test_matchparen_ignore_sh_case()
   let filename = 'Xmatchparen_sh'
   call writefile(lines, filename, 'D')
 
-  let buf = RunVimInTerminal('-S '.filename, #{rows: 10})
+  let buf = RunMNVInTerminal('-S '.filename, #{rows: 10})
   call VerifyScreenDump(buf, 'Test_matchparen_sh_case_1', {})
   " Send keys one by one so that CursorMoved is triggered.
   for c in 'A foobar'
@@ -172,7 +172,7 @@ func Test_matchparen_ignore_sh_case()
     call term_wait(buf)
   endfor
   call VerifyScreenDump(buf, 'Test_matchparen_sh_case_2', {})
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 " Test for the WinScrolled event
@@ -180,7 +180,7 @@ func Test_scroll_winscrolled()
   CheckScreendump
 
   let lines =<< trim END
-    source $VIMRUNTIME/plugin/matchparen.vim
+    source $MNVRUNTIME/plugin/matchparen.mnv
     set scrolloff=1
     call setline(1, ['foobar {', '', '', '', '}'])
     call cursor(5, 1)
@@ -189,14 +189,14 @@ func Test_scroll_winscrolled()
   let filename = 'Xmatchparen_winscrolled'
   call writefile(lines, filename, 'D')
 
-  let buf = RunVimInTerminal('-S '.filename, #{rows: 7})
+  let buf = RunMNVInTerminal('-S '.filename, #{rows: 7})
   call VerifyScreenDump(buf, 'Test_matchparen_winscrolled1', {})
   call term_sendkeys(buf, "\<C-E>")
   call VerifyScreenDump(buf, 'Test_matchparen_winscrolled2', {})
   call term_sendkeys(buf, "\<C-Y>")
   call VerifyScreenDump(buf, 'Test_matchparen_winscrolled1', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_plugin_netrw.vim b/uvim/src/testdir/test_plugin_netrw.mnv
index 478908824b..2850fa841e 100644
--- a/uvim/src/testdir/test_plugin_netrw.vim
+++ b/uvim/src/testdir/test_plugin_netrw.mnv
@@ -1,7 +1,7 @@
 const s:testdir = expand("<script>:h")
 const s:runtimedir = simplify(s:testdir . '/../../runtime')
-const s:netrw_path = s:runtimedir . '/pack/dist/opt/netrw/autoload/netrw.vim'
-const s:netrw_test_path = s:testdir . '/samples/netrw.vim'
+const s:netrw_path = s:runtimedir . '/pack/dist/opt/netrw/autoload/netrw.mnv'
+const s:netrw_test_path = s:testdir . '/samples/netrw.mnv'
 const s:testScript =<< trim END
 
 " Testing functions: {{{1
@@ -268,7 +268,7 @@ func Test_netrw_parse_regular_usernames()
   let hosts = ["localhost", "server.com", "fit-workspaces.ksi.fit.cvut.cz", "192.168.1.42"]
   let ports = ["", "22","420", "443", "2222", "1234"]
   let dirs = ["", "somefolder/", "path/to/the/bottom/of/the/world/please/send/help/"]
-  let files = ["test.txt", "tttt.vim", "Makefile"]
+  let files = ["test.txt", "tttt.mnv", "Makefile"]
 
   call s:combine(usernames, methods, hosts, ports, dirs, files)
 
@@ -322,8 +322,8 @@ func Test_netrw_check_UNC_paths()
   \ '//Server2/Share/Test/Foo.txt',
   \ '\\Server2\Share\Test\',
   \ '//Server2/Share/Test/',
-  \ '\\wsl.localhost\Ubuntu\home\user\_vimrc',
-  \ '//wsl.localhost/Ubuntu/home/user/_vimrc',
+  \ '\\wsl.localhost\Ubuntu\home\user\_mnvrc',
+  \ '//wsl.localhost/Ubuntu/home/user/_mnvrc',
   \ '\\wsl.localhost\Ubuntu\home\user',
   \ '//wsl.localhost/Ubuntu/home/user']
 
@@ -603,4 +603,4 @@ func Test_netrw_FileUrlEdit_pipe_injection()
   call assert_false(filereadable(fname), 'Command injection via pipe in file URL')
 endfunc
 
-" vim:ts=8 sts=2 sw=2 et
+" mnv:ts=8 sts=2 sw=2 et
diff --git a/uvim/src/testdir/test_plugin_osc52.vim b/uvim/src/testdir/test_plugin_osc52.mnv
index f14d3b8c16..d6bf86d3bb 100644
--- a/uvim/src/testdir/test_plugin_osc52.vim
+++ b/uvim/src/testdir/test_plugin_osc52.mnv
@@ -1,9 +1,9 @@
 " Test for the OSC 52 plugin
 
 CheckFeature clipboard_provider
-CheckRunVimInTerminal
+CheckRunMNVInTerminal
 
-source util/screendump.vim
+source util/screendump.mnv
 
 " Check if plugin correctly detects OSC 52 support if possible
 func Test_osc52_detect()
@@ -12,10 +12,10 @@ func Test_osc52_detect()
     packadd osc52
     set clipmethod=osc52
   END
-  call writefile(lines, "Xosc52.vim", "D")
+  call writefile(lines, "Xosc52.mnv", "D")
   defer delete("Xosc52result")
 
-  let buf = RunVimInTerminal("-S Xosc52.vim", {})
+  let buf = RunMNVInTerminal("-S Xosc52.mnv", {})
 
   " The plugin creates an autocmd listening for DA1 responses
 
@@ -38,7 +38,7 @@ func Test_osc52_detect()
   call WaitForAssert({-> assert_equal(["\<Esc>[?62;2;3;4;1;52;c", "osc52"],
         \ readfile('Xosc52result'))})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 " Test if pasting works
@@ -51,9 +51,9 @@ func Test_osc52_paste()
     set clipmethod=osc52
     redraw!
   END
-  call writefile(lines, "Xosc52.vim", "D")
+  call writefile(lines, "Xosc52.mnv", "D")
 
-  let buf = RunVimInTerminal("-S Xosc52.vim", {})
+  let buf = RunMNVInTerminal("-S Xosc52.mnv", {})
 
   call term_sendkeys(buf, "\<Esc>[?52;c")
   call TermWait(buf)
@@ -90,7 +90,7 @@ func Test_osc52_paste()
 
   call VerifyScreenDump(buf, 'Test_osc52_paste_04', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_plugin_tar.vim b/uvim/src/testdir/test_plugin_tar.mnv
index 8d34ce11a7..ce7c4fed6e 100644
--- a/uvim/src/testdir/test_plugin_tar.vim
+++ b/uvim/src/testdir/test_plugin_tar.mnv
@@ -1,9 +1,9 @@
-vim9script
+mnv9script
 
 CheckExecutable tar
 CheckNotMSWindows
 
-runtime plugin/tarPlugin.vim
+runtime plugin/tarPlugin.mnv
 
 def CopyFile(source: string)
   if !filecopy($"samples/{source}", "X.tar")
@@ -18,7 +18,7 @@ def g:Test_tar_basic()
   e X.tar
 
   ### Check header
-  assert_match('^" tar\.vim version v\d\+', getline(1))
+  assert_match('^" tar\.mnv version v\d\+', getline(1))
   assert_match('^" Browsing tarfile .*/X.tar', getline(2))
   assert_match('^" Select a file with cursor and press ENTER, "x" to extract a file', getline(3))
   assert_match('^$', getline(4))
@@ -73,7 +73,7 @@ def g:Test_tar_evil()
   e X.tar
 
   ### Check header
-  assert_match('^" tar\.vim version v\d\+', getline(1))
+  assert_match('^" tar\.mnv version v\d\+', getline(1))
   assert_match('^" Browsing tarfile .*/X.tar', getline(2))
   assert_match('^" Select a file with cursor and press ENTER, "x" to extract a file', getline(3))
   assert_match('^" Note: Path Traversal Attack detected', getline(4))
@@ -136,7 +136,7 @@ def g:Test_tar_path_traversal_with_nowrapscan()
   e X.tar
 
   ### Check header
-  assert_match('^" tar\.vim version v\d\+', getline(1))
+  assert_match('^" tar\.mnv version v\d\+', getline(1))
   assert_match('^" Browsing tarfile .*/X.tar', getline(2))
   assert_match('^" Select a file with cursor and press ENTER, "x" to extract a file', getline(3))
   assert_match('^" Note: Path Traversal Attack detected', getline(4))
diff --git a/uvim/src/testdir/test_plugin_termdebug.vim b/uvim/src/testdir/test_plugin_termdebug.mnv
index f651806483..5f25f732ec 100644
--- a/uvim/src/testdir/test_plugin_termdebug.vim
+++ b/uvim/src/testdir/test_plugin_termdebug.mnv
@@ -1,6 +1,6 @@
 " Test for the termdebug plugin
 
-source util/screendump.vim
+source util/screendump.mnv
 
 CheckUnix
 CheckFeature terminal
@@ -57,7 +57,7 @@ packadd termdebug
 
 func s:GetTermdebugFunction(name)
   for line in execute('scriptnames')->split("\n")
-    if line =~# 'termdebug/plugin/termdebug\.vim$'
+    if line =~# 'termdebug/plugin/termdebug\.mnv$'
       let sid = matchstr(line, '^\s*\zs\d\+')
       return function('<SNR>' .. sid .. '_' .. a:name)
     endif
@@ -434,7 +434,7 @@ func Test_termdebug_evaluate_in_popup()
   END
 
   call writefile(lines, 'Xscript', 'D')
-  let buf = RunVimInTerminal('-S Xscript', {})
+  let buf = RunMNVInTerminal('-S Xscript', {})
   call TermWait(buf, 400)
 
   call term_sendkeys(buf, ":Evaluate p\<CR>")
@@ -449,7 +449,7 @@ func Test_termdebug_evaluate_in_popup()
   call term_sendkeys(buf, ":Gdb")
   call term_sendkeys(buf, ":quit!\<CR>")
   call term_sendkeys(buf, ":qa!\<CR>")
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
   call delete(bin_name)
   %bw!
 endfunc
@@ -861,4 +861,4 @@ func Test_termdebug_remote_basic()
   %bw!
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_plugin_tohtml.vim b/uvim/src/testdir/test_plugin_tohtml.mnv
index a5c9d27b6e..df1288b25d 100644
--- a/uvim/src/testdir/test_plugin_tohtml.vim
+++ b/uvim/src/testdir/test_plugin_tohtml.mnv
@@ -1,4 +1,4 @@
-" Tests for Vim :TOhtml
+" Tests for MNV :TOhtml
 
 func s:setup_basic(src_name)
   let lines =<< trim END
@@ -37,7 +37,7 @@ func s:cleanup_basic(src_name)
   call delete(a:src_name . ".html")
 endfunc
 
-source $VIMRUNTIME/plugin/tohtml.vim
+source $MNVRUNTIME/plugin/tohtml.mnv
 
 func Test_tohtml_basic()
   let src_name = "Test_tohtml_basic.c"
@@ -67,4 +67,4 @@ func Test_tohtml_basic_no_css()
   unlet g:html_use_css
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_plugin_tutor.vim b/uvim/src/testdir/test_plugin_tutor.mnv
index 65371ca069..1253fe4423 100644
--- a/uvim/src/testdir/test_plugin_tutor.vim
+++ b/uvim/src/testdir/test_plugin_tutor.mnv
@@ -1,11 +1,11 @@
 " Test for the new-tutor plugin
 
-source util/screendump.vim
-source util/script_util.vim
+source util/screendump.mnv
+source util/script_util.mnv
 
 func SetUp()
   set nocompatible
-  runtime plugin/tutor.vim
+  runtime plugin/tutor.mnv
 endfunc
 
 func Test_auto_enable_interactive()
@@ -19,7 +19,7 @@ func Test_auto_enable_interactive()
 endfunc
 
 func Test_tutor_link()
-  let tutor_files = globpath($VIMRUNTIME, 'tutor/**/*.tutor', 0, 1)
+  let tutor_files = globpath($MNVRUNTIME, 'tutor/**/*.tutor', 0, 1)
   let pattern = '\[.\{-}@tutor:\zs[^)\]]*\ze[)\]]'
 
   for tutor_file in tutor_files
@@ -40,15 +40,15 @@ func Test_mark()
   CheckScreendump
   call writefile([
   \ 'set nocompatible',
-  \ 'runtime plugin/tutor.vim',
+  \ 'runtime plugin/tutor.mnv',
   \ 'Tutor tutor',
   \ 'set statusline=',
   \ ], 'Xtest_plugin_tutor_mark', 'D')
-  let buf = RunVimInTerminal('-S Xtest_plugin_tutor_mark', {'rows': 20, 'cols': 78})
+  let buf = RunMNVInTerminal('-S Xtest_plugin_tutor_mark', {'rows': 20, 'cols': 78})
   call term_sendkeys(buf, ":240\<CR>")
   call WaitForAssert({-> assert_match('Bot$', term_getline(buf, 20))})
   call VerifyScreenDump(buf, 'Test_plugin_tutor_mark_1', {})
 
   " clean up
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
diff --git a/uvim/src/testdir/test_plugin_zip.vim b/uvim/src/testdir/test_plugin_zip.mnv
index 53b6120834..172bea2917 100644
--- a/uvim/src/testdir/test_plugin_zip.vim
+++ b/uvim/src/testdir/test_plugin_zip.mnv
@@ -1,13 +1,13 @@
-vim9script
+mnv9script
 
 CheckExecutable unzip
 
 if 0 # Find uncovered line
   profile start zip_profile
-  profile! file */zip*.vim
+  profile! file */zip*.mnv
 endif
 
-runtime plugin/zipPlugin.vim
+runtime plugin/zipPlugin.mnv
 
 def CopyZipFile(source: string)
   if !filecopy($"samples/{source}", "X.zip")
@@ -21,7 +21,7 @@ def g:Test_zip_basic()
   e X.zip
 
   ### Check header
-  assert_match('^" zip\.vim version v\d\+', getline(1))
+  assert_match('^" zip\.mnv version v\d\+', getline(1))
   assert_match('^" Browsing zipfile .*/X.zip', getline(2))
   assert_match('^" Select a file with cursor and press ENTER', getline(3))
   assert_match('^$', getline(4))
diff --git a/uvim/src/testdir/test_plus_arg_edit.vim b/uvim/src/testdir/test_plus_arg_edit.mnv
index 5fdf1be640..668e712bbd 100644
--- a/uvim/src/testdir/test_plus_arg_edit.vim
+++ b/uvim/src/testdir/test_plus_arg_edit.mnv
@@ -42,4 +42,4 @@ func Test_binary_arg()
   close!
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_popup.vim b/uvim/src/testdir/test_popup.mnv
index bf400d18f9..251d8435b8 100644
--- a/uvim/src/testdir/test_popup.vim
+++ b/uvim/src/testdir/test_popup.mnv
@@ -1,6 +1,6 @@
 " Test for completion menu
 
-source util/screendump.vim
+source util/screendump.mnv
 
 let g:months = ['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December']
 let g:setting = ''
@@ -20,7 +20,7 @@ endfunc
 
 func Test_popup_complete2()
   " Although the popupmenu is not visible, this does not mean completion mode
-  " has ended. After pressing <f5> to complete the currently typed char, Vim
+  " has ended. After pressing <f5> to complete the currently typed char, MNV
   " still stays in the first state of the completion (:h ins-completion-menu),
   " although the popupmenu wasn't shown <c-e> will remove the inserted
   " completed text (:h complete_CTRL-E), while the following <c-e> will behave
@@ -190,7 +190,7 @@ func Test_popup_complete()
   " use menuone for 'completeopt'
   " Since for the first <c-y> the menu is still shown, will only select
   " three letters from the line above
-  set completeopt&vim
+  set completeopt&mnv
   set completeopt+=menuone
   call append(0, ["December2015"])
   call feedkeys("aD\<f5>\<C-Y>\<C-Y>\<C-Y>\<C-Y>\<enter>\<esc>", 'tx')
@@ -198,7 +198,7 @@ func Test_popup_complete()
   %d
 
   " use longest for 'completeopt'
-  set completeopt&vim
+  set completeopt&mnv
   call feedkeys("aM\<f5>\<C-N>\<C-P>\<c-e>\<enter>\<esc>", 'tx')
   set completeopt+=longest
   call feedkeys("aM\<f5>\<C-N>\<C-P>\<c-e>\<enter>\<esc>", 'tx')
@@ -206,7 +206,7 @@ func Test_popup_complete()
   %d
 
   " use noselect/noinsert for 'completeopt'
-  set completeopt&vim
+  set completeopt&mnv
   call feedkeys("aM\<f5>\<enter>\<esc>", 'tx')
   set completeopt+=noselect
   call feedkeys("aM\<f5>\<enter>\<esc>", 'tx')
@@ -308,7 +308,7 @@ func Test_complete_no_filter()
   iunmap <F5>
 endfunc
 
-func Test_compl_vim_cmds_after_register_expr()
+func Test_compl_mnv_cmds_after_register_expr()
   func! s:test_func()
     return 'autocmd '
   endfunc
@@ -686,9 +686,9 @@ func Test_popup_and_window_resize()
     return
   endif
   let rows = h / 3
-  let buf = term_start([GetVimProg(), '--clean', '-c', 'set noswapfile'], {'term_rows': rows})
+  let buf = term_start([GetMNVProg(), '--clean', '-c', 'set noswapfile'], {'term_rows': rows})
   call term_sendkeys(buf, (h / 3 - 1) . "o\<esc>")
-  " Wait for the nested Vim to exit insert mode, where it will show the ruler.
+  " Wait for the nested MNV to exit insert mode, where it will show the ruler.
   " Need to trigger a redraw.
   call WaitFor({-> execute("redraw") == "" && term_getline(buf, rows) =~ '\<' . rows . ',.*Bot'})
 
@@ -717,7 +717,7 @@ func Test_popup_and_preview_autocommand()
     throw 'Skipped: window height insufficient'
   endif
 
-  " This used to crash Vim
+  " This used to crash MNV
   new
   augroup MyBufAdd
     au!
@@ -752,7 +752,7 @@ func s:run_popup_and_previewwindow_dump(lines, dumpfile)
   CheckFeature quickfix
 
   call writefile(a:lines, 'Xscript', 'D')
-  let buf = RunVimInTerminal('-S Xscript', {})
+  let buf = RunMNVInTerminal('-S Xscript', {})
 
   " wait for the script to finish
   call TermWait(buf)
@@ -764,7 +764,7 @@ func s:run_popup_and_previewwindow_dump(lines, dumpfile)
   call VerifyScreenDump(buf, a:dumpfile, {})
 
   call term_sendkeys(buf, "\<Esc>u")
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_popup_and_previewwindow_dump_pedit()
@@ -791,9 +791,9 @@ func Test_balloon_split()
   CheckFunction balloon_split
 
   call assert_equal([
-        \ 'tempname: 0x555555e380a0 "/home/mool/.viminfz.tmp"',
+        \ 'tempname: 0x555555e380a0 "/home/mool/.mnvinfz.tmp"',
         \ ], balloon_split(
-        \ 'tempname: 0x555555e380a0 "/home/mool/.viminfz.tmp"'))
+        \ 'tempname: 0x555555e380a0 "/home/mool/.mnvinfz.tmp"'))
   call assert_equal([
         \ 'one two three four one two three four one two thre',
         \ 'e four',
@@ -842,7 +842,7 @@ func Test_popup_position()
                 123
   END
   call writefile(lines, 'Xtest', 'D')
-  let buf = RunVimInTerminal('Xtest', {'cols': 75})
+  let buf = RunMNVInTerminal('Xtest', {'cols': 75})
   call term_sendkeys(buf, ":vsplit\<CR>")
 
   " default pumwidth in left window: overlap in right window
@@ -871,7 +871,7 @@ func Test_popup_position()
   call VerifyScreenDump(buf, 'Test_popup_position_04', {'rows': 10})
 
   call term_sendkeys(buf, "\<Esc>u")
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_popup_command()
@@ -906,8 +906,8 @@ func Test_popup_command_dump()
 	one more two three four five
   END
   call writefile(lines, 'Xtest', 'D')
-  let buf = RunVimInTerminal('-S XtimerScript Xtest', {})
-  call term_sendkeys(buf, ":source $VIMRUNTIME/menu.vim\<CR>")
+  let buf = RunMNVInTerminal('-S XtimerScript Xtest', {})
+  call term_sendkeys(buf, ":source $MNVRUNTIME/menu.mnv\<CR>")
   call term_sendkeys(buf, "/X\<CR>:popup PopUp\<CR>")
   call VerifyScreenDump(buf, 'Test_popup_command_01', {})
 
@@ -947,7 +947,7 @@ func Test_popup_command_dump()
 
   call term_sendkeys(buf, "\<Esc>")
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 " Test position of right-click menu when clicking near window edge.
@@ -957,7 +957,7 @@ func Test_mouse_popup_position()
 
   let script =<< trim END
     set mousemodel=popup_setpos
-    source $VIMRUNTIME/menu.vim
+    source $MNVRUNTIME/menu.mnv
     call setline(1, join(range(20)))
     func Trigger(col)
       call test_setmouse(1, a:col)
@@ -965,7 +965,7 @@ func Test_mouse_popup_position()
     endfunc
   END
   call writefile(script, 'XmousePopupPosition', 'D')
-  let buf = RunVimInTerminal('-S XmousePopupPosition', #{rows: 20, cols: 50})
+  let buf = RunMNVInTerminal('-S XmousePopupPosition', #{rows: 20, cols: 50})
 
   call term_sendkeys(buf, ":call Trigger(45)\<CR>")
   call VerifyScreenDump(buf, 'Test_mouse_popup_position_01', {})
@@ -992,7 +992,7 @@ func Test_mouse_popup_position()
     call term_sendkeys(buf, "\<Esc>:set norightleft\<CR>")
   endif
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_popup_complete_backwards()
@@ -1289,11 +1289,11 @@ func Test_pum_rightleft()
 
   let lines =<< trim END
     abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz
-    vim
+    mnv
     victory
   END
   call writefile(lines, 'Xtest1', 'D')
-  let buf = RunVimInTerminal('--cmd "set rightleft" Xtest1', {})
+  let buf = RunMNVInTerminal('--cmd "set rightleft" Xtest1', {})
   call term_sendkeys(buf, "Go\<C-P>")
   call VerifyScreenDump(buf, 'Test_pum_rightleft_01', {'rows': 8})
   call term_sendkeys(buf, "\<C-P>\<C-Y>")
@@ -1319,7 +1319,7 @@ func Test_pum_rightleft()
   redraw!
   call WaitForAssert({-> assert_match('\s*eerht     eno', Screenline(4))})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 " Test for a popup menu with a scrollbar
@@ -1331,7 +1331,7 @@ func Test_pum_scrollbar()
     three
   END
   call writefile(lines, 'Xtest1', 'D')
-  let buf = RunVimInTerminal('--cmd "set pumheight=2" Xtest1', {})
+  let buf = RunMNVInTerminal('--cmd "set pumheight=2" Xtest1', {})
   call TermWait(buf)
   call term_sendkeys(buf, "Go\<C-P>\<C-P>\<C-P>")
   call VerifyScreenDump(buf, 'Test_pum_scrollbar_01', {'rows': 7})
@@ -1345,7 +1345,7 @@ func Test_pum_scrollbar()
     call VerifyScreenDump(buf, 'Test_pum_scrollbar_02', {'rows': 7})
   endif
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 " Test default highlight groups for popup menu
@@ -1367,14 +1367,14 @@ func Test_pum_highlights_default()
     set completefunc=CompleteFunc
   END
   call writefile(lines, 'Xscript', 'D')
-  let buf = RunVimInTerminal('-S Xscript', {})
+  let buf = RunMNVInTerminal('-S Xscript', {})
   call TermWait(buf)
   call term_sendkeys(buf, "iaw\<C-X>\<C-u>")
   call TermWait(buf, 50)
   call VerifyScreenDump(buf, 'Test_pum_highlights_01', {})
   call term_sendkeys(buf, "\<C-E>\<Esc>u")
   call TermWait(buf)
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 " Test custom highlight groups for popup menu
@@ -1400,14 +1400,14 @@ func Test_pum_highlights_custom()
     hi PmenuExtraSel  ctermfg=0 ctermbg=7
   END
   call writefile(lines, 'Xscript', 'D')
-  let buf = RunVimInTerminal('-S Xscript', {})
+  let buf = RunMNVInTerminal('-S Xscript', {})
   call TermWait(buf)
   call term_sendkeys(buf, "iaw\<C-X>\<C-u>")
   call TermWait(buf, 50)
   call VerifyScreenDump(buf, 'Test_pum_highlights_02', {})
   call term_sendkeys(buf, "\<C-E>\<Esc>u")
   call TermWait(buf)
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 " Test match relate highlight group in pmenu
@@ -1451,7 +1451,7 @@ func Test_pum_highlights_match()
     hi PmenuMatch     ctermfg=4 ctermbg=225
   END
   call writefile(lines, 'Xscript', 'D')
-  let  buf = RunVimInTerminal('-S Xscript', {})
+  let  buf = RunMNVInTerminal('-S Xscript', {})
   call TermWait(buf)
   call term_sendkeys(buf, "i\<C-X>\<C-O>")
   call TermWait(buf, 50)
@@ -1525,7 +1525,7 @@ func Test_pum_highlights_match()
 
   call term_sendkeys(buf, "\<C-E>\<Esc>")
   call TermWait(buf)
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_pum_completefuzzycollect()
@@ -1534,7 +1534,7 @@ func Test_pum_completefuzzycollect()
     set completeopt=menu,menuone,fuzzy
   END
   call writefile(lines, 'Xscript', 'D')
-  let  buf = RunVimInTerminal('-S Xscript', {})
+  let  buf = RunMNVInTerminal('-S Xscript', {})
 
   " issue #15095 wrong select
   call term_sendkeys(buf, "S hello helio hero h\<C-X>\<C-P>")
@@ -1552,7 +1552,7 @@ func Test_pum_completefuzzycollect()
   call term_sendkeys(buf, "\<C-E>\<Esc>")
 
   call TermWait(buf)
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_pum_highlights_match_with_abbr()
@@ -1575,7 +1575,7 @@ func Test_pum_highlights_match_with_abbr()
     hi PmenuMatch     ctermfg=4 ctermbg=225
   END
   call writefile(lines, 'Xscript', 'D')
-  let  buf = RunVimInTerminal('-S Xscript', {})
+  let  buf = RunMNVInTerminal('-S Xscript', {})
   call TermWait(buf)
   call term_sendkeys(buf, "i\<C-X>\<C-O>")
   call TermWait(buf, 50)
@@ -1585,7 +1585,7 @@ func Test_pum_highlights_match_with_abbr()
   call term_sendkeys(buf, "\<C-E>\<Esc>")
   call TermWait(buf)
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_pum_user_abbr_hlgroup()
@@ -1623,7 +1623,7 @@ func Test_pum_user_abbr_hlgroup()
     endfunc
   END
   call writefile(lines, 'Xscript', 'D')
-  let buf = RunVimInTerminal('-S Xscript', {})
+  let buf = RunMNVInTerminal('-S Xscript', {})
 
   call TermWait(buf)
   call term_sendkeys(buf, "Saw\<C-X>\<C-U>")
@@ -1647,7 +1647,7 @@ func Test_pum_user_abbr_hlgroup()
   call VerifyScreenDump(buf, 'Test_pum_highlights_17', {})
   call term_sendkeys(buf, "\<C-E>\<Esc>")
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_pum_user_kind_hlgroup()
@@ -1673,14 +1673,14 @@ func Test_pum_user_kind_hlgroup()
     hi KindClass ctermfg=green
   END
   call writefile(lines, 'Xscript', 'D')
-  let buf = RunVimInTerminal('-S Xscript', {})
+  let buf = RunMNVInTerminal('-S Xscript', {})
 
   call TermWait(buf)
   call term_sendkeys(buf, "S\<C-X>\<C-U>")
   call VerifyScreenDump(buf, 'Test_pum_highlights_16', {})
   call term_sendkeys(buf, "\<C-E>\<Esc>")
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_pum_completeitemalign()
@@ -1718,7 +1718,7 @@ func Test_pum_completeitemalign()
     command! -nargs=0 T7 set cia&
   END
   call writefile(lines, 'Xscript', 'D')
-  let  buf = RunVimInTerminal('-S Xscript', {})
+  let  buf = RunMNVInTerminal('-S Xscript', {})
   call TermWait(buf)
 
   " T1 is default
@@ -1754,7 +1754,7 @@ func Test_pum_completeitemalign()
   call term_sendkeys(buf, ":set columns=12 cmdheight=2 omnifunc=Omni_long\<CR>S\<C-X>\<C-O>")
   call VerifyScreenDump(buf, 'Test_pum_completeitemalign_07', {})
   call term_sendkeys(buf, "\<C-E>\<Esc>:T7\<CR>")
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_pum_keep_select()
@@ -1763,7 +1763,7 @@ func Test_pum_keep_select()
     set completeopt=menu,menuone,noinsert
   END
   call writefile(lines, 'Xscript', 'D')
-  let buf = RunVimInTerminal('-S Xscript', {})
+  let buf = RunMNVInTerminal('-S Xscript', {})
   call TermWait(buf)
 
   call term_sendkeys(buf, "ggSFab\<CR>Five\<CR>find\<CR>film\<CR>\<C-X>\<C-P>")
@@ -1779,7 +1779,7 @@ func Test_pum_keep_select()
   call term_sendkeys(buf, "\<C-E>\<Esc>")
 
   call TermWait(buf, 50)
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_pum_matchins_highlight()
@@ -1799,7 +1799,7 @@ func Test_pum_matchins_highlight()
     hi ComplMatchIns ctermfg=red
   END
   call writefile(lines, 'Xscript', 'D')
-  let buf = RunVimInTerminal('-S Xscript', {})
+  let buf = RunMNVInTerminal('-S Xscript', {})
 
   call TermWait(buf)
   call term_sendkeys(buf, "Sαβγ \<C-X>\<C-O>")
@@ -1844,7 +1844,7 @@ func Test_pum_matchins_highlight()
   call VerifyScreenDump(buf, 'Test_pum_matchins_11', {})
   call term_sendkeys(buf, "\<Esc>")
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_pum_matchins_highlight_combine()
@@ -1863,7 +1863,7 @@ func Test_pum_matchins_highlight_combine()
     call setline(1, 'aaa bbb')
   END
   call writefile(lines, 'Xscript', 'D')
-  let buf = RunVimInTerminal('-S Xscript', {})
+  let buf = RunMNVInTerminal('-S Xscript', {})
 
   " when ComplMatchIns is not set, CursorLine applies normally
   call term_sendkeys(buf, "0ea \<C-X>\<C-O>")
@@ -1907,7 +1907,7 @@ func Test_pum_matchins_highlight_combine()
   call VerifyScreenDump(buf, 'Test_pum_matchins_combine_09', {})
   call term_sendkeys(buf, "\<C-E>\<Esc>")
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 " this used to crash
@@ -1936,7 +1936,7 @@ func Test_pum_complete_with_special_characters()
   END
 
   call writefile(lines, 'Xpreviewscript', 'D')
-  let buf = RunVimInTerminal('-S Xpreviewscript', #{rows: 12})
+  let buf = RunMNVInTerminal('-S Xpreviewscript', #{rows: 12})
   call term_sendkeys(buf, "S\<C-X>\<C-O>")
   call TermWait(buf, 50)
   call VerifyScreenDump(buf, 'Test_pum_with_special_characters_01', {})
@@ -1999,7 +1999,7 @@ func Test_pum_complete_with_special_characters()
   call TermWait(buf, 50)
   call VerifyScreenDump(buf, 'Test_pum_with_special_characters_13', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_pum_maxwidth()
@@ -2011,7 +2011,7 @@ func Test_pum_maxwidth()
                 123
   END
   call writefile(lines, 'Xtest', 'D')
-  let buf = RunVimInTerminal('Xtest', {})
+  let buf = RunMNVInTerminal('Xtest', {})
 
   call term_sendkeys(buf, "G\"zyy")
   call term_sendkeys(buf, "A\<C-N>")
@@ -2039,7 +2039,7 @@ func Test_pum_maxwidth()
   call VerifyScreenDump(buf, 'Test_pum_maxwidth_05', {'rows': 10, 'cols': 32})
   call term_sendkeys(buf, "\<Esc>3Gdd\"zp")
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_pum_maxwidth_multibyte()
@@ -2085,7 +2085,7 @@ func Test_pum_maxwidth_multibyte()
     set cot+=menuone
   END
   call writefile(lines, 'Xtest', 'D')
-  let  buf = RunVimInTerminal('-S Xtest', {})
+  let  buf = RunMNVInTerminal('-S Xtest', {})
   call TermWait(buf)
 
   call term_sendkeys(buf, "S\<C-X>\<C-O>")
@@ -2197,7 +2197,7 @@ func Test_pum_maxwidth_multibyte()
   call VerifyScreenDump(buf, 'Test_pum_maxwidth_23', {'rows': 8})
   call term_sendkeys(buf, "\<ESC>")
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_pum_clear_when_switch_tab_or_win()
@@ -2209,7 +2209,7 @@ func Test_pum_clear_when_switch_tab_or_win()
   END
 
   call writefile(lines, 'Xtest', 'D')
-  let buf = RunVimInTerminal('-S Xtest', {})
+  let buf = RunMNVInTerminal('-S Xtest', {})
 
   call term_sendkeys(buf, ":tabe\<CR>")
   call TermWait(buf, 50)
@@ -2228,7 +2228,7 @@ func Test_pum_clear_when_switch_tab_or_win()
   call TermWait(buf, 50)
   call VerifyScreenDump(buf, 'Test_switchwin_clear_pum_02', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_pum_position_when_wrap()
@@ -2245,7 +2245,7 @@ func Test_pum_position_when_wrap()
     set cot+=noinsert
   END
   call writefile(lines, 'Xtest', 'D')
-  let buf = RunVimInTerminal('-S Xtest', #{rows: 15, cols: 25})
+  let buf = RunMNVInTerminal('-S Xtest', #{rows: 15, cols: 25})
 
   let long_text = repeat('abcde ', 20)
   call term_sendkeys(buf, "i" .. long_text)
@@ -2293,10 +2293,10 @@ func Test_pum_position_when_wrap()
   call term_sendkeys(buf, "\<C-E>\<ESC>")
   call TermWait(buf, 100)
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
-" Test that Vim does not crash when completion inside cmdwin opens a 'info'
+" Test that MNV does not crash when completion inside cmdwin opens a 'info'
 " preview window.
 func Test_popup_complete_cmdwin_preview()
   func! CompleteWithPreview(findstart, base)
@@ -2319,7 +2319,7 @@ func Test_popup_border()
 
   END
   call writefile(lines, 'Xtest', 'D')
-  let buf = RunVimInTerminal('Xtest', {'cols': 75})
+  let buf = RunMNVInTerminal('Xtest', {'cols': 75})
 
   func TestPumPosition(buf, spaces, dumpfile)
     call term_sendkeys(a:buf, $"GS{repeat(' ', a:spaces)}1\<C-N>")
@@ -2384,7 +2384,7 @@ func Test_popup_border()
     endif
   endfor
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_popup_shadow_hiddenchar()
@@ -2398,7 +2398,7 @@ func Test_popup_shadow_hiddenchar()
     normal bold italic underline reverse
   END
   call writefile(lines, 'Xtest', 'D')
-  let buf = RunVimInTerminal('Xtest', {'cols': 75})
+  let buf = RunMNVInTerminal('Xtest', {'cols': 75})
 
   call term_sendkeys(buf, ":set completeopt=menuone,noselect pumborder=shadow\<CR>")
   call term_sendkeys(buf, ":hi BoldGrp cterm=bold\<CR>")
@@ -2417,7 +2417,7 @@ func Test_popup_shadow_hiddenchar()
   call VerifyScreenDump(buf, 'Test_popup_shadow_hiddenchar_2', {'rows': 8})
   call term_sendkeys(buf, "\<Esc>")
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_popupwin.vim b/uvim/src/testdir/test_popupwin.mnv
index 023d890676..fcec649aec 100644
--- a/uvim/src/testdir/test_popupwin.vim
+++ b/uvim/src/testdir/test_popupwin.mnv
@@ -2,7 +2,7 @@
 
 CheckFeature popupwin
 
-source util/screendump.vim
+source util/screendump.mnv
 
 func Test_simple_popup()
   CheckScreendump
@@ -19,7 +19,7 @@ func Test_simple_popup()
 	call setwinvar(winid2, '&wincolor', 'PopupColor2')
   END
   call writefile(lines, 'XtestPopup', 'D')
-  let buf = RunVimInTerminal('-S XtestPopup', #{rows: 10})
+  let buf = RunMNVInTerminal('-S XtestPopup', #{rows: 10})
   call VerifyScreenDump(buf, 'Test_popupwin_01', {})
 
   " Add a tabpage
@@ -71,7 +71,7 @@ func Test_simple_popup()
   call VerifyScreenDump(buf, 'Test_popupwin_08', {})
 
   " clean up
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_popup_with_border_and_padding()
@@ -94,10 +94,10 @@ func Test_popup_with_border_and_padding()
     END
     call insert(lines, iter == 1 ? '' : 'set enc=latin1')
     call writefile(lines, 'XtestPopupBorder', 'D')
-    let buf = RunVimInTerminal('-S XtestPopupBorder', #{rows: 15})
+    let buf = RunMNVInTerminal('-S XtestPopupBorder', #{rows: 15})
     call VerifyScreenDump(buf, 'Test_popupwin_2' .. iter, {})
 
-    call StopVimInTerminal(buf)
+    call StopMNVInTerminal(buf)
   endfor
 
   let lines =<< trim END
@@ -118,7 +118,7 @@ func Test_popup_with_border_and_padding()
 	endfunc
   END
   call writefile(lines, 'XtestPopupBorder', 'D')
-  let buf = RunVimInTerminal('-S XtestPopupBorder', #{rows: 12})
+  let buf = RunMNVInTerminal('-S XtestPopupBorder', #{rows: 12})
   call VerifyScreenDump(buf, 'Test_popupwin_22', {})
 
   " check that changing borderchars triggers a redraw
@@ -131,7 +131,7 @@ func Test_popup_with_border_and_padding()
     call VerifyScreenDump(buf, 'Test_popupwin_24', {})
   endif
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 
   let with_border_or_padding = #{
 	\ line: 2,
@@ -223,11 +223,11 @@ func Test_popup_with_syntax_win_execute()
 	call win_execute(winid, 'set syntax=cpp')
   END
   call writefile(lines, 'XtestPopup', 'D')
-  let buf = RunVimInTerminal('-S XtestPopup', #{rows: 10})
+  let buf = RunMNVInTerminal('-S XtestPopup', #{rows: 10})
   call VerifyScreenDump(buf, 'Test_popupwin_10', {})
 
   " clean up
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_popup_with_syntax_setbufvar()
@@ -246,11 +246,11 @@ func Test_popup_with_syntax_setbufvar()
 	call setbufvar(winbufnr(winid), '&syntax', 'cpp')
   END
   call writefile(lines, 'XtestPopup', 'D')
-  let buf = RunVimInTerminal('-S XtestPopup', #{rows: 10})
+  let buf = RunMNVInTerminal('-S XtestPopup', #{rows: 10})
   call VerifyScreenDump(buf, 'Test_popupwin_11', {})
 
   " clean up
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_popup_with_matches()
@@ -271,11 +271,11 @@ func Test_popup_with_matches()
 	call win_execute(winid, "call matchadd('VeryBlue', '555')")
   END
   call writefile(lines, 'XtestPopupMatches', 'D')
-  let buf = RunVimInTerminal('-S XtestPopupMatches', #{rows: 10})
+  let buf = RunMNVInTerminal('-S XtestPopupMatches', #{rows: 10})
   call VerifyScreenDump(buf, 'Test_popupwin_matches', {})
 
   " clean up
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_popup_all_corners()
@@ -326,11 +326,11 @@ func Test_popup_all_corners()
 	      \ })
   END
   call writefile(lines, 'XtestPopupCorners', 'D')
-  let buf = RunVimInTerminal('-S XtestPopupCorners', #{rows: 12})
+  let buf = RunMNVInTerminal('-S XtestPopupCorners', #{rows: 12})
   call VerifyScreenDump(buf, 'Test_popupwin_corners', {})
 
   " clean up
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_popup_nospace()
@@ -417,11 +417,11 @@ func Test_popup_nospace()
 	      \ })
   END
   call writefile(lines, 'XtestPopupNospace', 'D')
-  let buf = RunVimInTerminal('-S XtestPopupNospace', #{rows: 12})
+  let buf = RunMNVInTerminal('-S XtestPopupNospace', #{rows: 12})
   call VerifyScreenDump(buf, 'Test_popupwin_nospace', {})
 
   " clean up
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_popup_firstline_dump()
@@ -435,7 +435,7 @@ func Test_popup_firstline_dump()
 	      \ })
   END
   call writefile(lines, 'XtestPopupFirstline', 'D')
-  let buf = RunVimInTerminal('-S XtestPopupFirstline', #{rows: 10})
+  let buf = RunMNVInTerminal('-S XtestPopupFirstline', #{rows: 10})
   call VerifyScreenDump(buf, 'Test_popupwin_firstline_1', {})
 
   call term_sendkeys(buf, ":call popup_setoptions(winid, #{firstline: -1})\<CR>")
@@ -443,7 +443,7 @@ func Test_popup_firstline_dump()
   call VerifyScreenDump(buf, 'Test_popupwin_firstline_2', {})
 
   " clean up
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_popup_firstline()
@@ -600,7 +600,7 @@ func Test_popup_drag()
 	endfunc
   END
   call writefile(lines, 'XtestPopupDrag', 'D')
-  let buf = RunVimInTerminal('-S XtestPopupDrag', #{rows: 10})
+  let buf = RunMNVInTerminal('-S XtestPopupDrag', #{rows: 10})
   call VerifyScreenDump(buf, 'Test_popupwin_drag_01', {})
 
   call term_sendkeys(buf, ":call Dragit()\<CR>")
@@ -620,7 +620,7 @@ func Test_popup_drag()
   call VerifyScreenDump(buf, 'Test_popupwin_drag_06', {})
 
   " clean up
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_popup_drag_minwidth()
@@ -651,7 +651,7 @@ func Test_popup_drag_minwidth()
 	endfunc
   END
   call writefile(lines, 'XtestPopupDrag', 'D')
-  let buf = RunVimInTerminal('-S XtestPopupDrag', #{rows: 10})
+  let buf = RunMNVInTerminal('-S XtestPopupDrag', #{rows: 10})
   call VerifyScreenDump(buf, 'Test_popupwin_drag_minwidth_1', {})
 
   call term_sendkeys(buf, ":call DragitDown()\<CR>")
@@ -663,7 +663,7 @@ func Test_popup_drag_minwidth()
   call term_sendkeys(buf, 'q')
 
   " clean up
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_popup_drag_termwin()
@@ -682,7 +682,7 @@ func Test_popup_drag_termwin()
 	%foldclose
 	set shell=/bin/sh noruler
 	unlet $PROMPT_COMMAND
-	let $PS1 = 'vim> '
+	let $PS1 = 'mnv> '
         terminal ++rows=4
 	$wincmd w
 	let winid = popup_create(['1111', '2222'], #{
@@ -706,7 +706,7 @@ func Test_popup_drag_termwin()
 	map <silent> <F6> :call test_setmouse(12, &columns / 2 - 20)<CR>
   END
   call writefile(lines, 'XtestPopupTerm', 'D')
-  let buf = RunVimInTerminal('-S XtestPopupTerm', #{rows: 16})
+  let buf = RunMNVInTerminal('-S XtestPopupTerm', #{rows: 16})
   call VerifyScreenDump(buf, 'Test_popupwin_term_01', {})
 
   call term_sendkeys(buf, ":call DragitLeft()\<CR>")
@@ -719,7 +719,7 @@ func Test_popup_drag_termwin()
   call VerifyScreenDump(buf, 'Test_popupwin_term_04', {})
 
   " clean up
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_popup_close_with_mouse()
@@ -773,7 +773,7 @@ func Test_popup_close_with_mouse()
 	endfunc
   END
   call writefile(lines, 'XtestPopupClose', 'D')
-  let buf = RunVimInTerminal('-S XtestPopupClose', #{rows: 10})
+  let buf = RunMNVInTerminal('-S XtestPopupClose', #{rows: 10})
   call VerifyScreenDump(buf, 'Test_popupwin_close_01', {})
 
   call term_sendkeys(buf, ":call CloseWithX()\<CR>")
@@ -791,7 +791,7 @@ func Test_popup_close_with_mouse()
   call VerifyScreenDump(buf, 'Test_popupwin_close_05', {})
 
   " clean up
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunction
 
 func Test_popup_menu_wrap()
@@ -814,7 +814,7 @@ func Test_popup_menu_wrap()
 	      \ })
   END
   call writefile(lines, 'XtestPopupWrap', 'D')
-  let buf = RunVimInTerminal('-S XtestPopupWrap', #{rows: 10})
+  let buf = RunMNVInTerminal('-S XtestPopupWrap', #{rows: 10})
   call VerifyScreenDump(buf, 'Test_popupwin_wrap_1', {})
 
   call term_sendkeys(buf, "jj")
@@ -822,7 +822,7 @@ func Test_popup_menu_wrap()
 
   " clean up
   call term_sendkeys(buf, "\<Esc>")
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunction
 
 func Test_popup_with_mask()
@@ -868,7 +868,7 @@ func Test_popup_with_mask()
 	    \ mask: [[1,2,1,1], [-5,-1,4,4], [7,9,2,3], [3,5,5,5],[-7,-4,5,5]]})
   END
   call writefile(lines, 'XtestPopupMask', 'D')
-  let buf = RunVimInTerminal('-S XtestPopupMask', #{rows: 13})
+  let buf = RunMNVInTerminal('-S XtestPopupMask', #{rows: 13})
   call VerifyScreenDump(buf, 'Test_popupwin_mask_1', {})
 
   call term_sendkeys(buf, ":call popup_move(winid, #{col: 11, line: 2})\<CR>")
@@ -892,7 +892,7 @@ func Test_popup_with_mask()
   call VerifyScreenDump(buf, 'Test_popupwin_mask_5', {})
 
   " clean up
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 
   " this was causing a crash
   call popup_create('test', #{mask: [[0, 0, 0, 0]]})
@@ -940,7 +940,7 @@ func Test_popup_select()
     map <silent> <F4> :call test_setmouse(6, 23)<CR>
   END
   call writefile(lines, 'XtestPopupSelect', 'D')
-  let buf = RunVimInTerminal('-S XtestPopupSelect', #{rows: 10})
+  let buf = RunMNVInTerminal('-S XtestPopupSelect', #{rows: 10})
   call term_sendkeys(buf, ":call Select1()\<CR>")
   call VerifyScreenDump(buf, 'Test_popupwin_select_01', {})
 
@@ -952,7 +952,7 @@ func Test_popup_select()
   call VerifyScreenDump(buf, 'Test_popupwin_select_02', {})
 
   " clean up
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_popup_in_tab()
@@ -1137,11 +1137,11 @@ func Test_popup_with_wrap()
 	   \ #{line: 3, col: 20, maxwidth: 10, wrap: 1})
   END
   call writefile(lines, 'XtestPopup', 'D')
-  let buf = RunVimInTerminal('-S XtestPopup', #{rows: 10})
+  let buf = RunMNVInTerminal('-S XtestPopup', #{rows: 10})
   call VerifyScreenDump(buf, 'Test_popupwin_wrap', {})
 
   " clean up
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_popup_without_wrap()
@@ -1154,11 +1154,11 @@ func Test_popup_without_wrap()
 	   \ #{line: 3, col: 20, maxwidth: 10, wrap: 0})
   END
   call writefile(lines, 'XtestPopup', 'D')
-  let buf = RunVimInTerminal('-S XtestPopup', #{rows: 10})
+  let buf = RunMNVInTerminal('-S XtestPopup', #{rows: 10})
   call VerifyScreenDump(buf, 'Test_popupwin_nowrap', {})
 
   " clean up
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_popup_with_showbreak()
@@ -1173,12 +1173,12 @@ func Test_popup_with_showbreak()
 	   \   maxwidth: 12})
   END
   call writefile(lines, 'XtestPopupShowbreak', 'D')
-  let buf = RunVimInTerminal('-S XtestPopupShowbreak', #{rows: 10})
+  let buf = RunMNVInTerminal('-S XtestPopupShowbreak', #{rows: 10})
   call VerifyScreenDump(buf, 'Test_popupwin_showbreak', {})
 
   " clean up
   call term_sendkeys(buf, "y")
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_popup_time()
@@ -1447,46 +1447,46 @@ func Test_popup_atcursor()
 
   call cursor(2, 2)
   redraw
-  let winid = popup_atcursor('vim', {})
+  let winid = popup_atcursor('mnv', {})
   redraw
   let line = join(map(range(1, 17), 'screenstring(1, v:val)'), '')
-  call assert_equal('xvimxxxxxxxxxxxxx', line)
+  call assert_equal('xmnvxxxxxxxxxxxxx', line)
   call popup_close(winid)
 
   call cursor(3, 4)
   redraw
-  let winid = 'vim'->popup_atcursor({})
+  let winid = 'mnv'->popup_atcursor({})
   redraw
   let line = join(map(range(1, 17), 'screenstring(2, v:val)'), '')
-  call assert_equal('xxxvimxxxxxxxxxxx', line)
+  call assert_equal('xxxmnvxxxxxxxxxxx', line)
   call popup_close(winid)
 
   call cursor(1, 1)
   redraw
-  let winid = popup_create('vim', #{
+  let winid = popup_create('mnv', #{
 	\ line: 'cursor+2',
 	\ col: 'cursor+1',
 	\})
   redraw
   let line = join(map(range(1, 17), 'screenstring(3, v:val)'), '')
-  call assert_equal('xvimxxxxxxxxxxxxx', line)
+  call assert_equal('xmnvxxxxxxxxxxxxx', line)
   call popup_close(winid)
 
   call cursor(3, 3)
   redraw
-  let winid = popup_create('vim', #{
+  let winid = popup_create('mnv', #{
 	\ line: 'cursor-2',
 	\ col: 'cursor-1',
 	\})
   redraw
   let line = join(map(range(1, 17), 'screenstring(1, v:val)'), '')
-  call assert_equal('xvimxxxxxxxxxxxxx', line)
+  call assert_equal('xmnvxxxxxxxxxxxxx', line)
   call popup_close(winid)
 
   " just enough room above
   call cursor(3, 3)
   redraw
-  let winid = popup_atcursor(['vim', 'is great'], {})
+  let winid = popup_atcursor(['mnv', 'is great'], {})
   redraw
   let pos = popup_getpos(winid)
   call assert_equal(1, pos.line)
@@ -1495,7 +1495,7 @@ func Test_popup_atcursor()
   " not enough room above, popup goes below the cursor
   call cursor(3, 3)
   redraw
-  let winid = popup_atcursor(['vim', 'is', 'great'], {})
+  let winid = popup_atcursor(['mnv', 'is', 'great'], {})
   redraw
   let pos = popup_getpos(winid)
   call assert_equal(4, pos.line)
@@ -1504,7 +1504,7 @@ func Test_popup_atcursor()
   " cursor in first line, popup in line 2
   call cursor(1, 1)
   redraw
-  let winid = popup_atcursor(['vim', 'is', 'great'], {})
+  let winid = popup_atcursor(['mnv', 'is', 'great'], {})
   redraw
   let pos = popup_getpos(winid)
   call assert_equal(2, pos.line)
@@ -1550,11 +1550,11 @@ func Test_popup_atcursor_pos()
 	call popup_atcursor('mark', {})
   END
   call writefile(lines, 'XtestPopupAtcursorPos', 'D')
-  let buf = RunVimInTerminal('-S XtestPopupAtcursorPos', #{rows: 12})
+  let buf = RunMNVInTerminal('-S XtestPopupAtcursorPos', #{rows: 12})
   call VerifyScreenDump(buf, 'Test_popupwin_atcursor_pos', {})
 
   " clean up
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_popup_beval()
@@ -1586,7 +1586,7 @@ func Test_popup_beval()
 	endfunc
   END
   call writefile(lines, 'XtestPopupBeval', 'D')
-  let buf = RunVimInTerminal('-S XtestPopupBeval', #{rows: 10})
+  let buf = RunMNVInTerminal('-S XtestPopupBeval', #{rows: 10})
   call TermWait(buf, 50)
   call term_sendkeys(buf, 'j')
   call term_sendkeys(buf, ":call Hover()\<CR>")
@@ -1599,7 +1599,7 @@ func Test_popup_beval()
   call VerifyScreenDump(buf, 'Test_popupwin_beval_3', {})
 
   " clean up
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_popup_filter()
@@ -1666,11 +1666,11 @@ func Test_popup_filter_normal_cmd()
       call timer_start(0, {-> win_execute(g:winid, 'norm! 10Gzz')})
   END
   call writefile(lines, 'XtestPopupNormal', 'D')
-  let buf = RunVimInTerminal('-S XtestPopupNormal', #{rows: 10})
+  let buf = RunMNVInTerminal('-S XtestPopupNormal', #{rows: 10})
   call TermWait(buf, 100)
   call VerifyScreenDump(buf, 'Test_popupwin_normal_cmd', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 " test that cursor line highlight is updated after using win_execute()
@@ -1687,14 +1687,14 @@ func Test_popup_filter_win_execute()
       redraw
   END
   call writefile(lines, 'XtestPopupWinExecute', 'D')
-  let buf = RunVimInTerminal('-S XtestPopupWinExecute', #{rows: 14})
+  let buf = RunMNVInTerminal('-S XtestPopupWinExecute', #{rows: 14})
 
   call term_sendkeys(buf, ":call win_execute(g:id, ['normal 17Gzz'])\<CR>")
   call term_sendkeys(buf, ":\<CR>")
 
   call VerifyScreenDump(buf, 'Test_popupwin_win_execute_cursorline', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_popup_set_firstline()
@@ -1713,7 +1713,7 @@ func Test_popup_set_firstline()
       redraw
   END
   call writefile(lines, 'XtestPopupWinSetFirstline', 'D')
-  let buf = RunVimInTerminal('-S XtestPopupWinSetFirstline', #{rows: 16})
+  let buf = RunMNVInTerminal('-S XtestPopupWinSetFirstline', #{rows: 16})
 
   call VerifyScreenDump(buf, 'Test_popupwin_set_firstline_1', {})
 
@@ -1721,7 +1721,7 @@ func Test_popup_set_firstline()
   call term_sendkeys(buf, ":\<CR>")
   call VerifyScreenDump(buf, 'Test_popupwin_set_firstline_2', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 " this tests that we don't get stuck with an error in "win_execute()"
@@ -1733,7 +1733,7 @@ func Test_popup_filter_win_execute_error()
       call timer_start(0, {-> win_execute(g:winid, 'invalidCommand')})
   END
   call writefile(lines, 'XtestPopupWinExecuteError', 'D')
-  let buf = RunVimInTerminal('-S XtestPopupWinExecuteError', #{rows: 10, wait_for_ruler: 0})
+  let buf = RunMNVInTerminal('-S XtestPopupWinExecuteError', #{rows: 10, wait_for_ruler: 0})
 
   call WaitFor({-> term_getline(buf, 9) =~ 'Not an editor command: invalidCommand'})
   call term_sendkeys(buf, "\<CR>")
@@ -1744,7 +1744,7 @@ func Test_popup_filter_win_execute_error()
   call term_sendkeys(buf, "\<CR>")
   call VerifyScreenDump(buf, 'Test_popupwin_win_execute', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func ShowDialog(key, result)
@@ -1823,7 +1823,7 @@ func Test_popup_menu_screenshot()
 	endfunc
   END
   call writefile(lines, 'XtestPopupMenu', 'D')
-  let buf = RunVimInTerminal('-S XtestPopupMenu', #{rows: 10})
+  let buf = RunMNVInTerminal('-S XtestPopupMenu', #{rows: 10})
   call VerifyScreenDump(buf, 'Test_popupwin_menu_01', {})
 
   call term_sendkeys(buf, "jj")
@@ -1833,7 +1833,7 @@ func Test_popup_menu_screenshot()
   call VerifyScreenDump(buf, 'Test_popupwin_menu_03', {})
 
   " clean up
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_popup_menu_narrow()
@@ -1848,12 +1848,12 @@ func Test_popup_menu_narrow()
 	endfunc
   END
   call writefile(lines, 'XtestPopupNarrowMenu', 'D')
-  let buf = RunVimInTerminal('-S XtestPopupNarrowMenu', #{rows: 10})
+  let buf = RunMNVInTerminal('-S XtestPopupNarrowMenu', #{rows: 10})
   call VerifyScreenDump(buf, 'Test_popupwin_menu_04', {})
 
   " clean up
   call term_sendkeys(buf, "x")
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_popup_title()
@@ -1866,7 +1866,7 @@ func Test_popup_title()
 	let winid = popup_create(['one', 'two', 'another'], #{title: 'Title String'})
   END
   call writefile(lines, 'XtestPopupTitle', 'D')
-  let buf = RunVimInTerminal('-S XtestPopupTitle', #{rows: 10})
+  let buf = RunMNVInTerminal('-S XtestPopupTitle', #{rows: 10})
   call VerifyScreenDump(buf, 'Test_popupwin_title', {})
 
   call term_sendkeys(buf, ":call popup_setoptions(winid, #{maxwidth: 20, title: 'a very long title that is not going to fit'})\<CR>")
@@ -1893,7 +1893,7 @@ func Test_popup_title()
   call term_sendkeys(buf, "x")
 
   " clean up
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 
   let winid = popup_create('something', #{title: 'Some Title'})
   call assert_equal('Some Title', popup_getoptions(winid).title)
@@ -1955,12 +1955,12 @@ func Test_popup_never_behind()
 	      \ })
   END
   call writefile(lines, 'XtestPopupBehind', 'D')
-  let buf = RunVimInTerminal('-S XtestPopupBehind', #{rows: 10})
+  let buf = RunMNVInTerminal('-S XtestPopupBehind', #{rows: 10})
   call term_sendkeys(buf, "\<C-W>w")
   call VerifyScreenDump(buf, 'Test_popupwin_behind', {})
 
   " clean up
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func s:VerifyPosition(p, msg, line, col, width, height)
@@ -2295,7 +2295,7 @@ func Test_notifications()
 	call popup_notification('first notification', {})
   END
   call writefile(lines, 'XtestNotifications', 'D')
-  let buf = RunVimInTerminal('-S XtestNotifications', #{rows: 10})
+  let buf = RunMNVInTerminal('-S XtestNotifications', #{rows: 10})
   call VerifyScreenDump(buf, 'Test_popupwin_notify_01', {})
 
   " second one goes below the first one
@@ -2304,7 +2304,7 @@ func Test_notifications()
   call VerifyScreenDump(buf, 'Test_popupwin_notify_02', {})
 
   " clean up
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_popup_scrollbar()
@@ -2384,7 +2384,7 @@ func Test_popup_scrollbar()
     map <silent> <F5> :call test_setmouse(7, 42)<CR>
   END
   call writefile(lines, 'XtestPopupScroll', 'D')
-  let buf = RunVimInTerminal('-S XtestPopupScroll', #{rows: 10})
+  let buf = RunMNVInTerminal('-S XtestPopupScroll', #{rows: 10})
   call VerifyScreenDump(buf, 'Test_popupwin_scroll_1', {})
 
   call term_sendkeys(buf, ":call popup_setoptions(winid, #{firstline: 2})\<CR>")
@@ -2440,7 +2440,7 @@ func Test_popup_scrollbar()
 
   " clean up
   call term_sendkeys(buf, "x")
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_popup_too_high_scrollbar()
@@ -2460,7 +2460,7 @@ func Test_popup_too_high_scrollbar()
     call ShowPopup()
   END
   call writefile(lines, 'XtestPopupToohigh', 'D')
-  let buf = RunVimInTerminal('-S XtestPopupToohigh', #{rows: 10})
+  let buf = RunMNVInTerminal('-S XtestPopupToohigh', #{rows: 10})
   call VerifyScreenDump(buf, 'Test_popupwin_toohigh_1', {})
 
   call term_sendkeys(buf, ":call popup_clear()\<CR>")
@@ -2474,7 +2474,7 @@ func Test_popup_too_high_scrollbar()
   call VerifyScreenDump(buf, 'Test_popupwin_toohigh_3', {})
 
   " clean up
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_popup_fitting_scrollbar()
@@ -2499,7 +2499,7 @@ func Test_popup_settext()
   END
 
   call writefile(lines, 'XtestPopupSetText', 'D')
-  let buf = RunVimInTerminal('-S XtestPopupSetText', #{rows: 10})
+  let buf = RunMNVInTerminal('-S XtestPopupSetText', #{rows: 10})
   call VerifyScreenDump(buf, 'Test_popup_settext_01', {})
 
   " Setting to empty string clears it
@@ -2531,7 +2531,7 @@ func Test_popup_settext()
   call VerifyScreenDump(buf, 'Test_popup_settext_07', {})
 
   " clean up
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_popup_settext_getline()
@@ -2566,7 +2566,7 @@ func Test_popup_setbuf()
   END
 
   call writefile(lines, 'XtestPopupSetBuf', 'D')
-  let buf = RunVimInTerminal('-S XtestPopupSetBuf', #{rows: 10})
+  let buf = RunMNVInTerminal('-S XtestPopupSetBuf', #{rows: 10})
   call VerifyScreenDump(buf, 'Test_popup_setbuf_01', {})
 
   " Setting to an non-existing buffer doesn't do anything
@@ -2594,7 +2594,7 @@ func Test_popup_setbuf()
   call VerifyScreenDump(buf, 'Test_popup_setbuf_05', {})
 
   " clean up
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_popup_setbuf_terminal()
@@ -2906,7 +2906,7 @@ func Test_popupwin_with_buffer()
   exe 'bwipe! ' .. buf
   setlocal nonumber
 
-  edit test_popupwin.vim
+  edit test_popupwin.mnv
   let winid = popup_create(bufnr(''), {})
   redraw
   call popup_close(winid)
@@ -3013,7 +3013,7 @@ func Test_popupwin_terminal_scrollbar()
 
   call writefile(range(50), 'Xtestfile', 'D')
   let lines =<< trim END
-      vim9script
+      mnv9script
 
       # testing CTRL-W CTRL-W requires two windows
       split
@@ -3029,7 +3029,7 @@ func Test_popupwin_terminal_scrollbar()
 	  })
   END
   call writefile(lines, 'Xpterm', 'D')
-  let buf = RunVimInTerminal('-S Xpterm', #{rows: 15})
+  let buf = RunMNVInTerminal('-S Xpterm', #{rows: 15})
   call VerifyScreenDump(buf, 'Test_popupwin_poptermscroll_1', {})
 
   " scroll to the middle
@@ -3044,7 +3044,7 @@ func Test_popupwin_terminal_scrollbar()
   call term_sendkeys(buf, ":q\<CR>")
   call VerifyScreenDump(buf, 'Test_popupwin_poptermscroll_4', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_popupwin_close_prevwin()
@@ -3156,7 +3156,7 @@ func Test_popup_menu_with_maxwidth()
 	call PopupMenu(repeat(['123456789|' .. ' '], 5), 1, 33, 1)
   END
   call writefile(lines, 'XtestPopupMenuMaxWidth', 'D')
-  let buf = RunVimInTerminal('-S XtestPopupMenuMaxWidth', #{rows: 13})
+  let buf = RunMNVInTerminal('-S XtestPopupMenuMaxWidth', #{rows: 13})
   call VerifyScreenDump(buf, 'Test_popupwin_menu_maxwidth_1', {})
 
   " close the menu popupwin.
@@ -3167,7 +3167,7 @@ func Test_popup_menu_with_maxwidth()
   call term_sendkeys(buf, " ")
 
   " clean up
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_popup_menu_with_scrollbar()
@@ -3185,7 +3185,7 @@ func Test_popup_menu_with_scrollbar()
 	  \ })
   END
   call writefile(lines, 'XtestPopupMenuScroll', 'D')
-  let buf = RunVimInTerminal('-S XtestPopupMenuScroll', #{rows: 10})
+  let buf = RunMNVInTerminal('-S XtestPopupMenuScroll', #{rows: 10})
 
   call term_sendkeys(buf, "j")
   call VerifyScreenDump(buf, 'Test_popupwin_menu_scroll_1', {})
@@ -3219,7 +3219,7 @@ func Test_popup_menu_with_scrollbar()
   call term_sendkeys(buf, " ")
 
   " clean up
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_popup_menu_filter()
@@ -3255,7 +3255,7 @@ func Test_popup_menu_filter()
 	  \ })
   END
   call writefile(lines, 'XtestPopupMenuFilter', 'D')
-  let buf = RunVimInTerminal('-S XtestPopupMenuFilter', #{rows: 10})
+  let buf = RunMNVInTerminal('-S XtestPopupMenuFilter', #{rows: 10})
 
   call term_sendkeys(buf, "j")
   call VerifyScreenDump(buf, 'Test_popupwin_menu_filter_1', {})
@@ -3275,7 +3275,7 @@ func Test_popup_menu_filter()
   call term_sendkeys(buf, "\<CR>")
 
   " clean up
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_popup_cursorline()
@@ -3316,10 +3316,10 @@ func Test_popup_cursorline()
 	call popup_create(['111', '222', '333'], #{ cursorline : 0 })
   END
   call writefile(lines, 'XtestPopupCursorLine', 'D')
-  let buf = RunVimInTerminal('-S XtestPopupCursorLine', #{rows: 10})
+  let buf = RunMNVInTerminal('-S XtestPopupCursorLine', #{rows: 10})
   call VerifyScreenDump(buf, 'Test_popupwin_cursorline_1', {})
   call term_sendkeys(buf, ":call popup_clear()\<cr>")
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 
   " ---------
   " Pattern 2
@@ -3328,10 +3328,10 @@ func Test_popup_cursorline()
 	call popup_create(['111', '222', '333'], #{ cursorline : 1 })
   END
   call writefile(lines, 'XtestPopupCursorLine')
-  let buf = RunVimInTerminal('-S XtestPopupCursorLine', #{rows: 10})
+  let buf = RunMNVInTerminal('-S XtestPopupCursorLine', #{rows: 10})
   call VerifyScreenDump(buf, 'Test_popupwin_cursorline_2', {})
   call term_sendkeys(buf, ":call popup_clear()\<cr>")
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 
   " ---------
   " Pattern 3
@@ -3355,13 +3355,13 @@ func Test_popup_cursorline()
 	  \ })
   END
   call writefile(lines, 'XtestPopupCursorLine')
-  let buf = RunVimInTerminal('-S XtestPopupCursorLine', #{rows: 10})
+  let buf = RunMNVInTerminal('-S XtestPopupCursorLine', #{rows: 10})
   call VerifyScreenDump(buf, 'Test_popupwin_cursorline_3', {})
   call term_sendkeys(buf, "j")
   call term_sendkeys(buf, "j")
   call VerifyScreenDump(buf, 'Test_popupwin_cursorline_4', {})
   call term_sendkeys(buf, "x")
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 
   " ---------
   " Pattern 4
@@ -3385,13 +3385,13 @@ func Test_popup_cursorline()
 	  \ })
   END
   call writefile(lines, 'XtestPopupCursorLine')
-  let buf = RunVimInTerminal('-S XtestPopupCursorLine', #{rows: 10})
+  let buf = RunMNVInTerminal('-S XtestPopupCursorLine', #{rows: 10})
   call VerifyScreenDump(buf, 'Test_popupwin_cursorline_5', {})
   call term_sendkeys(buf, "j")
   call term_sendkeys(buf, "j")
   call VerifyScreenDump(buf, 'Test_popupwin_cursorline_6', {})
   call term_sendkeys(buf, "x")
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 
   " ---------
   " Cursor in second line when creating the popup
@@ -3403,9 +3403,9 @@ func Test_popup_cursorline()
     call win_execute(winid, "2")
   END
   call writefile(lines, 'XtestPopupCursorLine')
-  let buf = RunVimInTerminal('-S XtestPopupCursorLine', #{rows: 10})
+  let buf = RunMNVInTerminal('-S XtestPopupCursorLine', #{rows: 10})
   call VerifyScreenDump(buf, 'Test_popupwin_cursorline_7', {})
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 
   " ---------
   " Use current buffer for popupmenu
@@ -3418,12 +3418,12 @@ func Test_popup_cursorline()
     call win_execute(winid, "2")
   END
   call writefile(lines, 'XtestPopupCursorLine')
-  let buf = RunVimInTerminal('-S XtestPopupCursorLine', #{rows: 10})
+  let buf = RunMNVInTerminal('-S XtestPopupCursorLine', #{rows: 10})
   call VerifyScreenDump(buf, 'Test_popupwin_cursorline_8', {})
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
-def Test_popup_cursorline_vim9()
+def Test_popup_cursorline_mnv9()
   var winid = popup_create('some text', { cursorline: true, })
   assert_equal(1, popup_getoptions(winid).cursorline)
   popup_close(winid)
@@ -3470,7 +3470,7 @@ func Test_previewpopup()
 	set path=.
   END
   call writefile(lines, 'XtestPreviewPopup', 'D')
-  let buf = RunVimInTerminal('-S XtestPreviewPopup', #{rows: 14})
+  let buf = RunMNVInTerminal('-S XtestPreviewPopup', #{rows: 14})
 
   call term_sendkeys(buf, "/theword\<CR>\<C-W>}")
   call term_sendkeys(buf, ":\<CR>")
@@ -3511,7 +3511,7 @@ func Test_previewpopup()
   call term_sendkeys(buf, ":call win_execute(popup_findpreview(), 'call popup_clear()')\<CR>")
   call VerifyScreenDump(buf, 'Test_popupwin_previewpopup_10', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func s:run_preview_popuppum(preview_lines, dumpfile_name)
@@ -3526,10 +3526,10 @@ func s:run_preview_popuppum(preview_lines, dumpfile_name)
       call system('echo hello')
       " the end
   END
-  call writefile(lines, 'XpreviewText.vim', 'D')
+  call writefile(lines, 'XpreviewText.mnv', 'D')
 
   call writefile(a:preview_lines, 'XtestPreviewPum', 'D')
-  let buf = RunVimInTerminal('-S XtestPreviewPum', #{rows: 12})
+  let buf = RunMNVInTerminal('-S XtestPreviewPum', #{rows: 12})
 
   call term_sendkeys(buf, "A o\<C-N>")
   call VerifyScreenDump(buf, 'Test_pum_preview_' . a:dumpfile_name . '_1', {})
@@ -3544,14 +3544,14 @@ func s:run_preview_popuppum(preview_lines, dumpfile_name)
   call VerifyScreenDump(buf, 'Test_pum_preview_' . a:dumpfile_name . '_4', {})
 
   call term_sendkeys(buf, "\<Esc>")
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_previewpopup_pum_pedit()
   let lines =<< trim END
       call setline(1, ['one', 'two', 'three', 'other', 'once', 'only', 'off'])
       set previewpopup=height:6,width:40
-      pedit XpreviewText.vim
+      pedit XpreviewText.mnv
   END
   call s:run_preview_popuppum(lines, 'pedit')
 endfunc
@@ -3560,7 +3560,7 @@ func Test_previewpopup_pum_pbuffer()
   let lines =<< trim END
       call setline(1, ['one', 'two', 'three', 'other', 'once', 'only', 'off'])
       set previewpopup=height:6,width:40
-      badd XpreviewText.vim
+      badd XpreviewText.mnv
       exe bufnr('$') . 'pbuffer'
   END
   call s:run_preview_popuppum(lines, 'pbuffer')
@@ -3576,7 +3576,7 @@ func Test_previewpopup_border()
     hi BorderColor ctermbg=lightcyan guibg=lightcyan
   END
   call writefile(lines, 'XtestPPBorder', 'D')
-  let buf = RunVimInTerminal('-S XtestPPBorder', #{rows: 14})
+  let buf = RunMNVInTerminal('-S XtestPPBorder', #{rows: 14})
   call TermWait(buf, 25)
   call term_sendkeys(buf, ":set previewpopup=height:4,width:40,border:single\<CR>")
   call term_sendkeys(buf, ":pedit Xppfile\<CR>:\<CR>")
@@ -3611,7 +3611,7 @@ func Test_previewpopup_border()
   call term_sendkeys(buf, ":set previewpopup=height:4,width:40,border:off\<CR>")
   call term_sendkeys(buf, ":pedit Xppfile\<CR>:\<CR>")
   call VerifyScreenDump(buf, 'Test_previewpopup_border_7', {})
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_previewpopup_border_mouse()
@@ -3627,7 +3627,7 @@ func Test_previewpopup_border_mouse()
 	set previewpopup=height:4,width:40
   END
   call writefile(lines, 'XtestPPBorderMouse', 'D')
-  let buf = RunVimInTerminal('-S XtestPPBorderMouse', #{rows: 14})
+  let buf = RunMNVInTerminal('-S XtestPPBorderMouse', #{rows: 14})
 
   call TermWait(buf, 25)
   call term_sendkeys(buf, ":pedit XppMousefile\<CR>:\<CR>")
@@ -3663,7 +3663,7 @@ func Test_previewpopup_border_mouse()
   call term_sendkeys(buf, ":pedit XppMousefile\<CR>:\<CR>")
   call VerifyScreenDump(buf, 'Test_previewpopup_border_mouse_7', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_previewpopup_shadow()
@@ -3677,7 +3677,7 @@ func Test_previewpopup_shadow()
     hi BorderColor ctermbg=lightcyan guibg=lightcyan
   END
   call writefile(lines, 'XtestPPShadow', 'D')
-  let buf = RunVimInTerminal('-S XtestPPShadow', #{rows: 14})
+  let buf = RunMNVInTerminal('-S XtestPPShadow', #{rows: 14})
 
   call TermWait(buf, 25)
   call term_sendkeys(buf, ":set previewpopup=height:4,width:40,shadow:on\<CR>")
@@ -3689,7 +3689,7 @@ func Test_previewpopup_shadow()
   call term_sendkeys(buf, ":pedit XppShadowfile\<CR>:\<CR>")
   call VerifyScreenDump(buf, 'Test_previewpopup_shadow_2', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Get_popupmenu_lines()
@@ -3828,7 +3828,7 @@ func Test_popupmenu_info_border()
   call add(lines, 'set completepopup=height:4,highlight:InfoPopup')
   call writefile(lines, 'XtestInfoPopup', 'D')
 
-  let buf = RunVimInTerminal('-S XtestInfoPopup', #{rows: 14})
+  let buf = RunMNVInTerminal('-S XtestInfoPopup', #{rows: 14})
   call TermWait(buf, 25)
 
   call term_sendkeys(buf, "A\<C-X>\<C-U>")
@@ -3877,7 +3877,7 @@ func Test_popupmenu_info_border()
   call VerifyScreenDump(buf, 'Test_popupwin_infopopup_9', {})
 
   call term_sendkeys(buf, "\<Esc>")
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_popupmenu_info_noborder()
@@ -3888,13 +3888,13 @@ func Test_popupmenu_info_noborder()
   call add(lines, 'set completepopup=height:4,border:off')
   call writefile(lines, 'XtestInfoPopupNb', 'D')
 
-  let buf = RunVimInTerminal('-S XtestInfoPopupNb', #{rows: 14})
+  let buf = RunMNVInTerminal('-S XtestInfoPopupNb', #{rows: 14})
   call TermWait(buf, 25)
 
   call term_sendkeys(buf, "A\<C-X>\<C-U>")
   call VerifyScreenDump(buf, 'Test_popupwin_infopopup_nb_1', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 " Info popup should not have close (X) and resize buttons when mouse is
@@ -3906,7 +3906,7 @@ func Test_popupmenu_info_border_mouse()
   let lines = Get_popupmenu_lines()
   call writefile(lines, 'XtestInfoPopup', 'D')
 
-  let buf = RunVimInTerminal('-S XtestInfoPopup', #{rows: 14})
+  let buf = RunMNVInTerminal('-S XtestInfoPopup', #{rows: 14})
   call TermWait(buf, 25)
 
   call term_sendkeys(buf, "Go\<CR>\<C-X>\<C-U>")
@@ -3919,7 +3919,7 @@ func Test_popupmenu_info_border_mouse()
   call VerifyScreenDump(buf, 'Test_popupwin_info_border_mouse_2', {})
 
   call term_sendkeys(buf, "\<Esc>")
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_popupmenu_info_align_menu()
@@ -3930,7 +3930,7 @@ func Test_popupmenu_info_align_menu()
   call add(lines, 'set completepopup=height:4,border:off,align:menu')
   call writefile(lines, 'XtestInfoPopupNb', 'D')
 
-  let buf = RunVimInTerminal('-S XtestInfoPopupNb', #{rows: 14})
+  let buf = RunMNVInTerminal('-S XtestInfoPopupNb', #{rows: 14})
   call TermWait(buf, 25)
 
   call term_sendkeys(buf, "A\<C-X>\<C-U>")
@@ -3949,7 +3949,7 @@ func Test_popupmenu_info_align_menu()
   call term_sendkeys(buf, "Gotest text test text\<C-X>\<C-U>")
   call VerifyScreenDump(buf, 'Test_popupwin_infopopup_align_3', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_popupmenu_info_align_item()
@@ -3971,7 +3971,7 @@ func Test_popupmenu_info_align_item()
     set number
   END
   call writefile(lines, 'XtestInfoPopupPos', 'D')
-  let buf = RunVimInTerminal('-S XtestInfoPopupPos', #{rows: 15})
+  let buf = RunMNVInTerminal('-S XtestInfoPopupPos', #{rows: 15})
   call TermWait(buf, 25)
 
   call term_sendkeys(buf, "A"..repeat("\<CR>", 12))
@@ -3981,7 +3981,7 @@ func Test_popupmenu_info_align_item()
   call VerifyScreenDump(buf, 'Test_popupwin_infopopup_align_item_01', {})
 
   call term_sendkeys(buf, "\<Esc>")
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_popupmenu_info_hidden()
@@ -3992,7 +3992,7 @@ func Test_popupmenu_info_hidden()
   call add(lines, 'call InfoHidden()')
   call writefile(lines, 'XtestInfoPopupHidden', 'D')
 
-  let buf = RunVimInTerminal('-S XtestInfoPopupHidden', #{rows: 14})
+  let buf = RunMNVInTerminal('-S XtestInfoPopupHidden', #{rows: 14})
   call TermWait(buf, 25)
 
   call term_sendkeys(buf, "A\<C-X>\<C-U>")
@@ -4005,7 +4005,7 @@ func Test_popupmenu_info_hidden()
   call VerifyScreenDump(buf, 'Test_popupwin_infopopup_hidden_3', {})
 
   call term_sendkeys(buf, "\<Esc>")
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_popupmenu_info_too_wide()
@@ -4049,14 +4049,14 @@ func Test_popupmenu_info_too_wide()
   END
 
   call writefile(lines, 'XtestInfoPopupWide', 'D')
-  let buf = RunVimInTerminal('-S XtestInfoPopupWide', #{rows: 8})
+  let buf = RunMNVInTerminal('-S XtestInfoPopupWide', #{rows: 8})
   call TermWait(buf, 25)
 
   call term_sendkeys(buf, "Ascr\<C-X>\<C-O>")
   call VerifyScreenDump(buf, 'Test_popupwin_infopopup_wide_1', {})
 
   call term_sendkeys(buf, "\<Esc>")
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_popupmenu_masking()
@@ -4069,7 +4069,7 @@ func Test_popupmenu_masking()
   call add(lines, 'inoremap <C-A> <Cmd>call OpenOtherPopups()<CR>')
   call writefile(lines, 'XtestPopupmenuMasking', 'D')
 
-  let buf = RunVimInTerminal('-S XtestPopupmenuMasking', #{rows: 14})
+  let buf = RunMNVInTerminal('-S XtestPopupmenuMasking', #{rows: 14})
   call TermWait(buf, 25)
 
   call term_sendkeys(buf, "A" .. GetEscCodeWithModifier('C', 'X')
@@ -4080,7 +4080,7 @@ func Test_popupmenu_masking()
   call term_sendkeys(buf, "\<Esc>")
   call VerifyScreenDump(buf, 'Test_popupwin_popupmenu_masking_2', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_popupwin_recycle_bnr()
@@ -4188,10 +4188,10 @@ func Test_popupwin_double_width()
   END
   call writefile(lines, 'XtestPopupWide', 'D')
 
-  let buf = RunVimInTerminal('-S XtestPopupWide', #{rows: 10})
+  let buf = RunMNVInTerminal('-S XtestPopupWide', #{rows: 10})
   call VerifyScreenDump(buf, 'Test_popupwin_doublewidth_1', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_popupwin_sign()
@@ -4233,14 +4233,14 @@ func Test_popupwin_sign()
   END
   call writefile(lines, 'XtestPopupSign', 'D')
 
-  let buf = RunVimInTerminal('-S XtestPopupSign', #{rows: 10})
+  let buf = RunMNVInTerminal('-S XtestPopupSign', #{rows: 10})
   call VerifyScreenDump(buf, 'Test_popupwin_sign_1', {})
 
   " set more options to check the width is adjusted
   call term_sendkeys(buf, ":call SetOptions()\<CR>")
   call VerifyScreenDump(buf, 'Test_popupwin_sign_2', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_popupwin_bufnr()
@@ -4306,12 +4306,12 @@ func Test_popupwin_filter_close_ctrl_c()
   END
   call writefile(lines, 'XtestPopupCtrlC', 'D')
 
-  let buf = RunVimInTerminal('-S XtestPopupCtrlC', #{rows: 10})
+  let buf = RunMNVInTerminal('-S XtestPopupCtrlC', #{rows: 10})
 
   call term_sendkeys(buf, "\<C-C>")
   call VerifyScreenDump(buf, 'Test_popupwin_ctrl_c', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_popupwin_filter_close_wrong_name()
@@ -4322,12 +4322,12 @@ func Test_popupwin_filter_close_wrong_name()
   END
   call writefile(lines, 'XtestPopupWrongName', 'D')
 
-  let buf = RunVimInTerminal('-S XtestPopupWrongName', #{rows: 10})
+  let buf = RunMNVInTerminal('-S XtestPopupWrongName', #{rows: 10})
 
   call term_sendkeys(buf, "j")
   call VerifyScreenDump(buf, 'Test_popupwin_wrong_name', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_popupwin_filter_close_three_errors()
@@ -4339,14 +4339,14 @@ func Test_popupwin_filter_close_three_errors()
   END
   call writefile(lines, 'XtestPopupThreeErrors', 'D')
 
-  let buf = RunVimInTerminal('-S XtestPopupThreeErrors', #{rows: 10})
+  let buf = RunMNVInTerminal('-S XtestPopupThreeErrors', #{rows: 10})
 
   call term_sendkeys(buf, "jj")
   call VerifyScreenDump(buf, 'Test_popupwin_three_errors_1', {})
   call term_sendkeys(buf, "j")
   call VerifyScreenDump(buf, 'Test_popupwin_three_errors_2', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_popupwin_latin1_encoding()
@@ -4369,11 +4369,11 @@ func Test_popupwin_latin1_encoding()
   call writefile(lines, 'XtestPopupLatin', 'D')
   call writefile([repeat("\u3042 ", 120)], 'Xmultibyte', 'D')
 
-  let buf = RunVimInTerminal('-S XtestPopupLatin', #{rows: 10})
+  let buf = RunMNVInTerminal('-S XtestPopupLatin', #{rows: 10})
   call WaitForAssert({-> assert_match('Done', term_getline(buf, 10))})
 
   call term_sendkeys(buf, ":q\<CR>")
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_popupwin_atcursor_far_right()
@@ -4471,7 +4471,7 @@ func Test_popup_prop_not_visible()
   CheckScreendump
 
   let lines =<< trim END
-      vim9script
+      mnv9script
       set nowrap stal=2
       rightbelow :31vnew
       setline(1, ['', 'some text', '', 'other text'])
@@ -4495,7 +4495,7 @@ func Test_popup_prop_not_visible()
           })
   END
   call writefile(lines, 'XtestPropNotVisible', 'D')
-  let buf = RunVimInTerminal('-S XtestPropNotVisible', #{rows: 10})
+  let buf = RunMNVInTerminal('-S XtestPropNotVisible', #{rows: 10})
   call VerifyScreenDump(buf, 'Test_popup_prop_not_visible_01', {})
 
   " check that hiding and unhiding the popup works
@@ -4511,7 +4511,7 @@ func Test_popup_prop_not_visible()
   call VerifyScreenDump(buf, 'Test_popup_prop_not_visible_03', {})
 
   " clean up
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunction
 
 func Test_bufdel_skips_popupwin_buffer()
@@ -4526,21 +4526,21 @@ func Test_term_popup_bufline()
   CheckScreendump
 
   let lines =<< trim END
-      vim9script
+      mnv9script
       &scrolloff = 5
       term_start('seq 1 5', {term_finish: 'open'})
       timer_start(50, (_) => {
-	  set cpoptions&vim
+	  set cpoptions&mnv
 	  var buf = popup_create([], {})->winbufnr()
 	  appendbufline(buf, 0, range(5))
       })
   END
   call writefile(lines, 'XtestTermPopup', 'D')
-  let buf = RunVimInTerminal('-S XtestTermPopup', #{rows: 15})
+  let buf = RunMNVInTerminal('-S XtestTermPopup', #{rows: 15})
   call VerifyScreenDump(buf, 'Test_term_popup_bufline', {})
 
   " clean up
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_popupwin_with_error()
@@ -4552,12 +4552,12 @@ func Test_popupwin_with_error()
   END
   "call popup_create('Hello world!', options)
   call writefile(lines, 'XtestPopupError', 'D')
-  let buf = RunVimInTerminal('-S XtestPopupError', {})
+  let buf = RunMNVInTerminal('-S XtestPopupError', {})
   call term_sendkeys(buf, ":call popup_create('Hello world!', options)\<CR>")
   call VerifyScreenDump(buf, 'Test_popupwin_with_error_1', {})
 
   " clean up
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_popup_close_callback_recursive()
@@ -4571,7 +4571,7 @@ func Test_popup_close_callback_recursive()
 endfunc
 
 func Test_popupwin_setbufvar_changing_window_view()
-  " Test for Github Issue https://github.com/vim/vim/issues/13863
+  " Test for Github Issue https://github.com/Project-Tick/Project-Tick/issues/13863
   " using setbufvar(buf, '&option') should not scroll
   " the current window
   20new
@@ -4594,7 +4594,7 @@ func Test_popupwin_clears_cmdline_on_hide()
   CheckScreendump
 
   let lines =<< trim END
-    vim9script
+    mnv9script
     var id: number
     def Filter(winid: number, key: string): bool
       if key == 'q'
@@ -4615,13 +4615,13 @@ func Test_popupwin_clears_cmdline_on_hide()
     })
   END
   call writefile(lines, 'XtestPopup_win', 'D')
-  let buf = RunVimInTerminal('-S XtestPopup_win', #{rows: 10})
+  let buf = RunMNVInTerminal('-S XtestPopup_win', #{rows: 10})
   call term_sendkeys(buf, "q")
   call term_wait(buf)
   call VerifyScreenDump(buf, 'Test_popupwin_hide_clear_cmdline_01', {})
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
   let lines =<< trim END
-    vim9script
+    mnv9script
     var id: number
     def Filter(winid: number, key: string): bool
       if key == 'q'
@@ -4642,13 +4642,13 @@ func Test_popupwin_clears_cmdline_on_hide()
     })
   END
   call writefile(lines, 'XtestPopup_win2', 'D')
-  let buf = RunVimInTerminal('-S XtestPopup_win2', #{rows: 10})
+  let buf = RunMNVInTerminal('-S XtestPopup_win2', #{rows: 10})
   call term_sendkeys(buf, "q")
   call term_wait(buf)
   call VerifyScreenDump(buf, 'Test_popupwin_hide_clear_cmdline_01', {})
 
   " clean up
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 
   let lines =<< trim END
     set completeopt=menuone,noinsert,noselect,popup,fuzzy
@@ -4664,7 +4664,7 @@ func Test_popupwin_clears_cmdline_on_hide()
     inoremap <f5> <cmd>call complete(1, g:list)<cr>
   END
   call writefile(lines, 'XtestPopup_win3', 'D')
-  let buf = RunVimInTerminal('-S XtestPopup_win3', #{rows: 15})
+  let buf = RunMNVInTerminal('-S XtestPopup_win3', #{rows: 15})
   call term_sendkeys(buf, "Go\<F5>\<C-N>\<C-N>\<C-N>\<C-N>\<C-N>")
   call term_wait(buf, 100)
   call VerifyScreenDump(buf, 'Test_info_popupwin_clears_cmdline_on_hide_01', {})
@@ -4673,16 +4673,16 @@ func Test_popupwin_clears_cmdline_on_hide()
   call term_wait(buf, 500)
   call VerifyScreenDump(buf, 'Test_info_popupwin_clears_cmdline_on_hide_02', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_popupwin_callback_closes_popupwin()
   " Test that the command line is properly cleared for overlong
   " popup windows and using popup_hide()
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   let lines =<< trim END
-    vim9script
+    mnv9script
 
     def Filter(winid: number, keyCode: string): bool
         popup_close(winid)
@@ -4700,7 +4700,7 @@ func Test_popupwin_callback_closes_popupwin()
     nnoremap gs <scriptcmd>Popup()<cr>
   END
   call writefile(lines, 'XtestPopup1_win', 'D')
-  let buf = RunVimInTerminal('-S XtestPopup1_win', #{rows: 10})
+  let buf = RunMNVInTerminal('-S XtestPopup1_win', #{rows: 10})
   let i = 0
   while i <= 10
     call term_sendkeys(buf, "gs")
@@ -4716,7 +4716,7 @@ func Test_popupwin_callback_closes_popupwin()
   call WaitForAssert({-> assert_match('Done', term_getline(buf, 10))})
 
   " clean up
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_popupwin_closing_buffer()
@@ -4740,7 +4740,7 @@ func Test_popupwin_firstline_after_scroll()
   CheckScreendump
 
   let lines =<< trim END
-    vim9script
+    mnv9script
 
     def Popup(): number
       return popup_create([], {
@@ -4759,7 +4759,7 @@ func Test_popupwin_firstline_after_scroll()
     popup_settext(id, repeat(['abcd'], 20))
   END
   call writefile(lines, 'XtestPopupScroll_win', 'D')
-  let buf = RunVimInTerminal('-S XtestPopupScroll_win', {})
+  let buf = RunMNVInTerminal('-S XtestPopupScroll_win', {})
   call TermWait(buf, 50)
 
   call term_sendkeys(buf, ":call popup_setoptions(g:popup_id, {'firstline': 6})\<CR>")
@@ -4770,7 +4770,7 @@ func Test_popupwin_firstline_after_scroll()
   call TermWait(buf, 50)
   call VerifyScreenDump(buf, 'Test_popupwin_first_after_scroll', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_popupwin_bottom_position_without_decoration()
@@ -4812,14 +4812,14 @@ func Test_popupwin_bottom_position_without_decoration()
     endfunction
   END
   call writefile(lines, 'XtestPopupBottomPostion', 'D')
-  let buf = RunVimInTerminal('-S XtestPopupBottomPostion', #{rows: 20})
+  let buf = RunMNVInTerminal('-S XtestPopupBottomPostion', #{rows: 20})
   call term_sendkeys(buf, 'a')
   call term_sendkeys(buf, repeat("\<CR>", 18))
   call TermWait(buf, 50)
   call term_sendkeys(buf, "\<ESC>:call CreatePopup()\<CR>")
   call TermWait(buf, 50)
   call VerifyScreenDump(buf, 'Test_popupwin_bottom_position_without_decoration', {})
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_popup_opacity_highlight()
@@ -4838,7 +4838,7 @@ func Test_popup_opacity_highlight()
 	call win_execute(winid, "call matchadd('MyHl', 'foo  ')")
   END
   call writefile(lines, 'XtestPopupOpacity', 'D')
-  let buf = RunVimInTerminal('-S XtestPopupOpacity', #{rows: 10})
+  let buf = RunMNVInTerminal('-S XtestPopupOpacity', #{rows: 10})
   call VerifyScreenDump(buf, 'Test_popupwin_opacity_hl_100', {})
 
   " opacity=80: highlighted text should still be visible
@@ -4853,7 +4853,7 @@ func Test_popup_opacity_highlight()
   call term_sendkeys(buf, ":\<CR>")
   call VerifyScreenDump(buf, 'Test_popupwin_opacity_hl_80', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_popup_opacity_100_blocks_background()
@@ -4868,9 +4868,9 @@ func Test_popup_opacity_100_blocks_background()
         \ #{line: 2, col: 1, minwidth: 20, opacity: 100})
   END
   call writefile(lines, 'XtestPopupOpaque100', 'D')
-  let buf = RunVimInTerminal('-S XtestPopupOpaque100', #{rows: 10})
+  let buf = RunMNVInTerminal('-S XtestPopupOpaque100', #{rows: 10})
   call VerifyScreenDump(buf, 'Test_popupwin_opacity_100_blocks_bg', {})
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_popup_opacity_zero()
@@ -4899,14 +4899,14 @@ func Test_popup_opacity_zero()
   END
 
   call writefile(lines, 'XtestPopupOpacityZero', 'D')
-  let buf = RunVimInTerminal('-S XtestPopupOpacityZero', #{rows: 10})
+  let buf = RunMNVInTerminal('-S XtestPopupOpacityZero', #{rows: 10})
   call VerifyScreenDump(buf, 'Test_popupwin_opacity_zero_01', {})
 
   call TermWait(buf, 50)
   call term_sendkeys(buf, ":echo popup_getoptions(g:pop_id)['opacity']\<CR>")
   call VerifyScreenDump(buf, 'Test_popupwin_opacity_zero_02', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_popup_getwininfo_tabnr()
@@ -4960,7 +4960,7 @@ func Test_popup_opacity_wide_char_overlap()
         \})
   END
   call writefile(lines, 'XtestPopupOpacityWide', 'D')
-  let buf = RunVimInTerminal('-S XtestPopupOpacityWide', #{rows: 15, cols: 45})
+  let buf = RunMNVInTerminal('-S XtestPopupOpacityWide', #{rows: 15, cols: 45})
   call VerifyScreenDump(buf, 'Test_popupwin_opacity_wide_1', {})
 
   " Move popups far apart so they don't overlap.
@@ -4970,7 +4970,7 @@ func Test_popup_opacity_wide_char_overlap()
   call term_sendkeys(buf, ":\<CR>")
   call VerifyScreenDump(buf, 'Test_popupwin_opacity_wide_2', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_popup_conceal_wrap()
@@ -4998,7 +4998,7 @@ func Test_popup_conceal_wrap()
     call win_execute(winid, 'syntax match HiddenSecret /SECRET/ conceal containedin=ALL')
   END
   call writefile(lines, 'XtestPopupConceal', 'D')
-  let buf = RunVimInTerminal('-S XtestPopupConceal', #{rows: 10})
+  let buf = RunMNVInTerminal('-S XtestPopupConceal', #{rows: 10})
   call VerifyScreenDump(buf, 'Test_popupwin_conceal_01', {})
 
   " Test with longer text that wraps
@@ -5020,7 +5020,7 @@ func Test_popup_conceal_wrap()
   call term_sendkeys(buf, ":call win_execute(winid3, 'syntax match HiddenSecret /SECRET/ conceal containedin=ALL')\<CR>")
   call VerifyScreenDump(buf, 'Test_popupwin_conceal_03', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_popup_opacity_vsplit()
@@ -5044,7 +5044,7 @@ func Test_popup_opacity_vsplit()
         \})
   END
   call writefile(lines, 'XtestPopupOpacityVsplit', 'D')
-  let buf = RunVimInTerminal('-S XtestPopupOpacityVsplit', #{rows: 12, cols: 60})
+  let buf = RunMNVInTerminal('-S XtestPopupOpacityVsplit', #{rows: 12, cols: 60})
   call VerifyScreenDump(buf, 'Test_popupwin_opacity_vsplit_1', {})
 
   " Move cursor multiple times to trigger redraws; without the fix the
@@ -5061,7 +5061,7 @@ func Test_popup_opacity_vsplit()
   call TermWait(buf, 50)
   call VerifyScreenDump(buf, 'Test_popupwin_opacity_vsplit_2', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_popup_close_b_nwindows()
@@ -5092,14 +5092,14 @@ func Test_popupwin_close_status_redraw()
           \ })
   END
   call writefile(lines, 'XtestPopupCloseStatus', 'D')
-  let buf = RunVimInTerminal('-S XtestPopupCloseStatus', #{rows: 15})
+  let buf = RunMNVInTerminal('-S XtestPopupCloseStatus', #{rows: 15})
   call VerifyScreenDump(buf, 'Test_popupwin_close_status_1', {})
 
   " close the popup and check the status line is redrawn
   call term_sendkeys(buf, ":call popup_close(winid)\<CR>")
   call VerifyScreenDump(buf, 'Test_popupwin_close_status_2', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
-" vim: shiftwidth=2 sts=2
+" mnv: shiftwidth=2 sts=2
diff --git a/uvim/src/testdir/test_popupwin_textprop.vim b/uvim/src/testdir/test_popupwin_textprop.mnv
index 2f30831f5d..6fc0daf0cc 100644
--- a/uvim/src/testdir/test_popupwin_textprop.vim
+++ b/uvim/src/testdir/test_popupwin_textprop.mnv
@@ -3,7 +3,7 @@
 CheckFeature popupwin
 CheckFeature textprop
 
-source util/screendump.vim
+source util/screendump.mnv
 
 func Test_textprop_popup()
   CheckScreendump
@@ -28,7 +28,7 @@ func Test_textprop_popup()
 	      \ })
   END
   call writefile(lines, 'XtestTextpropPopup', 'D')
-  let buf = RunVimInTerminal('-S XtestTextpropPopup', #{rows: 10})
+  let buf = RunMNVInTerminal('-S XtestTextpropPopup', #{rows: 10})
   call VerifyScreenDump(buf, 'Test_popup_textprop_01', {})
 
   call term_sendkeys(buf, "zt")
@@ -50,7 +50,7 @@ func Test_textprop_popup()
   call VerifyScreenDump(buf, 'Test_popup_textprop_07', {})
 
   " clean up
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_textprop_popup_corners()
@@ -91,7 +91,7 @@ func Test_textprop_popup_corners()
 	      \ })
   END
   call writefile(lines, 'XtestTextpropPopupCorners', 'D')
-  let buf = RunVimInTerminal('-S XtestTextpropPopupCorners', #{rows: 12})
+  let buf = RunMNVInTerminal('-S XtestTextpropPopupCorners', #{rows: 12})
   call VerifyScreenDump(buf, 'Test_popup_textprop_corn_1', {})
 
   call term_sendkeys(buf, "0dw")
@@ -111,7 +111,7 @@ func Test_textprop_popup_corners()
   call VerifyScreenDump(buf, 'Test_popup_textprop_corn_6', {})
 
   " clean up
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_textprop_popup_offsets()
@@ -159,7 +159,7 @@ func Test_textprop_popup_offsets()
 	      \ })
   END
   call writefile(lines, 'XtestTextpropPopupOffset', 'D')
-  let buf = RunVimInTerminal('-S XtestTextpropPopupOffset', #{rows: 12})
+  let buf = RunMNVInTerminal('-S XtestTextpropPopupOffset', #{rows: 12})
   call VerifyScreenDump(buf, 'Test_popup_textprop_off_1', {})
 
   " test that removing the text property closes the popups
@@ -167,8 +167,8 @@ func Test_textprop_popup_offsets()
   call VerifyScreenDump(buf, 'Test_popup_textprop_off_2', {})
 
   " clean up
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 
-" vim: shiftwidth=2 sts=2
+" mnv: shiftwidth=2 sts=2
diff --git a/uvim/src/testdir/test_preview.vim b/uvim/src/testdir/test_preview.mnv
index e06139c3f3..9bd4c85a1e 100644
--- a/uvim/src/testdir/test_preview.vim
+++ b/uvim/src/testdir/test_preview.mnv
@@ -103,4 +103,4 @@ func Test_multiple_preview_windows()
   %bw!
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_profile.vim b/uvim/src/testdir/test_profile.mnv
index fe35e49c2a..26c5c9a71d 100644
--- a/uvim/src/testdir/test_profile.vim
+++ b/uvim/src/testdir/test_profile.mnv
@@ -1,8 +1,8 @@
-" Test Vim profiler
+" Test MNV profiler
 
 CheckFeature profile
 
-source util/screendump.vim
+source util/screendump.mnv
 
 if has('prof_nsec')
   let s:header = 'count     total (s)      self (s)'
@@ -52,10 +52,10 @@ func RunProfileFunc(command, declare, assign)
   call map(lines, {k, v -> substitute(v, 'DDD', a:declare, '') })
   call map(lines, {k, v -> substitute(v, 'AAA', a:assign, '') })
 
-  call writefile(lines, 'Xprofile_func.vim', 'D')
-  call system(GetVimCommand()
+  call writefile(lines, 'Xprofile_func.mnv', 'D')
+  call system(GetMNVCommand()
     \ . ' -es --clean'
-    \ . ' -c "so Xprofile_func.vim"'
+    \ . ' -c "so Xprofile_func.mnv"'
     \ . ' -c "qall!"')
   call assert_equal(0, v:shell_error)
 
@@ -72,7 +72,7 @@ func RunProfileFunc(command, declare, assign)
   call assert_equal(31, len(lines))
 
   call assert_equal('FUNCTION  Foo1()',                            lines[0])
-  call assert_match('Defined:.*Xprofile_func.vim:3',               lines[1])
+  call assert_match('Defined:.*Xprofile_func.mnv:3',               lines[1])
   call assert_equal('Called 2 times',                              lines[2])
   call assert_match('^Total time:\s\+\d\+\.\d\+$',                 lines[3])
   call assert_match('^ Self time:\s\+\d\+\.\d\+$',                 lines[4])
@@ -147,12 +147,12 @@ func Run_profile_func_with_ifelse(command, declare)
   call map(lines, {k, v -> substitute(v, 'XXX', a:command, '') })
   call map(lines, {k, v -> substitute(v, 'DDD', a:declare, '') })
 
-  call writefile(lines, 'Xprofile_func.vim', 'D')
-  call system(GetVimCommand()
+  call writefile(lines, 'Xprofile_func.mnv', 'D')
+  call system(GetMNVCommand()
     \ . ' -es -i NONE --noplugin'
     \ . ' -c "profile start Xprofile_func.log"'
     \ . ' -c "profile func Foo*"'
-    \ . ' -c "so Xprofile_func.vim"'
+    \ . ' -c "so Xprofile_func.mnv"'
     \ . ' -c "qall!"')
   call assert_equal(0, v:shell_error)
 
@@ -164,7 +164,7 @@ func Run_profile_func_with_ifelse(command, declare)
   call assert_equal(57, len(lines))
 
   call assert_equal('FUNCTION  Foo1()',                            lines[0])
-  call assert_match('Defined:.*Xprofile_func.vim',                 lines[1])
+  call assert_match('Defined:.*Xprofile_func.mnv',                 lines[1])
   call assert_equal('Called 1 time',                               lines[2])
   call assert_match('^Total time:\s\+\d\+\.\d\+$',                 lines[3])
   call assert_match('^ Self time:\s\+\d\+\.\d\+$',                 lines[4])
@@ -273,12 +273,12 @@ func Run_profile_func_with_trycatch(command, declare)
   call map(lines, {k, v -> substitute(v, 'XXX', a:command, '') })
   call map(lines, {k, v -> substitute(v, 'DDD', a:declare, '') })
 
-  call writefile(lines, 'Xprofile_func.vim', 'D')
-  call system(GetVimCommand()
+  call writefile(lines, 'Xprofile_func.mnv', 'D')
+  call system(GetMNVCommand()
     \ . ' -es -i NONE --noplugin'
     \ . ' -c "profile start Xprofile_func.log"'
     \ . ' -c "profile func Foo*"'
-    \ . ' -c "so Xprofile_func.vim"'
+    \ . ' -c "so Xprofile_func.mnv"'
     \ . ' -c "qall!"')
   call assert_equal(0, v:shell_error)
 
@@ -290,7 +290,7 @@ func Run_profile_func_with_trycatch(command, declare)
   call assert_equal(57, len(lines))
 
   call assert_equal('FUNCTION  Foo1()',                            lines[0])
-  call assert_match('Defined:.*Xprofile_func.vim',                 lines[1])
+  call assert_match('Defined:.*Xprofile_func.mnv',                 lines[1])
   call assert_equal('Called 1 time',                               lines[2])
   call assert_match('^Total time:\s\+\d\+\.\d\+$',                 lines[3])
   call assert_match('^ Self time:\s\+\d\+\.\d\+$',                 lines[4])
@@ -359,13 +359,13 @@ func Test_profile_file()
     call Foo()
   [CODE]
 
-  call writefile(lines, 'Xprofile_file.vim', 'D')
-  call system(GetVimCommandClean()
+  call writefile(lines, 'Xprofile_file.mnv', 'D')
+  call system(GetMNVCommandClean()
     \ . ' -es'
     \ . ' -c "profile start Xprofile_file.log"'
-    \ . ' -c "profile file Xprofile_file.vim"'
-    \ . ' -c "so Xprofile_file.vim"'
-    \ . ' -c "so Xprofile_file.vim"'
+    \ . ' -c "profile file Xprofile_file.mnv"'
+    \ . ' -c "so Xprofile_file.mnv"'
+    \ . ' -c "so Xprofile_file.mnv"'
     \ . ' -c "qall!"')
   call assert_equal(0, v:shell_error)
 
@@ -373,7 +373,7 @@ func Test_profile_file()
 
   call assert_equal(14, len(lines))
 
-  call assert_match('^SCRIPT .*Xprofile_file.vim$',                   lines[0])
+  call assert_match('^SCRIPT .*Xprofile_file.mnv$',                   lines[0])
   call assert_equal('Sourced 2 times',                                lines[1])
   call assert_match('^Total time:\s\+\d\+\.\d\+$',                    lines[2])
   call assert_match('^ Self time:\s\+\d\+\.\d\+$',                    lines[3])
@@ -403,19 +403,19 @@ func Test_profile_file_with_cont()
     \ '  \bar"',
     \ ]
 
-  call writefile(lines, 'Xprofile_file.vim', 'D')
-  call system(GetVimCommandClean()
+  call writefile(lines, 'Xprofile_file.mnv', 'D')
+  call system(GetMNVCommandClean()
     \ . ' -es'
     \ . ' -c "profile start Xprofile_file.log"'
-    \ . ' -c "profile file Xprofile_file.vim"'
-    \ . ' -c "so Xprofile_file.vim"'
+    \ . ' -c "profile file Xprofile_file.mnv"'
+    \ . ' -c "so Xprofile_file.mnv"'
     \ . ' -c "qall!"')
   call assert_equal(0, v:shell_error)
 
   let lines = readfile('Xprofile_file.log')
   call assert_equal(11, len(lines))
 
-  call assert_match('^SCRIPT .*Xprofile_file.vim$',           lines[0])
+  call assert_match('^SCRIPT .*Xprofile_file.mnv$',           lines[0])
   call assert_equal('Sourced 1 time',                         lines[1])
   call assert_match('^Total time:\s\+\d\+\.\d\+$',            lines[2])
   call assert_match('^ Self time:\s\+\d\+\.\d\+$',            lines[3])
@@ -451,7 +451,7 @@ func Test_profile_stop_dump()
   let lines = readfile('Xprof1.out')
   call assert_equal(17, len(lines))
   call assert_equal('FUNCTION  Xprof_test1()',                lines[0])
-  call assert_match('Defined:.*test_profile.vim:',            lines[1])
+  call assert_match('Defined:.*test_profile.mnv:',            lines[1])
   call assert_equal('Called 1 time',                          lines[2])
   call assert_match('^Total time:\s\+\d\+\.\d\+$',            lines[3])
   call assert_match('^ Self time:\s\+\d\+\.\d\+$',            lines[4])
@@ -476,7 +476,7 @@ func Test_profile_stop_dump()
   let lines = readfile('Xprof2.out')
   call assert_equal(17, len(lines))
   call assert_equal('FUNCTION  Xprof_test2()',                lines[0])
-  call assert_match('Defined:.*test_profile.vim:',            lines[1])
+  call assert_match('Defined:.*test_profile.mnv:',            lines[1])
   call assert_equal('Called 1 time',                          lines[2])
   call assert_match('^Total time:\s\+\d\+\.\d\+$',            lines[3])
   call assert_match('^ Self time:\s\+\d\+\.\d\+$',            lines[4])
@@ -529,12 +529,12 @@ func Test_profile_completion()
   call assert_equal('"profile continue dump file func pause start stop', @:)
 
   call feedkeys(":profile start test_prof\<C-A>\<C-B>\"\<CR>", 'tx')
-  call assert_match('^"profile start.* test_profile\.vim', @:)
+  call assert_match('^"profile start.* test_profile\.mnv', @:)
 
   call feedkeys(":profile file test_prof\<Tab>\<C-B>\"\<CR>", 'tx')
-  call assert_match('"profile file test_profile\.vim', @:)
+  call assert_match('"profile file test_profile\.mnv', @:)
   call feedkeys(":profile file  test_prof\<Tab>\<C-B>\"\<CR>", 'tx')
-  call assert_match('"profile file  test_profile\.vim', @:)
+  call assert_match('"profile file  test_profile\.mnv', @:)
   call feedkeys(":profile file test_prof \<Tab>\<C-B>\"\<CR>", 'tx')
   call assert_match('"profile file test_prof ', @:)
   call feedkeys(":profile file X1B2C3\<Tab>\<C-B>\"\<CR>", 'tx')
@@ -560,7 +560,7 @@ func Test_profile_completion()
   call feedkeys(":profdel here \<Tab>\<C-B>\"\<CR>", 'tx')
   call assert_equal('"profdel here ', @:)
   call feedkeys(":profdel file test_prof\<Tab>\<C-B>\"\<CR>", 'tx')
-  call assert_equal('"profdel file test_profile.vim', @:)
+  call assert_equal('"profdel file test_profile.mnv', @:)
   call feedkeys(":profdel file  X1B2C3\<Tab>\<C-B>\"\<CR>", 'tx')
   call assert_equal('"profdel file  X1B2C3', @:)
   call feedkeys(":profdel func Xprof\<Tab>\<C-B>\"\<CR>", 'tx')
@@ -597,12 +597,12 @@ func Test_profile_truncate_mbyte()
     \ 'call Foo()',
     \ ]
 
-  call writefile(lines, 'Xprofile_file.vim', 'D')
-  call system(GetVimCommandClean()
+  call writefile(lines, 'Xprofile_file.mnv', 'D')
+  call system(GetMNVCommandClean()
     \ . ' -es --cmd "set enc=utf-8"'
     \ . ' -c "profile start Xprofile_file.log"'
-    \ . ' -c "profile file Xprofile_file.vim"'
-    \ . ' -c "so Xprofile_file.vim"'
+    \ . ' -c "profile file Xprofile_file.mnv"'
+    \ . ' -c "so Xprofile_file.mnv"'
     \ . ' -c "qall!"')
   call assert_equal(0, v:shell_error)
 
@@ -643,8 +643,8 @@ func Test_profdel_func()
     call Foo2()
     call Foo3()
   [CODE]
-  call writefile(lines, 'Xprofile_file.vim', 'D')
-  call system(GetVimCommandClean() . ' -es -c "so Xprofile_file.vim" -c q')
+  call writefile(lines, 'Xprofile_file.mnv', 'D')
+  call system(GetMNVCommandClean() . ' -es -c "so Xprofile_file.mnv" -c q')
   call assert_equal(0, v:shell_error)
 
   let lines = readfile('Xprofile_file.log')
@@ -655,7 +655,7 @@ func Test_profdel_func()
   " - Foo2() is called once (profdel invoked after it was called)
   " - Foo3() is not called (profdel invoked before it was called)
   call assert_equal('FUNCTION  Foo1()',               lines[0])
-  call assert_match('Defined:.*Xprofile_file.vim',    lines[1])
+  call assert_match('Defined:.*Xprofile_file.mnv',    lines[1])
   call assert_equal('Called 2 times',                 lines[2])
   call assert_equal('FUNCTION  Foo2()',               lines[8])
   call assert_equal('Called 1 time',                  lines[10])
@@ -677,15 +677,15 @@ func Test_profdel_star()
     profdel *
     call Foo()
   [CODE]
-  call writefile(lines, 'Xprofile_file.vim', 'D')
-  call system(GetVimCommandClean() . ' -es -c "so Xprofile_file.vim" -c q')
+  call writefile(lines, 'Xprofile_file.mnv', 'D')
+  call system(GetMNVCommandClean() . ' -es -c "so Xprofile_file.mnv" -c q')
   call assert_equal(0, v:shell_error)
 
   let lines = readfile('Xprofile_file.log')
   call assert_equal(16, len(lines))
 
   call assert_equal('FUNCTION  Foo()',                lines[0])
-  call assert_match('Defined:.*Xprofile_file.vim',    lines[1])
+  call assert_match('Defined:.*Xprofile_file.mnv',    lines[1])
   call assert_equal('Called 1 time',                  lines[2])
   call assert_equal('FUNCTIONS SORTED ON TOTAL TIME', lines[8])
   call assert_equal('FUNCTIONS SORTED ON SELF TIME',  lines[12])
@@ -701,7 +701,7 @@ func Test_profile_typed_func()
       profile start XprofileTypedFunc
   END
   call writefile(lines, 'XtestProfile', 'D')
-  let buf = RunVimInTerminal('-S XtestProfile', #{})
+  let buf = RunMNVInTerminal('-S XtestProfile', #{})
 
   call term_sendkeys(buf, ":func DoSomething()\<CR>"
 	\ .. "echo 'hello'\<CR>"
@@ -709,7 +709,7 @@ func Test_profile_typed_func()
   call term_sendkeys(buf, ":profile func DoSomething\<CR>")
   call term_sendkeys(buf, ":call DoSomething()\<CR>")
   call TermWait(buf, 100)
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
   let lines = readfile('XprofileTypedFunc')
   call assert_equal("FUNCTION  DoSomething()", lines[0])
   call assert_equal("Called 1 time", lines[1])
@@ -718,10 +718,10 @@ func Test_profile_typed_func()
   call delete('XprofileTypedFunc')
 endfunc
 
-func Test_vim9_profiling()
+func Test_mnv9_profiling()
   " only tests that compiling and calling functions doesn't crash
   let lines =<< trim END
-      vim9script
+      mnv9script
       def Func()
         Crash()
       enddef
@@ -731,17 +731,17 @@ func Test_vim9_profiling()
       prof func Func
       Func()
   END
-  call writefile(lines, 'Xprofile_crash.vim', 'D')
-  call system(GetVimCommandClean() . ' -es -c "so Xprofile_crash.vim" -c q')
+  call writefile(lines, 'Xprofile_crash.mnv', 'D')
+  call system(GetMNVCommandClean() . ' -es -c "so Xprofile_crash.mnv" -c q')
   call assert_equal(0, v:shell_error)
   call assert_true(readfile('Xprofile_crash.log')->len() > 10)
 
   call delete('Xprofile_crash.log')
 endfunc
 
-func Test_vim9_nested_call()
+func Test_mnv9_nested_call()
   let lines =<< trim END
-    vim9script
+    mnv9script
     var total = 0
     def One(Ref: func(number))
       for i in range(3)
@@ -757,8 +757,8 @@ func Test_vim9_nested_call()
     One((nr) => Two(nr))
     assert_equal(3, total)
   END
-  call writefile(lines, 'Xprofile_nested.vim', 'D')
-  call system(GetVimCommandClean() . ' -es -c "so Xprofile_nested.vim" -c q')
+  call writefile(lines, 'Xprofile_nested.mnv', 'D')
+  call system(GetMNVCommandClean() . ' -es -c "so Xprofile_nested.mnv" -c q')
   call assert_equal(0, v:shell_error)
 
   let prof_lines = readfile('Xprofile_nested.log')->join('#')
@@ -775,4 +775,4 @@ func Test_vim9_nested_call()
 endfunc
 
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_prompt_buffer.vim b/uvim/src/testdir/test_prompt_buffer.mnv
index 357492b408..2536454676 100644
--- a/uvim/src/testdir/test_prompt_buffer.vim
+++ b/uvim/src/testdir/test_prompt_buffer.mnv
@@ -2,7 +2,7 @@
 
 CheckFeature channel
 
-source util/screendump.vim
+source util/screendump.mnv
 
 func CanTestPromptBuffer()
   " We need to use a terminal window to be able to feed keys without leaving
@@ -56,7 +56,7 @@ func Test_prompt_basic()
   let scriptName = 'XpromptscriptBasic'
   call WriteScript(scriptName)
 
-  let buf = RunVimInTerminal('-S ' . scriptName, {})
+  let buf = RunMNVInTerminal('-S ' . scriptName, {})
   call WaitForAssert({-> assert_equal('cmd:', term_getline(buf, 1))})
 
   call term_sendkeys(buf, "hello\<CR>")
@@ -67,7 +67,7 @@ func Test_prompt_basic()
   call term_sendkeys(buf, "exit\<CR>")
   call WaitForAssert({-> assert_equal('other buffer', term_getline(buf, 1))})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
   call delete(scriptName)
 endfunc
 
@@ -76,7 +76,7 @@ func Test_prompt_editing()
   let scriptName = 'XpromptscriptEditing'
   call WriteScript(scriptName)
 
-  let buf = RunVimInTerminal('-S ' . scriptName, {})
+  let buf = RunMNVInTerminal('-S ' . scriptName, {})
   call WaitForAssert({-> assert_equal('cmd:', term_getline(buf, 1))})
 
   let bs = "\<BS>"
@@ -97,7 +97,7 @@ func Test_prompt_editing()
   call term_sendkeys(buf, "\<C-U>exit\<CR>")
   call WaitForAssert({-> assert_equal('other buffer', term_getline(buf, 1))})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
   call delete(scriptName)
 endfunc
 
@@ -106,7 +106,7 @@ func Test_prompt_switch_windows()
   let scriptName = 'XpromptSwitchWindows'
   call WriteScript(scriptName)
 
-  let buf = RunVimInTerminal('-S ' . scriptName, {'rows': 12})
+  let buf = RunMNVInTerminal('-S ' . scriptName, {'rows': 12})
   call WaitForAssert({-> assert_equal('cmd:', term_getline(buf, 1))})
   call WaitForAssert({-> assert_match('-- INSERT --', term_getline(buf, 12))})
 
@@ -118,7 +118,7 @@ func Test_prompt_switch_windows()
   call term_wait(buf, 50)
   call WaitForAssert({-> assert_match('^ *$', term_getline(buf, 12))})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
   call delete(scriptName)
 endfunc
 
@@ -237,7 +237,7 @@ func Test_prompt_while_writing_to_hidden_buffer()
   END
   eval script->writefile(scriptName, 'D')
 
-  let buf = RunVimInTerminal('-S ' .. scriptName, {})
+  let buf = RunMNVInTerminal('-S ' .. scriptName, {})
   call WaitForAssert({-> assert_equal('cmd:', term_getline(buf, 1))})
 
   call term_sendkeys(buf, 'test')
@@ -247,7 +247,7 @@ func Test_prompt_while_writing_to_hidden_buffer()
   call term_sendkeys(buf, 'test')
   call WaitForAssert({-> assert_equal('cmd:testtesttest', term_getline(buf, 1))})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_prompt_appending_while_hidden()
@@ -281,7 +281,7 @@ func Test_prompt_appending_while_hidden()
   END
   call writefile(script, 'XpromptBuffer', 'D')
 
-  let buf = RunVimInTerminal('-S XpromptBuffer', {'rows': 10})
+  let buf = RunMNVInTerminal('-S XpromptBuffer', {'rows': 10})
   call TermWait(buf)
 
   call term_sendkeys(buf, "asomething\<CR>")
@@ -314,7 +314,7 @@ func Test_prompt_appending_while_hidden()
   call term_sendkeys(buf, "\<C-R>=DoAutoAll('stopinsert')\<CR>")
   call WaitForAssert({-> assert_notmatch('-- .* --', term_getline(buf, 10))})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 " Modifying a hidden buffer while leaving a prompt buffer should not prevent
@@ -338,7 +338,7 @@ func Test_prompt_leave_modify_hidden()
   END
   call writefile(script, 'XpromptLeaveModifyHidden', 'D')
 
-  let buf = RunVimInTerminal('-S XpromptLeaveModifyHidden', {'rows': 10})
+  let buf = RunMNVInTerminal('-S XpromptLeaveModifyHidden', {'rows': 10})
   call TermWait(buf)
 
   call term_sendkeys(buf, "a")
@@ -359,7 +359,7 @@ func Test_prompt_leave_modify_hidden()
   call WaitForAssert({-> assert_equal('Leave', term_getline(buf, 4))})
   call WaitForAssert({-> assert_equal('Close', term_getline(buf, 5))})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_put.vim b/uvim/src/testdir/test_put.mnv
index 514a24ea02..ddb782077a 100644
--- a/uvim/src/testdir/test_put.vim
+++ b/uvim/src/testdir/test_put.mnv
@@ -1,6 +1,6 @@
 " Tests for put commands, e.g. ":put", "p", "gp", "P", "gP", etc.
 
-source util/screendump.vim
+source util/screendump.mnv
 
 func Test_put_block()
   new
@@ -229,7 +229,9 @@ func Test_put_visual_mode()
   set selection=exclusive
   exe "norm o\t"
   m0
-  sil! norm 
p
p
+  sil! norm 
+p
+p
 
   bwipe!
   set selection&
@@ -246,9 +248,9 @@ func Test_put_visual_block_mode()
   set ve=
 endfunc
 
-func Test_put_other_window()
+func Test_MNV_other_window()
   CheckScreendump
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   let lines =<< trim END
       40vsplit
@@ -257,32 +259,32 @@ func Test_put_other_window()
       put ='  two more text'
       put ='  three more text'
       put ='  four more text'
-  END
+  ENDMNV
   call writefile(lines, 'Xtest_put_other', 'D')
-  let buf = RunVimInTerminal('-S Xtest_put_other', #{rows: 10})
+  let buf = RunMNVInTerminal('-S Xtest_put_other', #{rows: 10})
 
-  call VerifyScreenDump(buf, 'Test_put_other_window_1', {})
+  call VeriMNVcreenDump(buf, 'Test_put_other_window_1', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
-func Test_put_in_last_displayed_line()
+func Test_MNV_in_last_displayed_line()
   CheckScreendump
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   let lines =<< trim END
-      vim9script
+      mnv9script
       autocmd CursorMoved * eval line('w$')
       @a = 'x'->repeat(&columns * 2 - 2)
       range(&lines)->setline(1)
       feedkeys('G"ap')
-  END
+  ENDMNV
   call writefile(lines, 'Xtest_put_last_line', 'D')
-  let buf = RunVimInTerminal('-S Xtest_put_last_line', #{rows: 10})
+  let buf = RunMNVInTerminal('-S Xtest_put_last_line', #{rows: 10})
 
-  call VerifyScreenDump(buf, 'Test_put_in_last_displayed_line_1', {})
+  call VeriMNVcreenDump(buf, 'Test_put_in_last_displayed_line_1', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_put_visual_replace_whole_fold()
@@ -442,4 +444,4 @@ func Test_put_tuple()
   bw!
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_python2.vim b/uvim/src/testdir/test_python2.mnv
index 30c3b33a91..3b1e0f853a 100644
--- a/uvim/src/testdir/test_python2.vim
+++ b/uvim/src/testdir/test_python2.mnv
@@ -13,7 +13,7 @@ CheckFeature quickfix
 " the other tests.
 func Test_AAA_python_setup()
   py << trim EOF
-    import vim
+    import mnv
     import sys
 
     def emsg(ei):
@@ -46,10 +46,10 @@ func Test_AAA_python_setup()
         if expr == 'fd(self=[])':
           # HACK: PyMapping_Check changed meaning
           msg = msg.replace('AttributeError:(\'keys\',)',
-                  'TypeError:(\'unable to convert list to vim dictionary\',)')
-        vim.current.buffer.append(expr + ':' + msg)
+                  'TypeError:(\'unable to convert list to mnv dictionary\',)')
+        mnv.current.buffer.append(expr + ':' + msg)
       else:
-        vim.current.buffer.append(expr + ':NOT FAILED')
+        mnv.current.buffer.append(expr + ':NOT FAILED')
   EOF
 endfunc
 
@@ -58,19 +58,19 @@ func Test_pydo()
 
   " Check deleting lines does not trigger an ml_get error.
   call setline(1, ['one', 'two', 'three'])
-  pydo vim.command("%d_")
+  pydo mnv.command("%d_")
   call assert_equal([''], getline(1, '$'))
 
   call setline(1, ['one', 'two', 'three'])
-  pydo vim.command("1,2d_")
+  pydo mnv.command("1,2d_")
   call assert_equal(['three'], getline(1, '$'))
 
   call setline(1, ['one', 'two', 'three'])
-  pydo vim.command("2,3d_"); return "REPLACED"
+  pydo mnv.command("2,3d_"); return "REPLACED"
   call assert_equal(['REPLACED'], getline(1, '$'))
 
   call setline(1, ['one', 'two', 'three'])
-  2,3pydo vim.command("1,2d_"); return "REPLACED"
+  2,3pydo mnv.command("1,2d_"); return "REPLACED"
   call assert_equal(['three'], getline(1, '$'))
 
   bwipe!
@@ -79,7 +79,7 @@ func Test_pydo()
   new
   let wincount = winnr('$')
   call setline(1, ['one', 'two', 'three'])
-  pydo vim.command("new")
+  pydo mnv.command("new")
   call assert_equal(wincount + 1, winnr('$'))
   bwipe!
   bwipe!
@@ -91,11 +91,11 @@ func Test_pydo()
 
   " Invalid command
   call AssertException(['pydo non_existing_cmd'],
-        \ "Vim(pydo):NameError: global name 'non_existing_cmd' is not defined")
+        \ "MNV(pydo):NameError: global name 'non_existing_cmd' is not defined")
   call AssertException(["pydo raise Exception('test')"],
-        \ 'Vim(pydo):Exception: test')
+        \ 'MNV(pydo):Exception: test')
   call AssertException(["pydo {lambda}"],
-        \ 'Vim(pydo):SyntaxError: invalid syntax')
+        \ 'MNV(pydo):SyntaxError: invalid syntax')
 endfunc
 
 func Test_set_cursor()
@@ -103,7 +103,7 @@ func Test_set_cursor()
   new
   call setline(1, ['first line', 'second line'])
   normal gg
-  pydo vim.current.window.cursor = (1, 5)
+  pydo mnv.current.window.cursor = (1, 5)
   call assert_equal([1, 6], [line('.'), col('.')])
 
   " Check that movement after setting cursor position keeps current column.
@@ -111,8 +111,8 @@ func Test_set_cursor()
   call assert_equal([2, 6], [line('.'), col('.')])
 endfunc
 
-func Test_vim_function()
-  " Check creating vim.Function object
+func Test_mnv_function()
+  " Check creating mnv.Function object
 
   func s:foo()
     return matchstr(expand('<sfile>'), '<SNR>\zs\d\+_foo$')
@@ -120,14 +120,14 @@ func Test_vim_function()
   let name = '<SNR>' . s:foo()
 
   try
-    py f = vim.bindeval('function("s:foo")')
+    py f = mnv.bindeval('function("s:foo")')
     call assert_equal(name, pyeval('f.name'))
   catch
     call assert_false(v:exception)
   endtry
 
   try
-    py f = vim.Function('\x80\xfdR' + vim.eval('s:foo()'))
+    py f = mnv.Function('\x80\xfdR' + mnv.eval('s:foo()'))
     call assert_equal(name, 'f.name'->pyeval())
   catch
     call assert_false(v:exception)
@@ -135,7 +135,7 @@ func Test_vim_function()
 
   " Non-existing function attribute
   call AssertException(["let x = pyeval('f.abc')"],
-        \ 'Vim(let):AttributeError: abc')
+        \ 'MNV(let):AttributeError: abc')
 
   py del f
   delfunc s:foo
@@ -144,9 +144,9 @@ endfunc
 func Test_skipped_python_command_does_not_affect_pyxversion()
   set pyxversion=0
   if 0
-    python import vim
+    python import mnv
   endif
-  call assert_equal(0, &pyxversion)  " This assertion would have failed with Vim 8.0.0251. (pyxversion was introduced in 8.0.0251.)
+  call assert_equal(0, &pyxversion)  " This assertion would have failed with MNV 8.0.0251. (pyxversion was introduced in 8.0.0251.)
 endfunc
 
 func _SetUpHiddenBuffer()
@@ -172,28 +172,28 @@ endfunc
 
 func Test_Write_To_HiddenBuffer_Does_Not_Fix_Cursor_Clear()
   call _SetUpHiddenBuffer()
-  py vim.buffers[ int( vim.eval( 'bufnr("hidden")' ) ) ][:] = None
+  py mnv.buffers[ int( mnv.eval( 'bufnr("hidden")' ) ) ][:] = None
   call assert_equal( line( '.' ), 11 )
   call _CleanUpHiddenBuffer()
 endfunc
 
 func Test_Write_To_HiddenBuffer_Does_Not_Fix_Cursor_List()
   call _SetUpHiddenBuffer()
-  py vim.buffers[ int( vim.eval( 'bufnr("hidden")' ) ) ][:] = [ 'test' ]
+  py mnv.buffers[ int( mnv.eval( 'bufnr("hidden")' ) ) ][:] = [ 'test' ]
   call assert_equal( line( '.' ), 11 )
   call _CleanUpHiddenBuffer()
 endfunc
 
 func Test_Write_To_HiddenBuffer_Does_Not_Fix_Cursor_Str()
   call _SetUpHiddenBuffer()
-  py vim.buffers[ int( vim.eval( 'bufnr("hidden")' ) ) ][0] = 'test'
+  py mnv.buffers[ int( mnv.eval( 'bufnr("hidden")' ) ) ][0] = 'test'
   call assert_equal( line( '.' ), 11 )
   call _CleanUpHiddenBuffer()
 endfunc
 
 func Test_Write_To_HiddenBuffer_Does_Not_Fix_Cursor_ClearLine()
   call _SetUpHiddenBuffer()
-  py vim.buffers[ int( vim.eval( 'bufnr("hidden")' ) ) ][0] = None
+  py mnv.buffers[ int( mnv.eval( 'bufnr("hidden")' ) ) ][0] = None
   call assert_equal( line( '.' ), 11 )
   call _CleanUpHiddenBuffer()
 endfunc
@@ -212,7 +212,7 @@ endfunc
 func Test_Write_To_Current_Buffer_Fixes_Cursor_Clear()
   call _SetUpVisibleBuffer()
 
-  py vim.current.buffer[:] = None
+  py mnv.current.buffer[:] = None
   call assert_equal( line( '.' ), 1 )
 
   bwipe!
@@ -221,7 +221,7 @@ endfunc
 func Test_Write_To_Current_Buffer_Fixes_Cursor_List()
   call _SetUpVisibleBuffer()
 
-  py vim.current.buffer[:] = [ 'test' ]
+  py mnv.current.buffer[:] = [ 'test' ]
   call assert_equal( line( '.' ), 1 )
 
   bwipe!
@@ -230,7 +230,7 @@ endfunc
 func Test_Write_To_Current_Buffer_Fixes_Cursor_Str()
   call _SetUpVisibleBuffer()
 
-  py vim.current.buffer[-1] = None
+  py mnv.current.buffer[-1] = None
   call assert_equal( line( '.' ), 10 )
 
   bwipe!
@@ -240,7 +240,7 @@ func Test_Catch_Exception_Message()
   try
     py raise RuntimeError( 'TEST' )
   catch /.*/
-    call assert_match( '^Vim(.*):RuntimeError: TEST$', v:exception )
+    call assert_match( '^MNV(.*):RuntimeError: TEST$', v:exception )
   endtry
 endfunc
 
@@ -271,7 +271,7 @@ endfunc
 func Test_python_range()
   new
   call setline(1, ['one', 'two', 'three'])
-  py b = vim.current.buffer
+  py b = mnv.current.buffer
   py r = b.range(1, 3)
   call assert_equal(0, pyeval('r.start'))
   call assert_equal(2, pyeval('r.end'))
@@ -300,7 +300,7 @@ func Test_python_range()
 
   " Non-existing range attribute
   call AssertException(["let x = pyeval('r.abc')"],
-        \ 'Vim(let):AttributeError: abc')
+        \ 'MNV(let):AttributeError: abc')
 
   close!
 endfunc
@@ -308,18 +308,18 @@ endfunc
 " Test for the python tabpage object
 func Test_python_tabpage()
   tabnew
-  py t = vim.tabpages[1]
+  py t = mnv.tabpages[1]
   py wl = t.windows
   tabclose
   " Accessing a closed tabpage
   call AssertException(["let n = pyeval('t.number')"],
-        \ 'Vim(let):vim.error: attempt to refer to deleted tab page')
+        \ 'MNV(let):mnv.error: attempt to refer to deleted tab page')
   call AssertException(["let n = pyeval('len(wl)')"],
-        \ 'Vim(let):vim.error: attempt to refer to deleted tab page')
+        \ 'MNV(let):mnv.error: attempt to refer to deleted tab page')
   call AssertException(["py w = wl[0]"],
-        \ 'Vim(python):vim.error: attempt to refer to deleted tab page')
-  call AssertException(["py vim.current.tabpage = t"],
-        \ 'Vim(python):vim.error: attempt to refer to deleted tab page')
+        \ 'MNV(python):mnv.error: attempt to refer to deleted tab page')
+  call AssertException(["py mnv.current.tabpage = t"],
+        \ 'MNV(python):mnv.error: attempt to refer to deleted tab page')
   call assert_match('<tabpage object (deleted)', pyeval('repr(t)'))
   %bw!
 endfunc
@@ -328,31 +328,31 @@ endfunc
 func Test_python_window()
   " Test for setting the window height
   10new
-  py vim.current.window.height = 5
+  py mnv.current.window.height = 5
   call assert_equal(5, winheight(0))
-  py vim.current.window.height = 3.2
+  py mnv.current.window.height = 3.2
   call assert_equal(3, winheight(0))
 
   " Test for setting the window width
   10vnew
-  py vim.current.window.width = 6
+  py mnv.current.window.width = 6
   call assert_equal(6, winwidth(0))
 
   " Try accessing a closed window
-  py w = vim.current.window
+  py w = mnv.current.window
   py wopts = w.options
   close
   " Access the attributes of a closed window
   call AssertException(["let n = pyeval('w.number')"],
-        \ 'Vim(let):vim.error: attempt to refer to deleted window')
+        \ 'MNV(let):mnv.error: attempt to refer to deleted window')
   call AssertException(["py w.height = 5"],
-        \ 'Vim(python):vim.error: attempt to refer to deleted window')
-  call AssertException(["py vim.current.window = w"],
-        \ 'Vim(python):vim.error: attempt to refer to deleted window')
+        \ 'MNV(python):mnv.error: attempt to refer to deleted window')
+  call AssertException(["py mnv.current.window = w"],
+        \ 'MNV(python):mnv.error: attempt to refer to deleted window')
   " Try to set one of the options of the closed window
   " The following caused an ASAN failure
   call AssertException(["py wopts['list'] = False"],
-        \ 'vim.error: attempt to refer to deleted window')
+        \ 'mnv.error: attempt to refer to deleted window')
   call assert_match('<window object (deleted)', pyeval("repr(w)"))
   %bw!
 endfunc
@@ -360,27 +360,27 @@ endfunc
 " Test for the python List object
 func Test_python_list()
   let l = [1, 2]
-  py pl = vim.bindeval('l')
+  py pl = mnv.bindeval('l')
   call assert_equal(['locked', '__members__'], pyeval('pl.__members__'))
 
   " Try to convert a null List
-  call AssertException(["py t = vim.eval('test_null_list()')"],
-        \ 'Vim(python):SystemError: error return without exception set')
+  call AssertException(["py t = mnv.eval('test_null_list()')"],
+        \ 'MNV(python):SystemError: error return without exception set')
 
   " Try to convert a List with a null List item
-  call AssertException(["py t = vim.eval('[test_null_list()]')"],
-        \ 'Vim(python):SystemError: error return without exception set')
+  call AssertException(["py t = mnv.eval('[test_null_list()]')"],
+        \ 'MNV(python):SystemError: error return without exception set')
 
   " Try to bind a null List variable (works because an empty list is used)
   let cmds =<< trim END
     let l = test_null_list()
-    py ll = vim.bindeval('l')
+    py ll = mnv.bindeval('l')
   END
   call AssertException(cmds, '')
 
   let l = []
-  py l = vim.bindeval('l')
-  py f = vim.bindeval('function("strlen")')
+  py l = mnv.bindeval('l')
+  py f = mnv.bindeval('function("strlen")')
   " Extending List directly with different types
   py l.extend([1, "as'd", [1, 2, f, {'a': 1}]])
   call assert_equal([1, "as'd", [1, 2, function("strlen"), {'a': 1}]], l)
@@ -395,142 +395,142 @@ func Test_python_list()
 
   " appending to a list
   let l = [1, 2]
-  py ll = vim.bindeval('l')
+  py ll = mnv.bindeval('l')
   py ll[2] = 8
   call assert_equal([1, 2, 8], l)
 
   " Using dict as an index
   call AssertException(['py ll[{}] = 10'],
-        \ 'Vim(python):TypeError: index must be int or slice, not dict')
+        \ 'MNV(python):TypeError: index must be int or slice, not dict')
 endfunc
 
 " Test for the python Tuple object
 func Test_python_tuple()
   " Try to convert a null tuple
-  call AssertException(["py l = vim.eval('test_null_tuple()')"],
-        \ 'Vim(python):SystemError: error return without exception set')
+  call AssertException(["py l = mnv.eval('test_null_tuple()')"],
+        \ 'MNV(python):SystemError: error return without exception set')
 
   " Try to convert a Tuple with a null Tuple item
-  call AssertException(["py t = vim.eval('(test_null_tuple(),)')"],
-        \ 'Vim(python):SystemError: error return without exception set')
+  call AssertException(["py t = mnv.eval('(test_null_tuple(),)')"],
+        \ 'MNV(python):SystemError: error return without exception set')
 
   " Try to convert a List with a null Tuple item
-  call AssertException(["py t = vim.eval('[test_null_tuple()]')"],
-        \ 'Vim(python):SystemError: error return without exception set')
+  call AssertException(["py t = mnv.eval('[test_null_tuple()]')"],
+        \ 'MNV(python):SystemError: error return without exception set')
 
   " Try to convert a Tuple with a null List item
-  call AssertException(["py t = vim.eval('(test_null_list(),)')"],
-        \ 'Vim(python):SystemError: error return without exception set')
+  call AssertException(["py t = mnv.eval('(test_null_list(),)')"],
+        \ 'MNV(python):SystemError: error return without exception set')
 
   " Try to bind a null Tuple variable (works because an empty tuple is used)
   let cmds =<< trim END
     let t = test_null_tuple()
-    py tt = vim.bindeval('t')
+    py tt = mnv.bindeval('t')
   END
   call AssertException(cmds, '')
 
   " Creating a tuple using different iterators
-  py t1 = vim.Tuple(['abc', 20, 1.2, (4, 5)])
+  py t1 = mnv.Tuple(['abc', 20, 1.2, (4, 5)])
   call assert_equal(('abc', 20, 1.2, (4, 5)), pyeval('t1'))
-  py t2 = vim.Tuple('abc')
+  py t2 = mnv.Tuple('abc')
   call assert_equal(('a', 'b', 'c'), pyeval('t2'))
-  py t3 = vim.Tuple({'color': 'red', 'model': 'ford'})
+  py t3 = mnv.Tuple({'color': 'red', 'model': 'ford'})
   call assert_equal(('color', 'model'), pyeval('t3'))
-  py t4 = vim.Tuple()
+  py t4 = mnv.Tuple()
   call assert_equal((), pyeval('t4'))
-  py t5 = vim.Tuple(x**2 for x in range(5))
+  py t5 = mnv.Tuple(x**2 for x in range(5))
   call assert_equal((0, 1, 4, 9, 16), pyeval('t5'))
-  py t6 = vim.Tuple(('abc', 20, 1.2, (4, 5)))
+  py t6 = mnv.Tuple(('abc', 20, 1.2, (4, 5)))
   call assert_equal(('abc', 20, 1.2, (4, 5)), pyeval('t6'))
 
-  " Convert between Vim tuple/list and python tuple/list
-  py t = vim.Tuple(vim.bindeval("('a', ('b',), ['c'], {'s': 'd'})"))
+  " Convert between MNV tuple/list and python tuple/list
+  py t = mnv.Tuple(mnv.bindeval("('a', ('b',), ['c'], {'s': 'd'})"))
   call assert_equal(('a', ('b',), ['c'], {'s': 'd'}), pyeval('t'))
   call assert_equal(['a', ('b',), ['c'], {'s': 'd'}], pyeval('list(t)'))
   call assert_equal(('a', ('b',), ['c'], {'s': 'd'}), pyeval('tuple(t)'))
 
-  py l = vim.List(vim.bindeval("['e', ('f',), ['g'], {'s': 'h'}]"))
+  py l = mnv.List(mnv.bindeval("['e', ('f',), ['g'], {'s': 'h'}]"))
   call assert_equal(('e', ('f',), ['g'], {'s': 'h'}), pyeval('tuple(l)'))
 
   " Tuple assignment
-  py tt = vim.bindeval('("a", "b")')
+  py tt = mnv.bindeval('("a", "b")')
   call AssertException(['py tt[0] = 10'],
-        \ "Vim(python):TypeError: 'vim.tuple' object does not support item assignment")
-  py tt = vim.bindeval('("a", "b")')
+        \ "MNV(python):TypeError: 'mnv.tuple' object does not support item assignment")
+  py tt = mnv.bindeval('("a", "b")')
   call AssertException(['py tt[0:1] = (10, 20)'],
-        \ "Vim(python):TypeError: 'vim.tuple' object does not support item assignment")
+        \ "MNV(python):TypeError: 'mnv.tuple' object does not support item assignment")
 
   " iterating over tuple from Python
-  py print([x for x in vim.bindeval("('a', 'b')")])
+  py print([x for x in mnv.bindeval("('a', 'b')")])
 
   " modifying a list item within a tuple
   let t = ('a', ['b', 'c'], 'd')
-  py vim.bindeval('t')[1][1] = 'x'
+  py mnv.bindeval('t')[1][1] = 'x'
   call assert_equal(('a', ['b', 'x'], 'd'), t)
 
   " length of a tuple
   let t = ()
-  py p_t = vim.bindeval('t')
+  py p_t = mnv.bindeval('t')
   call assert_equal(0, pyeval('len(p_t)'))
   let t = ('a', )
-  py p_t = vim.bindeval('t')
+  py p_t = mnv.bindeval('t')
   call assert_equal(1, pyeval('len(p_t)'))
   let t = ('a', 'b', 'c')
-  py p_t = vim.bindeval('t')
+  py p_t = mnv.bindeval('t')
   call assert_equal(3, pyeval('len(p_t)'))
 
   " membership test
   let t = ('a', 'b', 'c')
-  py p_t = vim.bindeval('t')
+  py p_t = mnv.bindeval('t')
   call assert_true(pyeval("b'c' in p_t"))
   call assert_true(pyeval("b'd' not in p_t"))
 
-  py x = vim.eval('("a", (2), [3], {})')
+  py x = mnv.eval('("a", (2), [3], {})')
   call assert_equal(('a', '2', ['3'], {}), pyeval('x'))
 
   " Using a keyword argument for a tuple
-  call AssertException(['py x = vim.Tuple(a=1)'],
-        \ 'Vim(python):TypeError: tuple constructor does not accept keyword arguments')
+  call AssertException(['py x = mnv.Tuple(a=1)'],
+        \ 'MNV(python):TypeError: tuple constructor does not accept keyword arguments')
 
   " Using dict as an index
   call AssertException(['py x = tt[{}]'],
-        \ 'Vim(python):TypeError: index must be int or slice, not dict')
+        \ 'MNV(python):TypeError: index must be int or slice, not dict')
   call AssertException(['py x = tt["abc"]'],
-        \ 'Vim(python):TypeError: index must be int or slice, not str')
+        \ 'MNV(python):TypeError: index must be int or slice, not str')
 
   call AssertException(['py del tt.locked'],
-        \ 'Vim(python):AttributeError: cannot delete vim.Tuple attributes')
+        \ 'MNV(python):AttributeError: cannot delete mnv.Tuple attributes')
 
   call AssertException(['py tt.foobar = 1'],
-        \ 'Vim(python):AttributeError: cannot set attribute foobar')
+        \ 'MNV(python):AttributeError: cannot set attribute foobar')
 endfunc
 
 " Test for the python Dict object
 func Test_python_dict()
   let d = {}
-  py pd = vim.bindeval('d')
+  py pd = mnv.bindeval('d')
   call assert_equal(['locked', 'scope', '__members__'],
         \ pyeval('pd.__members__'))
 
   " Try to convert a null Dict
-  call AssertException(["py t = vim.eval('test_null_dict()')"],
-        \ 'Vim(python):SystemError: error return without exception set')
+  call AssertException(["py t = mnv.eval('test_null_dict()')"],
+        \ 'MNV(python):SystemError: error return without exception set')
 
   " Try to convert a Dict with a null List value
-  call AssertException(["py t = vim.eval(\"{'a' : test_null_list()}\")"],
-        \ 'Vim(python):SystemError: error return without exception set')
+  call AssertException(["py t = mnv.eval(\"{'a' : test_null_list()}\")"],
+        \ 'MNV(python):SystemError: error return without exception set')
 
   " Try to convert a Dict with a null string key
-  py t = vim.eval("{test_null_string() : 10}")
+  py t = mnv.eval("{test_null_string() : 10}")
   call assert_fails("let d = pyeval('t')", 'E859:')
 
   " Dict length
   let d = {'a' : 10, 'b' : 20}
-  py d = vim.bindeval('d')
+  py d = mnv.bindeval('d')
   call assert_equal(2, pyeval('len(d)'))
 
   " Deleting a non-existing key
-  call AssertException(["py del d['c']"], "Vim(python):KeyError: 'c'")
+  call AssertException(["py del d['c']"], "MNV(python):KeyError: 'c'")
 endfunc
 
 " Extending Dictionary directly with different types
@@ -540,9 +540,9 @@ func Test_python_dict_extend()
     return 1
   endfunc
 
-  py f = vim.bindeval('function("strlen")')
+  py f = mnv.bindeval('function("strlen")')
   py << trim EOF
-    d = vim.bindeval('d')
+    d = mnv.bindeval('d')
     d['1'] = 'asd'
     d.update()  # Must not do anything, including throwing errors
     d.update(b = [1, 2, f])
@@ -560,13 +560,13 @@ func Test_python_dict_extend()
   " Try extending a locked dictionary
   lockvar d
   call AssertException(["py d.update({'b' : 20})"],
-        \ 'Vim(python):vim.error: dictionary is locked')
+        \ 'MNV(python):mnv.error: dictionary is locked')
   unlockvar d
 
   call assert_equal(1, pyeval("d['f'](self={})"))
   call assert_equal("['-1', '0', '1', 'b', 'f']", pyeval('repr(dk)'))
-  call assert_equal("['asd', -1L, <vim.Function '1'>, <vim.dictionary object at >, <vim.list object at >]", substitute(pyeval('repr(dv)'),'0x\x\+','','g'))
-  call assert_equal("[('-1', <vim.dictionary object at >), ('0', -1L), ('1', 'asd'), ('b', <vim.list object at >), ('f', <vim.Function '1'>)]", substitute(pyeval('repr(di)'),'0x\x\+','','g'))
+  call assert_equal("['asd', -1L, <mnv.Function '1'>, <mnv.dictionary object at >, <mnv.list object at >]", substitute(pyeval('repr(dv)'),'0x\x\+','','g'))
+  call assert_equal("[('-1', <mnv.dictionary object at >), ('0', -1L), ('1', 'asd'), ('b', <mnv.list object at >), ('f', <mnv.Function '1'>)]", substitute(pyeval('repr(di)'),'0x\x\+','','g'))
   call assert_equal(['0', '1', 'b', 'f', '-1'], keys(d))
   call assert_equal("[-1, 'asd', [1, 2, function('strlen')], function('1'), {'a': 1}]", string(values(d)))
   py del dk
@@ -577,12 +577,12 @@ endfunc
 func Test_python_list_del_items()
   " removing items with del
   let l = [0, function("strlen"), [1, 2, function("strlen"), {'a': 1}]]
-  py l = vim.bindeval('l')
+  py l = mnv.bindeval('l')
   py del l[2]
   call assert_equal("[0, function('strlen')]", string(l))
 
   let l = range(8)
-  py l = vim.bindeval('l')
+  py l = mnv.bindeval('l')
   py del l[:3]
   py del l[1:]
   call assert_equal([3], l)
@@ -591,7 +591,7 @@ func Test_python_list_del_items()
 
   " The following two ranges delete nothing as they match empty list:
   let l = [0, 1, 2, 3]
-  py l = vim.bindeval('l')
+  py l = mnv.bindeval('l')
   py del l[2:1]
   call assert_equal([0, 1, 2, 3], l)
   py del l[2:2]
@@ -600,23 +600,23 @@ func Test_python_list_del_items()
   call assert_equal([0, 1, 3], l)
 
   let l = [0, 1, 2, 3]
-  py l = vim.bindeval('l')
+  py l = mnv.bindeval('l')
   py del l[2:4]
   call assert_equal([0, 1], l)
 
   let l = [0, 1, 2, 3]
-  py l = vim.bindeval('l')
+  py l = mnv.bindeval('l')
   py del l[2:5]
   call assert_equal([0, 1], l)
 
   let l = [0, 1, 2, 3]
-  py l = vim.bindeval('l')
+  py l = mnv.bindeval('l')
   py del l[2:6]
   call assert_equal([0, 1], l)
 
   " The following two ranges delete nothing as they match empty list:
   let l = [0, 1, 2, 3]
-  py l = vim.bindeval('l')
+  py l = mnv.bindeval('l')
   py del l[-1:2]
   call assert_equal([0, 1, 2, 3], l)
   py del l[-2:2]
@@ -625,39 +625,39 @@ func Test_python_list_del_items()
   call assert_equal([0, 2, 3], l)
 
   let l = [0, 1, 2, 3]
-  py l = vim.bindeval('l')
+  py l = mnv.bindeval('l')
   py del l[-4:2]
   call assert_equal([2, 3], l)
 
   let l = [0, 1, 2, 3]
-  py l = vim.bindeval('l')
+  py l = mnv.bindeval('l')
   py del l[-5:2]
   call assert_equal([2, 3], l)
 
   let l = [0, 1, 2, 3]
-  py l = vim.bindeval('l')
+  py l = mnv.bindeval('l')
   py del l[-6:2]
   call assert_equal([2, 3], l)
 
   let l = [0, 1, 2, 3]
-  py l = vim.bindeval('l')
+  py l = mnv.bindeval('l')
   py del l[::2]
   call assert_equal([1, 3], l)
 
   let l = [0, 1, 2, 3]
-  py l = vim.bindeval('l')
+  py l = mnv.bindeval('l')
   py del l[3:0:-2]
   call assert_equal([0, 2], l)
 
   let l = [0, 1, 2, 3]
-  py l = vim.bindeval('l')
+  py l = mnv.bindeval('l')
   py del l[2:4:-2]
   let l = [0, 1, 2, 3]
 endfunc
 
 func Test_python_dict_del_items()
   let d = eval("{'0' : -1, '1' : 'asd', 'b' : [1, 2, function('strlen')], 'f' : function('min'), '-1' : {'a': 1}}")
-  py d = vim.bindeval('d')
+  py d = mnv.bindeval('d')
   py del d['-1']
   py del d['f']
   call assert_equal([1, 2, function('strlen')], pyeval('d.get(''b'', 1)'))
@@ -679,93 +679,93 @@ endfunc
 " Slice assignment to a list
 func Test_python_slice_assignment()
   let l = [0, 1, 2, 3]
-  py l = vim.bindeval('l')
+  py l = mnv.bindeval('l')
   py l[0:0] = ['a']
   call assert_equal(['a', 0, 1, 2, 3], l)
 
   let l = [0, 1, 2, 3]
-  py l = vim.bindeval('l')
+  py l = mnv.bindeval('l')
   py l[1:2] = ['b']
   call assert_equal([0, 'b', 2, 3], l)
 
   let l = [0, 1, 2, 3]
-  py l = vim.bindeval('l')
+  py l = mnv.bindeval('l')
   py l[2:4] = ['c']
   call assert_equal([0, 1, 'c'], l)
 
   let l = [0, 1, 2, 3]
-  py l = vim.bindeval('l')
+  py l = mnv.bindeval('l')
   py l[4:4] = ['d']
   call assert_equal([0, 1, 2, 3, 'd'], l)
 
   let l = [0, 1, 2, 3]
-  py l = vim.bindeval('l')
+  py l = mnv.bindeval('l')
   py l[-1:2] = ['e']
   call assert_equal([0, 1, 2, 'e', 3], l)
 
   let l = [0, 1, 2, 3]
-  py l = vim.bindeval('l')
+  py l = mnv.bindeval('l')
   py l[-10:2] = ['f']
   call assert_equal(['f', 2, 3], l)
 
   let l = [0, 1, 2, 3]
-  py l = vim.bindeval('l')
+  py l = mnv.bindeval('l')
   py l[2:-10] = ['g']
   call assert_equal([0, 1, 'g', 2, 3], l)
 
   let l = []
-  py l = vim.bindeval('l')
+  py l = mnv.bindeval('l')
   py l[0:0] = ['h']
   call assert_equal(['h'], l)
 
   let l = range(8)
-  py l = vim.bindeval('l')
+  py l = mnv.bindeval('l')
   py l[2:6:2] = [10, 20]
   call assert_equal([0, 1, 10, 3, 20, 5, 6, 7], l)
 
   let l = range(8)
-  py l = vim.bindeval('l')
+  py l = mnv.bindeval('l')
   py l[6:2:-2] = [10, 20]
   call assert_equal([0, 1, 2, 3, 20, 5, 10, 7], l)
 
   let l = range(8)
-  py l = vim.bindeval('l')
+  py l = mnv.bindeval('l')
   py l[6:2] = ()
   call assert_equal([0, 1, 2, 3, 4, 5, 6, 7], l)
 
   let l = range(8)
-  py l = vim.bindeval('l')
+  py l = mnv.bindeval('l')
   py l[6:2:1] = ()
   call assert_equal([0, 1, 2, 3, 4, 5, 6, 7], l)
 
   let l = range(8)
-  py l = vim.bindeval('l')
+  py l = mnv.bindeval('l')
   py l[2:2:1] = ()
   call assert_equal([0, 1, 2, 3, 4, 5, 6, 7], l)
 
   call AssertException(["py x = l[10:11:0]"],
-        \ "Vim(python):ValueError: slice step cannot be zero")
+        \ "MNV(python):ValueError: slice step cannot be zero")
 endfunc
 
 " Locked variables
 func Test_python_lockedvar()
   new
-  py cb = vim.current.buffer
+  py cb = mnv.current.buffer
   let l = [0, 1, 2, 3]
-  py l = vim.bindeval('l')
+  py l = mnv.bindeval('l')
   lockvar! l
   py << trim EOF
     try:
         l[2]='i'
-    except vim.error:
-        cb.append('l[2] threw vim.error: ' + emsg(sys.exc_info()))
+    except mnv.error:
+        cb.append('l[2] threw mnv.error: ' + emsg(sys.exc_info()))
   EOF
-  call assert_equal(['', "l[2] threw vim.error: error:('list is locked',)"],
+  call assert_equal(['', "l[2] threw mnv.error: error:('list is locked',)"],
         \ getline(1, '$'))
 
   " Try to concatenate a locked list
   call AssertException(['py l += [4, 5]'],
-        \ 'Vim(python):vim.error: list is locked')
+        \ 'MNV(python):mnv.error: list is locked')
 
   call assert_equal([0, 1, 2, 3], l)
   unlockvar! l
@@ -784,7 +784,7 @@ func Test_python_function_call()
 
   new
   let l = [function('New'), function('DictNew')]
-  py l = vim.bindeval('l')
+  py l = mnv.bindeval('l')
   py l.extend(list(l[0](1, 2, 3)))
   call assert_equal([function('New'), function('DictNew'), 'NewStart', 1, 2, 3, 'NewEnd'], l)
   py l.extend(list(l[1](1, 2, 3, self={'a': 'b'})))
@@ -792,19 +792,19 @@ func Test_python_function_call()
   py l.extend([l[0].name])
   call assert_equal([function('New'), function('DictNew'), 'NewStart', 1, 2, 3, 'NewEnd', 'DictNewStart', 1, 2, 3, 'DictNewEnd', {'a': 'b'}, 'New'], l)
   py ee('l[1](1, 2, 3)')
-  call assert_equal("l[1](1, 2, 3):error:('Vim:E725: Calling dict function without Dictionary: DictNew',)", getline(2))
+  call assert_equal("l[1](1, 2, 3):error:('MNV:E725: Calling dict function without Dictionary: DictNew',)", getline(2))
   %d
   py f = l[0]
   delfunction New
   py ee('f(1, 2, 3)')
-  call assert_equal("f(1, 2, 3):error:('Vim:E117: Unknown function: New',)", getline(2))
+  call assert_equal("f(1, 2, 3):error:('MNV:E117: Unknown function: New',)", getline(2))
   close!
   delfunction DictNew
 endfunc
 
 func Test_python_float()
   let l = [0.0]
-  py l = vim.bindeval('l')
+  py l = mnv.bindeval('l')
   py l.extend([0.0])
   call assert_equal([0.0, 0.0], l)
 endfunc
@@ -813,8 +813,8 @@ endfunc
 func Test_python_dict_key_error()
   let messages = []
   py << trim EOF
-    d = vim.bindeval('{}')
-    m = vim.bindeval('messages')
+    d = mnv.bindeval('{}')
+    m = mnv.bindeval('messages')
     def em(expr, g=globals(), l=locals()):
       try:
         exec(expr, g, l)
@@ -823,7 +823,7 @@ func Test_python_dict_key_error()
 
     em('d["abc1"]')
     em('d["abc1"]="\\0"')
-    em('d["abc1"]=vim')
+    em('d["abc1"]=mnv')
     em('d[""]=1')
     em('d["a\\0b"]=1')
     em('d[u"a\\0b"]=1')
@@ -844,7 +844,7 @@ func Test_python_lock_scope_attr()
   let res = []
   for s in split("d dl v: g:")
     let name = tr(s, ':', 's')
-    execute 'py ' .. name .. ' = vim.bindeval("' .. s .. '")'
+    execute 'py ' .. name .. ' = mnv.bindeval("' .. s .. '")'
     call add(res, s .. ' : ' .. join(map(['locked', 'scope'],
           \ 'v:val .. ":" .. pyeval(name .. "." .. v:val)'), ';'))
   endfor
@@ -865,7 +865,7 @@ func Test_python_lock_scope_attr()
   let res = []
   for s in split("l ll")
     let name = tr(s, ':', 's')
-    execute 'py ' .. name .. '=vim.bindeval("' .. s .. '")'
+    execute 'py ' .. name .. '=mnv.bindeval("' .. s .. '")'
     call add(res, s .. ' : locked:' .. pyeval(name .. '.locked'))
   endfor
   call assert_equal(['l : locked:0', 'll : locked:1'], res)
@@ -881,15 +881,15 @@ func Test_python_lock_scope_attr()
   unlet l ll
 
   " Try changing an attribute of a fixed list
-  py a = vim.bindeval('v:argv')
+  py a = mnv.bindeval('v:argv')
   call AssertException(['py a.locked = 0'],
-        \ 'Vim(python):TypeError: cannot modify fixed list')
+        \ 'MNV(python):TypeError: cannot modify fixed list')
 endfunc
 
 " Test for locking/unlocking a tuple
 func Test_tuple_lock()
   let t = (1, 2, 3)
-  py t = vim.bindeval('t')
+  py t = mnv.bindeval('t')
   py t.locked = True
   call assert_equal(1, islocked('t'))
   py t.locked = False
@@ -911,7 +911,7 @@ func Test_python_pyeval()
   call assert_equal(v:none, pyeval('None'))
   call assert_equal('', v:errmsg)
 
-  py v = vim.eval('test_null_function()')
+  py v = mnv.eval('test_null_function()')
   call assert_equal(v:none, pyeval('v'))
 
   call assert_equal(0.0, pyeval('0.0'))
@@ -920,8 +920,8 @@ func Test_python_pyeval()
   call AssertException(['let v = pyeval(''"\0"'')'], 'E859:')
   call AssertException(['let v = pyeval(''{"\0" : 1}'')'], 'E859:')
   call AssertException(['let v = pyeval("undefined_name")'],
-        \ "Vim(let):NameError: name 'undefined_name' is not defined")
-  call AssertException(['let v = pyeval("vim")'], 'E859:')
+        \ "MNV(let):NameError: name 'undefined_name' is not defined")
+  call AssertException(['let v = pyeval("mnv")'], 'E859:')
 endfunc
 
 " Test for pyeval with locals
@@ -971,30 +971,30 @@ func Test_python_pyeval_locals()
   call assert_equal(3, pyeval('f("abc")', {'f': StrLen}))
 endfunc
 
-" Test for vim.bindeval()
-func Test_python_vim_bindeval()
+" Test for mnv.bindeval()
+func Test_python_mnv_bindeval()
   " Float
   let f = 3.14
-  py f = vim.bindeval('f')
+  py f = mnv.bindeval('f')
   call assert_equal(3.14, pyeval('f'))
 
   " Blob
   let b = 0z12
-  py b = vim.bindeval('b')
+  py b = mnv.bindeval('b')
   call assert_equal("\x12", pyeval('b'))
 
   " Bool
-  call assert_equal(1, pyeval("vim.bindeval('v:true')"))
-  call assert_equal(0, pyeval("vim.bindeval('v:false')"))
-  call assert_equal(v:none, pyeval("vim.bindeval('v:null')"))
-  call assert_equal(v:none, pyeval("vim.bindeval('v:none')"))
+  call assert_equal(1, pyeval("mnv.bindeval('v:true')"))
+  call assert_equal(0, pyeval("mnv.bindeval('v:false')"))
+  call assert_equal(v:none, pyeval("mnv.bindeval('v:null')"))
+  call assert_equal(v:none, pyeval("mnv.bindeval('v:none')"))
 
   " channel/job
   if has('channel')
-    call assert_equal(v:none, pyeval("vim.bindeval('test_null_channel()')"))
+    call assert_equal(v:none, pyeval("mnv.bindeval('test_null_channel()')"))
   endif
   if has('job')
-    call assert_equal(v:none, pyeval("vim.bindeval('test_null_job()')"))
+    call assert_equal(v:none, pyeval("mnv.bindeval('test_null_job()')"))
   endif
 endfunc
 
@@ -1003,7 +1003,7 @@ endfunc
 " from running. So this test should be run before the pydo test
 func Test_aaa_python_threading()
   let l = [0]
-  py l = vim.bindeval('l')
+  py l = mnv.bindeval('l')
   py << trim EOF
     import threading
     import time
@@ -1040,7 +1040,7 @@ endfunc
 " settrace
 func Test_python_settrace()
   let l = []
-  py l = vim.bindeval('l')
+  py l = mnv.bindeval('l')
   py << trim EOF
     import sys
 
@@ -1064,7 +1064,7 @@ endfunc
 
 " Slice
 func Test_python_list_slice()
-  py ll = vim.bindeval('[0, 1, 2, 3, 4, 5]')
+  py ll = mnv.bindeval('[0, 1, 2, 3, 4, 5]')
   py l = ll[:4]
   call assert_equal([0, 1, 2, 3], pyeval('l'))
   py l = ll[2:]
@@ -1095,27 +1095,27 @@ func Test_python_list_slice()
   call assert_equal([], pyeval('l'))
 
   " Error case: Use an invalid index
-  call AssertException(['py ll[-10] = 5'], 'Vim(python):vim.error: internal error:')
+  call AssertException(['py ll[-10] = 5'], 'MNV(python):mnv.error: internal error:')
 
   " Use a step value of 0
   call AssertException(['py ll[0:3:0] = [1, 2, 3]'],
-        \ 'Vim(python):ValueError: slice step cannot be zero')
+        \ 'MNV(python):ValueError: slice step cannot be zero')
 
   " Error case: Invalid slice type
   call AssertException(["py x = ll['abc']"],
-        \ 'Vim(python):TypeError: index must be int or slice, not str')
+        \ 'MNV(python):TypeError: index must be int or slice, not str')
   py del l
 
   " Error case: List with a null list item
   let l = [test_null_list()]
-  py ll = vim.bindeval('l')
+  py ll = mnv.bindeval('l')
   call AssertException(["py x = ll[:]"],
-        \ 'Vim(python):SystemError: error return without exception set')
+        \ 'MNV(python):SystemError: error return without exception set')
 endfunc
 
 " Slice
 func Test_python_tuple_slice()
-  py tt = vim.bindeval('(0, 1, 2, 3, 4, 5)')
+  py tt = mnv.bindeval('(0, 1, 2, 3, 4, 5)')
   py t = tt[:4]
   call assert_equal((0, 1, 2, 3), pyeval('t'))
   py t = tt[2:]
@@ -1146,23 +1146,23 @@ func Test_python_tuple_slice()
   call assert_equal((), pyeval('t'))
 
   " Error case: Use an invalid index
-  call AssertException(['py x = tt[-10]'], 'Vim(python):IndexError: tuple index out of range')
+  call AssertException(['py x = tt[-10]'], 'MNV(python):IndexError: tuple index out of range')
 
   " Use a step value of 0
   call AssertException(['py x = tt[0:3:0]'],
-        \ 'Vim(python):ValueError: slice step cannot be zero')
+        \ 'MNV(python):ValueError: slice step cannot be zero')
 
   " Error case: Invalid slice type
   call AssertException(["py x = tt['abc']"],
-        \ "Vim(python):TypeError: index must be int or slice, not str")
+        \ "MNV(python):TypeError: index must be int or slice, not str")
 
   " Error case: List with a null tuple item
   let t = (test_null_tuple(),)
-  py tt = vim.bindeval('t')
-  call AssertException(["py x = tt[:]"], 'Vim(python):SystemError: error return without exception set')
+  py tt = mnv.bindeval('t')
+  call AssertException(["py x = tt[:]"], 'MNV(python):SystemError: error return without exception set')
 endfunc
 
-func Test_python_pytuple_to_vimtuple()
+func Test_python_pytuple_to_mnvtuple()
   let t = pyeval("('a', 'b')")
   call assert_equal(('a', 'b'), t)
   let t = pyeval("()")
@@ -1181,7 +1181,7 @@ func Test_python_pytuple_to_vimtuple()
         raise NotImplementedError('iter')
   END
   call assert_fails('call pyeval("(1, FailingIter, 2)")',
-        \ 'E859: Failed to convert returned python object to a Vim value')
+        \ 'E859: Failed to convert returned python object to a MNV value')
 
   py del FailingIter
 endfunc
@@ -1189,7 +1189,7 @@ endfunc
 " Test for tuple garbage collection
 func Test_python_tuple_garbage_collect()
   let t = (1, (2, 3), [4, 5], {'a': 6})
-  py py_t = vim.bindeval('t')
+  py py_t = mnv.bindeval('t')
   let save_testing = v:testing
   let v:testing = 1
   call test_garbagecollect_now()
@@ -1208,12 +1208,12 @@ func Test_python_vars()
   try
     throw "Abc"
   catch /Abc/
-    call assert_equal('Abc', pyeval('vim.vvars[''exception'']'))
+    call assert_equal('Abc', pyeval('mnv.vvars[''exception'']'))
   endtry
-  call assert_equal('bac', pyeval('vim.vars[''foo'']'))
-  call assert_equal('def', pyeval('vim.current.window.vars[''abc3'']'))
-  call assert_equal('bar', pyeval('vim.current.buffer.vars[''baz'']'))
-  call assert_equal('jkl', pyeval('vim.current.tabpage.vars[''bar'']'))
+  call assert_equal('bac', pyeval('mnv.vars[''foo'']'))
+  call assert_equal('def', pyeval('mnv.current.window.vars[''abc3'']'))
+  call assert_equal('bar', pyeval('mnv.current.buffer.vars[''baz'']'))
+  call assert_equal('jkl', pyeval('mnv.current.tabpage.vars[''bar'']'))
 endfunc
 
 " Options
@@ -1257,35 +1257,35 @@ func Test_python_opts()
       try:
         exec(s, g, l)
       except:
-        vim.command('return ' + repr(sys.exc_type.__name__))
+        mnv.command('return ' + repr(sys.exc_type.__name__))
 
     def ev(s, g=globals(), l=locals()):
       try:
         return eval(s, g, l)
       except:
-        vim.command('let exc=' + repr(sys.exc_type.__name__))
+        mnv.command('let exc=' + repr(sys.exc_type.__name__))
         return 0
   EOF
 
   func E(s)
-    python e(vim.eval('a:s'))
+    python e(mnv.eval('a:s'))
   endfunc
 
   func Ev(s)
-    let r = pyeval('ev(vim.eval("a:s"))')
+    let r = pyeval('ev(mnv.eval("a:s"))')
     if exists('exc')
       throw exc
     endif
     return r
   endfunc
 
-  py gopts1 = vim.options
-  py wopts1 = vim.windows[2].options
-  py wopts2 = vim.windows[0].options
-  py wopts3 = vim.windows[1].options
-  py bopts1 = vim.buffers[vim.bindeval("g:bufs")[2]].options
-  py bopts2 = vim.buffers[vim.bindeval("g:bufs")[1]].options
-  py bopts3 = vim.buffers[vim.bindeval("g:bufs")[0]].options
+  py gopts1 = mnv.options
+  py wopts1 = mnv.windows[2].options
+  py wopts2 = mnv.windows[0].options
+  py wopts3 = mnv.windows[1].options
+  py bopts1 = mnv.buffers[mnv.bindeval("g:bufs")[2]].options
+  py bopts2 = mnv.buffers[mnv.bindeval("g:bufs")[1]].options
+  py bopts3 = mnv.buffers[mnv.bindeval("g:bufs")[0]].options
   call add(g:res, 'wopts iters equal: ' ..
         \ pyeval('list(wopts1) == list(wopts2)'))
   call add(g:res, 'bopts iters equal: ' ..
@@ -1309,14 +1309,14 @@ func Test_python_opts()
   let lst += [['preserveindent', 0, 1, 1, 2, 1, 1, 2]]
   let lst += [['path', '.,,', ',,', '.', 0, 0, 1, 2]]
   for  [oname, oval1, oval2, oval3, invval, bool, global, local] in lst
-    py oname = vim.eval('oname')
-    py oval1 = vim.bindeval('oval1')
-    py oval2 = vim.bindeval('oval2')
-    py oval3 = vim.bindeval('oval3')
+    py oname = mnv.eval('oname')
+    py oval1 = mnv.bindeval('oval1')
+    py oval2 = mnv.bindeval('oval2')
+    py oval3 = mnv.bindeval('oval3')
     if invval is 0 || invval is 1
-      py invval = bool(vim.bindeval('invval'))
+      py invval = bool(mnv.bindeval('invval'))
     else
-      py invval = vim.bindeval('invval')
+      py invval = mnv.bindeval('invval')
     endif
     if bool
       py oval1 = bool(oval1)
@@ -1634,39 +1634,39 @@ func Test_python_opts()
   call assert_equal(expected, g:res)
   unlet g:res
 
-  call assert_equal(0, pyeval("'' in vim.options"))
+  call assert_equal(0, pyeval("'' in mnv.options"))
 
-  " use an empty key to index vim.options
-  call AssertException(["let v = pyeval(\"vim.options['']\")"],
-        \ 'Vim(let):ValueError: empty keys are not allowed')
-  call AssertException(["py vim.current.window.options[''] = 0"],
-        \ 'Vim(python):ValueError: empty keys are not allowed')
-  call AssertException(["py vim.current.window.options[{}] = 0"],
-        \ 'Vim(python):TypeError: expected str() or unicode() instance, but got dict')
+  " use an empty key to index mnv.options
+  call AssertException(["let v = pyeval(\"mnv.options['']\")"],
+        \ 'MNV(let):ValueError: empty keys are not allowed')
+  call AssertException(["py mnv.current.window.options[''] = 0"],
+        \ 'MNV(python):ValueError: empty keys are not allowed')
+  call AssertException(["py mnv.current.window.options[{}] = 0"],
+        \ 'MNV(python):TypeError: expected str() or unicode() instance, but got dict')
 
   " set one of the number options to a very large number
-  let cmd = ["py vim.options['previewheight'] = 9999999999999999"]
+  let cmd = ["py mnv.options['previewheight'] = 9999999999999999"]
   call AssertException(cmd, 'OverflowError:')
 
   " unset a global-local string option
-  call AssertException(["py del vim.options['errorformat']"],
-        \ 'Vim(python):ValueError: unable to unset global option errorformat')
+  call AssertException(["py del mnv.options['errorformat']"],
+        \ 'MNV(python):ValueError: unable to unset global option errorformat')
 endfunc
 
-" Test for vim.buffer object
+" Test for mnv.buffer object
 func Test_python_buffer()
   new
   call setline(1, "Hello\nWorld")
-  call assert_fails("let x = pyeval('vim.current.buffer[0]')", 'E859:')
+  call assert_fails("let x = pyeval('mnv.current.buffer[0]')", 'E859:')
   %bw!
 
   edit Xfile1
   let bnr1 = bufnr()
-  py cb = vim.current.buffer
+  py cb = mnv.current.buffer
   vnew Xfile2
   let bnr2 = bufnr()
   call setline(1, ['First line', 'Second line', 'Third line'])
-  py b = vim.current.buffer
+  py b = mnv.current.buffer
   wincmd w
 
   " Test for getting lines from the buffer using a slice
@@ -1676,19 +1676,19 @@ func Test_python_buffer()
   call assert_equal([], pyeval('b[10:12]'))
   call assert_equal([], pyeval('b[-10:-8]'))
   call AssertException(["py x = b[0:3:0]"],
-        \ "Vim(python):TypeError: sequence index must be integer, not 'slice'")
+        \ "MNV(python):TypeError: sequence index must be integer, not 'slice'")
   call AssertException(["py b[0:3:0] = 'abc'"],
-        \ "Vim(python):TypeError: sequence index must be integer, not 'slice'")
+        \ "MNV(python):TypeError: sequence index must be integer, not 'slice'")
   call AssertException(["py x = b[{}]"],
-        \ "Vim(python):TypeError: sequence index must be integer, not 'dict'")
+        \ "MNV(python):TypeError: sequence index must be integer, not 'dict'")
   call AssertException(["py b[{}] = 'abc'"],
-        \ "Vim(python):TypeError: sequence index must be integer, not 'dict'")
+        \ "MNV(python):TypeError: sequence index must be integer, not 'dict'")
 
   " Test for getting lines using a range
   call AssertException(["py x = b.range(0,3)[0:2:0]"],
-        \ "Vim(python):TypeError: sequence index must be integer, not 'slice'")
+        \ "MNV(python):TypeError: sequence index must be integer, not 'slice'")
   call AssertException(["py b.range(0,3)[0:2:0] = 'abc'"],
-        \ "Vim(python):TypeError: sequence index must be integer, not 'slice'")
+        \ "MNV(python):TypeError: sequence index must be integer, not 'slice'")
 
   " Tests BufferAppend and BufferItem
   py cb.append(b[0])
@@ -1697,11 +1697,11 @@ func Test_python_buffer()
 
   " Try to append using out-of-range line number
   call AssertException(["py b.append('abc', 10)"],
-        \ 'Vim(python):IndexError: line number out of range')
+        \ 'MNV(python):IndexError: line number out of range')
 
   " Append a non-string item
   call AssertException(["py b.append([22])"],
-        \ 'Vim(python):TypeError: expected str() or unicode() instance, but got int')
+        \ 'MNV(python):TypeError: expected str() or unicode() instance, but got int')
 
   " Tests BufferSlice and BufferAssSlice
   py cb.append('abc5') # Will be overwritten
@@ -1735,7 +1735,7 @@ func Test_python_buffer()
     b.append('foo')
     b[0]='bar'
     b[0:0]=['baz']
-    vim.command('call append("$", getbufline(%i, 1, "$"))' % b.number)
+    mnv.command('call append("$", getbufline(%i, 1, "$"))' % b.number)
   EOF
   call assert_equal(['baz', 'bar', 'Second line', 'Third line', 'foo'],
         \ getbufline(bnr2, 1, '$'))
@@ -1743,8 +1743,8 @@ func Test_python_buffer()
 
   " Test assigning to name property
   augroup BUFS
-    autocmd BufFilePost * python cb.append(vim.eval('expand("<abuf>")') + ':BufFilePost:' + vim.eval('bufnr("%")'))
-    autocmd BufFilePre * python cb.append(vim.eval('expand("<abuf>")') + ':BufFilePre:' + vim.eval('bufnr("%")'))
+    autocmd BufFilePost * python cb.append(mnv.eval('expand("<abuf>")') + ':BufFilePost:' + mnv.eval('bufnr("%")'))
+    autocmd BufFilePre * python cb.append(mnv.eval('expand("<abuf>")') + ':BufFilePre:' + mnv.eval('bufnr("%")'))
   augroup END
   py << trim EOF
     import os
@@ -1770,9 +1770,9 @@ func Test_python_buffer()
 
   " Test CheckBuffer
   py << trim EOF
-    for _b in vim.buffers:
+    for _b in mnv.buffers:
       if _b is not cb:
-        vim.command('bwipeout! ' + str(_b.number))
+        mnv.command('bwipeout! ' + str(_b.number))
     del _b
     cb.append('valid: b:%s, cb:%s' % (repr(b.valid), repr(cb.valid)))
   EOF
@@ -1783,39 +1783,39 @@ func Test_python_buffer()
     for expr in ('b[1]','b[:] = ["A", "B"]','b[:]','b.append("abc6")', 'b.name = "!"'):
       try:
         exec(expr)
-      except vim.error:
+      except mnv.error:
         pass
       else:
         # Usually a SEGV here
         # Should not happen in any case
         cb.append('No exception for ' + expr)
-    vim.command('cd .')
+    mnv.command('cd .')
     del b
   EOF
   call assert_equal([''], getline(1, '$'))
 
   " Delete all the lines in a buffer
   call setline(1, ['a', 'b', 'c'])
-  py vim.current.buffer[:] = []
+  py mnv.current.buffer[:] = []
   call assert_equal([''], getline(1, '$'))
 
   " Test for buffer marks
-  call assert_equal(v:none, pyeval("vim.current.buffer.mark('r')"))
+  call assert_equal(v:none, pyeval("mnv.current.buffer.mark('r')"))
 
   " Test for modifying a 'nomodifiable' buffer
   setlocal nomodifiable
-  call AssertException(["py vim.current.buffer[0] = 'abc'"],
-        \ "Vim(python):vim.error: Vim:E21: Cannot make changes, 'modifiable' is off")
-  call AssertException(["py vim.current.buffer[0] = None"],
-        \ "Vim(python):vim.error: Vim:E21: Cannot make changes, 'modifiable' is off")
-  call AssertException(["py vim.current.buffer[:] = None"],
-        \ "Vim(python):vim.error: Vim:E21: Cannot make changes, 'modifiable' is off")
-  call AssertException(["py vim.current.buffer[:] = []"],
-        \ "Vim(python):vim.error: Vim:E21: Cannot make changes, 'modifiable' is off")
-  call AssertException(["py vim.current.buffer.append('abc')"],
-        \ "Vim(python):vim.error: Vim:E21: Cannot make changes, 'modifiable' is off")
-  call AssertException(["py vim.current.buffer.append([])"],
-        \ "Vim(python):vim.error: Vim:E21: Cannot make changes, 'modifiable' is off")
+  call AssertException(["py mnv.current.buffer[0] = 'abc'"],
+        \ "MNV(python):mnv.error: MNV:E21: Cannot make changes, 'modifiable' is off")
+  call AssertException(["py mnv.current.buffer[0] = None"],
+        \ "MNV(python):mnv.error: MNV:E21: Cannot make changes, 'modifiable' is off")
+  call AssertException(["py mnv.current.buffer[:] = None"],
+        \ "MNV(python):mnv.error: MNV:E21: Cannot make changes, 'modifiable' is off")
+  call AssertException(["py mnv.current.buffer[:] = []"],
+        \ "MNV(python):mnv.error: MNV:E21: Cannot make changes, 'modifiable' is off")
+  call AssertException(["py mnv.current.buffer.append('abc')"],
+        \ "MNV(python):mnv.error: MNV:E21: Cannot make changes, 'modifiable' is off")
+  call AssertException(["py mnv.current.buffer.append([])"],
+        \ "MNV(python):mnv.error: MNV:E21: Cannot make changes, 'modifiable' is off")
   setlocal modifiable
 
   augroup BUFS
@@ -1827,39 +1827,39 @@ func Test_python_buffer()
   " Range object for a deleted buffer
   new Xpbuffile
   call setline(1, ['one', 'two', 'three'])
-  py b = vim.current.buffer
-  py r = vim.current.buffer.range(0, 2)
+  py b = mnv.current.buffer
+  py r = mnv.current.buffer.range(0, 2)
   call assert_equal('<range Xpbuffile (0:2)>', pyeval('repr(r)'))
   %bw!
   call AssertException(['py r[:] = []'],
-        \ 'Vim(python):vim.error: attempt to refer to deleted buffer')
+        \ 'MNV(python):mnv.error: attempt to refer to deleted buffer')
   call assert_match('<buffer object (deleted)', pyeval('repr(b)'))
   call assert_match('<range object (for deleted buffer)', pyeval('repr(r)'))
   call AssertException(["let n = pyeval('len(r)')"],
-        \ 'Vim(let):vim.error: attempt to refer to deleted buffer')
+        \ 'MNV(let):mnv.error: attempt to refer to deleted buffer')
   call AssertException(["py r.append('abc')"],
-        \ 'Vim(python):vim.error: attempt to refer to deleted buffer')
+        \ 'MNV(python):mnv.error: attempt to refer to deleted buffer')
 
   " object for a deleted buffer
   call AssertException(["py b[0] = 'one'"],
-        \ 'Vim(python):vim.error: attempt to refer to deleted buffer')
+        \ 'MNV(python):mnv.error: attempt to refer to deleted buffer')
   call AssertException(["py b.append('one')"],
-        \ 'Vim(python):vim.error: attempt to refer to deleted buffer')
+        \ 'MNV(python):mnv.error: attempt to refer to deleted buffer')
   call AssertException(["let n = pyeval('len(b)')"],
-        \ 'Vim(let):vim.error: attempt to refer to deleted buffer')
+        \ 'MNV(let):mnv.error: attempt to refer to deleted buffer')
   call AssertException(["py pos = b.mark('a')"],
-        \ 'Vim(python):vim.error: attempt to refer to deleted buffer')
-  call AssertException(["py vim.current.buffer = b"],
-        \ 'Vim(python):vim.error: attempt to refer to deleted buffer')
+        \ 'MNV(python):mnv.error: attempt to refer to deleted buffer')
+  call AssertException(["py mnv.current.buffer = b"],
+        \ 'MNV(python):mnv.error: attempt to refer to deleted buffer')
   call AssertException(["py rn = b.range(0, 2)"],
-        \ 'Vim(python):vim.error: attempt to refer to deleted buffer')
+        \ 'MNV(python):mnv.error: attempt to refer to deleted buffer')
 endfunc
 
-" Test vim.buffers object
+" Test mnv.buffers object
 func Test_python_buffers()
   %bw!
   edit Xpbuffile
-  py cb = vim.current.buffer
+  py cb = mnv.current.buffer
   set hidden
   edit a
   buffer #
@@ -1873,16 +1873,16 @@ func Test_python_buffers()
     except ImportError:
       next = lambda o: o.next()
     # Check GCing iterator that was not fully exhausted
-    i = iter(vim.buffers)
+    i = iter(mnv.buffers)
     cb.append('i:' + str(next(i)))
     # and also check creating more than one iterator at a time
-    i2 = iter(vim.buffers)
+    i2 = iter(mnv.buffers)
     cb.append('i2:' + str(next(i2)))
     cb.append('i:' + str(next(i)))
     # The following should trigger GC and not cause any problems
     del i
     del i2
-    i3 = iter(vim.buffers)
+    i3 = iter(mnv.buffers)
     cb.append('i3:' + str(next(i3)))
     del i3
   EOF
@@ -1893,17 +1893,17 @@ func Test_python_buffers()
 
   py << trim EOF
     prevnum = 0
-    for b in vim.buffers:
+    for b in mnv.buffers:
       # Check buffer order
       if prevnum >= b.number:
         cb.append('!!! Buffer numbers not in strictly ascending order')
-      # Check indexing: vim.buffers[number].number == number
-      cb.append(str(b.number) + ':' + repr(vim.buffers[b.number]) + \
+      # Check indexing: mnv.buffers[number].number == number
+      cb.append(str(b.number) + ':' + repr(mnv.buffers[b.number]) + \
                                                             '=' + repr(b))
       prevnum = b.number
     del prevnum
 
-    cb.append(str(len(vim.buffers)))
+    cb.append(str(len(mnv.buffers)))
   EOF
   call assert_equal([bufnr('Xpbuffile') .. ':<buffer Xpbuffile>=<buffer Xpbuffile>',
         \ bufnr('a') .. ':<buffer a>=<buffer a>',
@@ -1912,21 +1912,21 @@ func Test_python_buffers()
   %d
 
   py << trim EOF
-    bnums = list(map(lambda b: b.number, vim.buffers))[1:]
+    bnums = list(map(lambda b: b.number, mnv.buffers))[1:]
 
     # Test wiping out buffer with existing iterator
-    i4 = iter(vim.buffers)
+    i4 = iter(mnv.buffers)
     cb.append('i4:' + str(next(i4)))
-    vim.command('bwipeout! ' + str(bnums.pop(0)))
+    mnv.command('bwipeout! ' + str(bnums.pop(0)))
     try:
       next(i4)
-    except vim.error:
+    except mnv.error:
       pass
     else:
-      cb.append('!!!! No vim.error')
-    i4 = iter(vim.buffers)
-    vim.command('bwipeout! ' + str(bnums.pop(-1)))
-    vim.command('bwipeout! ' + str(bnums.pop(-1)))
+      cb.append('!!!! No mnv.error')
+    i4 = iter(mnv.buffers)
+    mnv.command('bwipeout! ' + str(bnums.pop(-1)))
+    mnv.command('bwipeout! ' + str(bnums.pop(-1)))
     cb.append('i4:' + str(next(i4)))
     try:
       next(i4)
@@ -1940,11 +1940,11 @@ func Test_python_buffers()
   %bw!
 endfunc
 
-" Test vim.{tabpage,window}list and vim.{tabpage,window} objects
+" Test mnv.{tabpage,window}list and mnv.{tabpage,window} objects
 func Test_python_tabpage_window()
   %bw
   edit Xpbuffile
-  py cb = vim.current.buffer
+  py cb = mnv.current.buffer
   tabnew 0
   tabnew 1
   vnew a.1
@@ -1953,10 +1953,10 @@ func Test_python_tabpage_window()
   vnew b.2
   vnew c.2
 
-  call assert_equal(4, pyeval('vim.current.window.tabpage.number'))
+  call assert_equal(4, pyeval('mnv.current.window.tabpage.number'))
 
   py << trim EOF
-    cb.append('Number of tabs: ' + str(len(vim.tabpages)))
+    cb.append('Number of tabs: ' + str(len(mnv.tabpages)))
     cb.append('Current tab pages:')
     def W(w):
       if repr(w).find('(unknown)') != -1:
@@ -1972,7 +1972,7 @@ func Test_python_tabpage_window()
       else:
         return repr(w.cursor)
 
-    for t in vim.tabpages:
+    for t in mnv.tabpages:
       cb.append('  ' + repr(t) + '(' + str(t.number) + ')' + ': ' + \
                 str(len(t.windows)) + ' windows, current is ' + W(t.window))
       cb.append('  Windows:')
@@ -1998,8 +1998,8 @@ func Test_python_tabpage_window()
     del W
     del Cursor
     cb.append('Number of windows in current tab page: ' + \
-                                                    str(len(vim.windows)))
-    if list(vim.windows) != list(vim.current.tabpage.windows):
+                                                    str(len(mnv.windows)))
+    if list(mnv.windows) != list(mnv.current.tabpage.windows):
       cb.append('!!!!!! Windows differ')
   EOF
 
@@ -2028,11 +2028,11 @@ func Test_python_tabpage_window()
   %bw!
 endfunc
 
-" Test vim.current
-func Test_python_vim_current()
+" Test mnv.current
+func Test_python_mnv_current()
   %bw
   edit Xpbuffile
-  py cb = vim.current.buffer
+  py cb = mnv.current.buffer
   tabnew 0
   tabnew 1
   vnew a.1
@@ -2044,12 +2044,12 @@ func Test_python_vim_current()
   py << trim EOF
     def H(o):
       return repr(o)
-    cb.append('Current tab page: ' + repr(vim.current.tabpage))
-    cb.append('Current window: ' + repr(vim.current.window) + ': ' + \
-               H(vim.current.window) + ' is ' + H(vim.current.tabpage.window))
-    cb.append('Current buffer: ' + repr(vim.current.buffer) + ': ' + \
-               H(vim.current.buffer) + ' is ' + H(vim.current.window.buffer)+ \
-               ' is ' + H(vim.current.tabpage.window.buffer))
+    cb.append('Current tab page: ' + repr(mnv.current.tabpage))
+    cb.append('Current window: ' + repr(mnv.current.window) + ': ' + \
+               H(mnv.current.window) + ' is ' + H(mnv.current.tabpage.window))
+    cb.append('Current buffer: ' + repr(mnv.current.buffer) + ': ' + \
+               H(mnv.current.buffer) + ' is ' + H(mnv.current.window.buffer)+ \
+               ' is ' + H(mnv.current.tabpage.window.buffer))
     del H
   EOF
   let expected =<< trim END
@@ -2063,23 +2063,23 @@ func Test_python_vim_current()
   " Assigning: fails
   py << trim EOF
     try:
-      vim.current.window = vim.tabpages[0].window
+      mnv.current.window = mnv.tabpages[0].window
     except ValueError:
       cb.append('ValueError at assigning foreign tab window')
 
     for attr in ('window', 'tabpage', 'buffer'):
       try:
-        setattr(vim.current, attr, None)
+        setattr(mnv.current, attr, None)
       except TypeError:
-        cb.append('Type error at assigning None to vim.current.' + attr)
+        cb.append('Type error at assigning None to mnv.current.' + attr)
     del attr
   EOF
 
   let expected =<< trim END
     ValueError at assigning foreign tab window
-    Type error at assigning None to vim.current.window
-    Type error at assigning None to vim.current.tabpage
-    Type error at assigning None to vim.current.buffer
+    Type error at assigning None to mnv.current.window
+    Type error at assigning None to mnv.current.tabpage
+    Type error at assigning None to mnv.current.buffer
   END
   call assert_equal(expected, getbufline(bufnr('Xpbuffile'), 2, '$'))
   call deletebufline(bufnr('Xpbuffile'), 1, '$')
@@ -2087,14 +2087,14 @@ func Test_python_vim_current()
   call setbufline(bufnr('Xpbuffile'), 1, 'python interface')
   py << trim EOF
     # Assigning: success
-    vim.current.tabpage = vim.tabpages[-2]
-    vim.current.buffer = cb
-    vim.current.window = vim.windows[0]
-    vim.current.window.cursor = (len(vim.current.buffer), 0)
-    cb.append('Current tab page: ' + repr(vim.current.tabpage))
-    cb.append('Current window: ' + repr(vim.current.window))
-    cb.append('Current buffer: ' + repr(vim.current.buffer))
-    cb.append('Current line: ' + repr(vim.current.line))
+    mnv.current.tabpage = mnv.tabpages[-2]
+    mnv.current.buffer = cb
+    mnv.current.window = mnv.windows[0]
+    mnv.current.window.cursor = (len(mnv.current.buffer), 0)
+    cb.append('Current tab page: ' + repr(mnv.current.tabpage))
+    cb.append('Current window: ' + repr(mnv.current.window))
+    cb.append('Current buffer: ' + repr(mnv.current.buffer))
+    cb.append('Current line: ' + repr(mnv.current.line))
   EOF
 
   let expected =<< trim END
@@ -2104,16 +2104,16 @@ func Test_python_vim_current()
     Current line: 'python interface'
   END
   call assert_equal(expected, getbufline(bufnr('Xpbuffile'), 2, '$'))
-  py vim.current.line = 'one line'
+  py mnv.current.line = 'one line'
   call assert_equal('one line', getline('.'))
   call deletebufline(bufnr('Xpbuffile'), 1, '$')
 
   py << trim EOF
-    ws = list(vim.windows)
-    ts = list(vim.tabpages)
-    for b in vim.buffers:
+    ws = list(mnv.windows)
+    ts = list(mnv.tabpages)
+    for b in mnv.buffers:
       if b is not cb:
-        vim.command('bwipeout! ' + str(b.number))
+        mnv.command('bwipeout! ' + str(b.number))
     del b
     cb.append('w.valid: ' + repr([w.valid for w in ws]))
     cb.append('t.valid: ' + repr([t.valid for t in ts]))
@@ -2133,34 +2133,34 @@ endfunc
 " Test types
 func Test_python_types()
   %d
-  py cb = vim.current.buffer
+  py cb = mnv.current.buffer
   py << trim EOF
     for expr, attr in (
-      ('vim.vars',                         'Dictionary'),
-      ('vim.options',                      'Options'),
-      ('vim.bindeval("{}")',               'Dictionary'),
-      ('vim.bindeval("[]")',               'List'),
-      ('vim.bindeval("function(\'tr\')")', 'Function'),
-      ('vim.current.buffer',               'Buffer'),
-      ('vim.current.range',                'Range'),
-      ('vim.current.window',               'Window'),
-      ('vim.current.tabpage',              'TabPage'),
+      ('mnv.vars',                         'Dictionary'),
+      ('mnv.options',                      'Options'),
+      ('mnv.bindeval("{}")',               'Dictionary'),
+      ('mnv.bindeval("[]")',               'List'),
+      ('mnv.bindeval("function(\'tr\')")', 'Function'),
+      ('mnv.current.buffer',               'Buffer'),
+      ('mnv.current.range',                'Range'),
+      ('mnv.current.window',               'Window'),
+      ('mnv.current.tabpage',              'TabPage'),
     ):
       cb.append(expr + ':' + attr + ':' + \
-                                repr(type(eval(expr)) is getattr(vim, attr)))
+                                repr(type(eval(expr)) is getattr(mnv, attr)))
     del expr
     del attr
   EOF
   let expected =<< trim END
-    vim.vars:Dictionary:True
-    vim.options:Options:True
-    vim.bindeval("{}"):Dictionary:True
-    vim.bindeval("[]"):List:True
-    vim.bindeval("function('tr')"):Function:True
-    vim.current.buffer:Buffer:True
-    vim.current.range:Range:True
-    vim.current.window:Window:True
-    vim.current.tabpage:TabPage:True
+    mnv.vars:Dictionary:True
+    mnv.options:Options:True
+    mnv.bindeval("{}"):Dictionary:True
+    mnv.bindeval("[]"):List:True
+    mnv.bindeval("function('tr')"):Function:True
+    mnv.current.buffer:Buffer:True
+    mnv.current.range:Range:True
+    mnv.current.window:Window:True
+    mnv.current.tabpage:TabPage:True
   END
   call assert_equal(expected, getline(2, '$'))
 endfunc
@@ -2168,18 +2168,18 @@ endfunc
 " Test __dir__() method
 func Test_python_dir_method()
   %d
-  py cb = vim.current.buffer
+  py cb = mnv.current.buffer
   py << trim EOF
     for name, o in (
-            ('current',    vim.current),
-            ('buffer',     vim.current.buffer),
-            ('window',     vim.current.window),
-            ('tabpage',    vim.current.tabpage),
-            ('range',      vim.current.range),
-            ('dictionary', vim.bindeval('{}')),
-            ('list',       vim.bindeval('[]')),
-            ('tuple',       vim.bindeval('()')),
-            ('function',   vim.bindeval('function("tr")')),
+            ('current',    mnv.current),
+            ('buffer',     mnv.current.buffer),
+            ('window',     mnv.current.window),
+            ('tabpage',    mnv.current.tabpage),
+            ('range',      mnv.current.range),
+            ('dictionary', mnv.bindeval('{}')),
+            ('list',       mnv.bindeval('[]')),
+            ('tuple',       mnv.bindeval('()')),
+            ('function',   mnv.bindeval('function("tr")')),
             ('output',     sys.stdout),
         ):
         cb.append(name + ':' + ','.join(dir(o)))
@@ -2201,37 +2201,37 @@ func Test_python_dir_method()
   call assert_equal(expected, getline(2, '$'))
 endfunc
 
-" Test vim.*.__new__
+" Test mnv.*.__new__
 func Test_python_new()
-  call assert_equal({}, pyeval('vim.Dictionary({})'))
-  call assert_equal({'a': 1}, pyeval('vim.Dictionary(a=1)'))
-  call assert_equal({'a': 1}, pyeval('vim.Dictionary(((''a'', 1),))'))
-  call assert_equal([], pyeval('vim.List()'))
-  call assert_equal((), pyeval('vim.Tuple()'))
-  call assert_equal(['a', 'b', 'c', '7'], pyeval('vim.List(iter(''abc7''))'))
-  call assert_equal(('a', 'b', 'c', '7'), pyeval('vim.Tuple(iter(''abc7''))'))
-  call assert_equal(function('tr'), pyeval('vim.Function(''tr'')'))
+  call assert_equal({}, pyeval('mnv.Dictionary({})'))
+  call assert_equal({'a': 1}, pyeval('mnv.Dictionary(a=1)'))
+  call assert_equal({'a': 1}, pyeval('mnv.Dictionary(((''a'', 1),))'))
+  call assert_equal([], pyeval('mnv.List()'))
+  call assert_equal((), pyeval('mnv.Tuple()'))
+  call assert_equal(['a', 'b', 'c', '7'], pyeval('mnv.List(iter(''abc7''))'))
+  call assert_equal(('a', 'b', 'c', '7'), pyeval('mnv.Tuple(iter(''abc7''))'))
+  call assert_equal(function('tr'), pyeval('mnv.Function(''tr'')'))
   call assert_equal(function('tr', [123, 3, 4]),
-        \ pyeval('vim.Function(''tr'', args=[123, 3, 4])'))
-  call assert_equal(function('tr'), pyeval('vim.Function(''tr'', args=[])'))
+        \ pyeval('mnv.Function(''tr'', args=[123, 3, 4])'))
+  call assert_equal(function('tr'), pyeval('mnv.Function(''tr'', args=[])'))
   call assert_equal(function('tr', {}),
-        \ pyeval('vim.Function(''tr'', self={})'))
+        \ pyeval('mnv.Function(''tr'', self={})'))
   call assert_equal(function('tr', [123, 3, 4], {}),
-        \ pyeval('vim.Function(''tr'', args=[123, 3, 4], self={})'))
+        \ pyeval('mnv.Function(''tr'', args=[123, 3, 4], self={})'))
   call assert_equal(function('tr'),
-        \ pyeval('vim.Function(''tr'', auto_rebind=False)'))
+        \ pyeval('mnv.Function(''tr'', auto_rebind=False)'))
   call assert_equal(function('tr', [123, 3, 4]),
-        \ pyeval('vim.Function(''tr'', args=[123, 3, 4], auto_rebind=False)'))
+        \ pyeval('mnv.Function(''tr'', args=[123, 3, 4], auto_rebind=False)'))
   call assert_equal(function('tr'),
-        \ pyeval('vim.Function(''tr'', args=[], auto_rebind=False)'))
+        \ pyeval('mnv.Function(''tr'', args=[], auto_rebind=False)'))
   call assert_equal(function('tr', {}),
-        \ pyeval('vim.Function(''tr'', self={}, auto_rebind=False)'))
+        \ pyeval('mnv.Function(''tr'', self={}, auto_rebind=False)'))
   call assert_equal(function('tr', [123, 3, 4], {}),
-        \ pyeval('vim.Function(''tr'', args=[123, 3, 4], self={}, auto_rebind=False)'))
+        \ pyeval('mnv.Function(''tr'', args=[123, 3, 4], self={}, auto_rebind=False)'))
 endfunc
 
-" Test vim.Function
-func Test_python_vim_func()
+" Test mnv.Function
+func Test_python_mnv_func()
   func Args(...)
     return a:000
   endfunc
@@ -2242,14 +2242,14 @@ func Test_python_vim_func()
 
   " The following four lines should not crash
   let Pt = function('tr', [[]], {'l': []})
-  py Pt = vim.bindeval('Pt')
+  py Pt = mnv.bindeval('Pt')
   unlet Pt
   py del Pt
 
-  call assert_equal(3, pyeval('vim.strwidth("a\tb")'))
+  call assert_equal(3, pyeval('mnv.strwidth("a\tb")'))
 
   %bw!
-  py cb = vim.current.buffer
+  py cb = mnv.current.buffer
   py << trim EOF
     def ecall(out_prefix, func, *args, **kwargs):
         line = out_prefix + ': '
@@ -2258,31 +2258,31 @@ func Test_python_vim_func()
         except Exception:
             line += '!exception: ' + emsg(sys.exc_info())
         else:
-            line += '!result: ' + vim.Function('string')(ret)
+            line += '!result: ' + mnv.Function('string')(ret)
         cb.append(line)
-    a = vim.Function('Args')
-    pa1 = vim.Function('Args', args=['abcArgsPA1'])
-    pa2 = vim.Function('Args', args=[])
-    pa3 = vim.Function('Args', args=['abcArgsPA3'], self={'abcSelfPA3': 'abcSelfPA3Val'})
-    pa4 = vim.Function('Args', self={'abcSelfPA4': 'abcSelfPA4Val'})
+    a = mnv.Function('Args')
+    pa1 = mnv.Function('Args', args=['abcArgsPA1'])
+    pa2 = mnv.Function('Args', args=[])
+    pa3 = mnv.Function('Args', args=['abcArgsPA3'], self={'abcSelfPA3': 'abcSelfPA3Val'})
+    pa4 = mnv.Function('Args', self={'abcSelfPA4': 'abcSelfPA4Val'})
     cb.append('a: ' + repr(a))
     cb.append('pa1: ' + repr(pa1))
     cb.append('pa2: ' + repr(pa2))
     cb.append('pa3: ' + repr(pa3))
     cb.append('pa4: ' + repr(pa4))
-    sa = vim.Function('SelfArgs')
-    psa1 = vim.Function('SelfArgs', args=['abcArgsPSA1'])
-    psa2 = vim.Function('SelfArgs', args=[])
-    psa3 = vim.Function('SelfArgs', args=['abcArgsPSA3'], self={'abcSelfPSA3': 'abcSelfPSA3Val'})
-    psa4 = vim.Function('SelfArgs', self={'abcSelfPSA4': 'abcSelfPSA4Val'})
-    psa5 = vim.Function('SelfArgs', self={'abcSelfPSA5': 'abcSelfPSA5Val'}, auto_rebind=0)
-    psa6 = vim.Function('SelfArgs', args=['abcArgsPSA6'], self={'abcSelfPSA6': 'abcSelfPSA6Val'}, auto_rebind=())
-    psa7 = vim.Function('SelfArgs', args=['abcArgsPSA7'], auto_rebind=[])
-    psa8 = vim.Function('SelfArgs', auto_rebind=False)
-    psa9 = vim.Function('SelfArgs', self={'abcSelfPSA9': 'abcSelfPSA9Val'}, auto_rebind=True)
-    psaA = vim.Function('SelfArgs', args=['abcArgsPSAA'], self={'abcSelfPSAA': 'abcSelfPSAAVal'}, auto_rebind=1)
-    psaB = vim.Function('SelfArgs', args=['abcArgsPSAB'], auto_rebind={'abcARPSAB': 'abcARPSABVal'})
-    psaC = vim.Function('SelfArgs', auto_rebind=['abcARPSAC'])
+    sa = mnv.Function('SelfArgs')
+    psa1 = mnv.Function('SelfArgs', args=['abcArgsPSA1'])
+    psa2 = mnv.Function('SelfArgs', args=[])
+    psa3 = mnv.Function('SelfArgs', args=['abcArgsPSA3'], self={'abcSelfPSA3': 'abcSelfPSA3Val'})
+    psa4 = mnv.Function('SelfArgs', self={'abcSelfPSA4': 'abcSelfPSA4Val'})
+    psa5 = mnv.Function('SelfArgs', self={'abcSelfPSA5': 'abcSelfPSA5Val'}, auto_rebind=0)
+    psa6 = mnv.Function('SelfArgs', args=['abcArgsPSA6'], self={'abcSelfPSA6': 'abcSelfPSA6Val'}, auto_rebind=())
+    psa7 = mnv.Function('SelfArgs', args=['abcArgsPSA7'], auto_rebind=[])
+    psa8 = mnv.Function('SelfArgs', auto_rebind=False)
+    psa9 = mnv.Function('SelfArgs', self={'abcSelfPSA9': 'abcSelfPSA9Val'}, auto_rebind=True)
+    psaA = mnv.Function('SelfArgs', args=['abcArgsPSAA'], self={'abcSelfPSAA': 'abcSelfPSAAVal'}, auto_rebind=1)
+    psaB = mnv.Function('SelfArgs', args=['abcArgsPSAB'], auto_rebind={'abcARPSAB': 'abcARPSABVal'})
+    psaC = mnv.Function('SelfArgs', auto_rebind=['abcARPSAC'])
     cb.append('sa: ' + repr(sa))
     cb.append('psa1: ' + repr(psa1))
     cb.append('psa2: ' + repr(psa2))
@@ -2297,7 +2297,7 @@ func Test_python_vim_func()
     cb.append('psaB: ' + repr(psaB))
     cb.append('psaC: ' + repr(psaC))
 
-    psar = vim.Function('SelfArgs', args=[{'abcArgsPSAr': 'abcArgsPSArVal'}], self={'abcSelfPSAr': 'abcSelfPSArVal'})
+    psar = mnv.Function('SelfArgs', args=[{'abcArgsPSAr': 'abcArgsPSArVal'}], self={'abcSelfPSAr': 'abcSelfPSArVal'})
     psar.args[0]['abcArgsPSAr2'] = [psar.self, psar.args[0]]
     psar.self['rec'] = psar
     psar.self['self'] = psar.self
@@ -2310,25 +2310,25 @@ func Test_python_vim_func()
   EOF
 
   let expected =<< trim END
-    a: <vim.Function 'Args'>
-    pa1: <vim.Function 'Args', args=['abcArgsPA1']>
-    pa2: <vim.Function 'Args'>
-    pa3: <vim.Function 'Args', args=['abcArgsPA3'], self={'abcSelfPA3': 'abcSelfPA3Val'}>
-    pa4: <vim.Function 'Args', self={'abcSelfPA4': 'abcSelfPA4Val'}>
-    sa: <vim.Function 'SelfArgs'>
-    psa1: <vim.Function 'SelfArgs', args=['abcArgsPSA1']>
-    psa2: <vim.Function 'SelfArgs'>
-    psa3: <vim.Function 'SelfArgs', args=['abcArgsPSA3'], self={'abcSelfPSA3': 'abcSelfPSA3Val'}>
-    psa4: <vim.Function 'SelfArgs', self={'abcSelfPSA4': 'abcSelfPSA4Val'}>
-    psa5: <vim.Function 'SelfArgs', self={'abcSelfPSA5': 'abcSelfPSA5Val'}>
-    psa6: <vim.Function 'SelfArgs', args=['abcArgsPSA6'], self={'abcSelfPSA6': 'abcSelfPSA6Val'}>
-    psa7: <vim.Function 'SelfArgs', args=['abcArgsPSA7']>
-    psa8: <vim.Function 'SelfArgs'>
-    psa9: <vim.Function 'SelfArgs', self={'abcSelfPSA9': 'abcSelfPSA9Val'}, auto_rebind=True>
-    psaA: <vim.Function 'SelfArgs', args=['abcArgsPSAA'], self={'abcSelfPSAA': 'abcSelfPSAAVal'}, auto_rebind=True>
-    psaB: <vim.Function 'SelfArgs', args=['abcArgsPSAB']>
-    psaC: <vim.Function 'SelfArgs'>
-    psar: <vim.Function 'SelfArgs', args=[{'abcArgsPSAr2': [{'rec': function('SelfArgs', [{...}], {...}), 'self': {...}, 'abcSelfPSAr': 'abcSelfPSArVal', 'args': [{...}]}, {...}], 'abcArgsPSAr': 'abcArgsPSArVal'}], self={'rec': function('SelfArgs', [{'abcArgsPSAr2': [{...}, {...}], 'abcArgsPSAr': 'abcArgsPSArVal'}], {...}), 'self': {...}, 'abcSelfPSAr': 'abcSelfPSArVal', 'args': [{'abcArgsPSAr2': [{...}, {...}], 'abcArgsPSAr': 'abcArgsPSArVal'}]}>
+    a: <mnv.Function 'Args'>
+    pa1: <mnv.Function 'Args', args=['abcArgsPA1']>
+    pa2: <mnv.Function 'Args'>
+    pa3: <mnv.Function 'Args', args=['abcArgsPA3'], self={'abcSelfPA3': 'abcSelfPA3Val'}>
+    pa4: <mnv.Function 'Args', self={'abcSelfPA4': 'abcSelfPA4Val'}>
+    sa: <mnv.Function 'SelfArgs'>
+    psa1: <mnv.Function 'SelfArgs', args=['abcArgsPSA1']>
+    psa2: <mnv.Function 'SelfArgs'>
+    psa3: <mnv.Function 'SelfArgs', args=['abcArgsPSA3'], self={'abcSelfPSA3': 'abcSelfPSA3Val'}>
+    psa4: <mnv.Function 'SelfArgs', self={'abcSelfPSA4': 'abcSelfPSA4Val'}>
+    psa5: <mnv.Function 'SelfArgs', self={'abcSelfPSA5': 'abcSelfPSA5Val'}>
+    psa6: <mnv.Function 'SelfArgs', args=['abcArgsPSA6'], self={'abcSelfPSA6': 'abcSelfPSA6Val'}>
+    psa7: <mnv.Function 'SelfArgs', args=['abcArgsPSA7']>
+    psa8: <mnv.Function 'SelfArgs'>
+    psa9: <mnv.Function 'SelfArgs', self={'abcSelfPSA9': 'abcSelfPSA9Val'}, auto_rebind=True>
+    psaA: <mnv.Function 'SelfArgs', args=['abcArgsPSAA'], self={'abcSelfPSAA': 'abcSelfPSAAVal'}, auto_rebind=True>
+    psaB: <mnv.Function 'SelfArgs', args=['abcArgsPSAB']>
+    psaC: <mnv.Function 'SelfArgs'>
+    psar: <mnv.Function 'SelfArgs', args=[{'abcArgsPSAr2': [{'rec': function('SelfArgs', [{...}], {...}), 'self': {...}, 'abcSelfPSAr': 'abcSelfPSArVal', 'args': [{...}]}, {...}], 'abcArgsPSAr': 'abcArgsPSArVal'}], self={'rec': function('SelfArgs', [{'abcArgsPSAr2': [{...}, {...}], 'abcArgsPSAr': 'abcArgsPSArVal'}], {...}), 'self': {...}, 'abcSelfPSAr': 'abcSelfPSArVal', 'args': [{'abcArgsPSAr2': [{...}, {...}], 'abcArgsPSAr': 'abcArgsPSArVal'}]}>
   END
   call assert_equal(expected, getline(2, '$'))
   %d
@@ -2425,7 +2425,7 @@ func Test_python_vim_func()
         if v is None:
             return repr(v)
         else:
-            return vim.Function('string')(v)
+            return mnv.Function('string')(v)
 
     cb.append('a.args: ' + s(a.args))
     cb.append('pa1.args: ' + s(pa1.args))
@@ -2510,9 +2510,9 @@ func Test_python_vim_func()
     pa2(): !result: []
     pa3(): !result: ['abcArgsPA3']
     pa4(): !result: []
-    sa(): !exception: error:('Vim:E725: Calling dict function without Dictionary: SelfArgs',)
-    psa1(): !exception: error:('Vim:E725: Calling dict function without Dictionary: SelfArgs',)
-    psa2(): !exception: error:('Vim:E725: Calling dict function without Dictionary: SelfArgs',)
+    sa(): !exception: error:('MNV:E725: Calling dict function without Dictionary: SelfArgs',)
+    psa1(): !exception: error:('MNV:E725: Calling dict function without Dictionary: SelfArgs',)
+    psa2(): !exception: error:('MNV:E725: Calling dict function without Dictionary: SelfArgs',)
     psa3(): !result: [['abcArgsPSA3'], {'abcSelfPSA3': 'abcSelfPSA3Val'}]
     psa4(): !result: [[], {'abcSelfPSA4': 'abcSelfPSA4Val'}]
     a(42, 43): !result: [42, 43]
@@ -2520,9 +2520,9 @@ func Test_python_vim_func()
     pa2(42, 43): !result: [42, 43]
     pa3(42, 43): !result: ['abcArgsPA3', 42, 43]
     pa4(42, 43): !result: [42, 43]
-    sa(42, 43): !exception: error:('Vim:E725: Calling dict function without Dictionary: SelfArgs',)
-    psa1(42, 43): !exception: error:('Vim:E725: Calling dict function without Dictionary: SelfArgs',)
-    psa2(42, 43): !exception: error:('Vim:E725: Calling dict function without Dictionary: SelfArgs',)
+    sa(42, 43): !exception: error:('MNV:E725: Calling dict function without Dictionary: SelfArgs',)
+    psa1(42, 43): !exception: error:('MNV:E725: Calling dict function without Dictionary: SelfArgs',)
+    psa2(42, 43): !exception: error:('MNV:E725: Calling dict function without Dictionary: SelfArgs',)
     psa3(42, 43): !result: [['abcArgsPSA3', 42, 43], {'abcSelfPSA3': 'abcSelfPSA3Val'}]
     psa4(42, 43): !result: [[42, 43], {'abcSelfPSA4': 'abcSelfPSA4Val'}]
     a(42, self={"20": 1}): !result: [42]
@@ -2629,14 +2629,14 @@ func Test_python_subclass()
   endfunc
 
   py << trim EOF
-    class DupDict(vim.Dictionary):
+    class DupDict(mnv.Dictionary):
       def __setitem__(self, key, value):
         super(DupDict, self).__setitem__(key, value)
         super(DupDict, self).__setitem__('dup_' + key, value)
     dd = DupDict()
     dd['a'] = 'b'
 
-    class DupList(vim.List):
+    class DupList(mnv.List):
       def __getitem__(self, idx):
         return [super(DupList, self).__getitem__(idx)] * 2
 
@@ -2644,7 +2644,7 @@ func Test_python_subclass()
     dl2 = DupList(iter('abcC'))
     dl.extend(dl2[0])
 
-    class DupFun(vim.Function):
+    class DupFun(mnv.Function):
       def __call__(self, arg):
         return super(DupFun, self).__call__(arg, arg)
 
@@ -2674,12 +2674,12 @@ endfunc
 " Test chdir
 func Test_python_chdir()
   new Xpycfile
-  py cb = vim.current.buffer
+  py cb = mnv.current.buffer
   py << trim EOF
     import os
-    fnamemodify = vim.Function('fnamemodify')
+    fnamemodify = mnv.Function('fnamemodify')
     cb.append(fnamemodify('.', ':p:h:t'))
-    cb.append(vim.eval('@%'))
+    cb.append(mnv.eval('@%'))
     os.chdir('..')
     path = fnamemodify('.', ':p:h:t')
     if path != 'src' and path != 'src2':
@@ -2688,22 +2688,22 @@ func Test_python_chdir()
       # extra fnamemodify
       os.chdir('..')
       cb.append(fnamemodify('.', ':p:h:t'))
-      cb.append(fnamemodify(vim.eval('@%'), ':s?^%s.??' % path).replace(os.path.sep, '/'))
+      cb.append(fnamemodify(mnv.eval('@%'), ':s?^%s.??' % path).replace(os.path.sep, '/'))
       os.chdir(path)
       del path
     else:
       # Also accept running from src2/testdir/ for MS-Windows CI.
       cb.append(fnamemodify('.', ':p:h:t').replace('src2', 'src'))
-      cb.append(vim.eval('@%').replace(os.path.sep, '/'))
+      cb.append(mnv.eval('@%').replace(os.path.sep, '/'))
     os.chdir('testdir')
     cb.append(fnamemodify('.', ':p:h:t'))
-    cb.append(vim.eval('@%'))
+    cb.append(mnv.eval('@%'))
     del fnamemodify
   EOF
   call assert_equal(['testdir', 'Xpycfile', 'src', 'testdir/Xpycfile', 'testdir',
         \ 'Xpycfile'], getline(2, '$'))
   close!
-  call AssertException(["py vim.chdir(None)"], "Vim(python):TypeError:")
+  call AssertException(["py mnv.chdir(None)"], "MNV(python):TypeError:")
 endfunc
 
 " Test errors
@@ -2715,21 +2715,21 @@ func Test_python_errors()
   endfunc
 
   new
-  py cb = vim.current.buffer
+  py cb = mnv.current.buffer
 
   py << trim EOF
-    d = vim.Dictionary()
-    ned = vim.Dictionary(foo='bar', baz='abcD')
-    dl = vim.Dictionary(a=1)
+    d = mnv.Dictionary()
+    ned = mnv.Dictionary(foo='bar', baz='abcD')
+    dl = mnv.Dictionary(a=1)
     dl.locked = True
-    l = vim.List()
-    ll = vim.List('abcE')
+    l = mnv.List()
+    ll = mnv.List('abcE')
     ll.locked = True
-    nel = vim.List('abcO')
-    f = vim.Function('string')
-    fd = vim.Function('F')
-    fdel = vim.Function('D')
-    vim.command('delfunction D')
+    nel = mnv.List('abcO')
+    f = mnv.Function('string')
+    fd = mnv.Function('F')
+    fdel = mnv.Function('D')
+    mnv.command('delfunction D')
 
     def subexpr_test(expr, name, subexprs):
         cb.append('>>> Testing %s using %s' % (name, expr))
@@ -2889,50 +2889,50 @@ func Test_python_errors()
     ee('sys.stdout.writelines(None)')
     ee('sys.stdout.writelines([1])')
     iter_test('sys.stdout.writelines(%s)')
-    cb.append("> VimCommand")
-    stringtochars_test('vim.command(%s)')
-    ee('vim.command("", 2)')
-    #! Not checked: vim->python exceptions translating: checked later
-    cb.append("> VimToPython")
+    cb.append("> MNVCommand")
+    stringtochars_test('mnv.command(%s)')
+    ee('mnv.command("", 2)')
+    #! Not checked: mnv->python exceptions translating: checked later
+    cb.append("> MNVToPython")
     #! Not checked: everything: needs errors in internal python functions
-    cb.append("> VimEval")
-    stringtochars_test('vim.eval(%s)')
-    ee('vim.eval("", FailingTrue())')
+    cb.append("> MNVEval")
+    stringtochars_test('mnv.eval(%s)')
+    ee('mnv.eval("", FailingTrue())')
     #! Not checked: everything: needs errors in internal python functions
-    cb.append("> VimEvalPy")
-    stringtochars_test('vim.bindeval(%s)')
-    ee('vim.eval("", 2)')
-    #! Not checked: vim->python exceptions translating: checked later
-    cb.append("> VimStrwidth")
-    stringtochars_test('vim.strwidth(%s)')
-    cb.append("> VimForeachRTP")
-    ee('vim.foreach_rtp(None)')
-    ee('vim.foreach_rtp(NoArgsCall())')
-    ee('vim.foreach_rtp(FailingCall())')
-    ee('vim.foreach_rtp(int, 2)')
+    cb.append("> MNVEvalPy")
+    stringtochars_test('mnv.bindeval(%s)')
+    ee('mnv.eval("", 2)')
+    #! Not checked: mnv->python exceptions translating: checked later
+    cb.append("> MNVStrwidth")
+    stringtochars_test('mnv.strwidth(%s)')
+    cb.append("> MNVForeachRTP")
+    ee('mnv.foreach_rtp(None)')
+    ee('mnv.foreach_rtp(NoArgsCall())')
+    ee('mnv.foreach_rtp(FailingCall())')
+    ee('mnv.foreach_rtp(int, 2)')
     cb.append('> import')
-    old_rtp = vim.options['rtp']
-    vim.options['rtp'] = os.getcwd().replace('\\', '\\\\').replace(',', '\\,')
+    old_rtp = mnv.options['rtp']
+    mnv.options['rtp'] = os.getcwd().replace('\\', '\\\\').replace(',', '\\,')
     ee('import xxx_no_such_module_xxx')
     ee('import failing_import')
     ee('import failing')
-    vim.options['rtp'] = old_rtp
+    mnv.options['rtp'] = old_rtp
     del old_rtp
     cb.append("> Options")
     cb.append(">> OptionsItem")
-    ee('vim.options["abcQ"]')
-    ee('vim.options[""]')
-    stringtochars_test('vim.options[%s]')
+    ee('mnv.options["abcQ"]')
+    ee('mnv.options[""]')
+    stringtochars_test('mnv.options[%s]')
     cb.append(">> OptionsContains")
-    stringtochars_test('%s in vim.options')
+    stringtochars_test('%s in mnv.options')
     cb.append("> Dictionary")
     cb.append(">> DictionaryConstructor")
-    ee('vim.Dictionary("abcI")')
+    ee('mnv.Dictionary("abcI")')
     ##! Not checked: py_dict_alloc failure
     cb.append(">> DictionarySetattr")
     ee('del d.locked')
     ee('d.locked = FailingTrue()')
-    ee('vim.vvars.locked = False')
+    ee('mnv.vvars.locked = False')
     ee('d.scope = True')
     ee('d.xxx = True')
     cb.append(">> _DictionaryItem")
@@ -2966,10 +2966,10 @@ func Test_python_errors()
     ee('d.has_key()')
     cb.append("> List")
     cb.append(">> ListConstructor")
-    ee('vim.List(1, 2)')
-    ee('vim.List(a=1)')
-    iter_test('vim.List(%s)')
-    convertfrompyobject_test('vim.List([%s])')
+    ee('mnv.List(1, 2)')
+    ee('mnv.List(a=1)')
+    iter_test('mnv.List(%s)')
+    convertfrompyobject_test('mnv.List([%s])')
     cb.append(">> ListItem")
     ee('l[1000]')
     cb.append(">> ListAssItem")
@@ -2997,82 +2997,82 @@ func Test_python_errors()
     cb.append("> Function")
     cb.append(">> FunctionConstructor")
     cb.append(">>> FunctionConstructor")
-    ee('vim.Function("123")')
-    ee('vim.Function("xxx_non_existent_function_xxx")')
-    ee('vim.Function("xxx#non#existent#function#xxx")')
-    ee('vim.Function("xxx_non_existent_function_xxx2", args=[])')
-    ee('vim.Function("xxx_non_existent_function_xxx3", self={})')
-    ee('vim.Function("xxx_non_existent_function_xxx4", args=[], self={})')
+    ee('mnv.Function("123")')
+    ee('mnv.Function("xxx_non_existent_function_xxx")')
+    ee('mnv.Function("xxx#non#existent#function#xxx")')
+    ee('mnv.Function("xxx_non_existent_function_xxx2", args=[])')
+    ee('mnv.Function("xxx_non_existent_function_xxx3", self={})')
+    ee('mnv.Function("xxx_non_existent_function_xxx4", args=[], self={})')
     cb.append(">>> FunctionNew")
-    ee('vim.Function("tr", self="abcFuncSelf")')
-    ee('vim.Function("tr", args=427423)')
-    ee('vim.Function("tr", self="abcFuncSelf2", args="abcFuncArgs2")')
-    ee('vim.Function(self="abcFuncSelf2", args="abcFuncArgs2")')
-    ee('vim.Function("tr", "", self="abcFuncSelf2", args="abcFuncArgs2")')
-    ee('vim.Function("tr", "")')
+    ee('mnv.Function("tr", self="abcFuncSelf")')
+    ee('mnv.Function("tr", args=427423)')
+    ee('mnv.Function("tr", self="abcFuncSelf2", args="abcFuncArgs2")')
+    ee('mnv.Function(self="abcFuncSelf2", args="abcFuncArgs2")')
+    ee('mnv.Function("tr", "", self="abcFuncSelf2", args="abcFuncArgs2")')
+    ee('mnv.Function("tr", "")')
     cb.append(">> FunctionCall")
     convertfrompyobject_test('f(%s)')
     convertfrompymapping_test('fd(self=%s)')
     cb.append("> TabPage")
     cb.append(">> TabPageAttr")
-    ee('vim.current.tabpage.xxx')
+    ee('mnv.current.tabpage.xxx')
     cb.append("> TabList")
     cb.append(">> TabListItem")
-    ee('vim.tabpages[1000]')
+    ee('mnv.tabpages[1000]')
     cb.append("> Window")
     cb.append(">> WindowAttr")
-    ee('vim.current.window.xxx')
+    ee('mnv.current.window.xxx')
     cb.append(">> WindowSetattr")
-    ee('vim.current.window.buffer = 0')
-    ee('vim.current.window.cursor = (100000000, 100000000)')
-    ee('vim.current.window.cursor = True')
-    number_test('vim.current.window.height = %s', unsigned=True)
-    number_test('vim.current.window.width = %s', unsigned=True)
-    ee('vim.current.window.xxxxxx = True')
+    ee('mnv.current.window.buffer = 0')
+    ee('mnv.current.window.cursor = (100000000, 100000000)')
+    ee('mnv.current.window.cursor = True')
+    number_test('mnv.current.window.height = %s', unsigned=True)
+    number_test('mnv.current.window.width = %s', unsigned=True)
+    ee('mnv.current.window.xxxxxx = True')
     cb.append("> WinList")
     cb.append(">> WinListItem")
-    ee('vim.windows[1000]')
+    ee('mnv.windows[1000]')
     cb.append("> Buffer")
     cb.append(">> StringToLine (indirect)")
-    ee('vim.current.buffer[0] = "\\na"')
-    ee('vim.current.buffer[0] = u"\\na"')
+    ee('mnv.current.buffer[0] = "\\na"')
+    ee('mnv.current.buffer[0] = u"\\na"')
     cb.append(">> SetBufferLine (indirect)")
-    ee('vim.current.buffer[0] = True')
+    ee('mnv.current.buffer[0] = True')
     cb.append(">> SetBufferLineList (indirect)")
-    ee('vim.current.buffer[:] = True')
-    ee('vim.current.buffer[:] = ["\\na", "bc"]')
+    ee('mnv.current.buffer[:] = True')
+    ee('mnv.current.buffer[:] = ["\\na", "bc"]')
     cb.append(">> InsertBufferLines (indirect)")
-    ee('vim.current.buffer.append(None)')
-    ee('vim.current.buffer.append(["\\na", "bc"])')
-    ee('vim.current.buffer.append("\\nbc")')
+    ee('mnv.current.buffer.append(None)')
+    ee('mnv.current.buffer.append(["\\na", "bc"])')
+    ee('mnv.current.buffer.append("\\nbc")')
     cb.append(">> RBItem")
-    ee('vim.current.buffer[100000000]')
+    ee('mnv.current.buffer[100000000]')
     cb.append(">> RBAsItem")
-    ee('vim.current.buffer[100000000] = ""')
+    ee('mnv.current.buffer[100000000] = ""')
     cb.append(">> BufferAttr")
-    ee('vim.current.buffer.xxx')
+    ee('mnv.current.buffer.xxx')
     cb.append(">> BufferSetattr")
-    ee('vim.current.buffer.name = True')
-    ee('vim.current.buffer.xxx = True')
+    ee('mnv.current.buffer.name = True')
+    ee('mnv.current.buffer.xxx = True')
     cb.append(">> BufferMark")
-    ee('vim.current.buffer.mark(0)')
-    ee('vim.current.buffer.mark("abcM")')
-    ee('vim.current.buffer.mark("!")')
+    ee('mnv.current.buffer.mark(0)')
+    ee('mnv.current.buffer.mark("abcM")')
+    ee('mnv.current.buffer.mark("!")')
     cb.append(">> BufferRange")
-    ee('vim.current.buffer.range(1, 2, 3)')
+    ee('mnv.current.buffer.range(1, 2, 3)')
     cb.append("> BufMap")
     cb.append(">> BufMapItem")
-    ee('vim.buffers[100000000]')
-    number_test('vim.buffers[%s]', natural=True)
+    ee('mnv.buffers[100000000]')
+    number_test('mnv.buffers[%s]', natural=True)
     cb.append("> Current")
     cb.append(">> CurrentGetattr")
-    ee('vim.current.xxx')
+    ee('mnv.current.xxx')
     cb.append(">> CurrentSetattr")
-    ee('vim.current.line = True')
-    ee('vim.current.buffer = True')
-    ee('vim.current.window = True')
-    ee('vim.current.tabpage = True')
-    ee('vim.current.xxx = True')
+    ee('mnv.current.line = True')
+    ee('mnv.current.buffer = True')
+    ee('mnv.current.window = True')
+    ee('mnv.current.tabpage = True')
+    ee('mnv.current.xxx = True')
     del d
     del ned
     del dl
@@ -3143,65 +3143,65 @@ func Test_python_errors()
     sys.stdout.writelines(FailingIter()):NotImplementedError:('iter',)
     sys.stdout.writelines(FailingIterNext()):NotImplementedError:('next',)
     <<< Finished
-    > VimCommand
-    >>> Testing StringToChars using vim.command(%s)
-    vim.command(1):TypeError:('expected str() or unicode() instance, but got int',)
-    vim.command(u"\0"):TypeError:('expected string without null bytes',)
-    vim.command("\0"):TypeError:('expected string without null bytes',)
-    <<< Finished
-    vim.command("", 2):TypeError:('command() takes exactly one argument (2 given)',)
-    > VimToPython
-    > VimEval
-    >>> Testing StringToChars using vim.eval(%s)
-    vim.eval(1):TypeError:('expected str() or unicode() instance, but got int',)
-    vim.eval(u"\0"):TypeError:('expected string without null bytes',)
-    vim.eval("\0"):TypeError:('expected string without null bytes',)
-    <<< Finished
-    vim.eval("", FailingTrue()):TypeError:('function takes exactly 1 argument (2 given)',)
-    > VimEvalPy
-    >>> Testing StringToChars using vim.bindeval(%s)
-    vim.bindeval(1):TypeError:('expected str() or unicode() instance, but got int',)
-    vim.bindeval(u"\0"):TypeError:('expected string without null bytes',)
-    vim.bindeval("\0"):TypeError:('expected string without null bytes',)
-    <<< Finished
-    vim.eval("", 2):TypeError:('function takes exactly 1 argument (2 given)',)
-    > VimStrwidth
-    >>> Testing StringToChars using vim.strwidth(%s)
-    vim.strwidth(1):TypeError:('expected str() or unicode() instance, but got int',)
-    vim.strwidth(u"\0"):TypeError:('expected string without null bytes',)
-    vim.strwidth("\0"):TypeError:('expected string without null bytes',)
-    <<< Finished
-    > VimForeachRTP
-    vim.foreach_rtp(None):TypeError:("'NoneType' object is not callable",)
-    vim.foreach_rtp(NoArgsCall()):TypeError:('__call__() takes exactly 1 argument (2 given)',)
-    vim.foreach_rtp(FailingCall()):NotImplementedError:('call',)
-    vim.foreach_rtp(int, 2):TypeError:('foreach_rtp() takes exactly one argument (2 given)',)
+    > MNVCommand
+    >>> Testing StringToChars using mnv.command(%s)
+    mnv.command(1):TypeError:('expected str() or unicode() instance, but got int',)
+    mnv.command(u"\0"):TypeError:('expected string without null bytes',)
+    mnv.command("\0"):TypeError:('expected string without null bytes',)
+    <<< Finished
+    mnv.command("", 2):TypeError:('command() takes exactly one argument (2 given)',)
+    > MNVToPython
+    > MNVEval
+    >>> Testing StringToChars using mnv.eval(%s)
+    mnv.eval(1):TypeError:('expected str() or unicode() instance, but got int',)
+    mnv.eval(u"\0"):TypeError:('expected string without null bytes',)
+    mnv.eval("\0"):TypeError:('expected string without null bytes',)
+    <<< Finished
+    mnv.eval("", FailingTrue()):TypeError:('function takes exactly 1 argument (2 given)',)
+    > MNVEvalPy
+    >>> Testing StringToChars using mnv.bindeval(%s)
+    mnv.bindeval(1):TypeError:('expected str() or unicode() instance, but got int',)
+    mnv.bindeval(u"\0"):TypeError:('expected string without null bytes',)
+    mnv.bindeval("\0"):TypeError:('expected string without null bytes',)
+    <<< Finished
+    mnv.eval("", 2):TypeError:('function takes exactly 1 argument (2 given)',)
+    > MNVStrwidth
+    >>> Testing StringToChars using mnv.strwidth(%s)
+    mnv.strwidth(1):TypeError:('expected str() or unicode() instance, but got int',)
+    mnv.strwidth(u"\0"):TypeError:('expected string without null bytes',)
+    mnv.strwidth("\0"):TypeError:('expected string without null bytes',)
+    <<< Finished
+    > MNVForeachRTP
+    mnv.foreach_rtp(None):TypeError:("'NoneType' object is not callable",)
+    mnv.foreach_rtp(NoArgsCall()):TypeError:('__call__() takes exactly 1 argument (2 given)',)
+    mnv.foreach_rtp(FailingCall()):NotImplementedError:('call',)
+    mnv.foreach_rtp(int, 2):TypeError:('foreach_rtp() takes exactly one argument (2 given)',)
     > import
     import xxx_no_such_module_xxx:ImportError:('No module named xxx_no_such_module_xxx',)
     import failing_import:ImportError:()
     import failing:NotImplementedError:()
     > Options
     >> OptionsItem
-    vim.options["abcQ"]:KeyError:('abcQ',)
-    vim.options[""]:ValueError:('empty keys are not allowed',)
-    >>> Testing StringToChars using vim.options[%s]
-    vim.options[1]:TypeError:('expected str() or unicode() instance, but got int',)
-    vim.options[u"\0"]:TypeError:('expected string without null bytes',)
-    vim.options["\0"]:TypeError:('expected string without null bytes',)
+    mnv.options["abcQ"]:KeyError:('abcQ',)
+    mnv.options[""]:ValueError:('empty keys are not allowed',)
+    >>> Testing StringToChars using mnv.options[%s]
+    mnv.options[1]:TypeError:('expected str() or unicode() instance, but got int',)
+    mnv.options[u"\0"]:TypeError:('expected string without null bytes',)
+    mnv.options["\0"]:TypeError:('expected string without null bytes',)
     <<< Finished
     >> OptionsContains
-    >>> Testing StringToChars using %s in vim.options
-    1 in vim.options:TypeError:('expected str() or unicode() instance, but got int',)
-    u"\0" in vim.options:TypeError:('expected string without null bytes',)
-    "\0" in vim.options:TypeError:('expected string without null bytes',)
+    >>> Testing StringToChars using %s in mnv.options
+    1 in mnv.options:TypeError:('expected str() or unicode() instance, but got int',)
+    u"\0" in mnv.options:TypeError:('expected string without null bytes',)
+    "\0" in mnv.options:TypeError:('expected string without null bytes',)
     <<< Finished
     > Dictionary
     >> DictionaryConstructor
-    vim.Dictionary("abcI"):ValueError:('expected sequence element of size 2, but got sequence of size 1',)
+    mnv.Dictionary("abcI"):ValueError:('expected sequence element of size 2, but got sequence of size 1',)
     >> DictionarySetattr
-    del d.locked:AttributeError:('cannot delete vim.Dictionary attributes',)
+    del d.locked:AttributeError:('cannot delete mnv.Dictionary attributes',)
     d.locked = FailingTrue():NotImplementedError:('bool',)
-    vim.vvars.locked = False:TypeError:('cannot modify fixed dictionary',)
+    mnv.vvars.locked = False:TypeError:('cannot modify fixed dictionary',)
     d.scope = True:AttributeError:('cannot set attribute scope',)
     d.xxx = True:AttributeError:('cannot set attribute xxx',)
     >> _DictionaryItem
@@ -3241,7 +3241,7 @@ func Test_python_errors()
     d["a"] = {"abcF" : Mapping({"\0" : 1})}:TypeError:('expected string without null bytes',)
     <<< Finished
     >>> Testing *Iter* using d["a"] = {"abcF" : %s}
-    d["a"] = {"abcF" : FailingIter()}:TypeError:('unable to convert FailingIter to a Vim structure',)
+    d["a"] = {"abcF" : FailingIter()}:TypeError:('unable to convert FailingIter to a MNV structure',)
     d["a"] = {"abcF" : FailingIterNext()}:NotImplementedError:('next',)
     <<< Finished
     >>> Testing ConvertFromPyObject using d["a"] = {"abcF" : %s}
@@ -3268,7 +3268,7 @@ func Test_python_errors()
     d["a"] = Mapping({"abcG" : Mapping({"\0" : 1})}):TypeError:('expected string without null bytes',)
     <<< Finished
     >>> Testing *Iter* using d["a"] = Mapping({"abcG" : %s})
-    d["a"] = Mapping({"abcG" : FailingIter()}):TypeError:('unable to convert FailingIter to a Vim structure',)
+    d["a"] = Mapping({"abcG" : FailingIter()}):TypeError:('unable to convert FailingIter to a MNV structure',)
     d["a"] = Mapping({"abcG" : FailingIterNext()}):NotImplementedError:('next',)
     <<< Finished
     >>> Testing ConvertFromPyObject using d["a"] = Mapping({"abcG" : %s})
@@ -3280,7 +3280,7 @@ func Test_python_errors()
     d["a"] = Mapping({"abcG" : FailingNumber()}):TypeError:('long() argument must be a string or a number',)
     <<< Finished
     >>> Testing *Iter* using d["a"] = %s
-    d["a"] = FailingIter():TypeError:('unable to convert FailingIter to a Vim structure',)
+    d["a"] = FailingIter():TypeError:('unable to convert FailingIter to a MNV structure',)
     d["a"] = FailingIterNext():NotImplementedError:('next',)
     <<< Finished
     >>> Testing ConvertFromPyObject using d["a"] = %s
@@ -3317,7 +3317,7 @@ func Test_python_errors()
     d.update({"abcF" : Mapping({"\0" : 1})}):TypeError:('expected string without null bytes',)
     <<< Finished
     >>> Testing *Iter* using d.update({"abcF" : %s})
-    d.update({"abcF" : FailingIter()}):TypeError:('unable to convert FailingIter to a Vim structure',)
+    d.update({"abcF" : FailingIter()}):TypeError:('unable to convert FailingIter to a MNV structure',)
     d.update({"abcF" : FailingIterNext()}):NotImplementedError:('next',)
     <<< Finished
     >>> Testing ConvertFromPyObject using d.update({"abcF" : %s})
@@ -3344,7 +3344,7 @@ func Test_python_errors()
     d.update(Mapping({"abcG" : Mapping({"\0" : 1})})):TypeError:('expected string without null bytes',)
     <<< Finished
     >>> Testing *Iter* using d.update(Mapping({"abcG" : %s}))
-    d.update(Mapping({"abcG" : FailingIter()})):TypeError:('unable to convert FailingIter to a Vim structure',)
+    d.update(Mapping({"abcG" : FailingIter()})):TypeError:('unable to convert FailingIter to a MNV structure',)
     d.update(Mapping({"abcG" : FailingIterNext()})):NotImplementedError:('next',)
     <<< Finished
     >>> Testing ConvertFromPyObject using d.update(Mapping({"abcG" : %s}))
@@ -3388,7 +3388,7 @@ func Test_python_errors()
     d.update((("a", {"abcF" : Mapping({"\0" : 1})}),)):TypeError:('expected string without null bytes',)
     <<< Finished
     >>> Testing *Iter* using d.update((("a", {"abcF" : %s}),))
-    d.update((("a", {"abcF" : FailingIter()}),)):TypeError:('unable to convert FailingIter to a Vim structure',)
+    d.update((("a", {"abcF" : FailingIter()}),)):TypeError:('unable to convert FailingIter to a MNV structure',)
     d.update((("a", {"abcF" : FailingIterNext()}),)):NotImplementedError:('next',)
     <<< Finished
     >>> Testing ConvertFromPyObject using d.update((("a", {"abcF" : %s}),))
@@ -3415,7 +3415,7 @@ func Test_python_errors()
     d.update((("a", Mapping({"abcG" : Mapping({"\0" : 1})})),)):TypeError:('expected string without null bytes',)
     <<< Finished
     >>> Testing *Iter* using d.update((("a", Mapping({"abcG" : %s})),))
-    d.update((("a", Mapping({"abcG" : FailingIter()})),)):TypeError:('unable to convert FailingIter to a Vim structure',)
+    d.update((("a", Mapping({"abcG" : FailingIter()})),)):TypeError:('unable to convert FailingIter to a MNV structure',)
     d.update((("a", Mapping({"abcG" : FailingIterNext()})),)):NotImplementedError:('next',)
     <<< Finished
     >>> Testing ConvertFromPyObject using d.update((("a", Mapping({"abcG" : %s})),))
@@ -3427,7 +3427,7 @@ func Test_python_errors()
     d.update((("a", Mapping({"abcG" : FailingNumber()})),)):TypeError:('long() argument must be a string or a number',)
     <<< Finished
     >>> Testing *Iter* using d.update((("a", %s),))
-    d.update((("a", FailingIter()),)):TypeError:('unable to convert FailingIter to a Vim structure',)
+    d.update((("a", FailingIter()),)):TypeError:('unable to convert FailingIter to a MNV structure',)
     d.update((("a", FailingIterNext()),)):NotImplementedError:('next',)
     <<< Finished
     >>> Testing ConvertFromPyObject using d.update((("a", %s),))
@@ -3444,77 +3444,77 @@ func Test_python_errors()
     d.has_key():TypeError:('has_key() takes exactly one argument (0 given)',)
     > List
     >> ListConstructor
-    vim.List(1, 2):TypeError:('function takes at most 1 argument (2 given)',)
-    vim.List(a=1):TypeError:('list constructor does not accept keyword arguments',)
-    >>> Testing *Iter* using vim.List(%s)
-    vim.List(FailingIter()):NotImplementedError:('iter',)
-    vim.List(FailingIterNext()):NotImplementedError:('next',)
-    <<< Finished
-    >>> Testing StringToChars using vim.List([{%s : 1}])
-    vim.List([{1 : 1}]):TypeError:('expected str() or unicode() instance, but got int',)
-    vim.List([{u"\0" : 1}]):TypeError:('expected string without null bytes',)
-    vim.List([{"\0" : 1}]):TypeError:('expected string without null bytes',)
-    <<< Finished
-    >>> Testing StringToChars using vim.List([{"abcF" : {%s : 1}}])
-    vim.List([{"abcF" : {1 : 1}}]):TypeError:('expected str() or unicode() instance, but got int',)
-    vim.List([{"abcF" : {u"\0" : 1}}]):TypeError:('expected string without null bytes',)
-    vim.List([{"abcF" : {"\0" : 1}}]):TypeError:('expected string without null bytes',)
-    <<< Finished
-    >>> Testing StringToChars using vim.List([{"abcF" : Mapping({%s : 1})}])
-    vim.List([{"abcF" : Mapping({1 : 1})}]):TypeError:('expected str() or unicode() instance, but got int',)
-    vim.List([{"abcF" : Mapping({u"\0" : 1})}]):TypeError:('expected string without null bytes',)
-    vim.List([{"abcF" : Mapping({"\0" : 1})}]):TypeError:('expected string without null bytes',)
-    <<< Finished
-    >>> Testing *Iter* using vim.List([{"abcF" : %s}])
-    vim.List([{"abcF" : FailingIter()}]):TypeError:('unable to convert FailingIter to a Vim structure',)
-    vim.List([{"abcF" : FailingIterNext()}]):NotImplementedError:('next',)
-    <<< Finished
-    >>> Testing ConvertFromPyObject using vim.List([{"abcF" : %s}])
-    vim.List([{"abcF" : None}]):NOT FAILED
-    vim.List([{"abcF" : {"": 1}}]):ValueError:('empty keys are not allowed',)
-    vim.List([{"abcF" : {u"": 1}}]):ValueError:('empty keys are not allowed',)
-    vim.List([{"abcF" : FailingMapping()}]):NotImplementedError:('keys',)
-    vim.List([{"abcF" : FailingMappingKey()}]):NotImplementedError:('getitem:mappingkey',)
-    vim.List([{"abcF" : FailingNumber()}]):TypeError:('long() argument must be a string or a number',)
-    <<< Finished
-    >>> Testing StringToChars using vim.List([Mapping({%s : 1})])
-    vim.List([Mapping({1 : 1})]):TypeError:('expected str() or unicode() instance, but got int',)
-    vim.List([Mapping({u"\0" : 1})]):TypeError:('expected string without null bytes',)
-    vim.List([Mapping({"\0" : 1})]):TypeError:('expected string without null bytes',)
-    <<< Finished
-    >>> Testing StringToChars using vim.List([Mapping({"abcG" : {%s : 1}})])
-    vim.List([Mapping({"abcG" : {1 : 1}})]):TypeError:('expected str() or unicode() instance, but got int',)
-    vim.List([Mapping({"abcG" : {u"\0" : 1}})]):TypeError:('expected string without null bytes',)
-    vim.List([Mapping({"abcG" : {"\0" : 1}})]):TypeError:('expected string without null bytes',)
-    <<< Finished
-    >>> Testing StringToChars using vim.List([Mapping({"abcG" : Mapping({%s : 1})})])
-    vim.List([Mapping({"abcG" : Mapping({1 : 1})})]):TypeError:('expected str() or unicode() instance, but got int',)
-    vim.List([Mapping({"abcG" : Mapping({u"\0" : 1})})]):TypeError:('expected string without null bytes',)
-    vim.List([Mapping({"abcG" : Mapping({"\0" : 1})})]):TypeError:('expected string without null bytes',)
-    <<< Finished
-    >>> Testing *Iter* using vim.List([Mapping({"abcG" : %s})])
-    vim.List([Mapping({"abcG" : FailingIter()})]):TypeError:('unable to convert FailingIter to a Vim structure',)
-    vim.List([Mapping({"abcG" : FailingIterNext()})]):NotImplementedError:('next',)
-    <<< Finished
-    >>> Testing ConvertFromPyObject using vim.List([Mapping({"abcG" : %s})])
-    vim.List([Mapping({"abcG" : None})]):NOT FAILED
-    vim.List([Mapping({"abcG" : {"": 1}})]):ValueError:('empty keys are not allowed',)
-    vim.List([Mapping({"abcG" : {u"": 1}})]):ValueError:('empty keys are not allowed',)
-    vim.List([Mapping({"abcG" : FailingMapping()})]):NotImplementedError:('keys',)
-    vim.List([Mapping({"abcG" : FailingMappingKey()})]):NotImplementedError:('getitem:mappingkey',)
-    vim.List([Mapping({"abcG" : FailingNumber()})]):TypeError:('long() argument must be a string or a number',)
-    <<< Finished
-    >>> Testing *Iter* using vim.List([%s])
-    vim.List([FailingIter()]):TypeError:('unable to convert FailingIter to a Vim structure',)
-    vim.List([FailingIterNext()]):NotImplementedError:('next',)
-    <<< Finished
-    >>> Testing ConvertFromPyObject using vim.List([%s])
-    vim.List([None]):NOT FAILED
-    vim.List([{"": 1}]):ValueError:('empty keys are not allowed',)
-    vim.List([{u"": 1}]):ValueError:('empty keys are not allowed',)
-    vim.List([FailingMapping()]):NotImplementedError:('keys',)
-    vim.List([FailingMappingKey()]):NotImplementedError:('getitem:mappingkey',)
-    vim.List([FailingNumber()]):TypeError:('long() argument must be a string or a number',)
+    mnv.List(1, 2):TypeError:('function takes at most 1 argument (2 given)',)
+    mnv.List(a=1):TypeError:('list constructor does not accept keyword arguments',)
+    >>> Testing *Iter* using mnv.List(%s)
+    mnv.List(FailingIter()):NotImplementedError:('iter',)
+    mnv.List(FailingIterNext()):NotImplementedError:('next',)
+    <<< Finished
+    >>> Testing StringToChars using mnv.List([{%s : 1}])
+    mnv.List([{1 : 1}]):TypeError:('expected str() or unicode() instance, but got int',)
+    mnv.List([{u"\0" : 1}]):TypeError:('expected string without null bytes',)
+    mnv.List([{"\0" : 1}]):TypeError:('expected string without null bytes',)
+    <<< Finished
+    >>> Testing StringToChars using mnv.List([{"abcF" : {%s : 1}}])
+    mnv.List([{"abcF" : {1 : 1}}]):TypeError:('expected str() or unicode() instance, but got int',)
+    mnv.List([{"abcF" : {u"\0" : 1}}]):TypeError:('expected string without null bytes',)
+    mnv.List([{"abcF" : {"\0" : 1}}]):TypeError:('expected string without null bytes',)
+    <<< Finished
+    >>> Testing StringToChars using mnv.List([{"abcF" : Mapping({%s : 1})}])
+    mnv.List([{"abcF" : Mapping({1 : 1})}]):TypeError:('expected str() or unicode() instance, but got int',)
+    mnv.List([{"abcF" : Mapping({u"\0" : 1})}]):TypeError:('expected string without null bytes',)
+    mnv.List([{"abcF" : Mapping({"\0" : 1})}]):TypeError:('expected string without null bytes',)
+    <<< Finished
+    >>> Testing *Iter* using mnv.List([{"abcF" : %s}])
+    mnv.List([{"abcF" : FailingIter()}]):TypeError:('unable to convert FailingIter to a MNV structure',)
+    mnv.List([{"abcF" : FailingIterNext()}]):NotImplementedError:('next',)
+    <<< Finished
+    >>> Testing ConvertFromPyObject using mnv.List([{"abcF" : %s}])
+    mnv.List([{"abcF" : None}]):NOT FAILED
+    mnv.List([{"abcF" : {"": 1}}]):ValueError:('empty keys are not allowed',)
+    mnv.List([{"abcF" : {u"": 1}}]):ValueError:('empty keys are not allowed',)
+    mnv.List([{"abcF" : FailingMapping()}]):NotImplementedError:('keys',)
+    mnv.List([{"abcF" : FailingMappingKey()}]):NotImplementedError:('getitem:mappingkey',)
+    mnv.List([{"abcF" : FailingNumber()}]):TypeError:('long() argument must be a string or a number',)
+    <<< Finished
+    >>> Testing StringToChars using mnv.List([Mapping({%s : 1})])
+    mnv.List([Mapping({1 : 1})]):TypeError:('expected str() or unicode() instance, but got int',)
+    mnv.List([Mapping({u"\0" : 1})]):TypeError:('expected string without null bytes',)
+    mnv.List([Mapping({"\0" : 1})]):TypeError:('expected string without null bytes',)
+    <<< Finished
+    >>> Testing StringToChars using mnv.List([Mapping({"abcG" : {%s : 1}})])
+    mnv.List([Mapping({"abcG" : {1 : 1}})]):TypeError:('expected str() or unicode() instance, but got int',)
+    mnv.List([Mapping({"abcG" : {u"\0" : 1}})]):TypeError:('expected string without null bytes',)
+    mnv.List([Mapping({"abcG" : {"\0" : 1}})]):TypeError:('expected string without null bytes',)
+    <<< Finished
+    >>> Testing StringToChars using mnv.List([Mapping({"abcG" : Mapping({%s : 1})})])
+    mnv.List([Mapping({"abcG" : Mapping({1 : 1})})]):TypeError:('expected str() or unicode() instance, but got int',)
+    mnv.List([Mapping({"abcG" : Mapping({u"\0" : 1})})]):TypeError:('expected string without null bytes',)
+    mnv.List([Mapping({"abcG" : Mapping({"\0" : 1})})]):TypeError:('expected string without null bytes',)
+    <<< Finished
+    >>> Testing *Iter* using mnv.List([Mapping({"abcG" : %s})])
+    mnv.List([Mapping({"abcG" : FailingIter()})]):TypeError:('unable to convert FailingIter to a MNV structure',)
+    mnv.List([Mapping({"abcG" : FailingIterNext()})]):NotImplementedError:('next',)
+    <<< Finished
+    >>> Testing ConvertFromPyObject using mnv.List([Mapping({"abcG" : %s})])
+    mnv.List([Mapping({"abcG" : None})]):NOT FAILED
+    mnv.List([Mapping({"abcG" : {"": 1}})]):ValueError:('empty keys are not allowed',)
+    mnv.List([Mapping({"abcG" : {u"": 1}})]):ValueError:('empty keys are not allowed',)
+    mnv.List([Mapping({"abcG" : FailingMapping()})]):NotImplementedError:('keys',)
+    mnv.List([Mapping({"abcG" : FailingMappingKey()})]):NotImplementedError:('getitem:mappingkey',)
+    mnv.List([Mapping({"abcG" : FailingNumber()})]):TypeError:('long() argument must be a string or a number',)
+    <<< Finished
+    >>> Testing *Iter* using mnv.List([%s])
+    mnv.List([FailingIter()]):TypeError:('unable to convert FailingIter to a MNV structure',)
+    mnv.List([FailingIterNext()]):NotImplementedError:('next',)
+    <<< Finished
+    >>> Testing ConvertFromPyObject using mnv.List([%s])
+    mnv.List([None]):NOT FAILED
+    mnv.List([{"": 1}]):ValueError:('empty keys are not allowed',)
+    mnv.List([{u"": 1}]):ValueError:('empty keys are not allowed',)
+    mnv.List([FailingMapping()]):NotImplementedError:('keys',)
+    mnv.List([FailingMappingKey()]):NotImplementedError:('getitem:mappingkey',)
+    mnv.List([FailingNumber()]):TypeError:('long() argument must be a string or a number',)
     <<< Finished
     >> ListItem
     l[1000]:IndexError:('list index out of range',)
@@ -3551,7 +3551,7 @@ func Test_python_errors()
     l[:] = [{"abcF" : Mapping({"\0" : 1})}]:TypeError:('expected string without null bytes',)
     <<< Finished
     >>> Testing *Iter* using l[:] = [{"abcF" : %s}]
-    l[:] = [{"abcF" : FailingIter()}]:TypeError:('unable to convert FailingIter to a Vim structure',)
+    l[:] = [{"abcF" : FailingIter()}]:TypeError:('unable to convert FailingIter to a MNV structure',)
     l[:] = [{"abcF" : FailingIterNext()}]:NotImplementedError:('next',)
     <<< Finished
     >>> Testing ConvertFromPyObject using l[:] = [{"abcF" : %s}]
@@ -3578,7 +3578,7 @@ func Test_python_errors()
     l[:] = [Mapping({"abcG" : Mapping({"\0" : 1})})]:TypeError:('expected string without null bytes',)
     <<< Finished
     >>> Testing *Iter* using l[:] = [Mapping({"abcG" : %s})]
-    l[:] = [Mapping({"abcG" : FailingIter()})]:TypeError:('unable to convert FailingIter to a Vim structure',)
+    l[:] = [Mapping({"abcG" : FailingIter()})]:TypeError:('unable to convert FailingIter to a MNV structure',)
     l[:] = [Mapping({"abcG" : FailingIterNext()})]:NotImplementedError:('next',)
     <<< Finished
     >>> Testing ConvertFromPyObject using l[:] = [Mapping({"abcG" : %s})]
@@ -3590,7 +3590,7 @@ func Test_python_errors()
     l[:] = [Mapping({"abcG" : FailingNumber()})]:TypeError:('long() argument must be a string or a number',)
     <<< Finished
     >>> Testing *Iter* using l[:] = [%s]
-    l[:] = [FailingIter()]:TypeError:('unable to convert FailingIter to a Vim structure',)
+    l[:] = [FailingIter()]:TypeError:('unable to convert FailingIter to a MNV structure',)
     l[:] = [FailingIterNext()]:NotImplementedError:('next',)
     <<< Finished
     >>> Testing ConvertFromPyObject using l[:] = [%s]
@@ -3622,7 +3622,7 @@ func Test_python_errors()
     l.extend([{"abcF" : Mapping({"\0" : 1})}]):TypeError:('expected string without null bytes',)
     <<< Finished
     >>> Testing *Iter* using l.extend([{"abcF" : %s}])
-    l.extend([{"abcF" : FailingIter()}]):TypeError:('unable to convert FailingIter to a Vim structure',)
+    l.extend([{"abcF" : FailingIter()}]):TypeError:('unable to convert FailingIter to a MNV structure',)
     l.extend([{"abcF" : FailingIterNext()}]):NotImplementedError:('next',)
     <<< Finished
     >>> Testing ConvertFromPyObject using l.extend([{"abcF" : %s}])
@@ -3649,7 +3649,7 @@ func Test_python_errors()
     l.extend([Mapping({"abcG" : Mapping({"\0" : 1})})]):TypeError:('expected string without null bytes',)
     <<< Finished
     >>> Testing *Iter* using l.extend([Mapping({"abcG" : %s})])
-    l.extend([Mapping({"abcG" : FailingIter()})]):TypeError:('unable to convert FailingIter to a Vim structure',)
+    l.extend([Mapping({"abcG" : FailingIter()})]):TypeError:('unable to convert FailingIter to a MNV structure',)
     l.extend([Mapping({"abcG" : FailingIterNext()})]):NotImplementedError:('next',)
     <<< Finished
     >>> Testing ConvertFromPyObject using l.extend([Mapping({"abcG" : %s})])
@@ -3661,7 +3661,7 @@ func Test_python_errors()
     l.extend([Mapping({"abcG" : FailingNumber()})]):TypeError:('long() argument must be a string or a number',)
     <<< Finished
     >>> Testing *Iter* using l.extend([%s])
-    l.extend([FailingIter()]):TypeError:('unable to convert FailingIter to a Vim structure',)
+    l.extend([FailingIter()]):TypeError:('unable to convert FailingIter to a MNV structure',)
     l.extend([FailingIterNext()]):NotImplementedError:('next',)
     <<< Finished
     >>> Testing ConvertFromPyObject using l.extend([%s])
@@ -3673,25 +3673,25 @@ func Test_python_errors()
     l.extend([FailingNumber()]):TypeError:('long() argument must be a string or a number',)
     <<< Finished
     >> ListSetattr
-    del l.locked:AttributeError:('cannot delete vim.List attributes',)
+    del l.locked:AttributeError:('cannot delete mnv.List attributes',)
     l.locked = FailingTrue():NotImplementedError:('bool',)
     l.xxx = True:AttributeError:('cannot set attribute xxx',)
     > Function
     >> FunctionConstructor
     >>> FunctionConstructor
-    vim.Function("123"):ValueError:('unnamed function 123 does not exist',)
-    vim.Function("xxx_non_existent_function_xxx"):ValueError:('function xxx_non_existent_function_xxx does not exist',)
-    vim.Function("xxx#non#existent#function#xxx"):NOT FAILED
-    vim.Function("xxx_non_existent_function_xxx2", args=[]):ValueError:('function xxx_non_existent_function_xxx2 does not exist',)
-    vim.Function("xxx_non_existent_function_xxx3", self={}):ValueError:('function xxx_non_existent_function_xxx3 does not exist',)
-    vim.Function("xxx_non_existent_function_xxx4", args=[], self={}):ValueError:('function xxx_non_existent_function_xxx4 does not exist',)
+    mnv.Function("123"):ValueError:('unnamed function 123 does not exist',)
+    mnv.Function("xxx_non_existent_function_xxx"):ValueError:('function xxx_non_existent_function_xxx does not exist',)
+    mnv.Function("xxx#non#existent#function#xxx"):NOT FAILED
+    mnv.Function("xxx_non_existent_function_xxx2", args=[]):ValueError:('function xxx_non_existent_function_xxx2 does not exist',)
+    mnv.Function("xxx_non_existent_function_xxx3", self={}):ValueError:('function xxx_non_existent_function_xxx3 does not exist',)
+    mnv.Function("xxx_non_existent_function_xxx4", args=[], self={}):ValueError:('function xxx_non_existent_function_xxx4 does not exist',)
     >>> FunctionNew
-    vim.Function("tr", self="abcFuncSelf"):TypeError:('unable to convert str to a Vim dictionary',)
-    vim.Function("tr", args=427423):TypeError:('unable to convert int to a Vim list',)
-    vim.Function("tr", self="abcFuncSelf2", args="abcFuncArgs2"):TypeError:('unable to convert str to a Vim dictionary',)
-    vim.Function(self="abcFuncSelf2", args="abcFuncArgs2"):TypeError:('unable to convert str to a Vim dictionary',)
-    vim.Function("tr", "", self="abcFuncSelf2", args="abcFuncArgs2"):TypeError:('unable to convert str to a Vim dictionary',)
-    vim.Function("tr", ""):TypeError:('function takes exactly 1 argument (2 given)',)
+    mnv.Function("tr", self="abcFuncSelf"):TypeError:('unable to convert str to a MNV dictionary',)
+    mnv.Function("tr", args=427423):TypeError:('unable to convert int to a MNV list',)
+    mnv.Function("tr", self="abcFuncSelf2", args="abcFuncArgs2"):TypeError:('unable to convert str to a MNV dictionary',)
+    mnv.Function(self="abcFuncSelf2", args="abcFuncArgs2"):TypeError:('unable to convert str to a MNV dictionary',)
+    mnv.Function("tr", "", self="abcFuncSelf2", args="abcFuncArgs2"):TypeError:('unable to convert str to a MNV dictionary',)
+    mnv.Function("tr", ""):TypeError:('function takes exactly 1 argument (2 given)',)
     >> FunctionCall
     >>> Testing StringToChars using f({%s : 1})
     f({1 : 1}):TypeError:('expected str() or unicode() instance, but got int',)
@@ -3709,7 +3709,7 @@ func Test_python_errors()
     f({"abcF" : Mapping({"\0" : 1})}):TypeError:('expected string without null bytes',)
     <<< Finished
     >>> Testing *Iter* using f({"abcF" : %s})
-    f({"abcF" : FailingIter()}):TypeError:('unable to convert FailingIter to a Vim structure',)
+    f({"abcF" : FailingIter()}):TypeError:('unable to convert FailingIter to a MNV structure',)
     f({"abcF" : FailingIterNext()}):NotImplementedError:('next',)
     <<< Finished
     >>> Testing ConvertFromPyObject using f({"abcF" : %s})
@@ -3736,7 +3736,7 @@ func Test_python_errors()
     f(Mapping({"abcG" : Mapping({"\0" : 1})})):TypeError:('expected string without null bytes',)
     <<< Finished
     >>> Testing *Iter* using f(Mapping({"abcG" : %s}))
-    f(Mapping({"abcG" : FailingIter()})):TypeError:('unable to convert FailingIter to a Vim structure',)
+    f(Mapping({"abcG" : FailingIter()})):TypeError:('unable to convert FailingIter to a MNV structure',)
     f(Mapping({"abcG" : FailingIterNext()})):NotImplementedError:('next',)
     <<< Finished
     >>> Testing ConvertFromPyObject using f(Mapping({"abcG" : %s}))
@@ -3748,7 +3748,7 @@ func Test_python_errors()
     f(Mapping({"abcG" : FailingNumber()})):TypeError:('long() argument must be a string or a number',)
     <<< Finished
     >>> Testing *Iter* using f(%s)
-    f(FailingIter()):TypeError:('unable to convert FailingIter to a Vim structure',)
+    f(FailingIter()):TypeError:('unable to convert FailingIter to a MNV structure',)
     f(FailingIterNext()):NotImplementedError:('next',)
     <<< Finished
     >>> Testing ConvertFromPyObject using f(%s)
@@ -3775,7 +3775,7 @@ func Test_python_errors()
     fd(self={"abcF" : Mapping({"\0" : 1})}):TypeError:('expected string without null bytes',)
     <<< Finished
     >>> Testing *Iter* using fd(self={"abcF" : %s})
-    fd(self={"abcF" : FailingIter()}):TypeError:('unable to convert FailingIter to a Vim structure',)
+    fd(self={"abcF" : FailingIter()}):TypeError:('unable to convert FailingIter to a MNV structure',)
     fd(self={"abcF" : FailingIterNext()}):NotImplementedError:('next',)
     <<< Finished
     >>> Testing ConvertFromPyObject using fd(self={"abcF" : %s})
@@ -3802,7 +3802,7 @@ func Test_python_errors()
     fd(self=Mapping({"abcG" : Mapping({"\0" : 1})})):TypeError:('expected string without null bytes',)
     <<< Finished
     >>> Testing *Iter* using fd(self=Mapping({"abcG" : %s}))
-    fd(self=Mapping({"abcG" : FailingIter()})):TypeError:('unable to convert FailingIter to a Vim structure',)
+    fd(self=Mapping({"abcG" : FailingIter()})):TypeError:('unable to convert FailingIter to a MNV structure',)
     fd(self=Mapping({"abcG" : FailingIterNext()})):NotImplementedError:('next',)
     <<< Finished
     >>> Testing ConvertFromPyObject using fd(self=Mapping({"abcG" : %s}))
@@ -3814,93 +3814,93 @@ func Test_python_errors()
     fd(self=Mapping({"abcG" : FailingNumber()})):TypeError:('long() argument must be a string or a number',)
     <<< Finished
     >>> Testing *Iter* using fd(self=%s)
-    fd(self=FailingIter()):TypeError:('unable to convert FailingIter to a Vim dictionary',)
-    fd(self=FailingIterNext()):TypeError:('unable to convert FailingIterNext to a Vim dictionary',)
+    fd(self=FailingIter()):TypeError:('unable to convert FailingIter to a MNV dictionary',)
+    fd(self=FailingIterNext()):TypeError:('unable to convert FailingIterNext to a MNV dictionary',)
     <<< Finished
     >>> Testing ConvertFromPyObject using fd(self=%s)
-    fd(self=None):TypeError:('unable to convert NoneType to a Vim dictionary',)
+    fd(self=None):TypeError:('unable to convert NoneType to a MNV dictionary',)
     fd(self={"": 1}):ValueError:('empty keys are not allowed',)
     fd(self={u"": 1}):ValueError:('empty keys are not allowed',)
     fd(self=FailingMapping()):NotImplementedError:('keys',)
     fd(self=FailingMappingKey()):NotImplementedError:('getitem:mappingkey',)
-    fd(self=FailingNumber()):TypeError:('unable to convert FailingNumber to a Vim dictionary',)
+    fd(self=FailingNumber()):TypeError:('unable to convert FailingNumber to a MNV dictionary',)
     <<< Finished
     >>> Testing ConvertFromPyMapping using fd(self=%s)
-    fd(self=[]):TypeError:('unable to convert list to a Vim dictionary',)
+    fd(self=[]):TypeError:('unable to convert list to a MNV dictionary',)
     <<< Finished
     > TabPage
     >> TabPageAttr
-    vim.current.tabpage.xxx:AttributeError:('xxx',)
+    mnv.current.tabpage.xxx:AttributeError:('xxx',)
     > TabList
     >> TabListItem
-    vim.tabpages[1000]:IndexError:('no such tab page',)
+    mnv.tabpages[1000]:IndexError:('no such tab page',)
     > Window
     >> WindowAttr
-    vim.current.window.xxx:AttributeError:('xxx',)
+    mnv.current.window.xxx:AttributeError:('xxx',)
     >> WindowSetattr
-    vim.current.window.buffer = 0:TypeError:('readonly attribute: buffer',)
-    vim.current.window.cursor = (100000000, 100000000):error:('cursor position outside buffer',)
-    vim.current.window.cursor = True:TypeError:('argument must be 2-item sequence, not bool',)
-    >>> Testing NumberToLong using vim.current.window.height = %s
-    vim.current.window.height = []:TypeError:('expected int(), long() or something supporting coercing to long(), but got list',)
-    vim.current.window.height = None:TypeError:('expected int(), long() or something supporting coercing to long(), but got NoneType',)
-    vim.current.window.height = -1:ValueError:('number must be greater or equal to zero',)
-    <<< Finished
-    >>> Testing NumberToLong using vim.current.window.width = %s
-    vim.current.window.width = []:TypeError:('expected int(), long() or something supporting coercing to long(), but got list',)
-    vim.current.window.width = None:TypeError:('expected int(), long() or something supporting coercing to long(), but got NoneType',)
-    vim.current.window.width = -1:ValueError:('number must be greater or equal to zero',)
-    <<< Finished
-    vim.current.window.xxxxxx = True:AttributeError:('xxxxxx',)
+    mnv.current.window.buffer = 0:TypeError:('readonly attribute: buffer',)
+    mnv.current.window.cursor = (100000000, 100000000):error:('cursor position outside buffer',)
+    mnv.current.window.cursor = True:TypeError:('argument must be 2-item sequence, not bool',)
+    >>> Testing NumberToLong using mnv.current.window.height = %s
+    mnv.current.window.height = []:TypeError:('expected int(), long() or something supporting coercing to long(), but got list',)
+    mnv.current.window.height = None:TypeError:('expected int(), long() or something supporting coercing to long(), but got NoneType',)
+    mnv.current.window.height = -1:ValueError:('number must be greater or equal to zero',)
+    <<< Finished
+    >>> Testing NumberToLong using mnv.current.window.width = %s
+    mnv.current.window.width = []:TypeError:('expected int(), long() or something supporting coercing to long(), but got list',)
+    mnv.current.window.width = None:TypeError:('expected int(), long() or something supporting coercing to long(), but got NoneType',)
+    mnv.current.window.width = -1:ValueError:('number must be greater or equal to zero',)
+    <<< Finished
+    mnv.current.window.xxxxxx = True:AttributeError:('xxxxxx',)
     > WinList
     >> WinListItem
-    vim.windows[1000]:IndexError:('no such window',)
+    mnv.windows[1000]:IndexError:('no such window',)
     > Buffer
     >> StringToLine (indirect)
-    vim.current.buffer[0] = "\na":error:('string cannot contain newlines',)
-    vim.current.buffer[0] = u"\na":error:('string cannot contain newlines',)
+    mnv.current.buffer[0] = "\na":error:('string cannot contain newlines',)
+    mnv.current.buffer[0] = u"\na":error:('string cannot contain newlines',)
     >> SetBufferLine (indirect)
-    vim.current.buffer[0] = True:TypeError:('bad argument type for built-in operation',)
+    mnv.current.buffer[0] = True:TypeError:('bad argument type for built-in operation',)
     >> SetBufferLineList (indirect)
-    vim.current.buffer[:] = True:TypeError:('bad argument type for built-in operation',)
-    vim.current.buffer[:] = ["\na", "bc"]:error:('string cannot contain newlines',)
+    mnv.current.buffer[:] = True:TypeError:('bad argument type for built-in operation',)
+    mnv.current.buffer[:] = ["\na", "bc"]:error:('string cannot contain newlines',)
     >> InsertBufferLines (indirect)
-    vim.current.buffer.append(None):TypeError:('bad argument type for built-in operation',)
-    vim.current.buffer.append(["\na", "bc"]):error:('string cannot contain newlines',)
-    vim.current.buffer.append("\nbc"):error:('string cannot contain newlines',)
+    mnv.current.buffer.append(None):TypeError:('bad argument type for built-in operation',)
+    mnv.current.buffer.append(["\na", "bc"]):error:('string cannot contain newlines',)
+    mnv.current.buffer.append("\nbc"):error:('string cannot contain newlines',)
     >> RBItem
-    vim.current.buffer[100000000]:IndexError:('line number out of range',)
+    mnv.current.buffer[100000000]:IndexError:('line number out of range',)
     >> RBAsItem
-    vim.current.buffer[100000000] = "":IndexError:('line number out of range',)
+    mnv.current.buffer[100000000] = "":IndexError:('line number out of range',)
     >> BufferAttr
-    vim.current.buffer.xxx:AttributeError:('xxx',)
+    mnv.current.buffer.xxx:AttributeError:('xxx',)
     >> BufferSetattr
-    vim.current.buffer.name = True:TypeError:('expected str() or unicode() instance, but got bool',)
-    vim.current.buffer.xxx = True:AttributeError:('xxx',)
+    mnv.current.buffer.name = True:TypeError:('expected str() or unicode() instance, but got bool',)
+    mnv.current.buffer.xxx = True:AttributeError:('xxx',)
     >> BufferMark
-    vim.current.buffer.mark(0):TypeError:('expected str() or unicode() instance, but got int',)
-    vim.current.buffer.mark("abcM"):ValueError:('mark name must be a single character',)
-    vim.current.buffer.mark("!"):error:('invalid mark name',)
+    mnv.current.buffer.mark(0):TypeError:('expected str() or unicode() instance, but got int',)
+    mnv.current.buffer.mark("abcM"):ValueError:('mark name must be a single character',)
+    mnv.current.buffer.mark("!"):error:('invalid mark name',)
     >> BufferRange
-    vim.current.buffer.range(1, 2, 3):TypeError:('function takes exactly 2 arguments (3 given)',)
+    mnv.current.buffer.range(1, 2, 3):TypeError:('function takes exactly 2 arguments (3 given)',)
     > BufMap
     >> BufMapItem
-    vim.buffers[100000000]:KeyError:(100000000,)
-    >>> Testing NumberToLong using vim.buffers[%s]
-    vim.buffers[[]]:TypeError:('expected int(), long() or something supporting coercing to long(), but got list',)
-    vim.buffers[None]:TypeError:('expected int(), long() or something supporting coercing to long(), but got NoneType',)
-    vim.buffers[-1]:ValueError:('number must be greater than zero',)
-    vim.buffers[0]:ValueError:('number must be greater than zero',)
+    mnv.buffers[100000000]:KeyError:(100000000,)
+    >>> Testing NumberToLong using mnv.buffers[%s]
+    mnv.buffers[[]]:TypeError:('expected int(), long() or something supporting coercing to long(), but got list',)
+    mnv.buffers[None]:TypeError:('expected int(), long() or something supporting coercing to long(), but got NoneType',)
+    mnv.buffers[-1]:ValueError:('number must be greater than zero',)
+    mnv.buffers[0]:ValueError:('number must be greater than zero',)
     <<< Finished
     > Current
     >> CurrentGetattr
-    vim.current.xxx:AttributeError:('xxx',)
+    mnv.current.xxx:AttributeError:('xxx',)
     >> CurrentSetattr
-    vim.current.line = True:TypeError:('bad argument type for built-in operation',)
-    vim.current.buffer = True:TypeError:('expected vim.Buffer object, but got bool',)
-    vim.current.window = True:TypeError:('expected vim.Window object, but got bool',)
-    vim.current.tabpage = True:TypeError:('expected vim.TabPage object, but got bool',)
-    vim.current.xxx = True:AttributeError:('xxx',)
+    mnv.current.line = True:TypeError:('bad argument type for built-in operation',)
+    mnv.current.buffer = True:TypeError:('expected mnv.Buffer object, but got bool',)
+    mnv.current.window = True:TypeError:('expected mnv.Window object, but got bool',)
+    mnv.current.tabpage = True:TypeError:('expected mnv.TabPage object, but got bool',)
+    mnv.current.xxx = True:AttributeError:('xxx',)
   END
 
   call assert_equal(expected, getline(2, '$'))
@@ -3910,21 +3910,21 @@ endfunc
 " Test import
 func Test_python_import()
   new
-  py cb = vim.current.buffer
+  py cb = mnv.current.buffer
 
   py << trim EOF
     sys.path.insert(0, os.path.join(os.getcwd(), 'python_before'))
     sys.path.append(os.path.join(os.getcwd(), 'python_after'))
-    vim.options['rtp'] = os.getcwd().replace(',', '\\,').replace('\\', '\\\\')
+    mnv.options['rtp'] = os.getcwd().replace(',', '\\,').replace('\\', '\\\\')
     l = []
     def callback(path):
         l.append(path[-len('/testdir'):].replace(os.path.sep, '/'))
-    vim.foreach_rtp(callback)
+    mnv.foreach_rtp(callback)
     cb.append(repr(l))
     del l
     def callback(path):
         return path[-len('/testdir'):].replace(os.path.sep, '/')
-    cb.append(repr(vim.foreach_rtp(callback)))
+    cb.append(repr(mnv.foreach_rtp(callback)))
     del callback
     from module import dir as d
     from modulex import ddir
@@ -3973,42 +3973,42 @@ func Test_python_exception()
   endfunc
 
   new
-  py cb = vim.current.buffer
+  py cb = mnv.current.buffer
 
   py << trim EOF
-    Exe = vim.bindeval('function("Exe")')
-    ee('vim.command("throw \'abcN\'")')
+    Exe = mnv.bindeval('function("Exe")')
+    ee('mnv.command("throw \'abcN\'")')
     ee('Exe("throw \'def\'")')
-    ee('vim.eval("Exe(\'throw \'\'ghi\'\'\')")')
-    ee('vim.eval("Exe(\'echoerr \'\'jkl\'\'\')")')
-    ee('vim.eval("Exe(\'xxx_non_existent_command_xxx\')")')
-    ee('vim.eval("xxx_unknown_function_xxx()")')
-    ee('vim.bindeval("Exe(\'xxx_non_existent_command_xxx\')")')
+    ee('mnv.eval("Exe(\'throw \'\'ghi\'\'\')")')
+    ee('mnv.eval("Exe(\'echoerr \'\'jkl\'\'\')")')
+    ee('mnv.eval("Exe(\'xxx_non_existent_command_xxx\')")')
+    ee('mnv.eval("xxx_unknown_function_xxx()")')
+    ee('mnv.bindeval("Exe(\'xxx_non_existent_command_xxx\')")')
     del Exe
   EOF
   delfunction Exe
 
   let expected =<< trim END
-    vim.command("throw 'abcN'"):error:('abcN',)
+    mnv.command("throw 'abcN'"):error:('abcN',)
     Exe("throw 'def'"):error:('def',)
-    vim.eval("Exe('throw ''ghi''')"):error:('ghi',)
-    vim.eval("Exe('echoerr ''jkl''')"):error:('Vim(echoerr):jkl',)
-    vim.eval("Exe('xxx_non_existent_command_xxx')"):error:('Vim:E492: Not an editor command: xxx_non_existent_command_xxx',)
-    vim.eval("xxx_unknown_function_xxx()"):error:('Vim:E117: Unknown function: xxx_unknown_function_xxx',)
-    vim.bindeval("Exe('xxx_non_existent_command_xxx')"):error:('Vim:E492: Not an editor command: xxx_non_existent_command_xxx',)
+    mnv.eval("Exe('throw ''ghi''')"):error:('ghi',)
+    mnv.eval("Exe('echoerr ''jkl''')"):error:('MNV(echoerr):jkl',)
+    mnv.eval("Exe('xxx_non_existent_command_xxx')"):error:('MNV:E492: Not an editor command: xxx_non_existent_command_xxx',)
+    mnv.eval("xxx_unknown_function_xxx()"):error:('MNV:E117: Unknown function: xxx_unknown_function_xxx',)
+    mnv.bindeval("Exe('xxx_non_existent_command_xxx')"):error:('MNV:E492: Not an editor command: xxx_non_existent_command_xxx',)
   END
   call assert_equal(expected, getline(2, '$'))
   close!
 endfunc
 
-" Regression: interrupting vim.command propagates to next vim.command
+" Regression: interrupting mnv.command propagates to next mnv.command
 func Test_python_keyboard_interrupt()
   new
-  py cb = vim.current.buffer
+  py cb = mnv.current.buffer
   py << trim EOF
     def test_keyboard_interrupt():
         try:
-            vim.command('while 1 | endwhile')
+            mnv.command('while 1 | endwhile')
         except KeyboardInterrupt:
             cb.append('Caught KeyboardInterrupt')
         except Exception:
@@ -4016,7 +4016,7 @@ func Test_python_keyboard_interrupt()
         else:
             cb.append('!!!!!!!! No exception')
         try:
-            vim.command('$ put =\'Running :put\'')
+            mnv.command('$ put =\'Running :put\'')
         except KeyboardInterrupt:
             cb.append('!!!!!!!! Caught KeyboardInterrupt')
         except Exception:
@@ -4047,9 +4047,9 @@ endfunc
 
 func Test_python_non_utf8_string()
   smap <Esc>@ <A-@>
-  python vim.command('redir => _tmp_smaps | smap | redir END')
-  python vim.eval('_tmp_smaps').splitlines()
+  python mnv.command('redir => _tmp_smaps | smap | redir END')
+  python mnv.eval('_tmp_smaps').splitlines()
   sunmap <Esc>@
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_python3.vim b/uvim/src/testdir/test_python3.mnv
index cb969e1877..e239571b61 100644
--- a/uvim/src/testdir/test_python3.vim
+++ b/uvim/src/testdir/test_python3.mnv
@@ -2,25 +2,25 @@
 
 CheckFeature python3
 
-func Create_vim_list()
+func Create_mnv_list()
   return [1]
 endfunction
 
-func Create_vim_tuple()
+func Create_mnv_tuple()
   return ('a', 'b')
 endfunction
 
-func Create_vim_dict()
+func Create_mnv_dict()
   return {'a': 1}
 endfunction
 
-let s:system_error_pat = 'Vim(py3):SystemError: \(<built-in function eval> returned NULL without setting an \(error\|exception\)\|error return without exception set\)'
+let s:system_error_pat = 'MNV(py3):SystemError: \(<built-in function eval> returned NULL without setting an \(error\|exception\)\|error return without exception set\)'
 
 " This function should be called first. This sets up python functions used by
 " the other tests.
 func Test_AAA_python3_setup()
   py3 << trim EOF
-    import vim
+    import mnv
     import sys
     import re
 
@@ -34,12 +34,12 @@ func Test_AAA_python3_setup()
       return ei[0].__name__ + ':' + repr(ei[1].args)
 
     def ee(expr, g=globals(), l=locals()):
-        cb = vim.current.buffer
+        cb = mnv.current.buffer
         try:
             try:
                 exec(expr, g, l)
             except Exception as e:
-                if sys.version_info >= (3, 3) and e.__class__ is AttributeError and str(e).find('has no attribute')>=0 and not str(e).startswith("'vim."):
+                if sys.version_info >= (3, 3) and e.__class__ is AttributeError and str(e).find('has no attribute')>=0 and not str(e).startswith("'mnv."):
                     msg = repr((e.__class__, AttributeError(str(e)[str(e).rfind(" '") + 2:-1])))
                 elif sys.version_info >= (3, 3) and e.__class__ is ImportError and str(e).find('No module named \'') >= 0:
                     msg = repr((e.__class__, ImportError(str(e).replace("'", ''))))
@@ -62,7 +62,7 @@ func Test_AAA_python3_setup()
                         oldmsg2 = '''"Can't convert 'int' object to str implicitly"'''
                         if msg.find(newmsg2) > -1:
                             msg = msg.replace(newmsg2, oldmsg2)
-                        # Python 3.9 reports errors like "vim.command() takes ..." instead of "command() takes ..."
+                        # Python 3.9 reports errors like "mnv.command() takes ..." instead of "command() takes ..."
                         msg = py39_type_error_pattern.sub(r'\1', msg)
                         msg = py310_type_error_pattern.sub(r'takes exactly \1 positional argument (\2 given)', msg)
                         # Python 3.14 has specific error messages for Tuple's
@@ -97,19 +97,19 @@ func Test_py3do()
 
   " Check deleting lines does not trigger an ml_get error.
   call setline(1, ['one', 'two', 'three'])
-  py3do vim.command("%d_")
+  py3do mnv.command("%d_")
   call assert_equal([''], getline(1, '$'))
 
   call setline(1, ['one', 'two', 'three'])
-  py3do vim.command("1,2d_")
+  py3do mnv.command("1,2d_")
   call assert_equal(['three'], getline(1, '$'))
 
   call setline(1, ['one', 'two', 'three'])
-  py3do vim.command("2,3d_"); return "REPLACED"
+  py3do mnv.command("2,3d_"); return "REPLACED"
   call assert_equal(['REPLACED'], getline(1, '$'))
 
   call setline(1, ['one', 'two', 'three'])
-  2,3py3do vim.command("1,2d_"); return "REPLACED"
+  2,3py3do mnv.command("1,2d_"); return "REPLACED"
   call assert_equal(['three'], getline(1, '$'))
 
   bwipe!
@@ -118,7 +118,7 @@ func Test_py3do()
   new
   let wincount = winnr('$')
   call setline(1, ['one', 'two', 'three'])
-  py3do vim.command("new")
+  py3do mnv.command("new")
   call assert_equal(wincount + 1, winnr('$'))
   bwipe!
   bwipe!
@@ -130,11 +130,11 @@ func Test_py3do()
 
   " Invalid command
   call AssertException(['py3do non_existing_cmd'],
-        \ "Vim(py3do):NameError: name 'non_existing_cmd' is not defined")
+        \ "MNV(py3do):NameError: name 'non_existing_cmd' is not defined")
   call AssertException(["py3do raise Exception('test')"],
-        \ 'Vim(py3do):Exception: test')
+        \ 'MNV(py3do):Exception: test')
   call AssertException(["py3do {lambda}"],
-        \ 'Vim(py3do):SyntaxError: invalid syntax')
+        \ 'MNV(py3do):SyntaxError: invalid syntax')
 endfunc
 
 func Test_set_cursor()
@@ -142,7 +142,7 @@ func Test_set_cursor()
   new
   call setline(1, ['first line', 'second line'])
   normal gg
-  py3do vim.current.window.cursor = (1, 5)
+  py3do mnv.current.window.cursor = (1, 5)
   call assert_equal([1, 6], [line('.'), col('.')])
 
   " Check that movement after setting cursor position keeps current column.
@@ -150,8 +150,8 @@ func Test_set_cursor()
   call assert_equal([2, 6], [line('.'), col('.')])
 endfunc
 
-func Test_vim_function()
-  " Check creating vim.Function object
+func Test_mnv_function()
+  " Check creating mnv.Function object
 
   func s:foo()
     return matchstr(expand('<sfile>'), '<SNR>\zs\d\+_foo$')
@@ -159,14 +159,14 @@ func Test_vim_function()
   let name = '<SNR>' . s:foo()
 
   try
-    py3 f = vim.bindeval('function("s:foo")')
+    py3 f = mnv.bindeval('function("s:foo")')
     call assert_equal(name, py3eval('f.name'))
   catch
     call assert_false(v:exception)
   endtry
 
   try
-    py3 f = vim.Function(b'\x80\xfdR' + vim.eval('s:foo()').encode())
+    py3 f = mnv.Function(b'\x80\xfdR' + mnv.eval('s:foo()').encode())
     call assert_equal(name, 'f.name'->py3eval())
   catch
     call assert_false(v:exception)
@@ -174,7 +174,7 @@ func Test_vim_function()
 
   " Non-existing function attribute
   call AssertException(["let x = py3eval('f.abc')"],
-        \ "Vim(let):AttributeError: 'vim.function' object has no attribute 'abc'")
+        \ "MNV(let):AttributeError: 'mnv.function' object has no attribute 'abc'")
 
   py3 del f
   delfunc s:foo
@@ -183,9 +183,9 @@ endfunc
 func Test_skipped_python3_command_does_not_affect_pyxversion()
   set pyxversion=0
   if 0
-    python3 import vim
+    python3 import mnv
   endif
-  call assert_equal(0, &pyxversion)  " This assertion would have failed with Vim 8.0.0251. (pyxversion was introduced in 8.0.0251.)
+  call assert_equal(0, &pyxversion)  " This assertion would have failed with MNV 8.0.0251. (pyxversion was introduced in 8.0.0251.)
 endfunc
 
 func _SetUpHiddenBuffer()
@@ -211,28 +211,28 @@ endfunc
 
 func Test_Write_To_HiddenBuffer_Does_Not_Fix_Cursor_Clear()
   call _SetUpHiddenBuffer()
-  py3 vim.buffers[ int( vim.eval( 'bufnr("hidden")' ) ) ][:] = None
+  py3 mnv.buffers[ int( mnv.eval( 'bufnr("hidden")' ) ) ][:] = None
   call assert_equal( line( '.' ), 11 )
   call _CleanUpHiddenBuffer()
 endfunc
 
 func Test_Write_To_HiddenBuffer_Does_Not_Fix_Cursor_List()
   call _SetUpHiddenBuffer()
-  py3 vim.buffers[ int( vim.eval( 'bufnr("hidden")' ) ) ][:] = [ 'test' ]
+  py3 mnv.buffers[ int( mnv.eval( 'bufnr("hidden")' ) ) ][:] = [ 'test' ]
   call assert_equal( line( '.' ), 11 )
   call _CleanUpHiddenBuffer()
 endfunc
 
 func Test_Write_To_HiddenBuffer_Does_Not_Fix_Cursor_Str()
   call _SetUpHiddenBuffer()
-  py3 vim.buffers[ int( vim.eval( 'bufnr("hidden")' ) ) ][0] = 'test'
+  py3 mnv.buffers[ int( mnv.eval( 'bufnr("hidden")' ) ) ][0] = 'test'
   call assert_equal( line( '.' ), 11 )
   call _CleanUpHiddenBuffer()
 endfunc
 
 func Test_Write_To_HiddenBuffer_Does_Not_Fix_Cursor_ClearLine()
   call _SetUpHiddenBuffer()
-  py3 vim.buffers[ int( vim.eval( 'bufnr("hidden")' ) ) ][0] = None
+  py3 mnv.buffers[ int( mnv.eval( 'bufnr("hidden")' ) ) ][0] = None
   call assert_equal( line( '.' ), 11 )
   call _CleanUpHiddenBuffer()
 endfunc
@@ -251,7 +251,7 @@ endfunc
 func Test_Write_To_Current_Buffer_Fixes_Cursor_Clear()
   call _SetUpVisibleBuffer()
 
-  py3 vim.current.buffer[:] = None
+  py3 mnv.current.buffer[:] = None
   call assert_equal( line( '.' ), 1 )
 
   bwipe!
@@ -260,7 +260,7 @@ endfunc
 func Test_Write_To_Current_Buffer_Fixes_Cursor_List()
   call _SetUpVisibleBuffer()
 
-  py3 vim.current.buffer[:] = [ 'test' ]
+  py3 mnv.current.buffer[:] = [ 'test' ]
   call assert_equal( line( '.' ), 1 )
 
   bwipe!
@@ -269,7 +269,7 @@ endfunc
 func Test_Write_To_Current_Buffer_Fixes_Cursor_Str()
   call _SetUpVisibleBuffer()
 
-  py3 vim.current.buffer[-1] = None
+  py3 mnv.current.buffer[-1] = None
   call assert_equal( line( '.' ), 10 )
 
   bwipe!
@@ -279,12 +279,12 @@ func Test_Catch_Exception_Message()
   try
     py3 raise RuntimeError( 'TEST' )
   catch /.*/
-    call assert_match( '^Vim(.*):RuntimeError: TEST$', v:exception )
+    call assert_match( '^MNV(.*):RuntimeError: TEST$', v:exception )
   endtry
 endfunc
 
 func Test_unicode()
-  " this crashed Vim once
+  " this crashed MNV once
   if &tenc != ''
     throw "Skipped: 'termencoding' is not empty"
   endif
@@ -303,38 +303,38 @@ func Test_unicode()
   set encoding=utf8
 endfunc
 
-" Test vim.eval() with various types.
-func Test_python3_vim_eval()
-  call assert_equal("\n2061300532912", execute('py3 print(vim.eval("2061300532912"))'))
-  call assert_equal("\n9223372036854775807", execute('py3 print(vim.eval("9223372036854775807"))'))
-  call assert_equal("\n-9223372036854775807",execute('py3 print(vim.eval("-9223372036854775807"))'))
-  call assert_equal("\n2147483648",  execute('py3 print(vim.eval("2147483648"))'))
-  call assert_equal("\n-2147483649", execute('py3 print(vim.eval("-2147483649"))'))
-  call assert_equal("\n8",           execute('py3 print(vim.eval("3+5"))'))
-  call assert_equal("\n3.140000",    execute('py3 print(vim.eval("1.01+2.13"))'))
-  call assert_equal("\n0.000000",    execute('py3 print(vim.eval("0.0/(1.0/0.0)"))'))
-  call assert_equal("\n0.000000",    execute('py3 print(vim.eval("0.0/(1.0/0.0)"))'))
-  call assert_equal("\n-0.000000",   execute('py3 print(vim.eval("0.0/(-1.0/0.0)"))'))
+" Test mnv.eval() with various types.
+func Test_python3_mnv_eval()
+  call assert_equal("\n2061300532912", execute('py3 print(mnv.eval("2061300532912"))'))
+  call assert_equal("\n9223372036854775807", execute('py3 print(mnv.eval("9223372036854775807"))'))
+  call assert_equal("\n-9223372036854775807",execute('py3 print(mnv.eval("-9223372036854775807"))'))
+  call assert_equal("\n2147483648",  execute('py3 print(mnv.eval("2147483648"))'))
+  call assert_equal("\n-2147483649", execute('py3 print(mnv.eval("-2147483649"))'))
+  call assert_equal("\n8",           execute('py3 print(mnv.eval("3+5"))'))
+  call assert_equal("\n3.140000",    execute('py3 print(mnv.eval("1.01+2.13"))'))
+  call assert_equal("\n0.000000",    execute('py3 print(mnv.eval("0.0/(1.0/0.0)"))'))
+  call assert_equal("\n0.000000",    execute('py3 print(mnv.eval("0.0/(1.0/0.0)"))'))
+  call assert_equal("\n-0.000000",   execute('py3 print(mnv.eval("0.0/(-1.0/0.0)"))'))
   " Commented out: output of infinity and nan depend on platforms.
-  " call assert_equal("\ninf",         execute('py3 print(vim.eval("1.0/0.0"))'))
-  " call assert_equal("\n-inf",        execute('py3 print(vim.eval("-1.0/0.0"))'))
-  " call assert_equal("\n-nan",        execute('py3 print(vim.eval("0.0/0.0"))'))
-  call assert_equal("\nabc",           execute('py3 print(vim.eval("\"abc\""))'))
-  call assert_equal("\n['1', '2']",    execute('py3 print(vim.eval("[1, 2]"))'))
-  call assert_equal("\n{'1': '2'}",    execute('py3 print(vim.eval("{1:2}"))'))
-  call assert_equal("\nTrue",          execute('py3 print(vim.eval("v:true"))'))
-  call assert_equal("\nFalse",         execute('py3 print(vim.eval("v:false"))'))
-  call assert_equal("\nNone",          execute('py3 print(vim.eval("v:null"))'))
-  call assert_equal("\nNone",          execute('py3 print(vim.eval("v:none"))'))
-  call assert_equal("\nb'\\xab\\x12'", execute('py3 print(vim.eval("0zab12"))'))
-
-  call assert_fails('py3 vim.eval("1+")', 'E15: Invalid expression')
+  " call assert_equal("\ninf",         execute('py3 print(mnv.eval("1.0/0.0"))'))
+  " call assert_equal("\n-inf",        execute('py3 print(mnv.eval("-1.0/0.0"))'))
+  " call assert_equal("\n-nan",        execute('py3 print(mnv.eval("0.0/0.0"))'))
+  call assert_equal("\nabc",           execute('py3 print(mnv.eval("\"abc\""))'))
+  call assert_equal("\n['1', '2']",    execute('py3 print(mnv.eval("[1, 2]"))'))
+  call assert_equal("\n{'1': '2'}",    execute('py3 print(mnv.eval("{1:2}"))'))
+  call assert_equal("\nTrue",          execute('py3 print(mnv.eval("v:true"))'))
+  call assert_equal("\nFalse",         execute('py3 print(mnv.eval("v:false"))'))
+  call assert_equal("\nNone",          execute('py3 print(mnv.eval("v:null"))'))
+  call assert_equal("\nNone",          execute('py3 print(mnv.eval("v:none"))'))
+  call assert_equal("\nb'\\xab\\x12'", execute('py3 print(mnv.eval("0zab12"))'))
+
+  call assert_fails('py3 mnv.eval("1+")', 'E15: Invalid expression')
 endfunc
 
 " Test range objects, see :help python-range
 func Test_python3_range()
   new
-  py3 b = vim.current.buffer
+  py3 b = mnv.current.buffer
 
   call setline(1, range(1, 6))
   py3 r = b.range(2, 4)
@@ -358,7 +358,7 @@ func Test_python3_range()
 
   %d | call setline(1, range(1, 6))
   py3 r = b.range(2, 4)
-  py3 vim.command("%d,%dnorm Ax" % (r.start + 1, r.end + 1))
+  py3 mnv.command("%d,%dnorm Ax" % (r.start + 1, r.end + 1))
   call assert_equal(['1', '2x', '3x', '4x', '5', '6'], getline(1, '$'))
 
   %d | call setline(1, range(1, 4))
@@ -382,8 +382,8 @@ endfunc
 func Test_python3_opt_reset_local_to_global()
   new
 
-  py3 curbuf = vim.current.buffer
-  py3 curwin = vim.current.window
+  py3 curbuf = mnv.current.buffer
+  py3 curwin = mnv.current.window
 
   " List of buffer-local options. Each list item has [option name, global
   " value, buffer-local value, buffer-local value after reset] to use in the
@@ -417,8 +417,8 @@ func Test_python3_opt_reset_local_to_global()
   " buffer-local option value.
   for opt in bopts
     py3 << trim END
-      pyopt = vim.bindeval("opt")
-      vim.options[pyopt[0]] = pyopt[1]
+      pyopt = mnv.bindeval("opt")
+      mnv.options[pyopt[0]] = pyopt[1]
       curbuf.options[pyopt[0]] = pyopt[2]
     END
     exe "call assert_equal(opt[2], &" .. opt[0] .. ")"
@@ -443,8 +443,8 @@ func Test_python3_opt_reset_local_to_global()
         \ ['virtualedit', 'block', 'insert', '']]
   for opt in wopts
     py3 << trim
-      pyopt = vim.bindeval("opt")
-      vim.options[pyopt[0]] = pyopt[1]
+      pyopt = mnv.bindeval("opt")
+      mnv.options[pyopt[0]] = pyopt[1]
       curwin.options[pyopt[0]] = pyopt[2]
     .
     exe "call assert_equal(opt[2], &" .. opt[0] .. ")"
@@ -487,14 +487,14 @@ endfunc
 func Test_python3_range2()
   new
   call setline(1, ['one', 'two', 'three'])
-  py3 b = vim.current.buffer
+  py3 b = mnv.current.buffer
   py3 r = b.range(1, 3)
   call assert_equal(0, py3eval('r.start'))
   call assert_equal(2, py3eval('r.end'))
   call assert_equal('one', py3eval('r[0]'))
   call assert_equal('one', py3eval('r[-3]'))
   call AssertException(["let x = py3eval('r[-4]')"],
-        \ 'Vim(let):IndexError: line number out of range')
+        \ 'MNV(let):IndexError: line number out of range')
   call assert_equal(['two', 'three'], py3eval('r[1:]'))
   py3 r[0] = 'green'
   call assert_equal(['green', 'two', 'three'], getline(1, '$'))
@@ -516,7 +516,7 @@ func Test_python3_range2()
 
   " Non-existing range attribute
   call AssertException(["let x = py3eval('r.abc')"],
-        \ "Vim(let):AttributeError: 'vim.range' object has no attribute 'abc'")
+        \ "MNV(let):AttributeError: 'mnv.range' object has no attribute 'abc'")
 
   bw!
 endfunc
@@ -524,18 +524,18 @@ endfunc
 " Test for the python tabpage object
 func Test_python3_tabpage()
   tabnew
-  py3 t = vim.tabpages[1]
+  py3 t = mnv.tabpages[1]
   py3 wl = t.windows
   tabclose
   " Accessing a closed tabpage
   call AssertException(["let n = py3eval('t.number')"],
-        \ 'Vim(let):vim.error: attempt to refer to deleted tab page')
+        \ 'MNV(let):mnv.error: attempt to refer to deleted tab page')
   call AssertException(["let n = py3eval('len(wl)')"],
-        \ 'Vim(let):vim.error: attempt to refer to deleted tab page')
+        \ 'MNV(let):mnv.error: attempt to refer to deleted tab page')
   call AssertException(["py3 w = wl[0]"],
-        \ 'Vim(py3):vim.error: attempt to refer to deleted tab page')
-  call AssertException(["py3 vim.current.tabpage = t"],
-        \ 'Vim(py3):vim.error: attempt to refer to deleted tab page')
+        \ 'MNV(py3):mnv.error: attempt to refer to deleted tab page')
+  call AssertException(["py3 mnv.current.tabpage = t"],
+        \ 'MNV(py3):mnv.error: attempt to refer to deleted tab page')
   call assert_match('<tabpage object (deleted)', py3eval('repr(t)'))
   %bw!
 endfunc
@@ -544,31 +544,31 @@ endfunc
 func Test_python3_window()
   " Test for setting the window height
   10new
-  py3 vim.current.window.height = 5
+  py3 mnv.current.window.height = 5
   call assert_equal(5, winheight(0))
-  py3 vim.current.window.height = 3.2
+  py3 mnv.current.window.height = 3.2
   call assert_equal(3, winheight(0))
 
   " Test for setting the window width
   10vnew
-  py3 vim.current.window.width = 6
+  py3 mnv.current.window.width = 6
   call assert_equal(6, winwidth(0))
 
   " Try accessing a closed window
-  py3 w = vim.current.window
+  py3 w = mnv.current.window
   py3 wopts = w.options
   close
   " Access the attributes of a closed window
   call AssertException(["let n = py3eval('w.number')"],
-        \ 'Vim(let):vim.error: attempt to refer to deleted window')
+        \ 'MNV(let):mnv.error: attempt to refer to deleted window')
   call AssertException(["py3 w.height = 5"],
-        \ 'Vim(py3):vim.error: attempt to refer to deleted window')
-  call AssertException(["py3 vim.current.window = w"],
-        \ 'Vim(py3):vim.error: attempt to refer to deleted window')
+        \ 'MNV(py3):mnv.error: attempt to refer to deleted window')
+  call AssertException(["py3 mnv.current.window = w"],
+        \ 'MNV(py3):mnv.error: attempt to refer to deleted window')
   " Try to set one of the options of the closed window
   " The following caused ASAN failure
   call AssertException(["py3 wopts['list'] = False"],
-        \ 'Vim(py3):vim.error: attempt to refer to deleted window')
+        \ 'MNV(py3):mnv.error: attempt to refer to deleted window')
   call assert_match('<window object (deleted)', py3eval("repr(w)"))
   %bw!
 endfunc
@@ -581,7 +581,7 @@ func Test_python3_window_set_height()
   set foldmethod=expr
   new
   wincmd w
-  python3 vim.windows[0].height = 5
+  python3 mnv.windows[0].height = 5
   call assert_equal(5, winheight(1))
 
   call feedkeys('j', 'xt')
@@ -594,23 +594,23 @@ endfunc
 " Test for the python List object
 func Test_python3_list()
   " Try to convert a null List
-  call AssertException(["py3 t = vim.eval('test_null_list()')"],
+  call AssertException(["py3 t = mnv.eval('test_null_list()')"],
         \ s:system_error_pat)
 
   " Try to convert a List with a null List item
-  call AssertException(["py3 t = vim.eval('[test_null_list()]')"],
+  call AssertException(["py3 t = mnv.eval('[test_null_list()]')"],
         \ s:system_error_pat)
 
   " Try to bind a null List variable (works because an empty list is used)
   let cmds =<< trim END
     let l = test_null_list()
-    py3 ll = vim.bindeval('l')
+    py3 ll = mnv.bindeval('l')
   END
   call AssertException(cmds, '')
 
   let l = []
-  py3 l = vim.bindeval('l')
-  py3 f = vim.bindeval('function("strlen")')
+  py3 l = mnv.bindeval('l')
+  py3 f = mnv.bindeval('function("strlen")')
   " Extending List directly with different types
   py3 l += [1, "as'd", [1, 2, f, {'a': 1}]]
   call assert_equal([1, "as'd", [1, 2, function("strlen"), {'a': 1}]], l)
@@ -625,140 +625,140 @@ func Test_python3_list()
 
   " appending to a list
   let l = [1, 2]
-  py3 ll = vim.bindeval('l')
+  py3 ll = mnv.bindeval('l')
   py3 ll[2] = 8
   call assert_equal([1, 2, 8], l)
 
   " iterating over list from Python
-  py3 print([x for x in vim.Function("getline")(1, 2)])
+  py3 print([x for x in mnv.Function("getline")(1, 2)])
 
   " Using dict as an index
   call AssertException(['py3 ll[{}] = 10'],
-        \ 'Vim(py3):TypeError: index must be int or slice, not dict')
+        \ 'MNV(py3):TypeError: index must be int or slice, not dict')
 endfunc
 
 " Test for the python Tuple object
 func Test_python3_tuple()
   " Try to convert a null tuple
-  call AssertException(["py3 l = vim.eval('test_null_tuple()')"],
+  call AssertException(["py3 l = mnv.eval('test_null_tuple()')"],
         \ s:system_error_pat)
 
   " Try to convert a Tuple with a null Tuple item
-  call AssertException(["py3 t = vim.eval('(test_null_tuple(),)')"],
+  call AssertException(["py3 t = mnv.eval('(test_null_tuple(),)')"],
         \ s:system_error_pat)
 
   " Try to convert a List with a null Tuple item
-  call AssertException(["py3 t = vim.eval('[test_null_tuple()]')"],
+  call AssertException(["py3 t = mnv.eval('[test_null_tuple()]')"],
         \ s:system_error_pat)
 
   " Try to convert a Tuple with a null List item
-  call AssertException(["py3 t = vim.eval('(test_null_list(),)')"],
+  call AssertException(["py3 t = mnv.eval('(test_null_list(),)')"],
         \ s:system_error_pat)
 
   " Try to bind a null Tuple variable (works because an empty tuple is used)
   let cmds =<< trim END
     let t = test_null_tuple()
-    py3 tt = vim.bindeval('t')
+    py3 tt = mnv.bindeval('t')
   END
   call AssertException(cmds, '')
 
   " Creating a tuple using different iterators
-  py3 t1 = vim.Tuple(['abc', 20, 1.2, (4, 5)])
+  py3 t1 = mnv.Tuple(['abc', 20, 1.2, (4, 5)])
   call assert_equal(('abc', 20, 1.2, (4, 5)), py3eval('t1'))
-  py3 t2 = vim.Tuple('abc')
+  py3 t2 = mnv.Tuple('abc')
   call assert_equal(('a', 'b', 'c'), py3eval('t2'))
-  py3 t3 = vim.Tuple({'color': 'red', 'model': 'ford'})
+  py3 t3 = mnv.Tuple({'color': 'red', 'model': 'ford'})
   call assert_equal(('color', 'model'), py3eval('t3'))
-  py3 t4 = vim.Tuple()
+  py3 t4 = mnv.Tuple()
   call assert_equal((), py3eval('t4'))
-  py3 t5 = vim.Tuple(x**2 for x in range(5))
+  py3 t5 = mnv.Tuple(x**2 for x in range(5))
   call assert_equal((0, 1, 4, 9, 16), py3eval('t5'))
-  py3 t6 = vim.Tuple(('abc', 20, 1.2, (4, 5)))
+  py3 t6 = mnv.Tuple(('abc', 20, 1.2, (4, 5)))
   call assert_equal(('abc', 20, 1.2, (4, 5)), py3eval('t6'))
 
-  " Convert between Vim tuple/list and python tuple/list
-  py3 t = vim.Tuple(vim.bindeval("('a', ('b',), ['c'], {'s': 'd'})"))
+  " Convert between MNV tuple/list and python tuple/list
+  py3 t = mnv.Tuple(mnv.bindeval("('a', ('b',), ['c'], {'s': 'd'})"))
   call assert_equal(('a', ('b',), ['c'], {'s': 'd'}), py3eval('t'))
   call assert_equal(['a', ('b',), ['c'], {'s': 'd'}], py3eval('list(t)'))
   call assert_equal(('a', ('b',), ['c'], {'s': 'd'}), py3eval('tuple(t)'))
 
-  py3 l = vim.List(vim.bindeval("['e', ('f',), ['g'], {'s': 'h'}]"))
+  py3 l = mnv.List(mnv.bindeval("['e', ('f',), ['g'], {'s': 'h'}]"))
   call assert_equal(('e', ('f',), ['g'], {'s': 'h'}), py3eval('tuple(l)'))
 
   " Tuple assignment
-  py3 tt = vim.bindeval('("a", "b")')
+  py3 tt = mnv.bindeval('("a", "b")')
   call AssertException(['py3 tt[0] = 10'],
-        \ "Vim(py3):TypeError: 'vim.tuple' object does not support item assignment")
-  py3 tt = vim.bindeval('("a", "b")')
+        \ "MNV(py3):TypeError: 'mnv.tuple' object does not support item assignment")
+  py3 tt = mnv.bindeval('("a", "b")')
   call AssertException(['py3 tt[0:1] = (10, 20)'],
-        \ "Vim(py3):TypeError: 'vim.tuple' object does not support item assignment")
+        \ "MNV(py3):TypeError: 'mnv.tuple' object does not support item assignment")
 
   " iterating over tuple from Python
-  py3 print([x for x in vim.bindeval("('a', 'b')")])
+  py3 print([x for x in mnv.bindeval("('a', 'b')")])
 
   " modifying a list item within a tuple
   let t = ('a', ['b', 'c'], 'd')
-  py3 vim.bindeval('t')[1][1] = 'x'
+  py3 mnv.bindeval('t')[1][1] = 'x'
   call assert_equal(('a', ['b', 'x'], 'd'), t)
 
   " length of a tuple
   let t = ()
-  py3 p_t = vim.bindeval('t')
+  py3 p_t = mnv.bindeval('t')
   call assert_equal(0, py3eval('len(p_t)'))
   let t = ('a', )
-  py3 p_t = vim.bindeval('t')
+  py3 p_t = mnv.bindeval('t')
   call assert_equal(1, py3eval('len(p_t)'))
   let t = ('a', 'b', 'c')
-  py3 p_t = vim.bindeval('t')
+  py3 p_t = mnv.bindeval('t')
   call assert_equal(3, py3eval('len(p_t)'))
 
   " membership test
   let t = ('a', 'b', 'c')
-  py3 p_t = vim.bindeval('t')
+  py3 p_t = mnv.bindeval('t')
   call assert_true(py3eval("b'c' in p_t"))
   call assert_true(py3eval("b'd' not in p_t"))
 
-  py3 x = vim.eval('("a", (2), [3], {})')
+  py3 x = mnv.eval('("a", (2), [3], {})')
   call assert_equal(('a', '2', ['3'], {}), py3eval('x'))
 
   " Using a keyword argument for a tuple
-  call AssertException(['py3 x = vim.Tuple(a=1)'],
-        \ 'Vim(py3):TypeError: tuple constructor does not accept keyword arguments')
+  call AssertException(['py3 x = mnv.Tuple(a=1)'],
+        \ 'MNV(py3):TypeError: tuple constructor does not accept keyword arguments')
 
   " Using dict as an index
   call AssertException(['py3 x = tt[{}]'],
-        \ 'Vim(py3):TypeError: index must be int or slice, not dict')
+        \ 'MNV(py3):TypeError: index must be int or slice, not dict')
   call AssertException(['py3 x = tt["abc"]'],
-        \ 'Vim(py3):TypeError: index must be int or slice, not str')
+        \ 'MNV(py3):TypeError: index must be int or slice, not str')
 
   call AssertException(['py3 del tt.locked'],
-        \ 'Vim(py3):AttributeError: cannot delete vim.Tuple attributes')
+        \ 'MNV(py3):AttributeError: cannot delete mnv.Tuple attributes')
 
   call AssertException(['py3 tt.foobar = 1'],
-        \ 'Vim(py3):AttributeError: cannot set attribute foobar')
+        \ 'MNV(py3):AttributeError: cannot set attribute foobar')
 endfunc
 
 " Test for the python Dict object
 func Test_python3_dict()
   " Try to convert a null Dict
-  call AssertException(["py3 t = vim.eval('test_null_dict()')"],
+  call AssertException(["py3 t = mnv.eval('test_null_dict()')"],
         \ s:system_error_pat)
 
   " Try to convert a Dict with a null List value
-  call AssertException(["py3 t = vim.eval(\"{'a' : test_null_list()}\")"],
+  call AssertException(["py3 t = mnv.eval(\"{'a' : test_null_list()}\")"],
         \ s:system_error_pat)
 
   " Try to convert a Dict with a null string key
-  py3 t = vim.eval("{test_null_string() : 10}")
+  py3 t = mnv.eval("{test_null_string() : 10}")
   call assert_fails("let d = py3eval('t')", 'E859:')
 
   " Dict length
   let d = {'a' : 10, 'b' : 20}
-  py3 d = vim.bindeval('d')
+  py3 d = mnv.bindeval('d')
   call assert_equal(2, py3eval('len(d)'))
 
   " Deleting a non-existing key
-  call AssertException(["py3 del d['c']"], "Vim(py3):KeyError: 'c'")
+  call AssertException(["py3 del d['c']"], "MNV(py3):KeyError: 'c'")
 endfunc
 
 " Extending Dictionary directly with different types
@@ -768,9 +768,9 @@ func Test_python3_dict_extend()
     return 1
   endfunc
 
-  py3 f = vim.bindeval('function("strlen")')
+  py3 f = mnv.bindeval('function("strlen")')
   py3 << trim EOF
-    d = vim.bindeval('d')
+    d = mnv.bindeval('d')
     d['1'] = 'asd'
     d.update()  # Must not do anything, including throwing errors
     d.update(b = [1, 2, f])
@@ -787,13 +787,13 @@ func Test_python3_dict_extend()
   " Try extending a locked dictionary
   lockvar d
   call AssertException(["py3 d.update({'b' : 20})"],
-        \ 'Vim(py3):vim.error: dictionary is locked')
+        \ 'MNV(py3):mnv.error: dictionary is locked')
   unlockvar d
 
   call assert_equal(1, py3eval("d['f'](self={})"))
   call assert_equal("[b'-1', b'0', b'1', b'b', b'f']", py3eval('repr(dk)'))
-  call assert_equal("[-1, <vim.Function '1'>, <vim.dictionary object at >, <vim.list object at >, b'asd']", substitute(py3eval('repr(dv)'),'0x\x\+','','g'))
-  call assert_equal("[(b'-1', <vim.dictionary object at >), (b'0', -1), (b'1', b'asd'), (b'b', <vim.list object at >), (b'f', <vim.Function '1'>)]", substitute(py3eval('repr(di)'),'0x\x\+','','g'))
+  call assert_equal("[-1, <mnv.Function '1'>, <mnv.dictionary object at >, <mnv.list object at >, b'asd']", substitute(py3eval('repr(dv)'),'0x\x\+','','g'))
+  call assert_equal("[(b'-1', <mnv.dictionary object at >), (b'0', -1), (b'1', b'asd'), (b'b', <mnv.list object at >), (b'f', <mnv.Function '1'>)]", substitute(py3eval('repr(di)'),'0x\x\+','','g'))
   call assert_equal(['0', '1', 'b', 'f', '-1'], keys(d))
   call assert_equal("[-1, 'asd', [1, 2, function('strlen')], function('1'), {'a': 1}]", string(values(d)))
   py3 del dk
@@ -804,12 +804,12 @@ endfunc
 func Test_python3_list_del_items()
   " removing items with del
   let l = [0, function("strlen"), [1, 2, function("strlen"), {'a': 1}]]
-  py3 l = vim.bindeval('l')
+  py3 l = mnv.bindeval('l')
   py3 del l[2]
   call assert_equal("[0, function('strlen')]", string(l))
 
   let l = range(8)
-  py3 l = vim.bindeval('l')
+  py3 l = mnv.bindeval('l')
   py3 del l[:3]
   py3 del l[1:]
   call assert_equal([3], l)
@@ -818,7 +818,7 @@ func Test_python3_list_del_items()
 
   " The following two ranges delete nothing as they match empty list:
   let l = [0, 1, 2, 3]
-  py3 l = vim.bindeval('l')
+  py3 l = mnv.bindeval('l')
   py3 del l[2:1]
   call assert_equal([0, 1, 2, 3], l)
   py3 del l[2:2]
@@ -827,23 +827,23 @@ func Test_python3_list_del_items()
   call assert_equal([0, 1, 3], l)
 
   let l = [0, 1, 2, 3]
-  py3 l = vim.bindeval('l')
+  py3 l = mnv.bindeval('l')
   py3 del l[2:4]
   call assert_equal([0, 1], l)
 
   let l = [0, 1, 2, 3]
-  py3 l = vim.bindeval('l')
+  py3 l = mnv.bindeval('l')
   py3 del l[2:5]
   call assert_equal([0, 1], l)
 
   let l = [0, 1, 2, 3]
-  py3 l = vim.bindeval('l')
+  py3 l = mnv.bindeval('l')
   py3 del l[2:6]
   call assert_equal([0, 1], l)
 
   " The following two ranges delete nothing as they match empty list:
   let l = [0, 1, 2, 3]
-  py3 l = vim.bindeval('l')
+  py3 l = mnv.bindeval('l')
   py3 del l[-1:2]
   call assert_equal([0, 1, 2, 3], l)
   py3 del l[-2:2]
@@ -852,39 +852,39 @@ func Test_python3_list_del_items()
   call assert_equal([0, 2, 3], l)
 
   let l = [0, 1, 2, 3]
-  py3 l = vim.bindeval('l')
+  py3 l = mnv.bindeval('l')
   py3 del l[-4:2]
   call assert_equal([2, 3], l)
 
   let l = [0, 1, 2, 3]
-  py3 l = vim.bindeval('l')
+  py3 l = mnv.bindeval('l')
   py3 del l[-5:2]
   call assert_equal([2, 3], l)
 
   let l = [0, 1, 2, 3]
-  py3 l = vim.bindeval('l')
+  py3 l = mnv.bindeval('l')
   py3 del l[-6:2]
   call assert_equal([2, 3], l)
 
   let l = [0, 1, 2, 3]
-  py3 l = vim.bindeval('l')
+  py3 l = mnv.bindeval('l')
   py3 del l[::2]
   call assert_equal([1, 3], l)
 
   let l = [0, 1, 2, 3]
-  py3 l = vim.bindeval('l')
+  py3 l = mnv.bindeval('l')
   py3 del l[3:0:-2]
   call assert_equal([0, 2], l)
 
   let l = [0, 1, 2, 3]
-  py3 l = vim.bindeval('l')
+  py3 l = mnv.bindeval('l')
   py3 del l[2:4:-2]
   let l = [0, 1, 2, 3]
 endfunc
 
 func Test_python3_dict_del_items()
   let d = eval("{'0' : -1, '1' : 'asd', 'b' : [1, 2, function('strlen')], 'f' : function('min'), '-1' : {'a': 1}}")
-  py3 d = vim.bindeval('d')
+  py3 d = mnv.bindeval('d')
   py3 del d['-1']
   py3 del d['f']
   call assert_equal([1, 2, function('strlen')], py3eval('d.get(''b'', 1)'))
@@ -906,92 +906,92 @@ endfunc
 " Slice assignment to a list
 func Test_python3_slice_assignment()
   let l = [0, 1, 2, 3]
-  py3 l = vim.bindeval('l')
+  py3 l = mnv.bindeval('l')
   py3 l[0:0] = ['a']
   call assert_equal(['a', 0, 1, 2, 3], l)
 
   let l = [0, 1, 2, 3]
-  py3 l = vim.bindeval('l')
+  py3 l = mnv.bindeval('l')
   py3 l[1:2] = ['b']
   call assert_equal([0, 'b', 2, 3], l)
 
   let l = [0, 1, 2, 3]
-  py3 l = vim.bindeval('l')
+  py3 l = mnv.bindeval('l')
   py3 l[2:4] = ['c']
   call assert_equal([0, 1, 'c'], l)
 
   let l = [0, 1, 2, 3]
-  py3 l = vim.bindeval('l')
+  py3 l = mnv.bindeval('l')
   py3 l[4:4] = ['d']
   call assert_equal([0, 1, 2, 3, 'd'], l)
 
   let l = [0, 1, 2, 3]
-  py3 l = vim.bindeval('l')
+  py3 l = mnv.bindeval('l')
   py3 l[-1:2] = ['e']
   call assert_equal([0, 1, 2, 'e', 3], l)
 
   let l = [0, 1, 2, 3]
-  py3 l = vim.bindeval('l')
+  py3 l = mnv.bindeval('l')
   py3 l[-10:2] = ['f']
   call assert_equal(['f', 2, 3], l)
 
   let l = [0, 1, 2, 3]
-  py3 l = vim.bindeval('l')
+  py3 l = mnv.bindeval('l')
   py3 l[2:-10] = ['g']
   call assert_equal([0, 1, 'g', 2, 3], l)
 
   let l = []
-  py3 l = vim.bindeval('l')
+  py3 l = mnv.bindeval('l')
   py3 l[0:0] = ['h']
   call assert_equal(['h'], l)
 
   let l = range(8)
-  py3 l = vim.bindeval('l')
+  py3 l = mnv.bindeval('l')
   py3 l[2:6:2] = [10, 20]
   call assert_equal([0, 1, 10, 3, 20, 5, 6, 7], l)
 
   let l = range(8)
-  py3 l = vim.bindeval('l')
+  py3 l = mnv.bindeval('l')
   py3 l[6:2:-2] = [10, 20]
   call assert_equal([0, 1, 2, 3, 20, 5, 10, 7], l)
 
   let l = range(8)
-  py3 l = vim.bindeval('l')
+  py3 l = mnv.bindeval('l')
   py3 l[6:2] = ()
   call assert_equal([0, 1, 2, 3, 4, 5, 6, 7], l)
 
   let l = range(8)
-  py3 l = vim.bindeval('l')
+  py3 l = mnv.bindeval('l')
   py3 l[6:2:1] = ()
   call assert_equal([0, 1, 2, 3, 4, 5, 6, 7], l)
 
   let l = range(8)
-  py3 l = vim.bindeval('l')
+  py3 l = mnv.bindeval('l')
   py3 l[2:2:1] = ()
   call assert_equal([0, 1, 2, 3, 4, 5, 6, 7], l)
 
   call AssertException(["py3 x = l[10:11:0]"],
-        \ "Vim(py3):ValueError: slice step cannot be zero")
+        \ "MNV(py3):ValueError: slice step cannot be zero")
 endfunc
 
 " Locked variables
 func Test_python3_lockedvar()
   new
-  py3 cb = vim.current.buffer
+  py3 cb = mnv.current.buffer
   let l = [0, 1, 2, 3]
-  py3 l = vim.bindeval('l')
+  py3 l = mnv.bindeval('l')
   lockvar! l
   py3 << trim EOF
     try:
         l[2]='i'
-    except vim.error:
-        cb.append('l[2] threw vim.error: ' + emsg(sys.exc_info()))
+    except mnv.error:
+        cb.append('l[2] threw mnv.error: ' + emsg(sys.exc_info()))
   EOF
-  call assert_equal(['', "l[2] threw vim.error: error:('list is locked',)"],
+  call assert_equal(['', "l[2] threw mnv.error: error:('list is locked',)"],
         \ getline(1, '$'))
 
   " Try to concatenate a locked list
-  call AssertException(['py3 l += [4, 5]'], 'Vim(py3):vim.error: list is locked')
+  call AssertException(['py3 l += [4, 5]'], 'MNV(py3):mnv.error: list is locked')
 
   call assert_equal([0, 1, 2, 3], l)
   unlockvar! l
@@ -1010,7 +1010,7 @@ func Test_python3_function_call()
 
   new
   let l = [function('New'), function('DictNew')]
-  py3 l = vim.bindeval('l')
+  py3 l = mnv.bindeval('l')
   py3 l.extend(list(l[0](1, 2, 3)))
   call assert_equal([function('New'), function('DictNew'), 'NewStart', 1, 2, 3, 'NewEnd'], l)
   py3 l.extend(list(l[1](1, 2, 3, self={'a': 'b'})))
@@ -1018,19 +1018,19 @@ func Test_python3_function_call()
   py3 l += [[l[0].name]]
   call assert_equal([function('New'), function('DictNew'), 'NewStart', 1, 2, 3, 'NewEnd', 'DictNewStart', 1, 2, 3, 'DictNewEnd', {'a': 'b'}, ['New']], l)
   py3 ee('l[1](1, 2, 3)')
-  call assert_equal("l[1](1, 2, 3):(<class 'vim.error'>, error('Vim:E725: Calling dict function without Dictionary: DictNew',))", getline(2))
+  call assert_equal("l[1](1, 2, 3):(<class 'mnv.error'>, error('MNV:E725: Calling dict function without Dictionary: DictNew',))", getline(2))
   %d
   py3 f = l[0]
   delfunction New
   py3 ee('f(1, 2, 3)')
-  call assert_equal("f(1, 2, 3):(<class 'vim.error'>, error('Vim:E117: Unknown function: New',))", getline(2))
+  call assert_equal("f(1, 2, 3):(<class 'mnv.error'>, error('MNV:E117: Unknown function: New',))", getline(2))
   bw!
   delfunction DictNew
 endfunc
 
 func Test_python3_float()
   let l = [0.0]
-  py3 l = vim.bindeval('l')
+  py3 l = mnv.bindeval('l')
   py3 l.extend([0.0])
   call assert_equal([0.0, 0.0], l)
 endfunc
@@ -1040,8 +1040,8 @@ func Test_python3_dict_key_error()
   let messages = []
   py3 << trim EOF
     import sys
-    d = vim.bindeval('{}')
-    m = vim.bindeval('messages')
+    d = mnv.bindeval('{}')
+    m = mnv.bindeval('messages')
     def em(expr, g=globals(), l=locals()):
       try:
         exec(expr, g, l)
@@ -1053,7 +1053,7 @@ func Test_python3_dict_key_error()
 
     em('d["abc1"]')
     em('d["abc1"]="\\0"')
-    em('d["abc1"]=vim')
+    em('d["abc1"]=mnv')
     em('d[""]=1')
     em('d["a\\0b"]=1')
     em('d[b"a\\0b"]=1')
@@ -1074,7 +1074,7 @@ func Test_python3_lock_scope_attr()
   let res = []
   for s in split("d dl v: g:")
     let name = tr(s, ':', 's')
-    execute 'py3 ' .. name .. ' = vim.bindeval("' .. s .. '")'
+    execute 'py3 ' .. name .. ' = mnv.bindeval("' .. s .. '")'
     call add(res, s .. ' : ' .. join(map(['locked', 'scope'],
           \ 'v:val .. ":" .. py3eval(name .. "." .. v:val)'), ';'))
   endfor
@@ -1095,7 +1095,7 @@ func Test_python3_lock_scope_attr()
   let res = []
   for s in split("l ll")
     let name = tr(s, ':', 's')
-    execute 'py3 ' .. name .. '=vim.bindeval("' .. s .. '")'
+    execute 'py3 ' .. name .. '=mnv.bindeval("' .. s .. '")'
     call add(res, s .. ' : locked:' .. py3eval(name .. '.locked'))
   endfor
   call assert_equal(['l : locked:0', 'll : locked:1'], res)
@@ -1111,15 +1111,15 @@ func Test_python3_lock_scope_attr()
   unlet l ll
 
   " Try changing an attribute of a fixed list
-  py3 a = vim.bindeval('v:argv')
+  py3 a = mnv.bindeval('v:argv')
   call AssertException(['py3 a.locked = 0'],
-        \ 'Vim(py3):TypeError: cannot modify fixed list')
+        \ 'MNV(py3):TypeError: cannot modify fixed list')
 endfunc
 
 " Test for locking/unlocking a tuple
 func Test_tuple_lock()
   let t = (1, 2, 3)
-  py3 t = vim.bindeval('t')
+  py3 t = mnv.bindeval('t')
   py3 t.locked = True
   call assert_equal(1, islocked('t'))
   py3 t.locked = False
@@ -1141,7 +1141,7 @@ func Test_python3_pyeval()
   call assert_equal(v:none, py3eval('None'))
   call assert_equal('', v:errmsg)
 
-  py3 v = vim.eval('test_null_function()')
+  py3 v = mnv.eval('test_null_function()')
   call assert_equal(v:none, py3eval('v'))
 
   call assert_equal(0.0, py3eval('0.0'))
@@ -1150,8 +1150,8 @@ func Test_python3_pyeval()
   call AssertException(['let v = py3eval(''"\0"'')'], 'E859:')
   call AssertException(['let v = py3eval(''{"\0" : 1}'')'], 'E859:')
   call AssertException(['let v = py3eval("undefined_name")'],
-        \ "Vim(let):NameError: name 'undefined_name' is not defined")
-  call AssertException(['let v = py3eval("vim")'], 'E859:')
+        \ "MNV(let):NameError: name 'undefined_name' is not defined")
+  call AssertException(['let v = py3eval("mnv")'], 'E859:')
 endfunc
 
 " Test for py3eval with locals
@@ -1204,30 +1204,30 @@ func Test_python3_pyeval_locals()
   call assert_equal(3, py3eval('f("abc")', {'f': StrLen}))
 endfunc
 
-" Test for vim.bindeval()
-func Test_python3_vim_bindeval()
+" Test for mnv.bindeval()
+func Test_python3_mnv_bindeval()
   " Float
   let f = 3.14
-  py3 f = vim.bindeval('f')
+  py3 f = mnv.bindeval('f')
   call assert_equal(3.14, py3eval('f'))
 
   " Blob
   let b = 0z12
-  py3 b = vim.bindeval('b')
+  py3 b = mnv.bindeval('b')
   call assert_equal("\x12", py3eval('b'))
 
   " Bool
-  call assert_equal(1, py3eval("vim.bindeval('v:true')"))
-  call assert_equal(0, py3eval("vim.bindeval('v:false')"))
-  call assert_equal(v:none, py3eval("vim.bindeval('v:null')"))
-  call assert_equal(v:none, py3eval("vim.bindeval('v:none')"))
+  call assert_equal(1, py3eval("mnv.bindeval('v:true')"))
+  call assert_equal(0, py3eval("mnv.bindeval('v:false')"))
+  call assert_equal(v:none, py3eval("mnv.bindeval('v:null')"))
+  call assert_equal(v:none, py3eval("mnv.bindeval('v:none')"))
 
   " channel/job
   if has('channel')
-    call assert_equal(v:none, py3eval("vim.bindeval('test_null_channel()')"))
+    call assert_equal(v:none, py3eval("mnv.bindeval('test_null_channel()')"))
   endif
   if has('job')
-    call assert_equal(v:none, py3eval("vim.bindeval('test_null_job()')"))
+    call assert_equal(v:none, py3eval("mnv.bindeval('test_null_job()')"))
   endif
 endfunc
 
@@ -1236,7 +1236,7 @@ endfunc
 " from running. So this test should be run before the pydo test
 func Test_aaa_python3_threading()
   let l = [0]
-  py3 l = vim.bindeval('l')
+  py3 l = mnv.bindeval('l')
   py3 << trim EOF
     import threading
     import time
@@ -1273,7 +1273,7 @@ endfunc
 " settrace
 func Test_python3_settrace()
   let l = []
-  py3 l = vim.bindeval('l')
+  py3 l = mnv.bindeval('l')
   py3 << trim EOF
     import sys
 
@@ -1297,7 +1297,7 @@ endfunc
 
 " Slice
 func Test_python3_list_slice()
-  py3 ll = vim.bindeval('[0, 1, 2, 3, 4, 5]')
+  py3 ll = mnv.bindeval('[0, 1, 2, 3, 4, 5]')
   py3 l = ll[:4]
   call assert_equal([0, 1, 2, 3], py3eval('l'))
   py3 l = ll[2:]
@@ -1328,27 +1328,27 @@ func Test_python3_list_slice()
   call assert_equal([], py3eval('l'))
 
   " Error case: Use an invalid index
-  call AssertException(['py3 ll[-10] = 5'], 'Vim(py3):vim.error: internal error:')
+  call AssertException(['py3 ll[-10] = 5'], 'MNV(py3):mnv.error: internal error:')
 
   " Use a step value of 0
   call AssertException(['py3 ll[0:3:0] = [1, 2, 3]'],
-        \ 'Vim(py3):ValueError: slice step cannot be zero')
+        \ 'MNV(py3):ValueError: slice step cannot be zero')
 
   " Error case: Invalid slice type
   call AssertException(["py3 x = ll['abc']"],
-        \ "Vim(py3):TypeError: index must be int or slice, not str")
+        \ "MNV(py3):TypeError: index must be int or slice, not str")
   py3 del l
 
   " Error case: List with a null list item
   let l = [test_null_list()]
-  py3 ll = vim.bindeval('l')
+  py3 ll = mnv.bindeval('l')
   call AssertException(["py3 x = ll[:]"],
         \ s:system_error_pat)
 endfunc
 
 " Slice
 func Test_python3_tuple_slice()
-  py3 tt = vim.bindeval('(0, 1, 2, 3, 4, 5)')
+  py3 tt = mnv.bindeval('(0, 1, 2, 3, 4, 5)')
   py3 t = tt[:4]
   call assert_equal((0, 1, 2, 3), py3eval('t'))
   py3 t = tt[2:]
@@ -1379,23 +1379,23 @@ func Test_python3_tuple_slice()
   call assert_equal((), py3eval('t'))
 
   " Error case: Use an invalid index
-  call AssertException(['py3 x = tt[-10]'], 'Vim(py3):IndexError: tuple index out of range')
+  call AssertException(['py3 x = tt[-10]'], 'MNV(py3):IndexError: tuple index out of range')
 
   " Use a step value of 0
   call AssertException(['py3 x = tt[0:3:0]'],
-        \ 'Vim(py3):ValueError: slice step cannot be zero')
+        \ 'MNV(py3):ValueError: slice step cannot be zero')
 
   " Error case: Invalid slice type
   call AssertException(["py3 x = tt['abc']"],
-        \ "Vim(py3):TypeError: index must be int or slice, not str")
+        \ "MNV(py3):TypeError: index must be int or slice, not str")
 
   " Error case: List with a null tuple item
   let t = (test_null_tuple(),)
-  py3 tt = vim.bindeval('t')
+  py3 tt = mnv.bindeval('t')
   call AssertException(["py3 x = tt[:]"], s:system_error_pat)
 endfunc
 
-func Test_python3_pytuple_to_vimtuple()
+func Test_python3_pytuple_to_mnvtuple()
   let t = py3eval("('a', 'b')")
   call assert_equal(('a', 'b'), t)
   let t = py3eval("()")
@@ -1414,7 +1414,7 @@ func Test_python3_pytuple_to_vimtuple()
         raise NotImplementedError('iter')
   END
   call assert_fails('call py3eval("(1, FailingIter, 2)")',
-        \ 'E859: Failed to convert returned python object to a Vim value')
+        \ 'E859: Failed to convert returned python object to a MNV value')
 
   py3 del FailingIter
 endfunc
@@ -1422,7 +1422,7 @@ endfunc
 " Test for tuple garbage collection
 func Test_python3_tuple_garbage_collect()
   let t = (1, (2, 3), [4, 5], {'a': 6})
-  py3 py_t = vim.bindeval('t')
+  py3 py_t = mnv.bindeval('t')
   let save_testing = v:testing
   let v:testing = 1
   call test_garbagecollect_now()
@@ -1441,12 +1441,12 @@ func Test_python3_vars()
   try
     throw "Abc"
   catch /Abc/
-    call assert_equal('Abc', py3eval('vim.vvars[''exception'']'))
+    call assert_equal('Abc', py3eval('mnv.vvars[''exception'']'))
   endtry
-  call assert_equal('bac', py3eval('vim.vars[''foo'']'))
-  call assert_equal('def', py3eval('vim.current.window.vars[''abc3'']'))
-  call assert_equal('bar', py3eval('vim.current.buffer.vars[''baz'']'))
-  call assert_equal('jkl', py3eval('vim.current.tabpage.vars[''bar'']'))
+  call assert_equal('bac', py3eval('mnv.vars[''foo'']'))
+  call assert_equal('def', py3eval('mnv.current.window.vars[''abc3'']'))
+  call assert_equal('bar', py3eval('mnv.current.buffer.vars[''baz'']'))
+  call assert_equal('jkl', py3eval('mnv.current.tabpage.vars[''bar'']'))
 endfunc
 
 " Options
@@ -1490,35 +1490,35 @@ func Test_python3_opts()
       try:
         exec(s, g, l)
       except Exception as e:
-        vim.command('return ' + repr(e.__class__.__name__))
+        mnv.command('return ' + repr(e.__class__.__name__))
 
     def ev(s, g=globals(), l=locals()):
       try:
         return eval(s, g, l)
       except Exception as e:
-        vim.command('let exc=' + repr(e.__class__.__name__))
+        mnv.command('let exc=' + repr(e.__class__.__name__))
         return 0
   EOF
 
   func E(s)
-    python3 e(vim.eval('a:s'))
+    python3 e(mnv.eval('a:s'))
   endfunc
 
   func Ev(s)
-    let r = py3eval('ev(vim.eval("a:s"))')
+    let r = py3eval('ev(mnv.eval("a:s"))')
     if exists('exc')
       throw exc
     endif
     return r
   endfunc
 
-  py3 gopts1 = vim.options
-  py3 wopts1 = vim.windows[2].options
-  py3 wopts2 = vim.windows[0].options
-  py3 wopts3 = vim.windows[1].options
-  py3 bopts1 = vim.buffers[vim.bindeval("g:bufs")[2]].options
-  py3 bopts2 = vim.buffers[vim.bindeval("g:bufs")[1]].options
-  py3 bopts3 = vim.buffers[vim.bindeval("g:bufs")[0]].options
+  py3 gopts1 = mnv.options
+  py3 wopts1 = mnv.windows[2].options
+  py3 wopts2 = mnv.windows[0].options
+  py3 wopts3 = mnv.windows[1].options
+  py3 bopts1 = mnv.buffers[mnv.bindeval("g:bufs")[2]].options
+  py3 bopts2 = mnv.buffers[mnv.bindeval("g:bufs")[1]].options
+  py3 bopts3 = mnv.buffers[mnv.bindeval("g:bufs")[0]].options
   call add(g:res, 'wopts iters equal: ' ..
         \ py3eval('list(wopts1) == list(wopts2)'))
   call add(g:res, 'bopts iters equal: ' ..
@@ -1542,14 +1542,14 @@ func Test_python3_opts()
   let lst += [['preserveindent', 0, 1, 1, 2, 1, 1, 2]]
   let lst += [['path', '.,,', ',,', '.', 0, 0, 1, 2]]
   for  [oname, oval1, oval2, oval3, invval, bool, global, local] in lst
-    py3 oname = vim.eval('oname')
-    py3 oval1 = vim.bindeval('oval1')
-    py3 oval2 = vim.bindeval('oval2')
-    py3 oval3 = vim.bindeval('oval3')
+    py3 oname = mnv.eval('oname')
+    py3 oval1 = mnv.bindeval('oval1')
+    py3 oval2 = mnv.bindeval('oval2')
+    py3 oval3 = mnv.bindeval('oval3')
     if invval is 0 || invval is 1
-      py3 invval = bool(vim.bindeval('invval'))
+      py3 invval = bool(mnv.bindeval('invval'))
     else
-      py3 invval = vim.bindeval('invval')
+      py3 invval = mnv.bindeval('invval')
     endif
     if bool
       py3 oval1 = bool(oval1)
@@ -1867,39 +1867,39 @@ func Test_python3_opts()
   call assert_equal(expected, g:res)
   unlet g:res
 
-  call assert_equal(0, py3eval("'' in vim.options"))
+  call assert_equal(0, py3eval("'' in mnv.options"))
 
-  " use an empty key to index vim.options
-  call AssertException(["let v = py3eval(\"vim.options['']\")"],
-        \ 'Vim(let):ValueError: empty keys are not allowed')
-  call AssertException(["py3 vim.current.window.options[''] = 0"],
-        \ 'Vim(py3):ValueError: empty keys are not allowed')
-  call AssertException(["py3 vim.current.window.options[{}] = 0"],
-        \ 'Vim(py3):TypeError: expected bytes() or str() instance, but got dict')
+  " use an empty key to index mnv.options
+  call AssertException(["let v = py3eval(\"mnv.options['']\")"],
+        \ 'MNV(let):ValueError: empty keys are not allowed')
+  call AssertException(["py3 mnv.current.window.options[''] = 0"],
+        \ 'MNV(py3):ValueError: empty keys are not allowed')
+  call AssertException(["py3 mnv.current.window.options[{}] = 0"],
+        \ 'MNV(py3):TypeError: expected bytes() or str() instance, but got dict')
 
   " set one of the number options to a very large number
-  let cmd = ["py3 vim.options['previewheight'] = 9999999999999999"]
-  call AssertException(cmd, "Vim(py3):OverflowError:")
+  let cmd = ["py3 mnv.options['previewheight'] = 9999999999999999"]
+  call AssertException(cmd, "MNV(py3):OverflowError:")
 
   " unset a global-local string option
-  call AssertException(["py3 del vim.options['errorformat']"],
-        \ 'Vim(py3):ValueError: unable to unset global option errorformat')
+  call AssertException(["py3 del mnv.options['errorformat']"],
+        \ 'MNV(py3):ValueError: unable to unset global option errorformat')
 endfunc
 
-" Test for vim.buffer object
+" Test for mnv.buffer object
 func Test_python3_buffer()
   new
   call setline(1, "Hello\nWorld")
-  call assert_fails("let x = py3eval('vim.current.buffer[0]')", 'E859:')
+  call assert_fails("let x = py3eval('mnv.current.buffer[0]')", 'E859:')
   %bw!
 
   edit Xfile1
   let bnr1 = bufnr()
-  py3 cb = vim.current.buffer
+  py3 cb = mnv.current.buffer
   vnew Xfile2
   let bnr2 = bufnr()
   call setline(1, ['First line', 'Second line', 'Third line'])
-  py3 b = vim.current.buffer
+  py3 b = mnv.current.buffer
   wincmd w
 
   " Test for getting lines from the buffer using a slice
@@ -1909,19 +1909,19 @@ func Test_python3_buffer()
   call assert_equal([], py3eval('b[10:12]'))
   call assert_equal([], py3eval('b[-10:-8]'))
   call AssertException(["py3 x = b[0:3:0]"],
-        \ 'Vim(py3):ValueError: slice step cannot be zero')
+        \ 'MNV(py3):ValueError: slice step cannot be zero')
   call AssertException(["py3 b[0:3:0] = 'abc'"],
-        \ 'Vim(py3):ValueError: slice step cannot be zero')
+        \ 'MNV(py3):ValueError: slice step cannot be zero')
   call AssertException(["py3 x = b[{}]"],
-        \ 'Vim(py3):TypeError: index must be int or slice, not dict')
+        \ 'MNV(py3):TypeError: index must be int or slice, not dict')
   call AssertException(["py3 b[{}] = 'abc'"],
-        \ 'Vim(py3):TypeError: index must be int or slice, not dict')
+        \ 'MNV(py3):TypeError: index must be int or slice, not dict')
 
   " Test for getting lines using a range
   call AssertException(["py3 x = b.range(0,3)[0:2:0]"],
-        \ "Vim(py3):ValueError: slice step cannot be zero")
+        \ "MNV(py3):ValueError: slice step cannot be zero")
   call AssertException(["py3 b.range(0,3)[0:2:0] = 'abc'"],
-        \ "Vim(py3):ValueError: slice step cannot be zero")
+        \ "MNV(py3):ValueError: slice step cannot be zero")
 
   " Tests BufferAppend and BufferItem
   py3 cb.append(b[0])
@@ -1930,11 +1930,11 @@ func Test_python3_buffer()
 
   " Try to append using out-of-range line number
   call AssertException(["py3 b.append('abc', 10)"],
-        \ 'Vim(py3):IndexError: line number out of range')
+        \ 'MNV(py3):IndexError: line number out of range')
 
   " Append a non-string item
   call AssertException(["py3 b.append([22])"],
-        \ 'Vim(py3):TypeError: expected bytes() or str() instance, but got int')
+        \ 'MNV(py3):TypeError: expected bytes() or str() instance, but got int')
 
   " Tests BufferSlice and BufferAssSlice
   py3 cb.append('abc5') # Will be overwritten
@@ -1968,7 +1968,7 @@ func Test_python3_buffer()
     b.append('foo')
     b[0]='bar'
     b[0:0]=['baz']
-    vim.command('call append("$", getbufline(%i, 1, "$"))' % b.number)
+    mnv.command('call append("$", getbufline(%i, 1, "$"))' % b.number)
   EOF
   call assert_equal(['baz', 'bar', 'Second line', 'Third line', 'foo'],
         \ getbufline(bnr2, 1, '$'))
@@ -1976,8 +1976,8 @@ func Test_python3_buffer()
 
   " Test assigning to name property
   augroup BUFS
-    autocmd BufFilePost * python3 cb.append(vim.eval('expand("<abuf>")') + ':BufFilePost:' + vim.eval('bufnr("%")'))
-    autocmd BufFilePre * python3 cb.append(vim.eval('expand("<abuf>")') + ':BufFilePre:' + vim.eval('bufnr("%")'))
+    autocmd BufFilePost * python3 cb.append(mnv.eval('expand("<abuf>")') + ':BufFilePost:' + mnv.eval('bufnr("%")'))
+    autocmd BufFilePre * python3 cb.append(mnv.eval('expand("<abuf>")') + ':BufFilePre:' + mnv.eval('bufnr("%")'))
   augroup END
   py3 << trim EOF
     import os
@@ -2003,9 +2003,9 @@ func Test_python3_buffer()
 
   " Test CheckBuffer
   py3 << trim EOF
-    for _b in vim.buffers:
+    for _b in mnv.buffers:
       if _b is not cb:
-        vim.command('bwipeout! ' + str(_b.number))
+        mnv.command('bwipeout! ' + str(_b.number))
     del _b
     cb.append('valid: b:%s, cb:%s' % (repr(b.valid), repr(cb.valid)))
   EOF
@@ -2016,39 +2016,39 @@ func Test_python3_buffer()
     for expr in ('b[1]','b[:] = ["A", "B"]','b[:]','b.append("abc6")'):
       try:
         exec(expr)
-      except vim.error:
+      except mnv.error:
         pass
       else:
         # Usually a SEGV here
         # Should not happen in any case
         cb.append('No exception for ' + expr)
-    vim.command('cd .')
+    mnv.command('cd .')
     del b
   EOF
   call assert_equal([''], getline(1, '$'))
 
   " Delete all the lines in a buffer
   call setline(1, ['a', 'b', 'c'])
-  py3 vim.current.buffer[:] = []
+  py3 mnv.current.buffer[:] = []
   call assert_equal([''], getline(1, '$'))
 
   " Test for buffer marks
-  call assert_equal(v:none, py3eval("vim.current.buffer.mark('r')"))
+  call assert_equal(v:none, py3eval("mnv.current.buffer.mark('r')"))
 
   " Test for modifying a 'nomodifiable' buffer
   setlocal nomodifiable
-  call AssertException(["py3 vim.current.buffer[0] = 'abc'"],
-        \ "Vim(py3):vim.error: Vim:E21: Cannot make changes, 'modifiable' is off")
-  call AssertException(["py3 vim.current.buffer[0] = None"],
-        \ "Vim(py3):vim.error: Vim:E21: Cannot make changes, 'modifiable' is off")
-  call AssertException(["py3 vim.current.buffer[:] = None"],
-        \ "Vim(py3):vim.error: Vim:E21: Cannot make changes, 'modifiable' is off")
-  call AssertException(["py3 vim.current.buffer[:] = []"],
-        \ "Vim(py3):vim.error: Vim:E21: Cannot make changes, 'modifiable' is off")
-  call AssertException(["py3 vim.current.buffer.append('abc')"],
-        \ "Vim(py3):vim.error: Vim:E21: Cannot make changes, 'modifiable' is off")
-  call AssertException(["py3 vim.current.buffer.append([])"],
-        \ "Vim(py3):vim.error: Vim:E21: Cannot make changes, 'modifiable' is off")
+  call AssertException(["py3 mnv.current.buffer[0] = 'abc'"],
+        \ "MNV(py3):mnv.error: MNV:E21: Cannot make changes, 'modifiable' is off")
+  call AssertException(["py3 mnv.current.buffer[0] = None"],
+        \ "MNV(py3):mnv.error: MNV:E21: Cannot make changes, 'modifiable' is off")
+  call AssertException(["py3 mnv.current.buffer[:] = None"],
+        \ "MNV(py3):mnv.error: MNV:E21: Cannot make changes, 'modifiable' is off")
+  call AssertException(["py3 mnv.current.buffer[:] = []"],
+        \ "MNV(py3):mnv.error: MNV:E21: Cannot make changes, 'modifiable' is off")
+  call AssertException(["py3 mnv.current.buffer.append('abc')"],
+        \ "MNV(py3):mnv.error: MNV:E21: Cannot make changes, 'modifiable' is off")
+  call AssertException(["py3 mnv.current.buffer.append([])"],
+        \ "MNV(py3):mnv.error: MNV:E21: Cannot make changes, 'modifiable' is off")
   setlocal modifiable
 
   augroup BUFS
@@ -2060,39 +2060,39 @@ func Test_python3_buffer()
   " Range object for a deleted buffer
   new Xp3buffile
   call setline(1, ['one', 'two', 'three'])
-  py3 b = vim.current.buffer
-  py3 r = vim.current.buffer.range(0, 2)
+  py3 b = mnv.current.buffer
+  py3 r = mnv.current.buffer.range(0, 2)
   call assert_equal('<range Xp3buffile (0:2)>', py3eval('repr(r)'))
   %bw!
   call AssertException(['py3 r[:] = []'],
-        \ 'Vim(py3):vim.error: attempt to refer to deleted buffer')
+        \ 'MNV(py3):mnv.error: attempt to refer to deleted buffer')
   call assert_match('<buffer object (deleted)', py3eval('repr(b)'))
   call assert_match('<range object (for deleted buffer)', py3eval('repr(r)'))
   call AssertException(["let n = py3eval('len(r)')"],
-        \ 'Vim(let):vim.error: attempt to refer to deleted buffer')
+        \ 'MNV(let):mnv.error: attempt to refer to deleted buffer')
   call AssertException(["py3 r.append('abc')"],
-        \ 'Vim(py3):vim.error: attempt to refer to deleted buffer')
+        \ 'MNV(py3):mnv.error: attempt to refer to deleted buffer')
 
   " object for a deleted buffer
   call AssertException(["py3 b[0] = 'one'"],
-        \ 'Vim(py3):vim.error: attempt to refer to deleted buffer')
+        \ 'MNV(py3):mnv.error: attempt to refer to deleted buffer')
   call AssertException(["py3 b.append('one')"],
-        \ 'Vim(py3):vim.error: attempt to refer to deleted buffer')
+        \ 'MNV(py3):mnv.error: attempt to refer to deleted buffer')
   call AssertException(["let n = py3eval('len(b)')"],
-        \ 'Vim(let):vim.error: attempt to refer to deleted buffer')
+        \ 'MNV(let):mnv.error: attempt to refer to deleted buffer')
   call AssertException(["py3 pos = b.mark('a')"],
-        \ 'Vim(py3):vim.error: attempt to refer to deleted buffer')
-  call AssertException(["py3 vim.current.buffer = b"],
-        \ 'Vim(py3):vim.error: attempt to refer to deleted buffer')
+        \ 'MNV(py3):mnv.error: attempt to refer to deleted buffer')
+  call AssertException(["py3 mnv.current.buffer = b"],
+        \ 'MNV(py3):mnv.error: attempt to refer to deleted buffer')
   call AssertException(["py3 rn = b.range(0, 2)"],
-        \ 'Vim(py3):vim.error: attempt to refer to deleted buffer')
+        \ 'MNV(py3):mnv.error: attempt to refer to deleted buffer')
 endfunc
 
-" Test vim.buffers object
+" Test mnv.buffers object
 func Test_python3_buffers()
   %bw!
   edit Xp3buffile
-  py3 cb = vim.current.buffer
+  py3 cb = mnv.current.buffer
   set hidden
   edit a
   buffer #
@@ -2102,16 +2102,16 @@ func Test_python3_buffers()
   buffer #
   py3 << trim EOF
     # Check GCing iterator that was not fully exhausted
-    i = iter(vim.buffers)
+    i = iter(mnv.buffers)
     cb.append('i:' + str(next(i)))
     # and also check creating more than one iterator at a time
-    i2 = iter(vim.buffers)
+    i2 = iter(mnv.buffers)
     cb.append('i2:' + str(next(i2)))
     cb.append('i:' + str(next(i)))
     # The following should trigger GC and not cause any problems
     del i
     del i2
-    i3 = iter(vim.buffers)
+    i3 = iter(mnv.buffers)
     cb.append('i3:' + str(next(i3)))
     del i3
   EOF
@@ -2122,17 +2122,17 @@ func Test_python3_buffers()
 
   py3 << trim EOF
     prevnum = 0
-    for b in vim.buffers:
+    for b in mnv.buffers:
       # Check buffer order
       if prevnum >= b.number:
         cb.append('!!! Buffer numbers not in strictly ascending order')
-      # Check indexing: vim.buffers[number].number == number
-      cb.append(str(b.number) + ':' + repr(vim.buffers[b.number]) + \
+      # Check indexing: mnv.buffers[number].number == number
+      cb.append(str(b.number) + ':' + repr(mnv.buffers[b.number]) + \
                                                             '=' + repr(b))
       prevnum = b.number
     del prevnum
 
-    cb.append(str(len(vim.buffers)))
+    cb.append(str(len(mnv.buffers)))
   EOF
   call assert_equal([bufnr('Xp3buffile') .. ':<buffer Xp3buffile>=<buffer Xp3buffile>',
         \ bufnr('a') .. ':<buffer a>=<buffer a>',
@@ -2141,21 +2141,21 @@ func Test_python3_buffers()
   %d
 
   py3 << trim EOF
-    bnums = list(map(lambda b: b.number, vim.buffers))[1:]
+    bnums = list(map(lambda b: b.number, mnv.buffers))[1:]
 
     # Test wiping out buffer with existing iterator
-    i4 = iter(vim.buffers)
+    i4 = iter(mnv.buffers)
     cb.append('i4:' + str(next(i4)))
-    vim.command('bwipeout! ' + str(bnums.pop(0)))
+    mnv.command('bwipeout! ' + str(bnums.pop(0)))
     try:
       next(i4)
-    except vim.error:
+    except mnv.error:
       pass
     else:
-      cb.append('!!!! No vim.error')
-    i4 = iter(vim.buffers)
-    vim.command('bwipeout! ' + str(bnums.pop(-1)))
-    vim.command('bwipeout! ' + str(bnums.pop(-1)))
+      cb.append('!!!! No mnv.error')
+    i4 = iter(mnv.buffers)
+    mnv.command('bwipeout! ' + str(bnums.pop(-1)))
+    mnv.command('bwipeout! ' + str(bnums.pop(-1)))
     cb.append('i4:' + str(next(i4)))
     try:
       next(i4)
@@ -2169,11 +2169,11 @@ func Test_python3_buffers()
   %bw!
 endfunc
 
-" Test vim.{tabpage,window}list and vim.{tabpage,window} objects
+" Test mnv.{tabpage,window}list and mnv.{tabpage,window} objects
 func Test_python3_tabpage_window()
   %bw
   edit Xp3buffile
-  py3 cb = vim.current.buffer
+  py3 cb = mnv.current.buffer
   tabnew 0
   tabnew 1
   vnew a.1
@@ -2183,7 +2183,7 @@ func Test_python3_tabpage_window()
   vnew c.2
 
   py3 << trim EOF
-    cb.append('Number of tabs: ' + str(len(vim.tabpages)))
+    cb.append('Number of tabs: ' + str(len(mnv.tabpages)))
     cb.append('Current tab pages:')
     def W(w):
       if '(unknown)' in repr(w):
@@ -2197,7 +2197,7 @@ func Test_python3_tabpage_window()
       else:
         return repr(w.cursor)
 
-    for t in vim.tabpages:
+    for t in mnv.tabpages:
       cb.append('  ' + repr(t) + '(' + str(t.number) + ')' + ': ' + \
                 str(len(t.windows)) + ' windows, current is ' + W(t.window))
       cb.append('  Windows:')
@@ -2223,8 +2223,8 @@ func Test_python3_tabpage_window()
     del W
     del Cursor
     cb.append('Number of windows in current tab page: ' + \
-                                                    str(len(vim.windows)))
-    if list(vim.windows) != list(vim.current.tabpage.windows):
+                                                    str(len(mnv.windows)))
+    if list(mnv.windows) != list(mnv.current.tabpage.windows):
       cb.append('!!!!!! Windows differ')
   EOF
 
@@ -2253,11 +2253,11 @@ func Test_python3_tabpage_window()
   %bw!
 endfunc
 
-" Test vim.current
-func Test_python3_vim_current()
+" Test mnv.current
+func Test_python3_mnv_current()
   %bw
   edit Xpy3cfile
-  py3 cb = vim.current.buffer
+  py3 cb = mnv.current.buffer
   tabnew 0
   tabnew 1
   vnew a.1
@@ -2269,12 +2269,12 @@ func Test_python3_vim_current()
   py3 << trim EOF
     def H(o):
       return repr(o)
-    cb.append('Current tab page: ' + repr(vim.current.tabpage))
-    cb.append('Current window: ' + repr(vim.current.window) + ': ' + \
-               H(vim.current.window) + ' is ' + H(vim.current.tabpage.window))
-    cb.append('Current buffer: ' + repr(vim.current.buffer) + ': ' + \
-               H(vim.current.buffer) + ' is ' + H(vim.current.window.buffer)+ \
-               ' is ' + H(vim.current.tabpage.window.buffer))
+    cb.append('Current tab page: ' + repr(mnv.current.tabpage))
+    cb.append('Current window: ' + repr(mnv.current.window) + ': ' + \
+               H(mnv.current.window) + ' is ' + H(mnv.current.tabpage.window))
+    cb.append('Current buffer: ' + repr(mnv.current.buffer) + ': ' + \
+               H(mnv.current.buffer) + ' is ' + H(mnv.current.window.buffer)+ \
+               ' is ' + H(mnv.current.tabpage.window.buffer))
     del H
   EOF
   let expected =<< trim END
@@ -2288,23 +2288,23 @@ func Test_python3_vim_current()
   " Assigning: fails
   py3 << trim EOF
     try:
-      vim.current.window = vim.tabpages[0].window
+      mnv.current.window = mnv.tabpages[0].window
     except ValueError:
       cb.append('ValueError at assigning foreign tab window')
 
     for attr in ('window', 'tabpage', 'buffer'):
       try:
-        setattr(vim.current, attr, None)
+        setattr(mnv.current, attr, None)
       except TypeError:
-        cb.append('Type error at assigning None to vim.current.' + attr)
+        cb.append('Type error at assigning None to mnv.current.' + attr)
     del attr
   EOF
 
   let expected =<< trim END
     ValueError at assigning foreign tab window
-    Type error at assigning None to vim.current.window
-    Type error at assigning None to vim.current.tabpage
-    Type error at assigning None to vim.current.buffer
+    Type error at assigning None to mnv.current.window
+    Type error at assigning None to mnv.current.tabpage
+    Type error at assigning None to mnv.current.buffer
   END
   call assert_equal(expected, getbufline(bufnr('Xpy3cfile'), 2, '$'))
   call deletebufline(bufnr('Xpy3cfile'), 1, '$')
@@ -2312,14 +2312,14 @@ func Test_python3_vim_current()
   call setbufline(bufnr('Xpy3cfile'), 1, 'python interface')
   py3 << trim EOF
     # Assigning: success
-    vim.current.tabpage = vim.tabpages[-2]
-    vim.current.buffer = cb
-    vim.current.window = vim.windows[0]
-    vim.current.window.cursor = (len(vim.current.buffer), 0)
-    cb.append('Current tab page: ' + repr(vim.current.tabpage))
-    cb.append('Current window: ' + repr(vim.current.window))
-    cb.append('Current buffer: ' + repr(vim.current.buffer))
-    cb.append('Current line: ' + repr(vim.current.line))
+    mnv.current.tabpage = mnv.tabpages[-2]
+    mnv.current.buffer = cb
+    mnv.current.window = mnv.windows[0]
+    mnv.current.window.cursor = (len(mnv.current.buffer), 0)
+    cb.append('Current tab page: ' + repr(mnv.current.tabpage))
+    cb.append('Current window: ' + repr(mnv.current.window))
+    cb.append('Current buffer: ' + repr(mnv.current.buffer))
+    cb.append('Current line: ' + repr(mnv.current.line))
   EOF
 
   let expected =<< trim END
@@ -2329,16 +2329,16 @@ func Test_python3_vim_current()
     Current line: 'python interface'
   END
   call assert_equal(expected, getbufline(bufnr('Xpy3cfile'), 2, '$'))
-  py3 vim.current.line = 'one line'
+  py3 mnv.current.line = 'one line'
   call assert_equal('one line', getline('.'))
   call deletebufline(bufnr('Xpy3cfile'), 1, '$')
 
   py3 << trim EOF
-    ws = list(vim.windows)
-    ts = list(vim.tabpages)
-    for b in vim.buffers:
+    ws = list(mnv.windows)
+    ts = list(mnv.tabpages)
+    for b in mnv.buffers:
       if b is not cb:
-        vim.command('bwipeout! ' + str(b.number))
+        mnv.command('bwipeout! ' + str(b.number))
     del b
     cb.append('w.valid: ' + repr([w.valid for w in ws]))
     cb.append('t.valid: ' + repr([t.valid for t in ts]))
@@ -2358,34 +2358,34 @@ endfunc
 " Test types
 func Test_python3_types()
   %d
-  py3 cb = vim.current.buffer
+  py3 cb = mnv.current.buffer
   py3 << trim EOF
     for expr, attr in (
-      ('vim.vars',                         'Dictionary'),
-      ('vim.options',                      'Options'),
-      ('vim.bindeval("{}")',               'Dictionary'),
-      ('vim.bindeval("[]")',               'List'),
-      ('vim.bindeval("function(\'tr\')")', 'Function'),
-      ('vim.current.buffer',               'Buffer'),
-      ('vim.current.range',                'Range'),
-      ('vim.current.window',               'Window'),
-      ('vim.current.tabpage',              'TabPage'),
+      ('mnv.vars',                         'Dictionary'),
+      ('mnv.options',                      'Options'),
+      ('mnv.bindeval("{}")',               'Dictionary'),
+      ('mnv.bindeval("[]")',               'List'),
+      ('mnv.bindeval("function(\'tr\')")', 'Function'),
+      ('mnv.current.buffer',               'Buffer'),
+      ('mnv.current.range',                'Range'),
+      ('mnv.current.window',               'Window'),
+      ('mnv.current.tabpage',              'TabPage'),
     ):
       cb.append(expr + ':' + attr + ':' + \
-                                repr(type(eval(expr)) is getattr(vim, attr)))
+                                repr(type(eval(expr)) is getattr(mnv, attr)))
     del expr
     del attr
   EOF
   let expected =<< trim END
-    vim.vars:Dictionary:True
-    vim.options:Options:True
-    vim.bindeval("{}"):Dictionary:True
-    vim.bindeval("[]"):List:True
-    vim.bindeval("function('tr')"):Function:True
-    vim.current.buffer:Buffer:True
-    vim.current.range:Range:True
-    vim.current.window:Window:True
-    vim.current.tabpage:TabPage:True
+    mnv.vars:Dictionary:True
+    mnv.options:Options:True
+    mnv.bindeval("{}"):Dictionary:True
+    mnv.bindeval("[]"):List:True
+    mnv.bindeval("function('tr')"):Function:True
+    mnv.current.buffer:Buffer:True
+    mnv.current.range:Range:True
+    mnv.current.window:Window:True
+    mnv.current.tabpage:TabPage:True
   END
   call assert_equal(expected, getline(2, '$'))
 endfunc
@@ -2393,18 +2393,18 @@ endfunc
 " Test __dir__() method
 func Test_python3_dir_method()
   %d
-  py3 cb = vim.current.buffer
+  py3 cb = mnv.current.buffer
   py3 << trim EOF
     for name, o in (
-            ('current',    vim.current),
-            ('buffer',     vim.current.buffer),
-            ('window',     vim.current.window),
-            ('tabpage',    vim.current.tabpage),
-            ('range',      vim.current.range),
-            ('dictionary', vim.bindeval('{}')),
-            ('list',       vim.bindeval('[]')),
-            ('tuple',       vim.bindeval('()')),
-            ('function',   vim.bindeval('function("tr")')),
+            ('current',    mnv.current),
+            ('buffer',     mnv.current.buffer),
+            ('window',     mnv.current.window),
+            ('tabpage',    mnv.current.tabpage),
+            ('range',      mnv.current.range),
+            ('dictionary', mnv.bindeval('{}')),
+            ('list',       mnv.bindeval('[]')),
+            ('tuple',       mnv.bindeval('()')),
+            ('function',   mnv.bindeval('function("tr")')),
             ('output',     sys.stdout),
         ):
         cb.append(name + ':' + ','.join(dir(o)))
@@ -2426,37 +2426,37 @@ func Test_python3_dir_method()
   call assert_equal(expected, getline(2, '$'))
 endfunc
 
-" Test vim.*.__new__
+" Test mnv.*.__new__
 func Test_python3_new()
-  call assert_equal({}, py3eval('vim.Dictionary({})'))
-  call assert_equal({'a': 1}, py3eval('vim.Dictionary(a=1)'))
-  call assert_equal({'a': 1}, py3eval('vim.Dictionary(((''a'', 1),))'))
-  call assert_equal([], py3eval('vim.List()'))
-  call assert_equal((), py3eval('vim.Tuple()'))
-  call assert_equal(['a', 'b', 'c', '7'], py3eval('vim.List(iter(''abc7''))'))
-  call assert_equal(('a', 'b', 'c', '7'), py3eval('vim.Tuple(iter(''abc7''))'))
-  call assert_equal(function('tr'), py3eval('vim.Function(''tr'')'))
+  call assert_equal({}, py3eval('mnv.Dictionary({})'))
+  call assert_equal({'a': 1}, py3eval('mnv.Dictionary(a=1)'))
+  call assert_equal({'a': 1}, py3eval('mnv.Dictionary(((''a'', 1),))'))
+  call assert_equal([], py3eval('mnv.List()'))
+  call assert_equal((), py3eval('mnv.Tuple()'))
+  call assert_equal(['a', 'b', 'c', '7'], py3eval('mnv.List(iter(''abc7''))'))
+  call assert_equal(('a', 'b', 'c', '7'), py3eval('mnv.Tuple(iter(''abc7''))'))
+  call assert_equal(function('tr'), py3eval('mnv.Function(''tr'')'))
   call assert_equal(function('tr', [123, 3, 4]),
-        \ py3eval('vim.Function(''tr'', args=[123, 3, 4])'))
-  call assert_equal(function('tr'), py3eval('vim.Function(''tr'', args=[])'))
+        \ py3eval('mnv.Function(''tr'', args=[123, 3, 4])'))
+  call assert_equal(function('tr'), py3eval('mnv.Function(''tr'', args=[])'))
   call assert_equal(function('tr', {}),
-        \ py3eval('vim.Function(''tr'', self={})'))
+        \ py3eval('mnv.Function(''tr'', self={})'))
   call assert_equal(function('tr', [123, 3, 4], {}),
-        \ py3eval('vim.Function(''tr'', args=[123, 3, 4], self={})'))
+        \ py3eval('mnv.Function(''tr'', args=[123, 3, 4], self={})'))
   call assert_equal(function('tr'),
-        \ py3eval('vim.Function(''tr'', auto_rebind=False)'))
+        \ py3eval('mnv.Function(''tr'', auto_rebind=False)'))
   call assert_equal(function('tr', [123, 3, 4]),
-        \ py3eval('vim.Function(''tr'', args=[123, 3, 4], auto_rebind=False)'))
+        \ py3eval('mnv.Function(''tr'', args=[123, 3, 4], auto_rebind=False)'))
   call assert_equal(function('tr'),
-        \ py3eval('vim.Function(''tr'', args=[], auto_rebind=False)'))
+        \ py3eval('mnv.Function(''tr'', args=[], auto_rebind=False)'))
   call assert_equal(function('tr', {}),
-        \ py3eval('vim.Function(''tr'', self={}, auto_rebind=False)'))
+        \ py3eval('mnv.Function(''tr'', self={}, auto_rebind=False)'))
   call assert_equal(function('tr', [123, 3, 4], {}),
-        \ py3eval('vim.Function(''tr'', args=[123, 3, 4], self={}, auto_rebind=False)'))
+        \ py3eval('mnv.Function(''tr'', args=[123, 3, 4], self={}, auto_rebind=False)'))
 endfunc
 
-" Test vim.Function
-func Test_python3_vim_func()
+" Test mnv.Function
+func Test_python3_mnv_func()
   func Args(...)
     return a:000
   endfunc
@@ -2467,14 +2467,14 @@ func Test_python3_vim_func()
 
   " The following four lines should not crash
   let Pt = function('tr', [[]], {'l': []})
-  py3 Pt = vim.bindeval('Pt')
+  py3 Pt = mnv.bindeval('Pt')
   unlet Pt
   py3 del Pt
 
-  call assert_equal(3, py3eval('vim.strwidth("a\tb")'))
+  call assert_equal(3, py3eval('mnv.strwidth("a\tb")'))
 
   %bw!
-  py3 cb = vim.current.buffer
+  py3 cb = mnv.current.buffer
   py3 << trim EOF
     def ecall(out_prefix, func, *args, **kwargs):
         line = out_prefix + ': '
@@ -2483,31 +2483,31 @@ func Test_python3_vim_func()
         except Exception:
             line += '!exception: ' + emsg(sys.exc_info())
         else:
-            line += '!result: ' + str(vim.Function('string')(ret), 'utf-8')
+            line += '!result: ' + str(mnv.Function('string')(ret), 'utf-8')
         cb.append(line)
-    a = vim.Function('Args')
-    pa1 = vim.Function('Args', args=['abcArgsPA1'])
-    pa2 = vim.Function('Args', args=[])
-    pa3 = vim.Function('Args', args=['abcArgsPA3'], self={'abcSelfPA3': 'abcSelfPA3Val'})
-    pa4 = vim.Function('Args', self={'abcSelfPA4': 'abcSelfPA4Val'})
+    a = mnv.Function('Args')
+    pa1 = mnv.Function('Args', args=['abcArgsPA1'])
+    pa2 = mnv.Function('Args', args=[])
+    pa3 = mnv.Function('Args', args=['abcArgsPA3'], self={'abcSelfPA3': 'abcSelfPA3Val'})
+    pa4 = mnv.Function('Args', self={'abcSelfPA4': 'abcSelfPA4Val'})
     cb.append('a: ' + repr(a))
     cb.append('pa1: ' + repr(pa1))
     cb.append('pa2: ' + repr(pa2))
     cb.append('pa3: ' + repr(pa3))
     cb.append('pa4: ' + repr(pa4))
-    sa = vim.Function('SelfArgs')
-    psa1 = vim.Function('SelfArgs', args=['abcArgsPSA1'])
-    psa2 = vim.Function('SelfArgs', args=[])
-    psa3 = vim.Function('SelfArgs', args=['abcArgsPSA3'], self={'abcSelfPSA3': 'abcSelfPSA3Val'})
-    psa4 = vim.Function('SelfArgs', self={'abcSelfPSA4': 'abcSelfPSA4Val'})
-    psa5 = vim.Function('SelfArgs', self={'abcSelfPSA5': 'abcSelfPSA5Val'}, auto_rebind=0)
-    psa6 = vim.Function('SelfArgs', args=['abcArgsPSA6'], self={'abcSelfPSA6': 'abcSelfPSA6Val'}, auto_rebind=())
-    psa7 = vim.Function('SelfArgs', args=['abcArgsPSA7'], auto_rebind=[])
-    psa8 = vim.Function('SelfArgs', auto_rebind=False)
-    psa9 = vim.Function('SelfArgs', self={'abcSelfPSA9': 'abcSelfPSA9Val'}, auto_rebind=True)
-    psaA = vim.Function('SelfArgs', args=['abcArgsPSAA'], self={'abcSelfPSAA': 'abcSelfPSAAVal'}, auto_rebind=1)
-    psaB = vim.Function('SelfArgs', args=['abcArgsPSAB'], auto_rebind={'abcARPSAB': 'abcARPSABVal'})
-    psaC = vim.Function('SelfArgs', auto_rebind=['abcARPSAC'])
+    sa = mnv.Function('SelfArgs')
+    psa1 = mnv.Function('SelfArgs', args=['abcArgsPSA1'])
+    psa2 = mnv.Function('SelfArgs', args=[])
+    psa3 = mnv.Function('SelfArgs', args=['abcArgsPSA3'], self={'abcSelfPSA3': 'abcSelfPSA3Val'})
+    psa4 = mnv.Function('SelfArgs', self={'abcSelfPSA4': 'abcSelfPSA4Val'})
+    psa5 = mnv.Function('SelfArgs', self={'abcSelfPSA5': 'abcSelfPSA5Val'}, auto_rebind=0)
+    psa6 = mnv.Function('SelfArgs', args=['abcArgsPSA6'], self={'abcSelfPSA6': 'abcSelfPSA6Val'}, auto_rebind=())
+    psa7 = mnv.Function('SelfArgs', args=['abcArgsPSA7'], auto_rebind=[])
+    psa8 = mnv.Function('SelfArgs', auto_rebind=False)
+    psa9 = mnv.Function('SelfArgs', self={'abcSelfPSA9': 'abcSelfPSA9Val'}, auto_rebind=True)
+    psaA = mnv.Function('SelfArgs', args=['abcArgsPSAA'], self={'abcSelfPSAA': 'abcSelfPSAAVal'}, auto_rebind=1)
+    psaB = mnv.Function('SelfArgs', args=['abcArgsPSAB'], auto_rebind={'abcARPSAB': 'abcARPSABVal'})
+    psaC = mnv.Function('SelfArgs', auto_rebind=['abcARPSAC'])
     cb.append('sa: ' + repr(sa))
     cb.append('psa1: ' + repr(psa1))
     cb.append('psa2: ' + repr(psa2))
@@ -2522,7 +2522,7 @@ func Test_python3_vim_func()
     cb.append('psaB: ' + repr(psaB))
     cb.append('psaC: ' + repr(psaC))
 
-    psar = vim.Function('SelfArgs', args=[{'abcArgsPSAr': 'abcArgsPSArVal'}], self={'abcSelfPSAr': 'abcSelfPSArVal'})
+    psar = mnv.Function('SelfArgs', args=[{'abcArgsPSAr': 'abcArgsPSArVal'}], self={'abcSelfPSAr': 'abcSelfPSArVal'})
     psar.args[0]['abcArgsPSAr2'] = [psar.self, psar.args[0]]
     psar.self['rec'] = psar
     psar.self['self'] = psar.self
@@ -2535,25 +2535,25 @@ func Test_python3_vim_func()
   EOF
 
   let expected =<< trim END
-    a: <vim.Function 'Args'>
-    pa1: <vim.Function 'Args', args=['abcArgsPA1']>
-    pa2: <vim.Function 'Args'>
-    pa3: <vim.Function 'Args', args=['abcArgsPA3'], self={'abcSelfPA3': 'abcSelfPA3Val'}>
-    pa4: <vim.Function 'Args', self={'abcSelfPA4': 'abcSelfPA4Val'}>
-    sa: <vim.Function 'SelfArgs'>
-    psa1: <vim.Function 'SelfArgs', args=['abcArgsPSA1']>
-    psa2: <vim.Function 'SelfArgs'>
-    psa3: <vim.Function 'SelfArgs', args=['abcArgsPSA3'], self={'abcSelfPSA3': 'abcSelfPSA3Val'}>
-    psa4: <vim.Function 'SelfArgs', self={'abcSelfPSA4': 'abcSelfPSA4Val'}>
-    psa5: <vim.Function 'SelfArgs', self={'abcSelfPSA5': 'abcSelfPSA5Val'}>
-    psa6: <vim.Function 'SelfArgs', args=['abcArgsPSA6'], self={'abcSelfPSA6': 'abcSelfPSA6Val'}>
-    psa7: <vim.Function 'SelfArgs', args=['abcArgsPSA7']>
-    psa8: <vim.Function 'SelfArgs'>
-    psa9: <vim.Function 'SelfArgs', self={'abcSelfPSA9': 'abcSelfPSA9Val'}, auto_rebind=True>
-    psaA: <vim.Function 'SelfArgs', args=['abcArgsPSAA'], self={'abcSelfPSAA': 'abcSelfPSAAVal'}, auto_rebind=True>
-    psaB: <vim.Function 'SelfArgs', args=['abcArgsPSAB']>
-    psaC: <vim.Function 'SelfArgs'>
-    psar: <vim.Function 'SelfArgs', args=[{'abcArgsPSAr2': [{'rec': function('SelfArgs', [{...}], {...}), 'self': {...}, 'abcSelfPSAr': 'abcSelfPSArVal', 'args': [{...}]}, {...}], 'abcArgsPSAr': 'abcArgsPSArVal'}], self={'rec': function('SelfArgs', [{'abcArgsPSAr2': [{...}, {...}], 'abcArgsPSAr': 'abcArgsPSArVal'}], {...}), 'self': {...}, 'abcSelfPSAr': 'abcSelfPSArVal', 'args': [{'abcArgsPSAr2': [{...}, {...}], 'abcArgsPSAr': 'abcArgsPSArVal'}]}>
+    a: <mnv.Function 'Args'>
+    pa1: <mnv.Function 'Args', args=['abcArgsPA1']>
+    pa2: <mnv.Function 'Args'>
+    pa3: <mnv.Function 'Args', args=['abcArgsPA3'], self={'abcSelfPA3': 'abcSelfPA3Val'}>
+    pa4: <mnv.Function 'Args', self={'abcSelfPA4': 'abcSelfPA4Val'}>
+    sa: <mnv.Function 'SelfArgs'>
+    psa1: <mnv.Function 'SelfArgs', args=['abcArgsPSA1']>
+    psa2: <mnv.Function 'SelfArgs'>
+    psa3: <mnv.Function 'SelfArgs', args=['abcArgsPSA3'], self={'abcSelfPSA3': 'abcSelfPSA3Val'}>
+    psa4: <mnv.Function 'SelfArgs', self={'abcSelfPSA4': 'abcSelfPSA4Val'}>
+    psa5: <mnv.Function 'SelfArgs', self={'abcSelfPSA5': 'abcSelfPSA5Val'}>
+    psa6: <mnv.Function 'SelfArgs', args=['abcArgsPSA6'], self={'abcSelfPSA6': 'abcSelfPSA6Val'}>
+    psa7: <mnv.Function 'SelfArgs', args=['abcArgsPSA7']>
+    psa8: <mnv.Function 'SelfArgs'>
+    psa9: <mnv.Function 'SelfArgs', self={'abcSelfPSA9': 'abcSelfPSA9Val'}, auto_rebind=True>
+    psaA: <mnv.Function 'SelfArgs', args=['abcArgsPSAA'], self={'abcSelfPSAA': 'abcSelfPSAAVal'}, auto_rebind=True>
+    psaB: <mnv.Function 'SelfArgs', args=['abcArgsPSAB']>
+    psaC: <mnv.Function 'SelfArgs'>
+    psar: <mnv.Function 'SelfArgs', args=[{'abcArgsPSAr2': [{'rec': function('SelfArgs', [{...}], {...}), 'self': {...}, 'abcSelfPSAr': 'abcSelfPSArVal', 'args': [{...}]}, {...}], 'abcArgsPSAr': 'abcArgsPSArVal'}], self={'rec': function('SelfArgs', [{'abcArgsPSAr2': [{...}, {...}], 'abcArgsPSAr': 'abcArgsPSArVal'}], {...}), 'self': {...}, 'abcSelfPSAr': 'abcSelfPSArVal', 'args': [{'abcArgsPSAr2': [{...}, {...}], 'abcArgsPSAr': 'abcArgsPSArVal'}]}>
   END
   call assert_equal(expected, getline(2, '$'))
   %d
@@ -2650,7 +2650,7 @@ func Test_python3_vim_func()
         if v is None:
             return repr(v)
         else:
-            return str(vim.Function('string')(v), 'utf-8')
+            return str(mnv.Function('string')(v), 'utf-8')
 
     cb.append('a.args: ' + s(a.args))
     cb.append('pa1.args: ' + s(pa1.args))
@@ -2735,9 +2735,9 @@ func Test_python3_vim_func()
     pa2(): !result: []
     pa3(): !result: ['abcArgsPA3']
     pa4(): !result: []
-    sa(): !exception: error:('Vim:E725: Calling dict function without Dictionary: SelfArgs',)
-    psa1(): !exception: error:('Vim:E725: Calling dict function without Dictionary: SelfArgs',)
-    psa2(): !exception: error:('Vim:E725: Calling dict function without Dictionary: SelfArgs',)
+    sa(): !exception: error:('MNV:E725: Calling dict function without Dictionary: SelfArgs',)
+    psa1(): !exception: error:('MNV:E725: Calling dict function without Dictionary: SelfArgs',)
+    psa2(): !exception: error:('MNV:E725: Calling dict function without Dictionary: SelfArgs',)
     psa3(): !result: [['abcArgsPSA3'], {'abcSelfPSA3': 'abcSelfPSA3Val'}]
     psa4(): !result: [[], {'abcSelfPSA4': 'abcSelfPSA4Val'}]
     a(42, 43): !result: [42, 43]
@@ -2745,9 +2745,9 @@ func Test_python3_vim_func()
     pa2(42, 43): !result: [42, 43]
     pa3(42, 43): !result: ['abcArgsPA3', 42, 43]
     pa4(42, 43): !result: [42, 43]
-    sa(42, 43): !exception: error:('Vim:E725: Calling dict function without Dictionary: SelfArgs',)
-    psa1(42, 43): !exception: error:('Vim:E725: Calling dict function without Dictionary: SelfArgs',)
-    psa2(42, 43): !exception: error:('Vim:E725: Calling dict function without Dictionary: SelfArgs',)
+    sa(42, 43): !exception: error:('MNV:E725: Calling dict function without Dictionary: SelfArgs',)
+    psa1(42, 43): !exception: error:('MNV:E725: Calling dict function without Dictionary: SelfArgs',)
+    psa2(42, 43): !exception: error:('MNV:E725: Calling dict function without Dictionary: SelfArgs',)
     psa3(42, 43): !result: [['abcArgsPSA3', 42, 43], {'abcSelfPSA3': 'abcSelfPSA3Val'}]
     psa4(42, 43): !result: [[42, 43], {'abcSelfPSA4': 'abcSelfPSA4Val'}]
     a(42, self={"20": 1}): !result: [42]
@@ -2854,14 +2854,14 @@ func Test_python3_subclass()
   endfunc
 
   py3 << trim EOF
-    class DupDict(vim.Dictionary):
+    class DupDict(mnv.Dictionary):
       def __setitem__(self, key, value):
         super(DupDict, self).__setitem__(key, value)
         super(DupDict, self).__setitem__('dup_' + key, value)
     dd = DupDict()
     dd['a'] = 'b'
 
-    class DupList(vim.List):
+    class DupList(mnv.List):
       def __getitem__(self, idx):
         return [super(DupList, self).__getitem__(idx)] * 2
 
@@ -2869,7 +2869,7 @@ func Test_python3_subclass()
     dl2 = DupList(iter('abcC'))
     dl.extend(dl2[0])
 
-    class DupFun(vim.Function):
+    class DupFun(mnv.Function):
       def __call__(self, arg):
         return super(DupFun, self).__call__(arg, arg)
 
@@ -2899,12 +2899,12 @@ endfunc
 " Test chdir
 func Test_python3_chdir()
   new Xp3cdfile
-  py3 cb = vim.current.buffer
+  py3 cb = mnv.current.buffer
   py3 << trim EOF
     import os
-    fnamemodify = vim.Function('fnamemodify')
+    fnamemodify = mnv.Function('fnamemodify')
     cb.append(str(fnamemodify('.', ':p:h:t')))
-    cb.append(vim.eval('@%'))
+    cb.append(mnv.eval('@%'))
     os.chdir('..')
     path = fnamemodify('.', ':p:h:t')
     if path != b'src' and path != b'src2':
@@ -2913,22 +2913,22 @@ func Test_python3_chdir()
       # slicing to remove the leading path and path separator
       os.chdir('..')
       cb.append(str(fnamemodify('.', ':p:h:t')))
-      cb.append(vim.eval('@%')[len(path)+1:].replace(os.path.sep, '/'))
+      cb.append(mnv.eval('@%')[len(path)+1:].replace(os.path.sep, '/'))
       os.chdir(path)
     else:
       # Also accept running from src2/testdir/ for MS-Windows CI.
       cb.append(str(fnamemodify('.', ':p:h:t').replace(b'src2', b'src')))
-      cb.append(vim.eval('@%').replace(os.path.sep, '/'))
+      cb.append(mnv.eval('@%').replace(os.path.sep, '/'))
     del path
     os.chdir('testdir')
     cb.append(str(fnamemodify('.', ':p:h:t')))
-    cb.append(vim.eval('@%'))
+    cb.append(mnv.eval('@%'))
     del fnamemodify
   EOF
   call assert_equal(["b'testdir'", 'Xp3cdfile', "b'src'", 'testdir/Xp3cdfile',
         \"b'testdir'", 'Xp3cdfile'], getline(2, '$'))
   bw!
-  call AssertException(["py3 vim.chdir(None)"], "Vim(py3):TypeError:")
+  call AssertException(["py3 mnv.chdir(None)"], "MNV(py3):TypeError:")
 endfunc
 
 " Test errors
@@ -2940,22 +2940,22 @@ func Test_python3_errors()
   endfunc
 
   new
-  py3 cb = vim.current.buffer
+  py3 cb = mnv.current.buffer
 
   py3 << trim EOF
     import os
-    d = vim.Dictionary()
-    ned = vim.Dictionary(foo='bar', baz='abcD')
-    dl = vim.Dictionary(a=1)
+    d = mnv.Dictionary()
+    ned = mnv.Dictionary(foo='bar', baz='abcD')
+    dl = mnv.Dictionary(a=1)
     dl.locked = True
-    l = vim.List()
-    ll = vim.List('abcE')
+    l = mnv.List()
+    ll = mnv.List('abcE')
     ll.locked = True
-    nel = vim.List('abcO')
-    f = vim.Function('string')
-    fd = vim.Function('F')
-    fdel = vim.Function('D')
-    vim.command('delfunction D')
+    nel = mnv.List('abcO')
+    f = mnv.Function('string')
+    fd = mnv.Function('F')
+    fdel = mnv.Function('D')
+    mnv.command('delfunction D')
 
     def subexpr_test(expr, name, subexprs):
         cb.append('>>> Testing %s using %s' % (name, expr))
@@ -3115,50 +3115,50 @@ func Test_python3_errors()
     ee('sys.stdout.writelines(None)')
     ee('sys.stdout.writelines([1])')
     iter_test('sys.stdout.writelines(%s)')
-    cb.append("> VimCommand")
-    stringtochars_test('vim.command(%s)')
-    ee('vim.command("", 2)')
-    #! Not checked: vim->python exceptions translating: checked later
-    cb.append("> VimToPython")
+    cb.append("> MNVCommand")
+    stringtochars_test('mnv.command(%s)')
+    ee('mnv.command("", 2)')
+    #! Not checked: mnv->python exceptions translating: checked later
+    cb.append("> MNVToPython")
     #! Not checked: everything: needs errors in internal python functions
-    cb.append("> VimEval")
-    stringtochars_test('vim.eval(%s)')
-    ee('vim.eval("", FailingTrue())')
+    cb.append("> MNVEval")
+    stringtochars_test('mnv.eval(%s)')
+    ee('mnv.eval("", FailingTrue())')
     #! Not checked: everything: needs errors in internal python functions
-    cb.append("> VimEvalPy")
-    stringtochars_test('vim.bindeval(%s)')
-    ee('vim.eval("", 2)')
-    #! Not checked: vim->python exceptions translating: checked later
-    cb.append("> VimStrwidth")
-    stringtochars_test('vim.strwidth(%s)')
-    cb.append("> VimForeachRTP")
-    ee('vim.foreach_rtp(None)')
-    ee('vim.foreach_rtp(NoArgsCall())')
-    ee('vim.foreach_rtp(FailingCall())')
-    ee('vim.foreach_rtp(int, 2)')
+    cb.append("> MNVEvalPy")
+    stringtochars_test('mnv.bindeval(%s)')
+    ee('mnv.eval("", 2)')
+    #! Not checked: mnv->python exceptions translating: checked later
+    cb.append("> MNVStrwidth")
+    stringtochars_test('mnv.strwidth(%s)')
+    cb.append("> MNVForeachRTP")
+    ee('mnv.foreach_rtp(None)')
+    ee('mnv.foreach_rtp(NoArgsCall())')
+    ee('mnv.foreach_rtp(FailingCall())')
+    ee('mnv.foreach_rtp(int, 2)')
     cb.append('> import')
-    old_rtp = vim.options['rtp']
-    vim.options['rtp'] = os.getcwd().replace('\\', '\\\\').replace(',', '\\,')
+    old_rtp = mnv.options['rtp']
+    mnv.options['rtp'] = os.getcwd().replace('\\', '\\\\').replace(',', '\\,')
     ee('import xxx_no_such_module_xxx')
     ee('import failing_import')
     ee('import failing')
-    vim.options['rtp'] = old_rtp
+    mnv.options['rtp'] = old_rtp
     del old_rtp
     cb.append("> Options")
     cb.append(">> OptionsItem")
-    ee('vim.options["abcQ"]')
-    ee('vim.options[""]')
-    stringtochars_test('vim.options[%s]')
+    ee('mnv.options["abcQ"]')
+    ee('mnv.options[""]')
+    stringtochars_test('mnv.options[%s]')
     cb.append(">> OptionsContains")
-    stringtochars_test('%s in vim.options')
+    stringtochars_test('%s in mnv.options')
     cb.append("> Dictionary")
     cb.append(">> DictionaryConstructor")
-    ee('vim.Dictionary("abcI")')
+    ee('mnv.Dictionary("abcI")')
     ##! Not checked: py_dict_alloc failure
     cb.append(">> DictionarySetattr")
     ee('del d.locked')
     ee('d.locked = FailingTrue()')
-    ee('vim.vvars.locked = False')
+    ee('mnv.vvars.locked = False')
     ee('d.scope = True')
     ee('d.xxx = True')
     cb.append(">> _DictionaryItem")
@@ -3192,10 +3192,10 @@ func Test_python3_errors()
     ee('d.has_key()')
     cb.append("> List")
     cb.append(">> ListConstructor")
-    ee('vim.List(1, 2)')
-    ee('vim.List(a=1)')
-    iter_test('vim.List(%s)')
-    convertfrompyobject_test('vim.List([%s])')
+    ee('mnv.List(1, 2)')
+    ee('mnv.List(a=1)')
+    iter_test('mnv.List(%s)')
+    convertfrompyobject_test('mnv.List([%s])')
     cb.append(">> ListItem")
     ee('l[1000]')
     cb.append(">> ListAssItem")
@@ -3223,82 +3223,82 @@ func Test_python3_errors()
     cb.append("> Function")
     cb.append(">> FunctionConstructor")
     cb.append(">>> FunctionConstructor")
-    ee('vim.Function("123")')
-    ee('vim.Function("xxx_non_existent_function_xxx")')
-    ee('vim.Function("xxx#non#existent#function#xxx")')
-    ee('vim.Function("xxx_non_existent_function_xxx2", args=[])')
-    ee('vim.Function("xxx_non_existent_function_xxx3", self={})')
-    ee('vim.Function("xxx_non_existent_function_xxx4", args=[], self={})')
+    ee('mnv.Function("123")')
+    ee('mnv.Function("xxx_non_existent_function_xxx")')
+    ee('mnv.Function("xxx#non#existent#function#xxx")')
+    ee('mnv.Function("xxx_non_existent_function_xxx2", args=[])')
+    ee('mnv.Function("xxx_non_existent_function_xxx3", self={})')
+    ee('mnv.Function("xxx_non_existent_function_xxx4", args=[], self={})')
     cb.append(">>> FunctionNew")
-    ee('vim.Function("tr", self="abcFuncSelf")')
-    ee('vim.Function("tr", args=427423)')
-    ee('vim.Function("tr", self="abcFuncSelf2", args="abcFuncArgs2")')
-    ee('vim.Function(self="abcFuncSelf2", args="abcFuncArgs2")')
-    ee('vim.Function("tr", "", self="abcFuncSelf2", args="abcFuncArgs2")')
-    ee('vim.Function("tr", "")')
+    ee('mnv.Function("tr", self="abcFuncSelf")')
+    ee('mnv.Function("tr", args=427423)')
+    ee('mnv.Function("tr", self="abcFuncSelf2", args="abcFuncArgs2")')
+    ee('mnv.Function(self="abcFuncSelf2", args="abcFuncArgs2")')
+    ee('mnv.Function("tr", "", self="abcFuncSelf2", args="abcFuncArgs2")')
+    ee('mnv.Function("tr", "")')
     cb.append(">> FunctionCall")
     convertfrompyobject_test('f(%s)')
     convertfrompymapping_test('fd(self=%s)')
     cb.append("> TabPage")
     cb.append(">> TabPageAttr")
-    ee('vim.current.tabpage.xxx')
+    ee('mnv.current.tabpage.xxx')
     cb.append("> TabList")
     cb.append(">> TabListItem")
-    ee('vim.tabpages[1000]')
+    ee('mnv.tabpages[1000]')
     cb.append("> Window")
     cb.append(">> WindowAttr")
-    ee('vim.current.window.xxx')
+    ee('mnv.current.window.xxx')
     cb.append(">> WindowSetattr")
-    ee('vim.current.window.buffer = 0')
-    ee('vim.current.window.cursor = (100000000, 100000000)')
-    ee('vim.current.window.cursor = True')
-    number_test('vim.current.window.height = %s', unsigned=True)
-    number_test('vim.current.window.width = %s', unsigned=True)
-    ee('vim.current.window.xxxxxx = True')
+    ee('mnv.current.window.buffer = 0')
+    ee('mnv.current.window.cursor = (100000000, 100000000)')
+    ee('mnv.current.window.cursor = True')
+    number_test('mnv.current.window.height = %s', unsigned=True)
+    number_test('mnv.current.window.width = %s', unsigned=True)
+    ee('mnv.current.window.xxxxxx = True')
     cb.append("> WinList")
     cb.append(">> WinListItem")
-    ee('vim.windows[1000]')
+    ee('mnv.windows[1000]')
     cb.append("> Buffer")
     cb.append(">> StringToLine (indirect)")
-    ee('vim.current.buffer[0] = "\\na"')
-    ee('vim.current.buffer[0] = b"\\na"')
+    ee('mnv.current.buffer[0] = "\\na"')
+    ee('mnv.current.buffer[0] = b"\\na"')
     cb.append(">> SetBufferLine (indirect)")
-    ee('vim.current.buffer[0] = True')
+    ee('mnv.current.buffer[0] = True')
     cb.append(">> SetBufferLineList (indirect)")
-    ee('vim.current.buffer[:] = True')
-    ee('vim.current.buffer[:] = ["\\na", "bc"]')
+    ee('mnv.current.buffer[:] = True')
+    ee('mnv.current.buffer[:] = ["\\na", "bc"]')
     cb.append(">> InsertBufferLines (indirect)")
-    ee('vim.current.buffer.append(None)')
-    ee('vim.current.buffer.append(["\\na", "bc"])')
-    ee('vim.current.buffer.append("\\nbc")')
+    ee('mnv.current.buffer.append(None)')
+    ee('mnv.current.buffer.append(["\\na", "bc"])')
+    ee('mnv.current.buffer.append("\\nbc")')
     cb.append(">> RBItem")
-    ee('vim.current.buffer[100000000]')
+    ee('mnv.current.buffer[100000000]')
     cb.append(">> RBAsItem")
-    ee('vim.current.buffer[100000000] = ""')
+    ee('mnv.current.buffer[100000000] = ""')
     cb.append(">> BufferAttr")
-    ee('vim.current.buffer.xxx')
+    ee('mnv.current.buffer.xxx')
     cb.append(">> BufferSetattr")
-    ee('vim.current.buffer.name = True')
-    ee('vim.current.buffer.xxx = True')
+    ee('mnv.current.buffer.name = True')
+    ee('mnv.current.buffer.xxx = True')
     cb.append(">> BufferMark")
-    ee('vim.current.buffer.mark(0)')
-    ee('vim.current.buffer.mark("abcM")')
-    ee('vim.current.buffer.mark("!")')
+    ee('mnv.current.buffer.mark(0)')
+    ee('mnv.current.buffer.mark("abcM")')
+    ee('mnv.current.buffer.mark("!")')
     cb.append(">> BufferRange")
-    ee('vim.current.buffer.range(1, 2, 3)')
+    ee('mnv.current.buffer.range(1, 2, 3)')
     cb.append("> BufMap")
     cb.append(">> BufMapItem")
-    ee('vim.buffers[100000000]')
-    number_test('vim.buffers[%s]', natural=True)
+    ee('mnv.buffers[100000000]')
+    number_test('mnv.buffers[%s]', natural=True)
     cb.append("> Current")
     cb.append(">> CurrentGetattr")
-    ee('vim.current.xxx')
+    ee('mnv.current.xxx')
     cb.append(">> CurrentSetattr")
-    ee('vim.current.line = True')
-    ee('vim.current.buffer = True')
-    ee('vim.current.window = True')
-    ee('vim.current.tabpage = True')
-    ee('vim.current.xxx = True')
+    ee('mnv.current.line = True')
+    ee('mnv.current.buffer = True')
+    ee('mnv.current.window = True')
+    ee('mnv.current.tabpage = True')
+    ee('mnv.current.xxx = True')
     del d
     del ned
     del dl
@@ -3369,65 +3369,65 @@ func Test_python3_errors()
     sys.stdout.writelines(FailingIter()):(<class 'NotImplementedError'>, NotImplementedError('iter',))
     sys.stdout.writelines(FailingIterNext()):(<class 'NotImplementedError'>, NotImplementedError('next',))
     <<< Finished
-    > VimCommand
-    >>> Testing StringToChars using vim.command(%s)
-    vim.command(1):(<class 'TypeError'>, TypeError('expected bytes() or str() instance, but got int',))
-    vim.command(b"\0"):(<class 'TypeError'>, TypeError('expected bytes with no null',))
-    vim.command("\0"):(<class 'TypeError'>, TypeError('expected bytes with no null',))
+    > MNVCommand
+    >>> Testing StringToChars using mnv.command(%s)
+    mnv.command(1):(<class 'TypeError'>, TypeError('expected bytes() or str() instance, but got int',))
+    mnv.command(b"\0"):(<class 'TypeError'>, TypeError('expected bytes with no null',))
+    mnv.command("\0"):(<class 'TypeError'>, TypeError('expected bytes with no null',))
     <<< Finished
-    vim.command("", 2):(<class 'TypeError'>, TypeError('command() takes exactly one argument (2 given)',))
-    > VimToPython
-    > VimEval
-    >>> Testing StringToChars using vim.eval(%s)
-    vim.eval(1):(<class 'TypeError'>, TypeError('expected bytes() or str() instance, but got int',))
-    vim.eval(b"\0"):(<class 'TypeError'>, TypeError('expected bytes with no null',))
-    vim.eval("\0"):(<class 'TypeError'>, TypeError('expected bytes with no null',))
+    mnv.command("", 2):(<class 'TypeError'>, TypeError('command() takes exactly one argument (2 given)',))
+    > MNVToPython
+    > MNVEval
+    >>> Testing StringToChars using mnv.eval(%s)
+    mnv.eval(1):(<class 'TypeError'>, TypeError('expected bytes() or str() instance, but got int',))
+    mnv.eval(b"\0"):(<class 'TypeError'>, TypeError('expected bytes with no null',))
+    mnv.eval("\0"):(<class 'TypeError'>, TypeError('expected bytes with no null',))
     <<< Finished
-    vim.eval("", FailingTrue()):(<class 'TypeError'>, TypeError('function takes exactly 1 argument (2 given)',))
-    > VimEvalPy
-    >>> Testing StringToChars using vim.bindeval(%s)
-    vim.bindeval(1):(<class 'TypeError'>, TypeError('expected bytes() or str() instance, but got int',))
-    vim.bindeval(b"\0"):(<class 'TypeError'>, TypeError('expected bytes with no null',))
-    vim.bindeval("\0"):(<class 'TypeError'>, TypeError('expected bytes with no null',))
+    mnv.eval("", FailingTrue()):(<class 'TypeError'>, TypeError('function takes exactly 1 argument (2 given)',))
+    > MNVEvalPy
+    >>> Testing StringToChars using mnv.bindeval(%s)
+    mnv.bindeval(1):(<class 'TypeError'>, TypeError('expected bytes() or str() instance, but got int',))
+    mnv.bindeval(b"\0"):(<class 'TypeError'>, TypeError('expected bytes with no null',))
+    mnv.bindeval("\0"):(<class 'TypeError'>, TypeError('expected bytes with no null',))
     <<< Finished
-    vim.eval("", 2):(<class 'TypeError'>, TypeError('function takes exactly 1 argument (2 given)',))
-    > VimStrwidth
-    >>> Testing StringToChars using vim.strwidth(%s)
-    vim.strwidth(1):(<class 'TypeError'>, TypeError('expected bytes() or str() instance, but got int',))
-    vim.strwidth(b"\0"):(<class 'TypeError'>, TypeError('expected bytes with no null',))
-    vim.strwidth("\0"):(<class 'TypeError'>, TypeError('expected bytes with no null',))
+    mnv.eval("", 2):(<class 'TypeError'>, TypeError('function takes exactly 1 argument (2 given)',))
+    > MNVStrwidth
+    >>> Testing StringToChars using mnv.strwidth(%s)
+    mnv.strwidth(1):(<class 'TypeError'>, TypeError('expected bytes() or str() instance, but got int',))
+    mnv.strwidth(b"\0"):(<class 'TypeError'>, TypeError('expected bytes with no null',))
+    mnv.strwidth("\0"):(<class 'TypeError'>, TypeError('expected bytes with no null',))
     <<< Finished
-    > VimForeachRTP
-    vim.foreach_rtp(None):(<class 'TypeError'>, TypeError("'NoneType' object is not callable",))
-    vim.foreach_rtp(NoArgsCall()):(<class 'TypeError'>, TypeError('__call__() takes exactly 1 positional argument (2 given)',))
-    vim.foreach_rtp(FailingCall()):(<class 'NotImplementedError'>, NotImplementedError('call',))
-    vim.foreach_rtp(int, 2):(<class 'TypeError'>, TypeError('foreach_rtp() takes exactly one argument (2 given)',))
+    > MNVForeachRTP
+    mnv.foreach_rtp(None):(<class 'TypeError'>, TypeError("'NoneType' object is not callable",))
+    mnv.foreach_rtp(NoArgsCall()):(<class 'TypeError'>, TypeError('__call__() takes exactly 1 positional argument (2 given)',))
+    mnv.foreach_rtp(FailingCall()):(<class 'NotImplementedError'>, NotImplementedError('call',))
+    mnv.foreach_rtp(int, 2):(<class 'TypeError'>, TypeError('foreach_rtp() takes exactly one argument (2 given)',))
     > import
     import xxx_no_such_module_xxx:(<class 'ImportError'>, ImportError('No module named xxx_no_such_module_xxx',))
     import failing_import:(<class 'ImportError'>, ImportError())
     import failing:(<class 'NotImplementedError'>, NotImplementedError())
     > Options
     >> OptionsItem
-    vim.options["abcQ"]:(<class 'KeyError'>, KeyError('abcQ',))
-    vim.options[""]:(<class 'ValueError'>, ValueError('empty keys are not allowed',))
-    >>> Testing StringToChars using vim.options[%s]
-    vim.options[1]:(<class 'TypeError'>, TypeError('expected bytes() or str() instance, but got int',))
-    vim.options[b"\0"]:(<class 'TypeError'>, TypeError('expected bytes with no null',))
-    vim.options["\0"]:(<class 'TypeError'>, TypeError('expected bytes with no null',))
+    mnv.options["abcQ"]:(<class 'KeyError'>, KeyError('abcQ',))
+    mnv.options[""]:(<class 'ValueError'>, ValueError('empty keys are not allowed',))
+    >>> Testing StringToChars using mnv.options[%s]
+    mnv.options[1]:(<class 'TypeError'>, TypeError('expected bytes() or str() instance, but got int',))
+    mnv.options[b"\0"]:(<class 'TypeError'>, TypeError('expected bytes with no null',))
+    mnv.options["\0"]:(<class 'TypeError'>, TypeError('expected bytes with no null',))
     <<< Finished
     >> OptionsContains
-    >>> Testing StringToChars using %s in vim.options
-    1 in vim.options:(<class 'TypeError'>, TypeError('expected bytes() or str() instance, but got int',))
-    b"\0" in vim.options:(<class 'TypeError'>, TypeError('expected bytes with no null',))
-    "\0" in vim.options:(<class 'TypeError'>, TypeError('expected bytes with no null',))
+    >>> Testing StringToChars using %s in mnv.options
+    1 in mnv.options:(<class 'TypeError'>, TypeError('expected bytes() or str() instance, but got int',))
+    b"\0" in mnv.options:(<class 'TypeError'>, TypeError('expected bytes with no null',))
+    "\0" in mnv.options:(<class 'TypeError'>, TypeError('expected bytes with no null',))
     <<< Finished
     > Dictionary
     >> DictionaryConstructor
-    vim.Dictionary("abcI"):(<class 'ValueError'>, ValueError('expected sequence element of size 2, but got sequence of size 1',))
+    mnv.Dictionary("abcI"):(<class 'ValueError'>, ValueError('expected sequence element of size 2, but got sequence of size 1',))
     >> DictionarySetattr
-    del d.locked:(<class 'AttributeError'>, AttributeError('cannot delete vim.Dictionary attributes',))
+    del d.locked:(<class 'AttributeError'>, AttributeError('cannot delete mnv.Dictionary attributes',))
     d.locked = FailingTrue():(<class 'NotImplementedError'>, NotImplementedError('bool',))
-    vim.vvars.locked = False:(<class 'TypeError'>, TypeError('cannot modify fixed dictionary',))
+    mnv.vvars.locked = False:(<class 'TypeError'>, TypeError('cannot modify fixed dictionary',))
     d.scope = True:(<class 'AttributeError'>, AttributeError('cannot set attribute scope',))
     d.xxx = True:(<class 'AttributeError'>, AttributeError('cannot set attribute xxx',))
     >> _DictionaryItem
@@ -3438,14 +3438,14 @@ func Test_python3_errors()
     d.get("\0"):(<class 'TypeError'>, TypeError('expected bytes with no null',))
     <<< Finished
     d.pop("a"):(<class 'KeyError'>, KeyError('a',))
-    dl.pop("a"):(<class 'vim.error'>, error('dictionary is locked',))
+    dl.pop("a"):(<class 'mnv.error'>, error('dictionary is locked',))
     >> DictionaryContains
     "" in d:(<class 'ValueError'>, ValueError('empty keys are not allowed',))
     0 in d:(<class 'TypeError'>, TypeError('expected bytes() or str() instance, but got int',))
     >> DictionaryIterNext
     for i in ned: ned["a"] = 1:(<class 'RuntimeError'>, RuntimeError('hashtab changed during iteration',))
     >> DictionaryAssItem
-    dl["b"] = 1:(<class 'vim.error'>, error('dictionary is locked',))
+    dl["b"] = 1:(<class 'mnv.error'>, error('dictionary is locked',))
     >>> Testing StringToChars using d[%s] = 1
     d[1] = 1:(<class 'TypeError'>, TypeError('expected bytes() or str() instance, but got int',))
     d[b"\0"] = 1:(<class 'TypeError'>, TypeError('expected bytes with no null',))
@@ -3467,7 +3467,7 @@ func Test_python3_errors()
     d["a"] = {"abcF" : Mapping({"\0" : 1})}:(<class 'TypeError'>, TypeError('expected bytes with no null',))
     <<< Finished
     >>> Testing *Iter* using d["a"] = {"abcF" : %s}
-    d["a"] = {"abcF" : FailingIter()}:(<class 'TypeError'>, TypeError('unable to convert FailingIter to a Vim structure',))
+    d["a"] = {"abcF" : FailingIter()}:(<class 'TypeError'>, TypeError('unable to convert FailingIter to a MNV structure',))
     d["a"] = {"abcF" : FailingIterNext()}:(<class 'NotImplementedError'>, NotImplementedError('next',))
     <<< Finished
     >>> Testing ConvertFromPyObject using d["a"] = {"abcF" : %s}
@@ -3494,7 +3494,7 @@ func Test_python3_errors()
     d["a"] = Mapping({"abcG" : Mapping({"\0" : 1})}):(<class 'TypeError'>, TypeError('expected bytes with no null',))
     <<< Finished
     >>> Testing *Iter* using d["a"] = Mapping({"abcG" : %s})
-    d["a"] = Mapping({"abcG" : FailingIter()}):(<class 'TypeError'>, TypeError('unable to convert FailingIter to a Vim structure',))
+    d["a"] = Mapping({"abcG" : FailingIter()}):(<class 'TypeError'>, TypeError('unable to convert FailingIter to a MNV structure',))
     d["a"] = Mapping({"abcG" : FailingIterNext()}):(<class 'NotImplementedError'>, NotImplementedError('next',))
     <<< Finished
     >>> Testing ConvertFromPyObject using d["a"] = Mapping({"abcG" : %s})
@@ -3506,7 +3506,7 @@ func Test_python3_errors()
     d["a"] = Mapping({"abcG" : FailingNumber()}):(<class 'NotImplementedError'>, NotImplementedError('int',))
     <<< Finished
     >>> Testing *Iter* using d["a"] = %s
-    d["a"] = FailingIter():(<class 'TypeError'>, TypeError('unable to convert FailingIter to a Vim structure',))
+    d["a"] = FailingIter():(<class 'TypeError'>, TypeError('unable to convert FailingIter to a MNV structure',))
     d["a"] = FailingIterNext():(<class 'NotImplementedError'>, NotImplementedError('next',))
     <<< Finished
     >>> Testing ConvertFromPyObject using d["a"] = %s
@@ -3543,7 +3543,7 @@ func Test_python3_errors()
     d.update({"abcF" : Mapping({"\0" : 1})}):(<class 'TypeError'>, TypeError('expected bytes with no null',))
     <<< Finished
     >>> Testing *Iter* using d.update({"abcF" : %s})
-    d.update({"abcF" : FailingIter()}):(<class 'TypeError'>, TypeError('unable to convert FailingIter to a Vim structure',))
+    d.update({"abcF" : FailingIter()}):(<class 'TypeError'>, TypeError('unable to convert FailingIter to a MNV structure',))
     d.update({"abcF" : FailingIterNext()}):(<class 'NotImplementedError'>, NotImplementedError('next',))
     <<< Finished
     >>> Testing ConvertFromPyObject using d.update({"abcF" : %s})
@@ -3570,7 +3570,7 @@ func Test_python3_errors()
     d.update(Mapping({"abcG" : Mapping({"\0" : 1})})):(<class 'TypeError'>, TypeError('expected bytes with no null',))
     <<< Finished
     >>> Testing *Iter* using d.update(Mapping({"abcG" : %s}))
-    d.update(Mapping({"abcG" : FailingIter()})):(<class 'TypeError'>, TypeError('unable to convert FailingIter to a Vim structure',))
+    d.update(Mapping({"abcG" : FailingIter()})):(<class 'TypeError'>, TypeError('unable to convert FailingIter to a MNV structure',))
     d.update(Mapping({"abcG" : FailingIterNext()})):(<class 'NotImplementedError'>, NotImplementedError('next',))
     <<< Finished
     >>> Testing ConvertFromPyObject using d.update(Mapping({"abcG" : %s}))
@@ -3614,11 +3614,11 @@ func Test_python3_errors()
     d.update((("a", {"abcF" : Mapping({"\0" : 1})}),)):(<class 'TypeError'>, TypeError('expected bytes with no null',))
     <<< Finished
     >>> Testing *Iter* using d.update((("a", {"abcF" : %s}),))
-    d.update((("a", {"abcF" : FailingIter()}),)):(<class 'TypeError'>, TypeError('unable to convert FailingIter to a Vim structure',))
+    d.update((("a", {"abcF" : FailingIter()}),)):(<class 'TypeError'>, TypeError('unable to convert FailingIter to a MNV structure',))
     d.update((("a", {"abcF" : FailingIterNext()}),)):(<class 'NotImplementedError'>, NotImplementedError('next',))
     <<< Finished
     >>> Testing ConvertFromPyObject using d.update((("a", {"abcF" : %s}),))
-    d.update((("a", {"abcF" : None}),)):(<class 'vim.error'>, error("failed to add key 'a' to dictionary",))
+    d.update((("a", {"abcF" : None}),)):(<class 'mnv.error'>, error("failed to add key 'a' to dictionary",))
     d.update((("a", {"abcF" : {b"": 1}}),)):(<class 'ValueError'>, ValueError('empty keys are not allowed',))
     d.update((("a", {"abcF" : {"": 1}}),)):(<class 'ValueError'>, ValueError('empty keys are not allowed',))
     d.update((("a", {"abcF" : FailingMapping()}),)):(<class 'NotImplementedError'>, NotImplementedError('keys',))
@@ -3641,11 +3641,11 @@ func Test_python3_errors()
     d.update((("a", Mapping({"abcG" : Mapping({"\0" : 1})})),)):(<class 'TypeError'>, TypeError('expected bytes with no null',))
     <<< Finished
     >>> Testing *Iter* using d.update((("a", Mapping({"abcG" : %s})),))
-    d.update((("a", Mapping({"abcG" : FailingIter()})),)):(<class 'TypeError'>, TypeError('unable to convert FailingIter to a Vim structure',))
+    d.update((("a", Mapping({"abcG" : FailingIter()})),)):(<class 'TypeError'>, TypeError('unable to convert FailingIter to a MNV structure',))
     d.update((("a", Mapping({"abcG" : FailingIterNext()})),)):(<class 'NotImplementedError'>, NotImplementedError('next',))
     <<< Finished
     >>> Testing ConvertFromPyObject using d.update((("a", Mapping({"abcG" : %s})),))
-    d.update((("a", Mapping({"abcG" : None})),)):(<class 'vim.error'>, error("failed to add key 'a' to dictionary",))
+    d.update((("a", Mapping({"abcG" : None})),)):(<class 'mnv.error'>, error("failed to add key 'a' to dictionary",))
     d.update((("a", Mapping({"abcG" : {b"": 1}})),)):(<class 'ValueError'>, ValueError('empty keys are not allowed',))
     d.update((("a", Mapping({"abcG" : {"": 1}})),)):(<class 'ValueError'>, ValueError('empty keys are not allowed',))
     d.update((("a", Mapping({"abcG" : FailingMapping()})),)):(<class 'NotImplementedError'>, NotImplementedError('keys',))
@@ -3653,11 +3653,11 @@ func Test_python3_errors()
     d.update((("a", Mapping({"abcG" : FailingNumber()})),)):(<class 'NotImplementedError'>, NotImplementedError('int',))
     <<< Finished
     >>> Testing *Iter* using d.update((("a", %s),))
-    d.update((("a", FailingIter()),)):(<class 'TypeError'>, TypeError('unable to convert FailingIter to a Vim structure',))
+    d.update((("a", FailingIter()),)):(<class 'TypeError'>, TypeError('unable to convert FailingIter to a MNV structure',))
     d.update((("a", FailingIterNext()),)):(<class 'NotImplementedError'>, NotImplementedError('next',))
     <<< Finished
     >>> Testing ConvertFromPyObject using d.update((("a", %s),))
-    d.update((("a", None),)):(<class 'vim.error'>, error("failed to add key 'a' to dictionary",))
+    d.update((("a", None),)):(<class 'mnv.error'>, error("failed to add key 'a' to dictionary",))
     d.update((("a", {b"": 1}),)):(<class 'ValueError'>, ValueError('empty keys are not allowed',))
     d.update((("a", {"": 1}),)):(<class 'ValueError'>, ValueError('empty keys are not allowed',))
     d.update((("a", FailingMapping()),)):(<class 'NotImplementedError'>, NotImplementedError('keys',))
@@ -3670,85 +3670,85 @@ func Test_python3_errors()
     d.has_key():(<class 'TypeError'>, TypeError('has_key() takes exactly one argument (0 given)',))
     > List
     >> ListConstructor
-    vim.List(1, 2):(<class 'TypeError'>, TypeError('function takes at most 1 argument (2 given)',))
-    vim.List(a=1):(<class 'TypeError'>, TypeError('list constructor does not accept keyword arguments',))
-    >>> Testing *Iter* using vim.List(%s)
-    vim.List(FailingIter()):(<class 'NotImplementedError'>, NotImplementedError('iter',))
-    vim.List(FailingIterNext()):(<class 'NotImplementedError'>, NotImplementedError('next',))
+    mnv.List(1, 2):(<class 'TypeError'>, TypeError('function takes at most 1 argument (2 given)',))
+    mnv.List(a=1):(<class 'TypeError'>, TypeError('list constructor does not accept keyword arguments',))
+    >>> Testing *Iter* using mnv.List(%s)
+    mnv.List(FailingIter()):(<class 'NotImplementedError'>, NotImplementedError('iter',))
+    mnv.List(FailingIterNext()):(<class 'NotImplementedError'>, NotImplementedError('next',))
     <<< Finished
-    >>> Testing StringToChars using vim.List([{%s : 1}])
-    vim.List([{1 : 1}]):(<class 'TypeError'>, TypeError('expected bytes() or str() instance, but got int',))
-    vim.List([{b"\0" : 1}]):(<class 'TypeError'>, TypeError('expected bytes with no null',))
-    vim.List([{"\0" : 1}]):(<class 'TypeError'>, TypeError('expected bytes with no null',))
+    >>> Testing StringToChars using mnv.List([{%s : 1}])
+    mnv.List([{1 : 1}]):(<class 'TypeError'>, TypeError('expected bytes() or str() instance, but got int',))
+    mnv.List([{b"\0" : 1}]):(<class 'TypeError'>, TypeError('expected bytes with no null',))
+    mnv.List([{"\0" : 1}]):(<class 'TypeError'>, TypeError('expected bytes with no null',))
     <<< Finished
-    >>> Testing StringToChars using vim.List([{"abcF" : {%s : 1}}])
-    vim.List([{"abcF" : {1 : 1}}]):(<class 'TypeError'>, TypeError('expected bytes() or str() instance, but got int',))
-    vim.List([{"abcF" : {b"\0" : 1}}]):(<class 'TypeError'>, TypeError('expected bytes with no null',))
-    vim.List([{"abcF" : {"\0" : 1}}]):(<class 'TypeError'>, TypeError('expected bytes with no null',))
+    >>> Testing StringToChars using mnv.List([{"abcF" : {%s : 1}}])
+    mnv.List([{"abcF" : {1 : 1}}]):(<class 'TypeError'>, TypeError('expected bytes() or str() instance, but got int',))
+    mnv.List([{"abcF" : {b"\0" : 1}}]):(<class 'TypeError'>, TypeError('expected bytes with no null',))
+    mnv.List([{"abcF" : {"\0" : 1}}]):(<class 'TypeError'>, TypeError('expected bytes with no null',))
     <<< Finished
-    >>> Testing StringToChars using vim.List([{"abcF" : Mapping({%s : 1})}])
-    vim.List([{"abcF" : Mapping({1 : 1})}]):(<class 'TypeError'>, TypeError('expected bytes() or str() instance, but got int',))
-    vim.List([{"abcF" : Mapping({b"\0" : 1})}]):(<class 'TypeError'>, TypeError('expected bytes with no null',))
-    vim.List([{"abcF" : Mapping({"\0" : 1})}]):(<class 'TypeError'>, TypeError('expected bytes with no null',))
+    >>> Testing StringToChars using mnv.List([{"abcF" : Mapping({%s : 1})}])
+    mnv.List([{"abcF" : Mapping({1 : 1})}]):(<class 'TypeError'>, TypeError('expected bytes() or str() instance, but got int',))
+    mnv.List([{"abcF" : Mapping({b"\0" : 1})}]):(<class 'TypeError'>, TypeError('expected bytes with no null',))
+    mnv.List([{"abcF" : Mapping({"\0" : 1})}]):(<class 'TypeError'>, TypeError('expected bytes with no null',))
     <<< Finished
-    >>> Testing *Iter* using vim.List([{"abcF" : %s}])
-    vim.List([{"abcF" : FailingIter()}]):(<class 'TypeError'>, TypeError('unable to convert FailingIter to a Vim structure',))
-    vim.List([{"abcF" : FailingIterNext()}]):(<class 'NotImplementedError'>, NotImplementedError('next',))
+    >>> Testing *Iter* using mnv.List([{"abcF" : %s}])
+    mnv.List([{"abcF" : FailingIter()}]):(<class 'TypeError'>, TypeError('unable to convert FailingIter to a MNV structure',))
+    mnv.List([{"abcF" : FailingIterNext()}]):(<class 'NotImplementedError'>, NotImplementedError('next',))
     <<< Finished
-    >>> Testing ConvertFromPyObject using vim.List([{"abcF" : %s}])
-    vim.List([{"abcF" : None}]):NOT FAILED
-    vim.List([{"abcF" : {b"": 1}}]):(<class 'ValueError'>, ValueError('empty keys are not allowed',))
-    vim.List([{"abcF" : {"": 1}}]):(<class 'ValueError'>, ValueError('empty keys are not allowed',))
-    vim.List([{"abcF" : FailingMapping()}]):(<class 'NotImplementedError'>, NotImplementedError('keys',))
-    vim.List([{"abcF" : FailingMappingKey()}]):(<class 'NotImplementedError'>, NotImplementedError('getitem:mappingkey',))
-    vim.List([{"abcF" : FailingNumber()}]):(<class 'NotImplementedError'>, NotImplementedError('int',))
+    >>> Testing ConvertFromPyObject using mnv.List([{"abcF" : %s}])
+    mnv.List([{"abcF" : None}]):NOT FAILED
+    mnv.List([{"abcF" : {b"": 1}}]):(<class 'ValueError'>, ValueError('empty keys are not allowed',))
+    mnv.List([{"abcF" : {"": 1}}]):(<class 'ValueError'>, ValueError('empty keys are not allowed',))
+    mnv.List([{"abcF" : FailingMapping()}]):(<class 'NotImplementedError'>, NotImplementedError('keys',))
+    mnv.List([{"abcF" : FailingMappingKey()}]):(<class 'NotImplementedError'>, NotImplementedError('getitem:mappingkey',))
+    mnv.List([{"abcF" : FailingNumber()}]):(<class 'NotImplementedError'>, NotImplementedError('int',))
     <<< Finished
-    >>> Testing StringToChars using vim.List([Mapping({%s : 1})])
-    vim.List([Mapping({1 : 1})]):(<class 'TypeError'>, TypeError('expected bytes() or str() instance, but got int',))
-    vim.List([Mapping({b"\0" : 1})]):(<class 'TypeError'>, TypeError('expected bytes with no null',))
-    vim.List([Mapping({"\0" : 1})]):(<class 'TypeError'>, TypeError('expected bytes with no null',))
+    >>> Testing StringToChars using mnv.List([Mapping({%s : 1})])
+    mnv.List([Mapping({1 : 1})]):(<class 'TypeError'>, TypeError('expected bytes() or str() instance, but got int',))
+    mnv.List([Mapping({b"\0" : 1})]):(<class 'TypeError'>, TypeError('expected bytes with no null',))
+    mnv.List([Mapping({"\0" : 1})]):(<class 'TypeError'>, TypeError('expected bytes with no null',))
     <<< Finished
-    >>> Testing StringToChars using vim.List([Mapping({"abcG" : {%s : 1}})])
-    vim.List([Mapping({"abcG" : {1 : 1}})]):(<class 'TypeError'>, TypeError('expected bytes() or str() instance, but got int',))
-    vim.List([Mapping({"abcG" : {b"\0" : 1}})]):(<class 'TypeError'>, TypeError('expected bytes with no null',))
-    vim.List([Mapping({"abcG" : {"\0" : 1}})]):(<class 'TypeError'>, TypeError('expected bytes with no null',))
+    >>> Testing StringToChars using mnv.List([Mapping({"abcG" : {%s : 1}})])
+    mnv.List([Mapping({"abcG" : {1 : 1}})]):(<class 'TypeError'>, TypeError('expected bytes() or str() instance, but got int',))
+    mnv.List([Mapping({"abcG" : {b"\0" : 1}})]):(<class 'TypeError'>, TypeError('expected bytes with no null',))
+    mnv.List([Mapping({"abcG" : {"\0" : 1}})]):(<class 'TypeError'>, TypeError('expected bytes with no null',))
     <<< Finished
-    >>> Testing StringToChars using vim.List([Mapping({"abcG" : Mapping({%s : 1})})])
-    vim.List([Mapping({"abcG" : Mapping({1 : 1})})]):(<class 'TypeError'>, TypeError('expected bytes() or str() instance, but got int',))
-    vim.List([Mapping({"abcG" : Mapping({b"\0" : 1})})]):(<class 'TypeError'>, TypeError('expected bytes with no null',))
-    vim.List([Mapping({"abcG" : Mapping({"\0" : 1})})]):(<class 'TypeError'>, TypeError('expected bytes with no null',))
+    >>> Testing StringToChars using mnv.List([Mapping({"abcG" : Mapping({%s : 1})})])
+    mnv.List([Mapping({"abcG" : Mapping({1 : 1})})]):(<class 'TypeError'>, TypeError('expected bytes() or str() instance, but got int',))
+    mnv.List([Mapping({"abcG" : Mapping({b"\0" : 1})})]):(<class 'TypeError'>, TypeError('expected bytes with no null',))
+    mnv.List([Mapping({"abcG" : Mapping({"\0" : 1})})]):(<class 'TypeError'>, TypeError('expected bytes with no null',))
     <<< Finished
-    >>> Testing *Iter* using vim.List([Mapping({"abcG" : %s})])
-    vim.List([Mapping({"abcG" : FailingIter()})]):(<class 'TypeError'>, TypeError('unable to convert FailingIter to a Vim structure',))
-    vim.List([Mapping({"abcG" : FailingIterNext()})]):(<class 'NotImplementedError'>, NotImplementedError('next',))
+    >>> Testing *Iter* using mnv.List([Mapping({"abcG" : %s})])
+    mnv.List([Mapping({"abcG" : FailingIter()})]):(<class 'TypeError'>, TypeError('unable to convert FailingIter to a MNV structure',))
+    mnv.List([Mapping({"abcG" : FailingIterNext()})]):(<class 'NotImplementedError'>, NotImplementedError('next',))
     <<< Finished
-    >>> Testing ConvertFromPyObject using vim.List([Mapping({"abcG" : %s})])
-    vim.List([Mapping({"abcG" : None})]):NOT FAILED
-    vim.List([Mapping({"abcG" : {b"": 1}})]):(<class 'ValueError'>, ValueError('empty keys are not allowed',))
-    vim.List([Mapping({"abcG" : {"": 1}})]):(<class 'ValueError'>, ValueError('empty keys are not allowed',))
-    vim.List([Mapping({"abcG" : FailingMapping()})]):(<class 'NotImplementedError'>, NotImplementedError('keys',))
-    vim.List([Mapping({"abcG" : FailingMappingKey()})]):(<class 'NotImplementedError'>, NotImplementedError('getitem:mappingkey',))
-    vim.List([Mapping({"abcG" : FailingNumber()})]):(<class 'NotImplementedError'>, NotImplementedError('int',))
+    >>> Testing ConvertFromPyObject using mnv.List([Mapping({"abcG" : %s})])
+    mnv.List([Mapping({"abcG" : None})]):NOT FAILED
+    mnv.List([Mapping({"abcG" : {b"": 1}})]):(<class 'ValueError'>, ValueError('empty keys are not allowed',))
+    mnv.List([Mapping({"abcG" : {"": 1}})]):(<class 'ValueError'>, ValueError('empty keys are not allowed',))
+    mnv.List([Mapping({"abcG" : FailingMapping()})]):(<class 'NotImplementedError'>, NotImplementedError('keys',))
+    mnv.List([Mapping({"abcG" : FailingMappingKey()})]):(<class 'NotImplementedError'>, NotImplementedError('getitem:mappingkey',))
+    mnv.List([Mapping({"abcG" : FailingNumber()})]):(<class 'NotImplementedError'>, NotImplementedError('int',))
     <<< Finished
-    >>> Testing *Iter* using vim.List([%s])
-    vim.List([FailingIter()]):(<class 'TypeError'>, TypeError('unable to convert FailingIter to a Vim structure',))
-    vim.List([FailingIterNext()]):(<class 'NotImplementedError'>, NotImplementedError('next',))
+    >>> Testing *Iter* using mnv.List([%s])
+    mnv.List([FailingIter()]):(<class 'TypeError'>, TypeError('unable to convert FailingIter to a MNV structure',))
+    mnv.List([FailingIterNext()]):(<class 'NotImplementedError'>, NotImplementedError('next',))
     <<< Finished
-    >>> Testing ConvertFromPyObject using vim.List([%s])
-    vim.List([None]):NOT FAILED
-    vim.List([{b"": 1}]):(<class 'ValueError'>, ValueError('empty keys are not allowed',))
-    vim.List([{"": 1}]):(<class 'ValueError'>, ValueError('empty keys are not allowed',))
-    vim.List([FailingMapping()]):(<class 'NotImplementedError'>, NotImplementedError('keys',))
-    vim.List([FailingMappingKey()]):(<class 'NotImplementedError'>, NotImplementedError('getitem:mappingkey',))
-    vim.List([FailingNumber()]):(<class 'NotImplementedError'>, NotImplementedError('int',))
+    >>> Testing ConvertFromPyObject using mnv.List([%s])
+    mnv.List([None]):NOT FAILED
+    mnv.List([{b"": 1}]):(<class 'ValueError'>, ValueError('empty keys are not allowed',))
+    mnv.List([{"": 1}]):(<class 'ValueError'>, ValueError('empty keys are not allowed',))
+    mnv.List([FailingMapping()]):(<class 'NotImplementedError'>, NotImplementedError('keys',))
+    mnv.List([FailingMappingKey()]):(<class 'NotImplementedError'>, NotImplementedError('getitem:mappingkey',))
+    mnv.List([FailingNumber()]):(<class 'NotImplementedError'>, NotImplementedError('int',))
     <<< Finished
     >> ListItem
     l[1000]:(<class 'IndexError'>, IndexError('list index out of range',))
     >> ListAssItem
-    ll[1] = 2:(<class 'vim.error'>, error('list is locked',))
+    ll[1] = 2:(<class 'mnv.error'>, error('list is locked',))
     l[1000] = 3:(<class 'IndexError'>, IndexError('list index out of range',))
     >> ListAssSlice
-    ll[1:100] = "abcJ":(<class 'vim.error'>, error('list is locked',))
+    ll[1:100] = "abcJ":(<class 'mnv.error'>, error('list is locked',))
     >>> Testing *Iter* using l[:] = %s
     l[:] = FailingIter():(<class 'NotImplementedError'>, NotImplementedError('iter',))
     l[:] = FailingIterNext():(<class 'NotImplementedError'>, NotImplementedError('next',))
@@ -3777,7 +3777,7 @@ func Test_python3_errors()
     l[:] = [{"abcF" : Mapping({"\0" : 1})}]:(<class 'TypeError'>, TypeError('expected bytes with no null',))
     <<< Finished
     >>> Testing *Iter* using l[:] = [{"abcF" : %s}]
-    l[:] = [{"abcF" : FailingIter()}]:(<class 'TypeError'>, TypeError('unable to convert FailingIter to a Vim structure',))
+    l[:] = [{"abcF" : FailingIter()}]:(<class 'TypeError'>, TypeError('unable to convert FailingIter to a MNV structure',))
     l[:] = [{"abcF" : FailingIterNext()}]:(<class 'NotImplementedError'>, NotImplementedError('next',))
     <<< Finished
     >>> Testing ConvertFromPyObject using l[:] = [{"abcF" : %s}]
@@ -3804,7 +3804,7 @@ func Test_python3_errors()
     l[:] = [Mapping({"abcG" : Mapping({"\0" : 1})})]:(<class 'TypeError'>, TypeError('expected bytes with no null',))
     <<< Finished
     >>> Testing *Iter* using l[:] = [Mapping({"abcG" : %s})]
-    l[:] = [Mapping({"abcG" : FailingIter()})]:(<class 'TypeError'>, TypeError('unable to convert FailingIter to a Vim structure',))
+    l[:] = [Mapping({"abcG" : FailingIter()})]:(<class 'TypeError'>, TypeError('unable to convert FailingIter to a MNV structure',))
     l[:] = [Mapping({"abcG" : FailingIterNext()})]:(<class 'NotImplementedError'>, NotImplementedError('next',))
     <<< Finished
     >>> Testing ConvertFromPyObject using l[:] = [Mapping({"abcG" : %s})]
@@ -3816,7 +3816,7 @@ func Test_python3_errors()
     l[:] = [Mapping({"abcG" : FailingNumber()})]:(<class 'NotImplementedError'>, NotImplementedError('int',))
     <<< Finished
     >>> Testing *Iter* using l[:] = [%s]
-    l[:] = [FailingIter()]:(<class 'TypeError'>, TypeError('unable to convert FailingIter to a Vim structure',))
+    l[:] = [FailingIter()]:(<class 'TypeError'>, TypeError('unable to convert FailingIter to a MNV structure',))
     l[:] = [FailingIterNext()]:(<class 'NotImplementedError'>, NotImplementedError('next',))
     <<< Finished
     >>> Testing ConvertFromPyObject using l[:] = [%s]
@@ -3848,7 +3848,7 @@ func Test_python3_errors()
     l.extend([{"abcF" : Mapping({"\0" : 1})}]):(<class 'TypeError'>, TypeError('expected bytes with no null',))
     <<< Finished
     >>> Testing *Iter* using l.extend([{"abcF" : %s}])
-    l.extend([{"abcF" : FailingIter()}]):(<class 'TypeError'>, TypeError('unable to convert FailingIter to a Vim structure',))
+    l.extend([{"abcF" : FailingIter()}]):(<class 'TypeError'>, TypeError('unable to convert FailingIter to a MNV structure',))
     l.extend([{"abcF" : FailingIterNext()}]):(<class 'NotImplementedError'>, NotImplementedError('next',))
     <<< Finished
     >>> Testing ConvertFromPyObject using l.extend([{"abcF" : %s}])
@@ -3875,7 +3875,7 @@ func Test_python3_errors()
     l.extend([Mapping({"abcG" : Mapping({"\0" : 1})})]):(<class 'TypeError'>, TypeError('expected bytes with no null',))
     <<< Finished
     >>> Testing *Iter* using l.extend([Mapping({"abcG" : %s})])
-    l.extend([Mapping({"abcG" : FailingIter()})]):(<class 'TypeError'>, TypeError('unable to convert FailingIter to a Vim structure',))
+    l.extend([Mapping({"abcG" : FailingIter()})]):(<class 'TypeError'>, TypeError('unable to convert FailingIter to a MNV structure',))
     l.extend([Mapping({"abcG" : FailingIterNext()})]):(<class 'NotImplementedError'>, NotImplementedError('next',))
     <<< Finished
     >>> Testing ConvertFromPyObject using l.extend([Mapping({"abcG" : %s})])
@@ -3887,7 +3887,7 @@ func Test_python3_errors()
     l.extend([Mapping({"abcG" : FailingNumber()})]):(<class 'NotImplementedError'>, NotImplementedError('int',))
     <<< Finished
     >>> Testing *Iter* using l.extend([%s])
-    l.extend([FailingIter()]):(<class 'TypeError'>, TypeError('unable to convert FailingIter to a Vim structure',))
+    l.extend([FailingIter()]):(<class 'TypeError'>, TypeError('unable to convert FailingIter to a MNV structure',))
     l.extend([FailingIterNext()]):(<class 'NotImplementedError'>, NotImplementedError('next',))
     <<< Finished
     >>> Testing ConvertFromPyObject using l.extend([%s])
@@ -3899,25 +3899,25 @@ func Test_python3_errors()
     l.extend([FailingNumber()]):(<class 'NotImplementedError'>, NotImplementedError('int',))
     <<< Finished
     >> ListSetattr
-    del l.locked:(<class 'AttributeError'>, AttributeError('cannot delete vim.List attributes',))
+    del l.locked:(<class 'AttributeError'>, AttributeError('cannot delete mnv.List attributes',))
     l.locked = FailingTrue():(<class 'NotImplementedError'>, NotImplementedError('bool',))
     l.xxx = True:(<class 'AttributeError'>, AttributeError('cannot set attribute xxx',))
     > Function
     >> FunctionConstructor
     >>> FunctionConstructor
-    vim.Function("123"):(<class 'ValueError'>, ValueError('unnamed function 123 does not exist',))
-    vim.Function("xxx_non_existent_function_xxx"):(<class 'ValueError'>, ValueError('function xxx_non_existent_function_xxx does not exist',))
-    vim.Function("xxx#non#existent#function#xxx"):NOT FAILED
-    vim.Function("xxx_non_existent_function_xxx2", args=[]):(<class 'ValueError'>, ValueError('function xxx_non_existent_function_xxx2 does not exist',))
-    vim.Function("xxx_non_existent_function_xxx3", self={}):(<class 'ValueError'>, ValueError('function xxx_non_existent_function_xxx3 does not exist',))
-    vim.Function("xxx_non_existent_function_xxx4", args=[], self={}):(<class 'ValueError'>, ValueError('function xxx_non_existent_function_xxx4 does not exist',))
+    mnv.Function("123"):(<class 'ValueError'>, ValueError('unnamed function 123 does not exist',))
+    mnv.Function("xxx_non_existent_function_xxx"):(<class 'ValueError'>, ValueError('function xxx_non_existent_function_xxx does not exist',))
+    mnv.Function("xxx#non#existent#function#xxx"):NOT FAILED
+    mnv.Function("xxx_non_existent_function_xxx2", args=[]):(<class 'ValueError'>, ValueError('function xxx_non_existent_function_xxx2 does not exist',))
+    mnv.Function("xxx_non_existent_function_xxx3", self={}):(<class 'ValueError'>, ValueError('function xxx_non_existent_function_xxx3 does not exist',))
+    mnv.Function("xxx_non_existent_function_xxx4", args=[], self={}):(<class 'ValueError'>, ValueError('function xxx_non_existent_function_xxx4 does not exist',))
     >>> FunctionNew
-    vim.Function("tr", self="abcFuncSelf"):(<class 'AttributeError'>, AttributeError('keys',))
-    vim.Function("tr", args=427423):(<class 'TypeError'>, TypeError('unable to convert int to a Vim list',))
-    vim.Function("tr", self="abcFuncSelf2", args="abcFuncArgs2"):(<class 'AttributeError'>, AttributeError('keys',))
-    vim.Function(self="abcFuncSelf2", args="abcFuncArgs2"):(<class 'AttributeError'>, AttributeError('keys',))
-    vim.Function("tr", "", self="abcFuncSelf2", args="abcFuncArgs2"):(<class 'AttributeError'>, AttributeError('keys',))
-    vim.Function("tr", ""):(<class 'TypeError'>, TypeError('function takes exactly 1 argument (2 given)',))
+    mnv.Function("tr", self="abcFuncSelf"):(<class 'AttributeError'>, AttributeError('keys',))
+    mnv.Function("tr", args=427423):(<class 'TypeError'>, TypeError('unable to convert int to a MNV list',))
+    mnv.Function("tr", self="abcFuncSelf2", args="abcFuncArgs2"):(<class 'AttributeError'>, AttributeError('keys',))
+    mnv.Function(self="abcFuncSelf2", args="abcFuncArgs2"):(<class 'AttributeError'>, AttributeError('keys',))
+    mnv.Function("tr", "", self="abcFuncSelf2", args="abcFuncArgs2"):(<class 'AttributeError'>, AttributeError('keys',))
+    mnv.Function("tr", ""):(<class 'TypeError'>, TypeError('function takes exactly 1 argument (2 given)',))
     >> FunctionCall
     >>> Testing StringToChars using f({%s : 1})
     f({1 : 1}):(<class 'TypeError'>, TypeError('expected bytes() or str() instance, but got int',))
@@ -3935,7 +3935,7 @@ func Test_python3_errors()
     f({"abcF" : Mapping({"\0" : 1})}):(<class 'TypeError'>, TypeError('expected bytes with no null',))
     <<< Finished
     >>> Testing *Iter* using f({"abcF" : %s})
-    f({"abcF" : FailingIter()}):(<class 'TypeError'>, TypeError('unable to convert FailingIter to a Vim structure',))
+    f({"abcF" : FailingIter()}):(<class 'TypeError'>, TypeError('unable to convert FailingIter to a MNV structure',))
     f({"abcF" : FailingIterNext()}):(<class 'NotImplementedError'>, NotImplementedError('next',))
     <<< Finished
     >>> Testing ConvertFromPyObject using f({"abcF" : %s})
@@ -3962,7 +3962,7 @@ func Test_python3_errors()
     f(Mapping({"abcG" : Mapping({"\0" : 1})})):(<class 'TypeError'>, TypeError('expected bytes with no null',))
     <<< Finished
     >>> Testing *Iter* using f(Mapping({"abcG" : %s}))
-    f(Mapping({"abcG" : FailingIter()})):(<class 'TypeError'>, TypeError('unable to convert FailingIter to a Vim structure',))
+    f(Mapping({"abcG" : FailingIter()})):(<class 'TypeError'>, TypeError('unable to convert FailingIter to a MNV structure',))
     f(Mapping({"abcG" : FailingIterNext()})):(<class 'NotImplementedError'>, NotImplementedError('next',))
     <<< Finished
     >>> Testing ConvertFromPyObject using f(Mapping({"abcG" : %s}))
@@ -3974,7 +3974,7 @@ func Test_python3_errors()
     f(Mapping({"abcG" : FailingNumber()})):(<class 'NotImplementedError'>, NotImplementedError('int',))
     <<< Finished
     >>> Testing *Iter* using f(%s)
-    f(FailingIter()):(<class 'TypeError'>, TypeError('unable to convert FailingIter to a Vim structure',))
+    f(FailingIter()):(<class 'TypeError'>, TypeError('unable to convert FailingIter to a MNV structure',))
     f(FailingIterNext()):(<class 'NotImplementedError'>, NotImplementedError('next',))
     <<< Finished
     >>> Testing ConvertFromPyObject using f(%s)
@@ -4001,7 +4001,7 @@ func Test_python3_errors()
     fd(self={"abcF" : Mapping({"\0" : 1})}):(<class 'TypeError'>, TypeError('expected bytes with no null',))
     <<< Finished
     >>> Testing *Iter* using fd(self={"abcF" : %s})
-    fd(self={"abcF" : FailingIter()}):(<class 'TypeError'>, TypeError('unable to convert FailingIter to a Vim structure',))
+    fd(self={"abcF" : FailingIter()}):(<class 'TypeError'>, TypeError('unable to convert FailingIter to a MNV structure',))
     fd(self={"abcF" : FailingIterNext()}):(<class 'NotImplementedError'>, NotImplementedError('next',))
     <<< Finished
     >>> Testing ConvertFromPyObject using fd(self={"abcF" : %s})
@@ -4028,7 +4028,7 @@ func Test_python3_errors()
     fd(self=Mapping({"abcG" : Mapping({"\0" : 1})})):(<class 'TypeError'>, TypeError('expected bytes with no null',))
     <<< Finished
     >>> Testing *Iter* using fd(self=Mapping({"abcG" : %s}))
-    fd(self=Mapping({"abcG" : FailingIter()})):(<class 'TypeError'>, TypeError('unable to convert FailingIter to a Vim structure',))
+    fd(self=Mapping({"abcG" : FailingIter()})):(<class 'TypeError'>, TypeError('unable to convert FailingIter to a MNV structure',))
     fd(self=Mapping({"abcG" : FailingIterNext()})):(<class 'NotImplementedError'>, NotImplementedError('next',))
     <<< Finished
     >>> Testing ConvertFromPyObject using fd(self=Mapping({"abcG" : %s}))
@@ -4040,93 +4040,93 @@ func Test_python3_errors()
     fd(self=Mapping({"abcG" : FailingNumber()})):(<class 'NotImplementedError'>, NotImplementedError('int',))
     <<< Finished
     >>> Testing *Iter* using fd(self=%s)
-    fd(self=FailingIter()):(<class 'TypeError'>, TypeError('unable to convert FailingIter to a Vim dictionary',))
-    fd(self=FailingIterNext()):(<class 'TypeError'>, TypeError('unable to convert FailingIterNext to a Vim dictionary',))
+    fd(self=FailingIter()):(<class 'TypeError'>, TypeError('unable to convert FailingIter to a MNV dictionary',))
+    fd(self=FailingIterNext()):(<class 'TypeError'>, TypeError('unable to convert FailingIterNext to a MNV dictionary',))
     <<< Finished
     >>> Testing ConvertFromPyObject using fd(self=%s)
-    fd(self=None):(<class 'TypeError'>, TypeError('unable to convert NoneType to a Vim dictionary',))
+    fd(self=None):(<class 'TypeError'>, TypeError('unable to convert NoneType to a MNV dictionary',))
     fd(self={b"": 1}):(<class 'ValueError'>, ValueError('empty keys are not allowed',))
     fd(self={"": 1}):(<class 'ValueError'>, ValueError('empty keys are not allowed',))
     fd(self=FailingMapping()):(<class 'NotImplementedError'>, NotImplementedError('keys',))
     fd(self=FailingMappingKey()):(<class 'NotImplementedError'>, NotImplementedError('getitem:mappingkey',))
-    fd(self=FailingNumber()):(<class 'TypeError'>, TypeError('unable to convert FailingNumber to a Vim dictionary',))
+    fd(self=FailingNumber()):(<class 'TypeError'>, TypeError('unable to convert FailingNumber to a MNV dictionary',))
     <<< Finished
     >>> Testing ConvertFromPyMapping using fd(self=%s)
     fd(self=[]):(<class 'AttributeError'>, AttributeError('keys',))
     <<< Finished
     > TabPage
     >> TabPageAttr
-    vim.current.tabpage.xxx:(<class 'AttributeError'>, AttributeError("'vim.tabpage' object has no attribute 'xxx'",))
+    mnv.current.tabpage.xxx:(<class 'AttributeError'>, AttributeError("'mnv.tabpage' object has no attribute 'xxx'",))
     > TabList
     >> TabListItem
-    vim.tabpages[1000]:(<class 'IndexError'>, IndexError('no such tab page',))
+    mnv.tabpages[1000]:(<class 'IndexError'>, IndexError('no such tab page',))
     > Window
     >> WindowAttr
-    vim.current.window.xxx:(<class 'AttributeError'>, AttributeError("'vim.window' object has no attribute 'xxx'",))
+    mnv.current.window.xxx:(<class 'AttributeError'>, AttributeError("'mnv.window' object has no attribute 'xxx'",))
     >> WindowSetattr
-    vim.current.window.buffer = 0:(<class 'TypeError'>, TypeError('readonly attribute: buffer',))
-    vim.current.window.cursor = (100000000, 100000000):(<class 'vim.error'>, error('cursor position outside buffer',))
-    vim.current.window.cursor = True:(<class 'TypeError'>, TypeError('argument must be 2-item sequence, not bool',))
-    >>> Testing NumberToLong using vim.current.window.height = %s
-    vim.current.window.height = []:(<class 'TypeError'>, TypeError('expected int() or something supporting coercing to int(), but got list',))
-    vim.current.window.height = None:(<class 'TypeError'>, TypeError('expected int() or something supporting coercing to int(), but got NoneType',))
-    vim.current.window.height = -1:(<class 'ValueError'>, ValueError('number must be greater or equal to zero',))
+    mnv.current.window.buffer = 0:(<class 'TypeError'>, TypeError('readonly attribute: buffer',))
+    mnv.current.window.cursor = (100000000, 100000000):(<class 'mnv.error'>, error('cursor position outside buffer',))
+    mnv.current.window.cursor = True:(<class 'TypeError'>, TypeError('argument must be 2-item sequence, not bool',))
+    >>> Testing NumberToLong using mnv.current.window.height = %s
+    mnv.current.window.height = []:(<class 'TypeError'>, TypeError('expected int() or something supporting coercing to int(), but got list',))
+    mnv.current.window.height = None:(<class 'TypeError'>, TypeError('expected int() or something supporting coercing to int(), but got NoneType',))
+    mnv.current.window.height = -1:(<class 'ValueError'>, ValueError('number must be greater or equal to zero',))
     <<< Finished
-    >>> Testing NumberToLong using vim.current.window.width = %s
-    vim.current.window.width = []:(<class 'TypeError'>, TypeError('expected int() or something supporting coercing to int(), but got list',))
-    vim.current.window.width = None:(<class 'TypeError'>, TypeError('expected int() or something supporting coercing to int(), but got NoneType',))
-    vim.current.window.width = -1:(<class 'ValueError'>, ValueError('number must be greater or equal to zero',))
+    >>> Testing NumberToLong using mnv.current.window.width = %s
+    mnv.current.window.width = []:(<class 'TypeError'>, TypeError('expected int() or something supporting coercing to int(), but got list',))
+    mnv.current.window.width = None:(<class 'TypeError'>, TypeError('expected int() or something supporting coercing to int(), but got NoneType',))
+    mnv.current.window.width = -1:(<class 'ValueError'>, ValueError('number must be greater or equal to zero',))
     <<< Finished
-    vim.current.window.xxxxxx = True:(<class 'AttributeError'>, AttributeError('xxxxxx',))
+    mnv.current.window.xxxxxx = True:(<class 'AttributeError'>, AttributeError('xxxxxx',))
     > WinList
     >> WinListItem
-    vim.windows[1000]:(<class 'IndexError'>, IndexError('no such window',))
+    mnv.windows[1000]:(<class 'IndexError'>, IndexError('no such window',))
     > Buffer
     >> StringToLine (indirect)
-    vim.current.buffer[0] = "\na":(<class 'vim.error'>, error('string cannot contain newlines',))
-    vim.current.buffer[0] = b"\na":(<class 'vim.error'>, error('string cannot contain newlines',))
+    mnv.current.buffer[0] = "\na":(<class 'mnv.error'>, error('string cannot contain newlines',))
+    mnv.current.buffer[0] = b"\na":(<class 'mnv.error'>, error('string cannot contain newlines',))
     >> SetBufferLine (indirect)
-    vim.current.buffer[0] = True:(<class 'TypeError'>, TypeError('bad argument type for built-in operation',))
+    mnv.current.buffer[0] = True:(<class 'TypeError'>, TypeError('bad argument type for built-in operation',))
     >> SetBufferLineList (indirect)
-    vim.current.buffer[:] = True:(<class 'TypeError'>, TypeError('bad argument type for built-in operation',))
-    vim.current.buffer[:] = ["\na", "bc"]:(<class 'vim.error'>, error('string cannot contain newlines',))
+    mnv.current.buffer[:] = True:(<class 'TypeError'>, TypeError('bad argument type for built-in operation',))
+    mnv.current.buffer[:] = ["\na", "bc"]:(<class 'mnv.error'>, error('string cannot contain newlines',))
     >> InsertBufferLines (indirect)
-    vim.current.buffer.append(None):(<class 'TypeError'>, TypeError('bad argument type for built-in operation',))
-    vim.current.buffer.append(["\na", "bc"]):(<class 'vim.error'>, error('string cannot contain newlines',))
-    vim.current.buffer.append("\nbc"):(<class 'vim.error'>, error('string cannot contain newlines',))
+    mnv.current.buffer.append(None):(<class 'TypeError'>, TypeError('bad argument type for built-in operation',))
+    mnv.current.buffer.append(["\na", "bc"]):(<class 'mnv.error'>, error('string cannot contain newlines',))
+    mnv.current.buffer.append("\nbc"):(<class 'mnv.error'>, error('string cannot contain newlines',))
     >> RBItem
-    vim.current.buffer[100000000]:(<class 'IndexError'>, IndexError('line number out of range',))
+    mnv.current.buffer[100000000]:(<class 'IndexError'>, IndexError('line number out of range',))
     >> RBAsItem
-    vim.current.buffer[100000000] = "":(<class 'IndexError'>, IndexError('line number out of range',))
+    mnv.current.buffer[100000000] = "":(<class 'IndexError'>, IndexError('line number out of range',))
     >> BufferAttr
-    vim.current.buffer.xxx:(<class 'AttributeError'>, AttributeError("'vim.buffer' object has no attribute 'xxx'",))
+    mnv.current.buffer.xxx:(<class 'AttributeError'>, AttributeError("'mnv.buffer' object has no attribute 'xxx'",))
     >> BufferSetattr
-    vim.current.buffer.name = True:(<class 'TypeError'>, TypeError('expected bytes() or str() instance, but got bool',))
-    vim.current.buffer.xxx = True:(<class 'AttributeError'>, AttributeError('xxx',))
+    mnv.current.buffer.name = True:(<class 'TypeError'>, TypeError('expected bytes() or str() instance, but got bool',))
+    mnv.current.buffer.xxx = True:(<class 'AttributeError'>, AttributeError('xxx',))
     >> BufferMark
-    vim.current.buffer.mark(0):(<class 'TypeError'>, TypeError('expected bytes() or str() instance, but got int',))
-    vim.current.buffer.mark("abcM"):(<class 'ValueError'>, ValueError('mark name must be a single character',))
-    vim.current.buffer.mark("!"):(<class 'vim.error'>, error('invalid mark name',))
+    mnv.current.buffer.mark(0):(<class 'TypeError'>, TypeError('expected bytes() or str() instance, but got int',))
+    mnv.current.buffer.mark("abcM"):(<class 'ValueError'>, ValueError('mark name must be a single character',))
+    mnv.current.buffer.mark("!"):(<class 'mnv.error'>, error('invalid mark name',))
     >> BufferRange
-    vim.current.buffer.range(1, 2, 3):(<class 'TypeError'>, TypeError('function takes exactly 2 arguments (3 given)',))
+    mnv.current.buffer.range(1, 2, 3):(<class 'TypeError'>, TypeError('function takes exactly 2 arguments (3 given)',))
     > BufMap
     >> BufMapItem
-    vim.buffers[100000000]:(<class 'KeyError'>, KeyError(100000000,))
-    >>> Testing NumberToLong using vim.buffers[%s]
-    vim.buffers[[]]:(<class 'TypeError'>, TypeError('expected int() or something supporting coercing to int(), but got list',))
-    vim.buffers[None]:(<class 'TypeError'>, TypeError('expected int() or something supporting coercing to int(), but got NoneType',))
-    vim.buffers[-1]:(<class 'ValueError'>, ValueError('number must be greater than zero',))
-    vim.buffers[0]:(<class 'ValueError'>, ValueError('number must be greater than zero',))
+    mnv.buffers[100000000]:(<class 'KeyError'>, KeyError(100000000,))
+    >>> Testing NumberToLong using mnv.buffers[%s]
+    mnv.buffers[[]]:(<class 'TypeError'>, TypeError('expected int() or something supporting coercing to int(), but got list',))
+    mnv.buffers[None]:(<class 'TypeError'>, TypeError('expected int() or something supporting coercing to int(), but got NoneType',))
+    mnv.buffers[-1]:(<class 'ValueError'>, ValueError('number must be greater than zero',))
+    mnv.buffers[0]:(<class 'ValueError'>, ValueError('number must be greater than zero',))
     <<< Finished
     > Current
     >> CurrentGetattr
-    vim.current.xxx:(<class 'AttributeError'>, AttributeError("'vim.currentdata' object has no attribute 'xxx'",))
+    mnv.current.xxx:(<class 'AttributeError'>, AttributeError("'mnv.currentdata' object has no attribute 'xxx'",))
     >> CurrentSetattr
-    vim.current.line = True:(<class 'TypeError'>, TypeError('bad argument type for built-in operation',))
-    vim.current.buffer = True:(<class 'TypeError'>, TypeError('expected vim.Buffer object, but got bool',))
-    vim.current.window = True:(<class 'TypeError'>, TypeError('expected vim.Window object, but got bool',))
-    vim.current.tabpage = True:(<class 'TypeError'>, TypeError('expected vim.TabPage object, but got bool',))
-    vim.current.xxx = True:(<class 'AttributeError'>, AttributeError('xxx',))
+    mnv.current.line = True:(<class 'TypeError'>, TypeError('bad argument type for built-in operation',))
+    mnv.current.buffer = True:(<class 'TypeError'>, TypeError('expected mnv.Buffer object, but got bool',))
+    mnv.current.window = True:(<class 'TypeError'>, TypeError('expected mnv.Window object, but got bool',))
+    mnv.current.tabpage = True:(<class 'TypeError'>, TypeError('expected mnv.TabPage object, but got bool',))
+    mnv.current.xxx = True:(<class 'AttributeError'>, AttributeError('xxx',))
   END
 
   let actual = getline(2, '$')
@@ -4145,21 +4145,21 @@ endfunc
 " Test import
 func Test_python3_import()
   new
-  py3 cb = vim.current.buffer
+  py3 cb = mnv.current.buffer
 
   py3 << trim EOF
     sys.path.insert(0, os.path.join(os.getcwd(), 'python_before'))
     sys.path.append(os.path.join(os.getcwd(), 'python_after'))
-    vim.options['rtp'] = os.getcwd().replace(',', '\\,').replace('\\', '\\\\')
+    mnv.options['rtp'] = os.getcwd().replace(',', '\\,').replace('\\', '\\\\')
     l = []
     def callback(path):
         l.append(os.path.relpath(path))
-    vim.foreach_rtp(callback)
+    mnv.foreach_rtp(callback)
     cb.append(repr(l))
     del l
     def callback(path):
         return os.path.relpath(path)
-    cb.append(repr(vim.foreach_rtp(callback)))
+    cb.append(repr(mnv.foreach_rtp(callback)))
     del callback
     from module import dir as d
     from modulex import ddir
@@ -4208,42 +4208,42 @@ func Test_python3_exception()
   endfunc
 
   new
-  py3 cb = vim.current.buffer
+  py3 cb = mnv.current.buffer
 
   py3 << trim EOF
-    Exe = vim.bindeval('function("Exe")')
-    ee('vim.command("throw \'abcN\'")')
+    Exe = mnv.bindeval('function("Exe")')
+    ee('mnv.command("throw \'abcN\'")')
     ee('Exe("throw \'def\'")')
-    ee('vim.eval("Exe(\'throw \'\'ghi\'\'\')")')
-    ee('vim.eval("Exe(\'echoerr \'\'jkl\'\'\')")')
-    ee('vim.eval("Exe(\'xxx_non_existent_command_xxx\')")')
-    ee('vim.eval("xxx_unknown_function_xxx()")')
-    ee('vim.bindeval("Exe(\'xxx_non_existent_command_xxx\')")')
+    ee('mnv.eval("Exe(\'throw \'\'ghi\'\'\')")')
+    ee('mnv.eval("Exe(\'echoerr \'\'jkl\'\'\')")')
+    ee('mnv.eval("Exe(\'xxx_non_existent_command_xxx\')")')
+    ee('mnv.eval("xxx_unknown_function_xxx()")')
+    ee('mnv.bindeval("Exe(\'xxx_non_existent_command_xxx\')")')
     del Exe
   EOF
   delfunction Exe
 
   let expected =<< trim END
-    vim.command("throw 'abcN'"):(<class 'vim.error'>, error('abcN',))
-    Exe("throw 'def'"):(<class 'vim.error'>, error('def',))
-    vim.eval("Exe('throw ''ghi''')"):(<class 'vim.error'>, error('ghi',))
-    vim.eval("Exe('echoerr ''jkl''')"):(<class 'vim.error'>, error('Vim(echoerr):jkl',))
-    vim.eval("Exe('xxx_non_existent_command_xxx')"):(<class 'vim.error'>, error('Vim:E492: Not an editor command: xxx_non_existent_command_xxx',))
-    vim.eval("xxx_unknown_function_xxx()"):(<class 'vim.error'>, error('Vim:E117: Unknown function: xxx_unknown_function_xxx',))
-    vim.bindeval("Exe('xxx_non_existent_command_xxx')"):(<class 'vim.error'>, error('Vim:E492: Not an editor command: xxx_non_existent_command_xxx',))
+    mnv.command("throw 'abcN'"):(<class 'mnv.error'>, error('abcN',))
+    Exe("throw 'def'"):(<class 'mnv.error'>, error('def',))
+    mnv.eval("Exe('throw ''ghi''')"):(<class 'mnv.error'>, error('ghi',))
+    mnv.eval("Exe('echoerr ''jkl''')"):(<class 'mnv.error'>, error('MNV(echoerr):jkl',))
+    mnv.eval("Exe('xxx_non_existent_command_xxx')"):(<class 'mnv.error'>, error('MNV:E492: Not an editor command: xxx_non_existent_command_xxx',))
+    mnv.eval("xxx_unknown_function_xxx()"):(<class 'mnv.error'>, error('MNV:E117: Unknown function: xxx_unknown_function_xxx',))
+    mnv.bindeval("Exe('xxx_non_existent_command_xxx')"):(<class 'mnv.error'>, error('MNV:E492: Not an editor command: xxx_non_existent_command_xxx',))
   END
   call assert_equal(expected, getline(2, '$'))
   bw!
 endfunc
 
-" Regression: interrupting vim.command propagates to next vim.command
+" Regression: interrupting mnv.command propagates to next mnv.command
 func Test_python3_keyboard_interrupt()
   new
-  py3 cb = vim.current.buffer
+  py3 cb = mnv.current.buffer
   py3 << trim EOF
     def test_keyboard_interrupt():
         try:
-            vim.command('while 1 | endwhile')
+            mnv.command('while 1 | endwhile')
         except KeyboardInterrupt:
             cb.append('Caught KeyboardInterrupt')
         except Exception:
@@ -4251,7 +4251,7 @@ func Test_python3_keyboard_interrupt()
         else:
             cb.append('!!!!!!!! No exception')
         try:
-            vim.command('$ put =\'Running :put\'')
+            mnv.command('$ put =\'Running :put\'')
         except KeyboardInterrupt:
             cb.append('!!!!!!!! Caught KeyboardInterrupt')
         except Exception:
@@ -4280,7 +4280,7 @@ func Test_python3_keyboard_interrupt()
   bw!
 endfunc
 
-" Regression: Iterator for a Vim object should hold a reference.
+" Regression: Iterator for a MNV object should hold a reference.
 func Test_python3_iter_ref()
   let g:list_iter_ref_count_increase = -1
   let g:tuple_iter_ref_count_increase = -1
@@ -4290,36 +4290,36 @@ func Test_python3_iter_ref()
 
   py3 << trim EOF
     import sys
-    import vim
+    import mnv
 
     def test_python3_iter_ref():
-      create_list = vim.Function('Create_vim_list')
+      create_list = mnv.Function('Create_mnv_list')
       v = create_list()
       base_ref_count = sys.getrefcount(v)
       for el in v:
-        vim.vars['list_iter_ref_count_increase'] = sys.getrefcount(v) - base_ref_count
+        mnv.vars['list_iter_ref_count_increase'] = sys.getrefcount(v) - base_ref_count
 
-      create_tuple = vim.Function('Create_vim_tuple')
+      create_tuple = mnv.Function('Create_mnv_tuple')
       v = create_tuple()
       base_ref_count = sys.getrefcount(v)
       for el in v:
-        vim.vars['tuple_iter_ref_count_increase'] = sys.getrefcount(v) - base_ref_count
+        mnv.vars['tuple_iter_ref_count_increase'] = sys.getrefcount(v) - base_ref_count
 
-      create_dict = vim.Function('Create_vim_dict')
+      create_dict = mnv.Function('Create_mnv_dict')
       v = create_dict()
       base_ref_count = sys.getrefcount(v)
       for el in v:
-        vim.vars['dict_iter_ref_count_increase'] = sys.getrefcount(v) - base_ref_count
+        mnv.vars['dict_iter_ref_count_increase'] = sys.getrefcount(v) - base_ref_count
 
-      v = vim.buffers
+      v = mnv.buffers
       base_ref_count = sys.getrefcount(v)
       for el in v:
-        vim.vars['bufmap_iter_ref_count_increase'] = sys.getrefcount(v) - base_ref_count
+        mnv.vars['bufmap_iter_ref_count_increase'] = sys.getrefcount(v) - base_ref_count
 
-      v = vim.options
+      v = mnv.options
       base_ref_count = sys.getrefcount(v)
       for el in v:
-        vim.vars['options_iter_ref_count_increase'] = sys.getrefcount(v) - base_ref_count
+        mnv.vars['options_iter_ref_count_increase'] = sys.getrefcount(v) - base_ref_count
 
     test_python3_iter_ref()
   EOF
@@ -4337,8 +4337,8 @@ endfunc
 
 func Test_python3_non_utf8_string()
   smap <Esc>@ <A-@>
-  py3 vim.command('redir => _tmp_smaps | smap | redir END')
-  py3 vim.eval('_tmp_smaps').splitlines()
+  py3 mnv.command('redir => _tmp_smaps | smap | redir END')
+  py3 mnv.eval('_tmp_smaps').splitlines()
   sunmap <Esc>@
 endfunc
 
@@ -4363,8 +4363,8 @@ func Test_python3_fold_hidden_buffer()
   call setline(1, repeat([''], 15) + repeat(['from'], 3))
   eval repeat(['x'], 17)->writefile('Xa.txt', 'D')
   split Xa.txt
-  py3 import vim
-  py3 b = vim.current.buffer
+  py3 import mnv
+  py3 b = mnv.current.buffer
   py3 aaa = b[:]
   hide
   py3 b[:] = aaa
@@ -4376,9 +4376,9 @@ endfunc
 
 " Test to catch regression fix #10437.
 func Test_python3_hidden_buf_mod_does_not_mess_up_display()
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
-  let testfile = 'Xtest.vim'
+  let testfile = 'Xtest.mnv'
   let lines =<< trim END
         set hidden number
         new
@@ -4386,8 +4386,8 @@ func Test_python3_hidden_buf_mod_does_not_mess_up_display()
         sil call setline(1, repeat(['aaa'], &lines) + ['bbbbbb'])
         fu Func()
         python3 << EOF
-        import vim
-        b = vim.buffers[2]
+        import mnv
+        b = mnv.buffers[2]
         b[:] = ['', '']
         EOF
         endfu
@@ -4397,7 +4397,7 @@ func Test_python3_hidden_buf_mod_does_not_mess_up_display()
   call writefile(lines, testfile, 'D')
 
   let rows = 10
-  let bufnr = term_start([GetVimProg(), '--clean', '-S', testfile], {'term_rows': rows})
+  let bufnr = term_start([GetMNVProg(), '--clean', '-S', testfile], {'term_rows': rows})
   call TermWait(bufnr, 100)
   call assert_equal('run', job_status(term_getjob(bufnr)))
   let g:test_is_flaky = 0
@@ -4410,4 +4410,4 @@ func Test_python3_hidden_buf_mod_does_not_mess_up_display()
   exe bufnr . 'bwipe!'
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_pyx2.vim b/uvim/src/testdir/test_pyx2.mnv
index 40b359afab..1ec749512e 100644
--- a/uvim/src/testdir/test_pyx2.vim
+++ b/uvim/src/testdir/test_pyx2.mnv
@@ -118,7 +118,7 @@ func Test_Catch_Exception_Message()
   try
     pyx raise RuntimeError( 'TEST' )
   catch /.*/
-    call assert_match( '^Vim(.*):RuntimeError: TEST$', v:exception )
+    call assert_match( '^MNV(.*):RuntimeError: TEST$', v:exception )
   endtry
 endfunc
 
@@ -145,4 +145,4 @@ trimm
   call assert_equal('ABCDEF', pyxeval('result'))
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_pyx3.vim b/uvim/src/testdir/test_pyx3.mnv
index 7820cc9c3b..ffd0508aa2 100644
--- a/uvim/src/testdir/test_pyx3.vim
+++ b/uvim/src/testdir/test_pyx3.mnv
@@ -117,7 +117,7 @@ func Test_Catch_Exception_Message()
   try
     pyx raise RuntimeError( 'TEST' )
   catch /.*/
-    call assert_match( '^Vim(.*):RuntimeError: TEST$', v:exception )
+    call assert_match( '^MNV(.*):RuntimeError: TEST$', v:exception )
   endtry
 endfunc
 
@@ -144,4 +144,4 @@ trimm
   call assert_equal('ABCDEF', pyxeval('result'))
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_quickfix.vim b/uvim/src/testdir/test_quickfix.mnv
index 5326c3dfb6..f8cd5ea228 100644
--- a/uvim/src/testdir/test_quickfix.vim
+++ b/uvim/src/testdir/test_quickfix.mnv
@@ -1,9 +1,9 @@
 " Test for the quickfix feature.
 
-import './util/vim9.vim' as v9
+import './util/mnv9.mnv' as v9
 CheckFeature quickfix
 
-source util/screendump.vim
+source util/screendump.mnv
 
 set encoding=utf-8
 
@@ -32,8 +32,8 @@ func s:setup_commands(cchar)
     command! -count -nargs=* -bang Xnfile <mods><count>cnfile<bang> <args>
     command! -nargs=* -bang Xpfile <mods>cpfile<bang> <args>
     command! -nargs=* Xexpr <mods>cexpr <args>
-    command! -count=999 -nargs=* Xvimgrep <mods> <count>vimgrep <args>
-    command! -nargs=* Xvimgrepadd <mods> vimgrepadd <args>
+    command! -count=999 -nargs=* Xmnvgrep <mods> <count>mnvgrep <args>
+    command! -nargs=* Xmnvgrepadd <mods> mnvgrepadd <args>
     command! -nargs=* Xgrep <mods> grep <args>
     command! -nargs=* Xgrepadd <mods> grepadd <args>
     command! -nargs=* Xhelpgrep helpgrep <args>
@@ -71,8 +71,8 @@ func s:setup_commands(cchar)
     command! -count -nargs=* -bang Xnfile <mods><count>lnfile<bang> <args>
     command! -nargs=* -bang Xpfile <mods>lpfile<bang> <args>
     command! -nargs=* Xexpr <mods>lexpr <args>
-    command! -count=999 -nargs=* Xvimgrep <mods> <count>lvimgrep <args>
-    command! -nargs=* Xvimgrepadd <mods> lvimgrepadd <args>
+    command! -count=999 -nargs=* Xmnvgrep <mods> <count>lmnvgrep <args>
+    command! -nargs=* Xmnvgrepadd <mods> lmnvgrepadd <args>
     command! -nargs=* Xgrep <mods> lgrep <args>
     command! -nargs=* Xgrepadd <mods> lgrepadd <args>
     command! -nargs=* Xhelpgrep lhelpgrep <args>
@@ -672,19 +672,19 @@ func Xnomem_tests(cchar)
   call s:setup_commands(a:cchar)
 
   call test_alloc_fail(GetAllocId('qf_dirname_start'), 0, 0)
-  call assert_fails('Xvimgrep vim runtest.vim', 'E342:')
+  call assert_fails('Xmnvgrep mnv runtest.mnv', 'E342:')
 
   call test_alloc_fail(GetAllocId('qf_dirname_now'), 0, 0)
-  call assert_fails('Xvimgrep vim runtest.vim', 'E342:')
+  call assert_fails('Xmnvgrep mnv runtest.mnv', 'E342:')
 
   call test_alloc_fail(GetAllocId('qf_namebuf'), 0, 0)
-  call assert_fails('Xfile runtest.vim', 'E342:')
+  call assert_fails('Xfile runtest.mnv', 'E342:')
 
   call test_alloc_fail(GetAllocId('qf_errmsg'), 0, 0)
-  call assert_fails('Xfile runtest.vim', 'E342:')
+  call assert_fails('Xfile runtest.mnv', 'E342:')
 
   call test_alloc_fail(GetAllocId('qf_pattern'), 0, 0)
-  call assert_fails('Xfile runtest.vim', 'E342:')
+  call assert_fails('Xfile runtest.mnv', 'E342:')
 
   call test_alloc_fail(GetAllocId('qf_efm_fmtstr'), 0, 0)
   set efm=%f
@@ -721,14 +721,14 @@ func Xnomem_tests(cchar)
 
   call test_alloc_fail(GetAllocId('qf_qfline'), 0, 0)
   try
-    call assert_fails('Xvimgrep vim runtest.vim', 'E342:')
-  catch /^Vim:Interrupt$/
+    call assert_fails('Xmnvgrep mnv runtest.mnv', 'E342:')
+  catch /^MNV:Interrupt$/
   endtry
 
   call test_alloc_fail(GetAllocId('qf_qfline'), 0, 0)
   try
-    call assert_fails('Xvimgrep /vim/f runtest.vim', 'E342:')
-  catch /^Vim:Interrupt$/
+    call assert_fails('Xmnvgrep /mnv/f runtest.mnv', 'E342:')
+  catch /^MNV:Interrupt$/
   endtry
 
   let l = getqflist({"lines": ["Xfile1:10:L10"]})
@@ -738,7 +738,7 @@ func Xnomem_tests(cchar)
   call test_alloc_fail(GetAllocId('qf_qfline'), 0, 0)
   try
     call assert_fails('Xhelpgrep quickfix', 'E342:')
-  catch /^Vim:Interrupt$/
+  catch /^MNV:Interrupt$/
   endtry
 
   call test_alloc_fail(GetAllocId('qf_qfinfo'), 0, 0)
@@ -753,7 +753,7 @@ func Xnomem_tests(cchar)
     call assert_equal([], getloclist(0))
 
     call test_alloc_fail(GetAllocId('qf_qfinfo'), 0, 0)
-    call assert_fails('lvimgrep vim runtest.vim', 'E342:')
+    call assert_fails('lmnvgrep mnv runtest.mnv', 'E342:')
 
     let l = getqflist({"lines": ["Xfile1:10:L10"]})
     call test_alloc_fail(GetAllocId('qf_qfinfo'), 0, 0)
@@ -766,7 +766,7 @@ func Xnomem_tests(cchar)
     call assert_fails('lexpr ["Xfile1:10:L10", "Xfile2:20:L20"]', 'E342:')
 
     call test_alloc_fail(GetAllocId('qf_qfinfo'), 0, 0)
-    call assert_fails('lfile runtest.vim', 'E342:')
+    call assert_fails('lfile runtest.mnv', 'E342:')
   endif
 
   call test_alloc_fail(GetAllocId('qf_dirstack'), 0, 0)
@@ -776,7 +776,7 @@ func Xnomem_tests(cchar)
 
   call test_alloc_fail(GetAllocId('qf_dirstack'), 0, 0)
   set efm=%+P[%f],(%l)%m
-  call assert_fails('Xexpr ["[runtest.vim]", "(1)Hello"]', 'E342:')
+  call assert_fails('Xexpr ["[runtest.mnv]", "(1)Hello"]', 'E342:')
   set efm&
 
   call test_alloc_fail(GetAllocId('qf_multiline_pfx'), 0, 0)
@@ -785,7 +785,7 @@ func Xnomem_tests(cchar)
   set efm&
 
   call test_alloc_fail(GetAllocId('qf_makecmd'), 0, 0)
-  call assert_fails('Xgrep vim runtest.vim', 'E342:')
+  call assert_fails('Xgrep mnv runtest.mnv', 'E342:')
 
   call test_alloc_fail(GetAllocId('qf_linebuf'), 0, 0)
   call assert_fails('Xexpr repeat("a", 8192)', 'E342:')
@@ -896,14 +896,14 @@ func Test_helpgrep()
   call s:test_xhelpgrep('l')
 endfunc
 
-def Test_helpgrep_vim9_restore_cpo()
+def Test_helpgrep_mnv9_restore_cpo()
   assert_equal('aABceFsz', &cpo)
 
   var rtp_save = &rtp
   var dir = 'Xruntime/after'
   &rtp ..= ',' .. dir
   mkdir(dir .. '/ftplugin', 'pR')
-  writefile(['vim9script'], dir .. '/ftplugin/qf.vim')
+  writefile(['mnv9script'], dir .. '/ftplugin/qf.mnv')
   filetype plugin on
   silent helpgrep grail
   cwindow
@@ -916,7 +916,7 @@ def Test_helpgrep_vim9_restore_cpo()
 enddef
 
 " When running the :helpgrep command, if an autocmd modifies the 'cpoptions'
-" value, then Vim crashes. (issue fixed by 7.2b-004 and 8.2.4453)
+" value, then MNV crashes. (issue fixed by 7.2b-004 and 8.2.4453)
 func Test_helpgrep_restore_cpo_aucmd()
   let save_cpo = &cpo
   augroup QF_Test
@@ -928,7 +928,7 @@ func Test_helpgrep_restore_cpo_aucmd()
   call assert_equal('acd', &cpo)
   %bw!
 
-  set cpo&vim
+  set cpo&mnv
   augroup QF_Test
     au!
     autocmd BufReadPost * set cpo=
@@ -944,7 +944,7 @@ func Test_helpgrep_restore_cpo_aucmd()
   let &cpo = save_cpo
 endfunc
 
-def Test_vim9_cexpr()
+def Test_mnv9_cexpr()
   var text = 'somefile:95:error'
   cexpr text
   var l = getqflist()
@@ -975,17 +975,17 @@ func Test_errortitle()
   augroup! QfBufWinEnter
 endfunc
 
-func Test_vimgreptitle()
+func Test_mnvgreptitle()
   augroup QfBufWinEnter
     au!
     au BufWinEnter * :let g:a=get(w:, 'quickfix_title', 'NONE')
   augroup END
   try
-    vimgrep /pattern/j file
+    mnvgrep /pattern/j file
   catch /E480/
   endtry
   copen
-  call assert_equal(':    vimgrep /pattern/j file', g:a)
+  call assert_equal(':    mnvgrep /pattern/j file', g:a)
   augroup QfBufWinEnter
     au!
   augroup END
@@ -1192,7 +1192,7 @@ func Test_locationlist_cross_tab_jump()
   call assert_equal(1, tabpagenr())
 
   enew | only | tabonly
-  set switchbuf&vim
+  set switchbuf&mnv
 endfunc
 
 " More tests for 'errorformat'
@@ -1206,7 +1206,7 @@ func Test_efm1()
     "Xtestfile", line 6 col 19; this is an error
     gcc -c -DHAVE_CONFIsing-prototypes -I/usr/X11R6/include  version.c
     Xtestfile:9: parse error before `asd'
-    make: *** [src/vim/testdir/Makefile:100: test_quickfix] Error 1
+    make: *** [src/mnv/testdir/Makefile:100: test_quickfix] Error 1
     in file "Xtestfile" linenr 10: there is an error
 
     2 returned
@@ -1611,7 +1611,7 @@ func Test_efm2()
   call assert_equal(15, l[0].lnum)
   call assert_equal('message', l[0].text)
 
-  " The following sequence of commands used to crash Vim
+  " The following sequence of commands used to crash MNV
   set efm=%W%m
   cgetexpr ['msg1']
   let l = getqflist()
@@ -1802,7 +1802,7 @@ func Test_caddbuffer_to_empty()
 endfunc
 
 func Test_cgetexpr_works()
-  " this must not crash Vim
+  " this must not crash MNV
   cgetexpr [$x]
   lgetexpr [$x]
 endfunc
@@ -1926,12 +1926,12 @@ func Xlist_empty_middle(cchar)
 
   " create three quickfix lists
   let @/ = 'Test_'
-  Xvimgrep // test_quickfix.vim
+  Xmnvgrep // test_quickfix.mnv
   let testlen = len(g:Xgetlist())
   call assert_true(testlen > 0)
-  Xvimgrep empty test_quickfix.vim
+  Xmnvgrep empty test_quickfix.mnv
   call assert_true(len(g:Xgetlist()) > 0)
-  Xvimgrep matches test_quickfix.vim
+  Xmnvgrep matches test_quickfix.mnv
   let matchlen = len(g:Xgetlist())
   call assert_true(matchlen > 0)
   Xolder
@@ -1954,13 +1954,13 @@ func Xlist_empty_older(cchar)
   call s:setup_commands(a:cchar)
 
   " create three quickfix lists
-  Xvimgrep one test_quickfix.vim
+  Xmnvgrep one test_quickfix.mnv
   let onelen = len(g:Xgetlist())
   call assert_true(onelen > 0)
-  Xvimgrep two test_quickfix.vim
+  Xmnvgrep two test_quickfix.mnv
   let twolen = len(g:Xgetlist())
   call assert_true(twolen > 0)
-  Xvimgrep three test_quickfix.vim
+  Xmnvgrep three test_quickfix.mnv
   let threelen = len(g:Xgetlist())
   call assert_true(threelen > 0)
   Xolder 2
@@ -2053,7 +2053,7 @@ func XquickfixSetListWithAct(cchar)
 endfunc
 
 func Test_setqflist_invalid_nr()
-  " The following command used to crash Vim
+  " The following command used to crash MNV
   eval []->setqflist(' ', {'nr' : $XXX_DOES_NOT_EXIST})
 endfunc
 
@@ -2271,18 +2271,18 @@ func Test_switchbuf()
 
   " If opening a file changes 'switchbuf', then the new value should be
   " retained.
-  set modeline&vim
-  call writefile(["vim: switchbuf=split"], 'Xqftestfile1', 'D')
+  set modeline&mnv
+  call writefile(["mnv: switchbuf=split"], 'Xqftestfile1', 'D')
   enew | only
-  set switchbuf&vim
+  set switchbuf&mnv
   cexpr "Xqftestfile1:1:10"
   call assert_equal('split', &switchbuf)
-  call writefile(["vim: switchbuf=usetab"], 'Xqftestfile1')
+  call writefile(["mnv: switchbuf=usetab"], 'Xqftestfile1')
   enew | only
   set switchbuf=useopen
   cexpr "Xqftestfile1:1:10"
   call assert_equal('usetab', &switchbuf)
-  call writefile(["vim: switchbuf&vim"], 'Xqftestfile1')
+  call writefile(["mnv: switchbuf&mnv"], 'Xqftestfile1')
   enew | only
   set switchbuf=useopen
   cexpr "Xqftestfile1:1:10"
@@ -2290,7 +2290,7 @@ func Test_switchbuf()
 
   call delete('Xqftestfile2')
   call delete('Xqftestfile3')
-  set switchbuf&vim
+  set switchbuf&mnv
 
   enew | only
 endfunc
@@ -2344,30 +2344,30 @@ func s:test_xgrep(cchar)
   " GrepAdd_Test_Text: Match 1
   " GrepAdd_Test_Text: Match 2
   enew! | only
-  set makeef&vim
-  silent Xgrep Grep_Test_Text: test_quickfix.vim
+  set makeef&mnv
+  silent Xgrep Grep_Test_Text: test_quickfix.mnv
   call assert_true(len(g:Xgetlist()) == 5)
   Xopen
   call assert_true(w:quickfix_title =~ '^:grep')
   Xclose
   enew
   set makeef=Temp_File_##
-  silent Xgrepadd GrepAdd_Test_Text: test_quickfix.vim
+  silent Xgrepadd GrepAdd_Test_Text: test_quickfix.mnv
   call assert_true(len(g:Xgetlist()) == 9)
 
   " Try with 'grepprg' set to 'internal'
   set grepprg=internal
-  silent Xgrep Grep_Test_Text: test_quickfix.vim
-  silent Xgrepadd GrepAdd_Test_Text: test_quickfix.vim
+  silent Xgrep Grep_Test_Text: test_quickfix.mnv
+  silent Xgrepadd GrepAdd_Test_Text: test_quickfix.mnv
   call assert_true(len(g:Xgetlist()) == 9)
-  set grepprg&vim
+  set grepprg&mnv
 
-  call writefile(['Vim'], 'XtestTempFile')
+  call writefile(['MNV'], 'XtestTempFile')
   set makeef=XtestTempFile
-  silent Xgrep Grep_Test_Text: test_quickfix.vim
+  silent Xgrep Grep_Test_Text: test_quickfix.mnv
   call assert_equal(5, len(g:Xgetlist()))
   call assert_false(filereadable('XtestTempFile'))
-  set makeef&vim
+  set makeef&mnv
 endfunc
 
 func Test_grep()
@@ -2389,9 +2389,9 @@ func Test_local_grepformat()
   call assert_equal('%f:%l:%m', &g:grepformat)
 
   set grepprg=internal
-  silent grep "^[[:space:]]*\" UNIQUEPREFIX:" test_quickfix.vim
+  silent grep "^[[:space:]]*\" UNIQUEPREFIX:" test_quickfix.mnv
   call assert_equal(1, len(getqflist()))
-  set grepprg&vim
+  set grepprg&mnv
 
   bwipe!
   let &grepformat = save_grepformat
@@ -2518,8 +2518,8 @@ func Test_duplicate_buf()
 
   " make sure only one buffer is created
   call writefile(['this one', 'that one'], 'Xgrepthis', 'D')
-  vimgrep one Xgrepthis
-  vimgrep one Xgrepthis
+  mnvgrep one Xgrepthis
+  mnvgrep one Xgrepthis
   call assert_equal(last_buffer + 1, bufnr("$"))
 endfunc
 
@@ -2609,7 +2609,7 @@ func Xproperty_tests(cchar)
   call g:Xsetlist([], 'a', {'context':246})
   let d = g:Xgetlist({'context':1})
   call assert_equal(246, d.context)
-  " set other Vim data types as context
+  " set other MNV data types as context
   call g:Xsetlist([], 'a', {'context' : test_null_blob()})
   if has('channel')
     call g:Xsetlist([], 'a', {'context' : test_null_channel()})
@@ -2711,7 +2711,7 @@ func Xproperty_tests(cchar)
     only
   endif
 
-  " The following used to crash Vim with address sanitizer
+  " The following used to crash MNV with address sanitizer
   call g:Xsetlist([], 'f')
   call g:Xsetlist([], 'a', {'items' : [{'filename':'F1', 'lnum':10}]})
   call assert_equal(10, g:Xgetlist({'items':1}).items[0].lnum)
@@ -2925,10 +2925,10 @@ func Test_Autocmd()
   let g:acmds = []
   helpgrep quickfix
   silent! helpgrep non_existing_help_topic
-  vimgrep test Xtest
-  vimgrepadd test Xtest
-  silent! vimgrep non_existing_test Xtest
-  silent! vimgrepadd non_existing_test Xtest
+  mnvgrep test Xtest
+  mnvgrepadd test Xtest
+  silent! mnvgrep non_existing_test Xtest
+  silent! mnvgrepadd non_existing_test Xtest
   set makeprg=
   silent! make
   set makeprg&
@@ -2937,14 +2937,14 @@ func Test_Autocmd()
     posthelpgrep
     prehelpgrep
     posthelpgrep
-    previmgrep
-    postvimgrep
-    previmgrepadd
-    postvimgrepadd
-    previmgrep
-    postvimgrep
-    previmgrepadd
-    postvimgrepadd
+    premnvgrep
+    postmnvgrep
+    premnvgrepadd
+    postmnvgrepadd
+    premnvgrep
+    postmnvgrep
+    premnvgrepadd
+    postmnvgrepadd
     premake
     postmake
   END
@@ -2957,16 +2957,16 @@ func Test_Autocmd()
     " Grep_Autocmd_Text: Match 1
     " GrepAdd_Autocmd_Text: Match 2
     let g:acmds = []
-    silent grep Grep_Autocmd_Text test_quickfix.vim
-    silent grepadd GrepAdd_Autocmd_Text test_quickfix.vim
+    silent grep Grep_Autocmd_Text test_quickfix.mnv
+    silent grepadd GrepAdd_Autocmd_Text test_quickfix.mnv
     silent grep abc123def Xtest
     silent grepadd abc123def Xtest
     set grepprg=internal
-    silent grep Grep_Autocmd_Text test_quickfix.vim
-    silent grepadd GrepAdd_Autocmd_Text test_quickfix.vim
-    silent lgrep Grep_Autocmd_Text test_quickfix.vim
-    silent lgrepadd GrepAdd_Autocmd_Text test_quickfix.vim
-    set grepprg&vim
+    silent grep Grep_Autocmd_Text test_quickfix.mnv
+    silent grepadd GrepAdd_Autocmd_Text test_quickfix.mnv
+    silent lgrep Grep_Autocmd_Text test_quickfix.mnv
+    silent lgrepadd GrepAdd_Autocmd_Text test_quickfix.mnv
+    set grepprg&mnv
     let l =<< trim END
       pregrep
       postgrep
@@ -3006,7 +3006,7 @@ func Test_Autocmd_Exception()
 
   call assert_equal('1', getloclist(0)[0].text)
 
-  set efm&vim
+  set efm&mnv
 endfunc
 
 func Test_caddbuffer_wrong()
@@ -3134,7 +3134,7 @@ func Test_cwindow_jump()
   call assert_equal(getloclist(1, {'id' : 0}).id, getloclist(3, {'id' : 0}).id)
 
   enew | only
-  set efm&vim
+  set efm&mnv
 endfunc
 
 func Test_cwindow_highlight()
@@ -3143,12 +3143,12 @@ func Test_cwindow_highlight()
   let lines =<< trim END
     call setline(1, ['some', 'text', 'with', 'matches'])
     write XCwindow
-    vimgrep e XCwindow
+    mnvgrep e XCwindow
     redraw
     cwindow 4
   END
   call writefile(lines, 'XtestCwindow', 'D')
-  let buf = RunVimInTerminal('-S XtestCwindow', #{rows: 12})
+  let buf = RunMNVInTerminal('-S XtestCwindow', #{rows: 12})
   call VerifyScreenDump(buf, 'Test_quickfix_cwindow_1', {})
 
   call term_sendkeys(buf, ":cnext\<CR>")
@@ -3166,15 +3166,15 @@ func Test_cwindow_highlight()
   call VerifyScreenDump(buf, 'Test_quickfix_cwindow_4', {})
 
   " clean up
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
   call delete('XCwindow')
 endfunc
 
-func XvimgrepTests(cchar)
+func XmnvgrepTests(cchar)
   call s:setup_commands(a:cchar)
 
   let lines =<< trim END
-    Editor:VIM vim
+    Editor:MNV mnv
     Editor:Emacs EmAcS
     Editor:Notepad NOTEPAD
   END
@@ -3182,23 +3182,23 @@ func XvimgrepTests(cchar)
   call writefile(['Linux', 'macOS', 'MS-Windows'], 'Xtestfile2', 'D')
 
   " Error cases
-  call assert_fails('Xvimgrep /abc *', 'E682:')
+  call assert_fails('Xmnvgrep /abc *', 'E682:')
 
   let @/=''
-  call assert_fails('Xvimgrep // *', 'E35:')
+  call assert_fails('Xmnvgrep // *', 'E35:')
 
-  call assert_fails('Xvimgrep abc', 'E683:')
-  call assert_fails('Xvimgrep a1b2c3 Xtestfile1', 'E480:')
-  call assert_fails('Xvimgrep pat Xa1b2c3', 'E480:')
+  call assert_fails('Xmnvgrep abc', 'E683:')
+  call assert_fails('Xmnvgrep a1b2c3 Xtestfile1', 'E480:')
+  call assert_fails('Xmnvgrep pat Xa1b2c3', 'E480:')
 
   Xexpr ""
-  Xvimgrepadd Notepad Xtestfile1
-  Xvimgrepadd macOS Xtestfile2
+  Xmnvgrepadd Notepad Xtestfile1
+  Xmnvgrepadd macOS Xtestfile2
   let l = g:Xgetlist()
   call assert_equal(2, len(l))
   call assert_equal('Editor:Notepad NOTEPAD', l[0].text)
 
-  10Xvimgrep #\cvim#g Xtestfile?
+  10Xmnvgrep #\cmnv#g Xtestfile?
   let l = g:Xgetlist()
   call assert_equal(2, len(l))
   call assert_equal(8, l[0].col)
@@ -3206,58 +3206,58 @@ func XvimgrepTests(cchar)
   call assert_equal(12, l[1].col)
   call assert_equal(15, l[1].end_col)
 
-  1Xvimgrep ?Editor? Xtestfile*
+  1Xmnvgrep ?Editor? Xtestfile*
   let l = g:Xgetlist()
   call assert_equal(1, len(l))
-  call assert_equal('Editor:VIM vim', l[0].text)
+  call assert_equal('Editor:MNV mnv', l[0].text)
 
   edit +3 Xtestfile2
-  Xvimgrep +\cemacs+j Xtestfile1
+  Xmnvgrep +\cemacs+j Xtestfile1
   let l = g:Xgetlist()
   call assert_equal('Xtestfile2', @%)
   call assert_equal('Editor:Emacs EmAcS', l[0].text)
 
-  " Test for unloading a buffer after vimgrep searched the buffer
+  " Test for unloading a buffer after mnvgrep searched the buffer
   %bwipe
-  Xvimgrep /Editor/j Xtestfile*
+  Xmnvgrep /Editor/j Xtestfile*
   call assert_equal(0, getbufinfo('Xtestfile1')[0].loaded)
   call assert_equal([], getbufinfo('Xtestfile2'))
 
-  " Test for opening the dummy buffer used by vimgrep in a window. The new
+  " Test for opening the dummy buffer used by mnvgrep in a window. The new
   " window should be closed
   %bw!
   augroup QF_Test
     au!
     autocmd BufReadPre * exe "sb " .. expand("<abuf>")
   augroup END
-  call assert_fails("Xvimgrep /sublime/ Xtestfile1", 'E480:')
+  call assert_fails("Xmnvgrep /sublime/ Xtestfile1", 'E480:')
   call assert_equal(1, winnr('$'))
   augroup QF_Test
     au!
   augroup END
 endfunc
 
-" Tests for the :vimgrep command
-func Test_vimgrep()
-  call XvimgrepTests('c')
-  call XvimgrepTests('l')
+" Tests for the :mnvgrep command
+func Test_mnvgrep()
+  call XmnvgrepTests('c')
+  call XmnvgrepTests('l')
 endfunc
 
-func Test_vimgrep_wildcards_expanded_once()
+func Test_mnvgrep_wildcards_expanded_once()
   new X[id-01] file.txt
   call setline(1, 'some text to search for')
-  vimgrep text %
+  mnvgrep text %
   bwipe!
 endfunc
 
-" Test for incsearch highlighting of the :vimgrep pattern
+" Test for incsearch highlighting of the :mnvgrep pattern
 " This test used to cause "E315: ml_get: invalid lnum" errors.
-func Test_vimgrep_incsearch()
+func Test_mnvgrep_incsearch()
   enew
   set incsearch
   call test_override("char_avail", 1)
 
-  call feedkeys(":2vimgrep assert test_quickfix.vim test_cdo.vim\<CR>", "ntx")
+  call feedkeys(":2mnvgrep assert test_quickfix.mnv test_cdo.mnv\<CR>", "ntx")
   let l = getqflist()
   call assert_equal(2, len(l))
 
@@ -3265,35 +3265,35 @@ func Test_vimgrep_incsearch()
   set noincsearch
 endfunc
 
-" Test vimgrep with the last search pattern not set
-func Test_vimgrep_with_no_last_search_pat()
+" Test mnvgrep with the last search pattern not set
+func Test_mnvgrep_with_no_last_search_pat()
   let lines =<< trim [SCRIPT]
-    call assert_fails('vimgrep // *', 'E35:')
+    call assert_fails('mnvgrep // *', 'E35:')
     call writefile(v:errors, 'Xresult')
     qall!
   [SCRIPT]
   call writefile(lines, 'Xscript', 'D')
-  if RunVim([], [], '--clean -S Xscript')
+  if RunMNV([], [], '--clean -S Xscript')
     call assert_equal([], readfile('Xresult'))
   endif
   call delete('Xresult')
 endfunc
 
-" Test vimgrep without swap file
-func Test_vimgrep_without_swap_file()
+" Test mnvgrep without swap file
+func Test_mnvgrep_without_swap_file()
   let lines =<< trim [SCRIPT]
-    vimgrep grep test_c*
+    mnvgrep grep test_c*
     call writefile(['done'], 'Xresult')
     qall!
   [SCRIPT]
   call writefile(lines, 'Xscript', 'D')
-  if RunVim([], [], '--clean -n -S Xscript Xscript')
+  if RunMNV([], [], '--clean -n -S Xscript Xscript')
     call assert_equal(['done'], readfile('Xresult'))
   endif
   call delete('Xresult')
 endfunc
 
-func Test_vimgrep_existing_swapfile()
+func Test_mnvgrep_existing_swapfile()
   call writefile(['match apple with apple'], 'Xapple', 'D')
   call writefile(['swapfile'], '.Xapple.swp', 'D')
   let g:foundSwap = 0
@@ -3301,7 +3301,7 @@ func Test_vimgrep_existing_swapfile()
   augroup grep
     au SwapExists * let foundSwap = 1 | let v:swapchoice = 'e'
   augroup END
-  vimgrep apple Xapple
+  mnvgrep apple Xapple
   call assert_equal(1, g:foundSwap)
   call assert_match('.Xapple.swo', swapname(''))
 
@@ -3389,7 +3389,7 @@ func Test_bufoverflow()
     File1:10:Hello World
   END
   cgetexpr lines
-  set efm&vim
+  set efm&mnv
 endfunc
 
 " Tests for getting the quickfix stack size
@@ -3510,12 +3510,12 @@ func Test_filetype_autocmd()
   augroup END
 endfunc
 
-func Test_vimgrep_with_textlock()
+func Test_mnvgrep_with_textlock()
   new
 
   " Simple way to execute something with "textlock" set.
-  " Check that vimgrep without jumping can be executed.
-  au InsertCharPre * vimgrep /RunTheTest/j runtest.vim
+  " Check that mnvgrep without jumping can be executed.
+  au InsertCharPre * mnvgrep /RunTheTest/j runtest.mnv
   normal ax
   let qflist = getqflist()
   call assert_true(len(qflist) > 0)
@@ -3523,8 +3523,8 @@ func Test_vimgrep_with_textlock()
   call setqflist([], 'r')
   au! InsertCharPre
 
-  " Check that vimgrepadd without jumping can be executed.
-  au InsertCharPre * vimgrepadd /RunTheTest/j runtest.vim
+  " Check that mnvgrepadd without jumping can be executed.
+  au InsertCharPre * mnvgrepadd /RunTheTest/j runtest.mnv
   normal ax
   let qflist = getqflist()
   call assert_true(len(qflist) > 0)
@@ -3532,8 +3532,8 @@ func Test_vimgrep_with_textlock()
   call setqflist([], 'r')
   au! InsertCharPre
 
-  " Check that lvimgrep without jumping can be executed.
-  au InsertCharPre * lvimgrep /RunTheTest/j runtest.vim
+  " Check that lmnvgrep without jumping can be executed.
+  au InsertCharPre * lmnvgrep /RunTheTest/j runtest.mnv
   normal ax
   let qflist = getloclist(0)
   call assert_true(len(qflist) > 0)
@@ -3541,8 +3541,8 @@ func Test_vimgrep_with_textlock()
   call setloclist(0, [], 'r')
   au! InsertCharPre
 
-  " Check that lvimgrepadd without jumping can be executed.
-  au InsertCharPre * lvimgrepadd /RunTheTest/j runtest.vim
+  " Check that lmnvgrepadd without jumping can be executed.
+  au InsertCharPre * lmnvgrepadd /RunTheTest/j runtest.mnv
   normal ax
   let qflist = getloclist(0)
   call assert_true(len(qflist) > 0)
@@ -3551,19 +3551,19 @@ func Test_vimgrep_with_textlock()
   au! InsertCharPre
 
   " trying to jump will give an error
-  au InsertCharPre * vimgrep /RunTheTest/ runtest.vim
+  au InsertCharPre * mnvgrep /RunTheTest/ runtest.mnv
   call assert_fails('normal ax', 'E565:')
   au! InsertCharPre
 
-  au InsertCharPre * vimgrepadd /RunTheTest/ runtest.vim
+  au InsertCharPre * mnvgrepadd /RunTheTest/ runtest.mnv
   call assert_fails('normal ax', 'E565:')
   au! InsertCharPre
 
-  au InsertCharPre * lvimgrep /RunTheTest/ runtest.vim
+  au InsertCharPre * lmnvgrep /RunTheTest/ runtest.mnv
   call assert_fails('normal ax', 'E565:')
   au! InsertCharPre
 
-  au InsertCharPre * lvimgrepadd /RunTheTest/ runtest.vim
+  au InsertCharPre * lmnvgrepadd /RunTheTest/ runtest.mnv
   call assert_fails('normal ax', 'E565:')
   au! InsertCharPre
 
@@ -3752,7 +3752,7 @@ func Test_perbuf_efm()
 endfunc
 
 " Open multiple help windows using ":lhelpgrep
-" This test used to crash Vim
+" This test used to crash MNV
 func Test_Multi_LL_Help()
   new | only
   lhelpgrep window
@@ -3908,8 +3908,8 @@ func Xqfid_tests(cchar)
   call assert_equal([1,2], g:Xgetlist({'nr':1, 'context':1}).context)
   call g:Xsetlist([], 'a', {'id':start_id+1, 'lines':['F1:10:L10']})
   call assert_equal('L10', g:Xgetlist({'nr':2, 'items':1}).items[0].text)
-  call assert_equal(-1, g:Xsetlist([], 'a', {'id':999, 'title':'Vim'}))
-  call assert_equal(-1, g:Xsetlist([], 'a', {'id':'abc', 'title':'Vim'}))
+  call assert_equal(-1, g:Xsetlist([], 'a', {'id':999, 'title':'MNV'}))
+  call assert_equal(-1, g:Xsetlist([], 'a', {'id':'abc', 'title':'MNV'}))
 
   let qfid = g:Xgetlist({'id':0, 'nr':0})
   call g:Xsetlist([], 'f')
@@ -4120,7 +4120,7 @@ func Xgetlist_empty_tests(cchar)
 endfunc
 
 func Test_empty_list_quickfixtextfunc()
-  " This was crashing.  Can only reproduce by running it in a separate Vim
+  " This was crashing.  Can only reproduce by running it in a separate MNV
   " instance.
   let lines =<< trim END
       func s:Func(o)
@@ -4131,7 +4131,7 @@ func Test_empty_list_quickfixtextfunc()
       cgetfile [ex
   END
   call writefile(lines, 'Xquickfixtextfunc', 'D')
-  call RunVim([], [], '-e -s -S Xquickfixtextfunc -c qa')
+  call RunMNV([], [], '-e -s -S Xquickfixtextfunc -c qa')
 endfunc
 
 func Test_getqflist()
@@ -4140,7 +4140,7 @@ func Test_getqflist()
 endfunc
 
 func Test_getqflist_invalid_nr()
-  " The following commands used to crash Vim
+  " The following commands used to crash MNV
   cexpr ""
   call getqflist({'nr' : $XXX_DOES_NOT_EXIST_XXX})
 
@@ -4207,7 +4207,7 @@ endfunc
 " Test helpgrep with lang specifier
 func Xtest_helpgrep_with_lang_specifier(cchar)
   call s:setup_commands(a:cchar)
-  Xhelpgrep Vim@en
+  Xhelpgrep MNV@en
   call assert_equal('help', &filetype)
   call assert_notequal(0, g:Xgetlist({'nr' : '$'}).nr)
   new | only
@@ -4218,7 +4218,7 @@ func Test_helpgrep_with_lang_specifier()
   call Xtest_helpgrep_with_lang_specifier('l')
 endfunc
 
-" The following test used to crash Vim.
+" The following test used to crash MNV.
 " Open the location list window and close the regular window associated with
 " the location list. When the garbage collection runs now, it incorrectly
 " marks the location list context as not in use and frees the context.
@@ -4243,7 +4243,7 @@ func Test_ll_window_user_data()
   %bwipe!
 endfunc
 
-" The following test used to crash vim
+" The following test used to crash mnv
 func Test_lfile_crash()
   sp Xtest
   au QuickFixCmdPre * bw
@@ -4251,7 +4251,7 @@ func Test_lfile_crash()
   au! QuickFixCmdPre
 endfunc
 
-" The following test used to crash vim
+" The following test used to crash mnv
 func Test_lbuffer_crash()
   sv Xtest
   augroup QF_Test
@@ -4264,7 +4264,7 @@ func Test_lbuffer_crash()
   augroup END
 endfunc
 
-" The following test used to crash vim
+" The following test used to crash mnv
 func Test_lexpr_crash()
   augroup QF_Test
     au!
@@ -4298,15 +4298,15 @@ func Test_lexpr_crash()
   augroup END
 endfunc
 
-" The following test used to crash Vim
-func Test_lvimgrep_crash()
-  " this leaves a swapfile .test_quickfix.vim.swp around, why?
+" The following test used to crash MNV
+func Test_lmnvgrep_crash()
+  " this leaves a swapfile .test_quickfix.mnv.swp around, why?
   sv Xtest
   augroup QF_Test
     au!
     au QuickFixCmdPre,QuickFixCmdPost,BufEnter,BufLeave * call setloclist(0, [], 'f')
   augroup END
-  lvimgrep quickfix test_quickfix.vim
+  lmnvgrep quickfix test_quickfix.mnv
   augroup QF_Test
     au!
   augroup END
@@ -4316,7 +4316,7 @@ func Test_lvimgrep_crash()
     au!
     au BufEnter * call setloclist(0, [], 'r')
   augroup END
-  call assert_fails('lvimgrep Test_lvimgrep_crash *', 'E926:')
+  call assert_fails('lmnvgrep Test_lmnvgrep_crash *', 'E926:')
   augroup QF_Test
     au!
   augroup END
@@ -4324,10 +4324,10 @@ func Test_lvimgrep_crash()
   enew | only
 endfunc
 
-func Test_lvimgrep_crash2()
+func Test_lmnvgrep_crash2()
   au BufNewFile x sfind
-  call assert_fails('lvimgrep x x', 'E471:')
-  call assert_fails('lvimgrep x x x', 'E471:')
+  call assert_fails('lmnvgrep x x', 'E471:')
+  call assert_fails('lmnvgrep x x x', 'E471:')
 
   au! BufNewFile
 endfunc
@@ -4360,39 +4360,39 @@ func Test_qfwin_pos()
 endfunc
 
 " Tests for quickfix/location lists changed by autocommands when
-" :vimgrep/:lvimgrep commands are running.
-func Test_vimgrep_autocmd()
+" :mnvgrep/:lmnvgrep commands are running.
+func Test_mnvgrep_autocmd()
   call setqflist([], 'f')
   call writefile(['stars'], 'Xtest1.txt', 'D')
   call writefile(['stars'], 'Xtest2.txt', 'D')
 
   " Test 1:
-  " When searching for a pattern using :vimgrep, if the quickfix list is
+  " When searching for a pattern using :mnvgrep, if the quickfix list is
   " changed by an autocmd, the results should be added to the correct quickfix
   " list.
   autocmd BufRead Xtest2.txt cexpr '' | cexpr ''
-  silent vimgrep stars Xtest*.txt
+  silent mnvgrep stars Xtest*.txt
   call assert_equal(1, getqflist({'nr' : 0}).nr)
   call assert_equal(3, getqflist({'nr' : '$'}).nr)
   call assert_equal('Xtest2.txt', bufname(getqflist()[1].bufnr))
   au! BufRead Xtest2.txt
 
   " Test 2:
-  " When searching for a pattern using :vimgrep, if the quickfix list is
+  " When searching for a pattern using :mnvgrep, if the quickfix list is
   " freed, then a error should be given.
   silent! %bwipe!
   call setqflist([], 'f')
   autocmd BufRead Xtest2.txt for i in range(10) | cexpr '' | endfor
-  call assert_fails('vimgrep stars Xtest*.txt', 'E925:')
+  call assert_fails('mnvgrep stars Xtest*.txt', 'E925:')
   au! BufRead Xtest2.txt
 
   " Test 3:
-  " When searching for a pattern using :lvimgrep, if the location list is
+  " When searching for a pattern using :lmnvgrep, if the location list is
   " freed, then the command should error out.
   silent! %bwipe!
   let g:save_winid = win_getid()
   autocmd BufRead Xtest2.txt call setloclist(g:save_winid, [], 'f')
-  call assert_fails('lvimgrep stars Xtest*.txt', 'E926:')
+  call assert_fails('lmnvgrep stars Xtest*.txt', 'E926:')
   au! BufRead Xtest2.txt
   " cleanup the swap files
   bw! Xtest2.txt Xtest1.txt
@@ -4400,8 +4400,8 @@ func Test_vimgrep_autocmd()
   call setqflist([], 'f')
 endfunc
 
-" Test for an autocmd changing the current directory when running vimgrep
-func Xvimgrep_autocmd_cd(cchar)
+" Test for an autocmd changing the current directory when running mnvgrep
+func Xmnvgrep_autocmd_cd(cchar)
   call s:setup_commands(a:cchar)
 
   %bwipe
@@ -4412,7 +4412,7 @@ func Xvimgrep_autocmd_cd(cchar)
     autocmd BufRead * silent cd %:p:h
   augroup END
 
-  10Xvimgrep /vim/ Xgrepdir/**
+  10Xmnvgrep /mnv/ Xgrepdir/**
   let l = g:Xgetlist()
   call assert_equal('f1.txt', bufname(l[0].bufnr))
   call assert_equal('f2.txt', fnamemodify(bufname(l[2].bufnr), ':t'))
@@ -4424,17 +4424,17 @@ func Xvimgrep_autocmd_cd(cchar)
   exe 'cd ' . save_cwd
 endfunc
 
-func Test_vimgrep_autocmd_cd()
+func Test_mnvgrep_autocmd_cd()
   call mkdir('Xgrepdir/a', 'pR')
   call mkdir('Xgrepdir/b', 'pR')
-  call writefile(['a_L1_vim', 'a_L2_vim'], 'Xgrepdir/a/f1.txt')
-  call writefile(['b_L1_vim', 'b_L2_vim'], 'Xgrepdir/b/f2.txt')
-  call Xvimgrep_autocmd_cd('c')
-  call Xvimgrep_autocmd_cd('l')
+  call writefile(['a_L1_mnv', 'a_L2_mnv'], 'Xgrepdir/a/f1.txt')
+  call writefile(['b_L1_mnv', 'b_L2_mnv'], 'Xgrepdir/b/f2.txt')
+  call Xmnvgrep_autocmd_cd('c')
+  call Xmnvgrep_autocmd_cd('l')
   %bwipe
 endfunc
 
-" The following test used to crash Vim
+" The following test used to crash MNV
 func Test_lhelpgrep_autocmd()
   lhelpgrep quickfix
   augroup QF_Test
@@ -4502,7 +4502,7 @@ func Test_lhelpgrep_autocmd()
   %bw!
 endfunc
 
-" The following test used to crash Vim
+" The following test used to crash MNV
 func Test_lhelpgrep_autocmd_free_loclist()
   %bw!
   lhelpgrep quickfix
@@ -4527,31 +4527,31 @@ func Test_shorten_fname()
   CheckUnix
   %bwipe
   " Create a quickfix list with an absolute path filename
-  let fname = getcwd() . '/test_quickfix.vim'
+  let fname = getcwd() . '/test_quickfix.mnv'
   call setqflist([], ' ', {'lines':[fname . ":20:Line20"], 'efm':'%f:%l:%m'})
-  call assert_equal(fname, bufname('test_quickfix.vim'))
+  call assert_equal(fname, bufname('test_quickfix.mnv'))
   " Opening the quickfix window should simplify the file path
   cwindow
-  call assert_equal('test_quickfix.vim', bufname('test_quickfix.vim'))
+  call assert_equal('test_quickfix.mnv', bufname('test_quickfix.mnv'))
   cclose
   %bwipe
   " Create a quickfix list with an absolute path filename
   call setqflist([], ' ', {'lines':[fname . ":20:Line20"], 'efm':'%f:%l:%m'})
-  call assert_equal(fname, bufname('test_quickfix.vim'))
+  call assert_equal(fname, bufname('test_quickfix.mnv'))
   " Displaying the quickfix list should simplify the file path
   silent! clist
-  call assert_equal('test_quickfix.vim', bufname('test_quickfix.vim'))
+  call assert_equal('test_quickfix.mnv', bufname('test_quickfix.mnv'))
   " Add a few entries for the same file with different paths and check whether
   " the buffer name is shortened
   %bwipe
   call setqflist([], 'f')
-  call setqflist([{'filename' : 'test_quickfix.vim', 'lnum' : 10},
-        \ {'filename' : '../testdir/test_quickfix.vim', 'lnum' : 20},
+  call setqflist([{'filename' : 'test_quickfix.mnv', 'lnum' : 10},
+        \ {'filename' : '../testdir/test_quickfix.mnv', 'lnum' : 20},
         \ {'filename' : fname, 'lnum' : 30}], ' ')
   copen
-  call assert_equal(['test_quickfix.vim|10| ',
-        \ 'test_quickfix.vim|20| ',
-        \ 'test_quickfix.vim|30| '], getline(1, '$'))
+  call assert_equal(['test_quickfix.mnv|10| ',
+        \ 'test_quickfix.mnv|20| ',
+        \ 'test_quickfix.mnv|30| '], getline(1, '$'))
   cclose
 endfunc
 
@@ -4615,16 +4615,16 @@ func Test_qftitle()
   call setqflist([], 'f')
   exe "grepadd F1 Xerr"
   call assert_equal(':grepadd F1 Xerr', getqflist({'title' : 1}).title)
-  set grepprg&vim
+  set grepprg&mnv
 
-  " :vimgrep
-  exe "vimgrep F1 Xerr"
-  call assert_equal(':vimgrep F1 Xerr', getqflist({'title' : 1}).title)
+  " :mnvgrep
+  exe "mnvgrep F1 Xerr"
+  call assert_equal(':mnvgrep F1 Xerr', getqflist({'title' : 1}).title)
 
-  " :vimgrepadd
+  " :mnvgrepadd
   call setqflist([], 'f')
-  exe "vimgrepadd F1 Xerr"
-  call assert_equal(':vimgrepadd F1 Xerr', getqflist({'title' : 1}).title)
+  exe "mnvgrepadd F1 Xerr"
+  call assert_equal(':mnvgrepadd F1 Xerr', getqflist({'title' : 1}).title)
 
   call setqflist(['F1:10:L10'], ' ')
   call assert_equal(':setqflist()', getqflist({'title' : 1}).title)
@@ -4788,11 +4788,11 @@ func Xautocmd_changelist(cchar)
     autocmd! QuickFixCmdPost
   endif
 
-  " Test for vimgrep/lvimgrep
+  " Test for mnvgrep/lmnvgrep
   call g:Xsetlist([], 'f')
   Xexpr 'Xtestfile1:2:Line2'
   autocmd QuickFixCmdPost * Xolder
-  silent Xvimgrep Line5 Xtestfile2
+  silent Xmnvgrep Line5 Xtestfile2
   call assert_equal('Xtestfile2', @%)
   call assert_equal(5, line('.'))
   autocmd! QuickFixCmdPost
@@ -4817,8 +4817,8 @@ func Xautocmd_changelist(cchar)
     silent Xgrep Line5 Xtestfile2
     call assert_true(v:errmsg !~# 'E42:')
   endif
-  " Test for vimgrep/lvimgrep
-  call assert_fails('silent Xvimgrep Line5 Xtestfile2', 'E480:')
+  " Test for mnvgrep/lmnvgrep
+  call assert_fails('silent Xmnvgrep Line5 Xtestfile2', 'E480:')
   autocmd! QuickFixCmdPost
 
   call delete('Xtestfile1')
@@ -5089,10 +5089,10 @@ func Test_qfbuf()
 endfunc
 
 " If there is an autocmd to use only one window, then opening the location
-" list window used to crash Vim.
+" list window used to crash MNV.
 func Test_winonly_autocmd()
   call s:create_test_file('Xtest1')
-  " Autocmd to show only one Vim window at a time
+  " Autocmd to show only one MNV window at a time
   autocmd WinEnter * only
   new
   " Load the location list
@@ -5380,10 +5380,10 @@ func Xtest_qfcmd_abort(cchar)
   call assert_equal(0, g:Xgetlist({'nr' : '$'}).nr)
   enew!
 
-  " vimgrep/lvimgrep
+  " mnvgrep/lmnvgrep
   let e = ''
   try
-    Xvimgrep /func/ test_quickfix.vim
+    Xmnvgrep /func/ test_quickfix.mnv
   catch /.*/
     let e = v:exception
   endtry
@@ -5404,7 +5404,7 @@ func Xtest_qfcmd_abort(cchar)
   if has('unix')
     let e = ''
     try
-      silent Xgrep func test_quickfix.vim
+      silent Xgrep func test_quickfix.mnv
     catch /.*/
       let e = v:exception
     endtry
@@ -5470,26 +5470,26 @@ endfunc
 
 " Test for :cquit
 func Test_cquit()
-  " Exit Vim with a non-zero value
-  if RunVim([], ["cquit 7"], '')
+  " Exit MNV with a non-zero value
+  if RunMNV([], ["cquit 7"], '')
     call assert_equal(7, v:shell_error)
   endif
 
-  if RunVim([], ["50cquit"], '')
+  if RunMNV([], ["50cquit"], '')
     call assert_equal(50, v:shell_error)
   endif
 
-  " Exit Vim with default value
-  if RunVim([], ["cquit"], '')
+  " Exit MNV with default value
+  if RunMNV([], ["cquit"], '')
     call assert_equal(1, v:shell_error)
   endif
 
-  " Exit Vim with zero value
-  if RunVim([], ["cquit 0"], '')
+  " Exit MNV with zero value
+  if RunMNV([], ["cquit 0"], '')
     call assert_equal(0, v:shell_error)
   endif
 
-  " Exit Vim with negative value
+  " Exit MNV with negative value
   call assert_fails('-3cquit', 'E16:')
 endfunc
 
@@ -5558,7 +5558,7 @@ func Xtest_qftextfunc(cchar)
   call assert_equal('F1-L10C2-green', getline(1))
   call assert_equal('F1-L20C4-blue', getline(2))
   Xclose
-  set quickfixtextfunc&vim
+  set quickfixtextfunc&mnv
   Xwindow
   call assert_equal('F1|10 col 2-7| green', getline(1))
   call assert_equal('F1|20-25 col 4-8| blue', getline(2))
@@ -5795,7 +5795,7 @@ func Test_qftextfunc_callback()
     call assert_equal('F9-L9C9-L9', getline(1))
     cclose
   END
-  call v9.CheckLegacyAndVim9Success(lines)
+  call v9.CheckLegacyAndMNV9Success(lines)
 
   " Test for using a script-local function name
   func s:TqfFunc2(info)
@@ -5933,7 +5933,7 @@ func Test_setloclist_crash()
   augroup END
 
   try
-    lvimgrep /.*/ *.mak
+    lmnvgrep /.*/ *.mak
   catch /E926:/
   endtry
   call assert_equal('tango down', getloclist(0, {'items' : 0}).items[0].text)
@@ -6010,7 +6010,7 @@ func Test_quickfix_window_fails_to_open()
 
   let lines =<< trim END
       split XquickfixFails
-      silent vimgrep anything %
+      silent mnvgrep anything %
       normal o
       au BufLeave * ++once source XquickfixFails
       " This will trigger the autocommand, which causes an error, what follows
@@ -6018,13 +6018,13 @@ func Test_quickfix_window_fails_to_open()
       silent! cwindow
   END
   call writefile(lines, 'XtestWinFails', 'D')
-  let buf = RunVimInTerminal('-S XtestWinFails', #{rows: 13})
+  let buf = RunMNVInTerminal('-S XtestWinFails', #{rows: 13})
   call VerifyScreenDump(buf, 'Test_quickfix_window_fails', {})
 
   " clean up
   call term_sendkeys(buf, ":bwipe!\<CR>")
   call term_wait(buf)
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 " Test for updating the quickfix buffer whenever the associated quickfix list
@@ -6085,20 +6085,20 @@ func Test_qfbuf_update()
   call Xqfbuf_update('l')
 endfunc
 
-func Test_vimgrep_noswapfile()
+func Test_mnvgrep_noswapfile()
   set noswapfile
   call writefile(['one', 'two', 'three'], 'Xgreppie', 'D')
-  vimgrep two Xgreppie
+  mnvgrep two Xgreppie
   call assert_equal('two', getline('.'))
 
   set swapfile
 endfunc
 
-" Test for the :vimgrep 'f' flag (fuzzy match)
-func Xvimgrep_fuzzy_match(cchar)
+" Test for the :mnvgrep 'f' flag (fuzzy match)
+func Xmnvgrep_fuzzy_match(cchar)
   call s:setup_commands(a:cchar)
 
-  Xvimgrep /three one/f Xfile*
+  Xmnvgrep /three one/f Xfile*
   let l = g:Xgetlist()
   call assert_equal(2, len(l))
   call assert_equal(['Xfile1', 1, 9, 'one two three'],
@@ -6106,7 +6106,7 @@ func Xvimgrep_fuzzy_match(cchar)
   call assert_equal(['Xfile2', 2, 1, 'three one two'],
         \ [bufname(l[1].bufnr), l[1].lnum, l[1].col, l[1].text])
 
-  Xvimgrep /the/f Xfile*
+  Xmnvgrep /the/f Xfile*
   let l = g:Xgetlist()
   call assert_equal(3, len(l))
   call assert_equal(['Xfile1', 1, 9, 'one two three'],
@@ -6116,7 +6116,7 @@ func Xvimgrep_fuzzy_match(cchar)
   call assert_equal(['Xfile2', 4, 4, 'aaathreeaaa'],
         \ [bufname(l[2].bufnr), l[2].lnum, l[2].col, l[2].text])
 
-  Xvimgrep /aaa/fg Xfile*
+  Xmnvgrep /aaa/fg Xfile*
   let l = g:Xgetlist()
   call assert_equal(4, len(l))
   call assert_equal(['Xfile1', 2, 1, 'aaaaaa'],
@@ -6128,14 +6128,14 @@ func Xvimgrep_fuzzy_match(cchar)
   call assert_equal(['Xfile2', 4, 9, 'aaathreeaaa'],
         \ [bufname(l[3].bufnr), l[3].lnum, l[3].col, l[3].text])
 
-  call assert_fails('Xvimgrep /xyz/fg Xfile*', 'E480:')
+  call assert_fails('Xmnvgrep /xyz/fg Xfile*', 'E480:')
 endfunc
 
-func Test_vimgrep_fuzzy_match()
+func Test_mnvgrep_fuzzy_match()
   call writefile(['one two three', 'aaaaaa'], 'Xfile1', 'D')
   call writefile(['one', 'three one two', 'two', 'aaathreeaaa'], 'Xfile2', 'D')
-  call Xvimgrep_fuzzy_match('c')
-  call Xvimgrep_fuzzy_match('l')
+  call Xmnvgrep_fuzzy_match('c')
+  call Xmnvgrep_fuzzy_match('l')
 endfunc
 
 func Test_locationlist_open_in_newtab()
@@ -6169,7 +6169,7 @@ func Test_locationlist_open_in_newtab()
   call delete('Xqftestfile1')
   call delete('Xqftestfile2')
   call delete('Xqftestfile3')
-  set switchbuf&vim
+  set switchbuf&mnv
 
   %bwipe!
 endfunc
@@ -6191,15 +6191,15 @@ func Test_win_gettype()
   lclose
 endfunc
 
-fun Test_vimgrep_nomatch()
+fun Test_mnvgrep_nomatch()
   call XexprTests('c')
   call g:Xsetlist([{'lnum':10,'text':'Line1'}])
   copen
   if has("win32")
-    call assert_fails('vimgrep foo *.zzz', 'E479:')
+    call assert_fails('mnvgrep foo *.zzz', 'E479:')
     let expected = [{'lnum': 10, 'bufnr': 0, 'end_lnum': 0, 'pattern': '', 'valid': 0, 'vcol': 0, 'nr': 0, 'module': '', 'type': '', 'end_col': 0, 'col': 0, 'text': 'Line1'}]
   else
-    call assert_fails('vimgrep foo *.zzz', 'E480:')
+    call assert_fails('mnvgrep foo *.zzz', 'E480:')
     let expected = []
   endif
   call assert_equal(expected, getqflist())
@@ -6274,7 +6274,7 @@ func Test_lopen_bwipe_all()
     qall!
   END
   call writefile(lines, 'Xscript', 'D')
-  if RunVim([], [], '-u NONE -n -X -Z -e -m -s -S Xscript')
+  if RunMNV([], [], '-u NONE -n -X -Z -e -m -s -S Xscript')
     call assert_equal(['done'], readfile('Xresult'))
   endif
 
@@ -6343,7 +6343,7 @@ endfunc
 " list
 func Test_qflist_statusmsg()
   cexpr "1\n2"
-  cexpr "1\n2\n3\ntest_quickfix.vim:1:msg"
+  cexpr "1\n2\n3\ntest_quickfix.mnv:1:msg"
   call assert_equal('(4 of 4): msg', v:statusmsg)
   call setqflist([], 'f')
   %bw!
@@ -6352,10 +6352,10 @@ func Test_qflist_statusmsg()
   " in the stack, then an error message should be displayed.
   augroup QF_Test
     au!
-    au BufEnter test_quickfix.vim colder
+    au BufEnter test_quickfix.mnv colder
   augroup END
   cexpr "1\n2"
-  call assert_fails('cexpr "1\n2\n3\ntest_quickfix.vim:1:msg"', 'E925:')
+  call assert_fails('cexpr "1\n2\n3\ntest_quickfix.mnv:1:msg"', 'E925:')
   call setqflist([], 'f')
   augroup QF_Test
     au!
@@ -6364,9 +6364,9 @@ func Test_qflist_statusmsg()
 
   augroup QF_Test
     au!
-    au BufEnter test_quickfix.vim caddexpr "4"
+    au BufEnter test_quickfix.mnv caddexpr "4"
   augroup END
-  call assert_fails('cexpr "1\n2\n3\ntest_quickfix.vim:1:msg"', 'E925:')
+  call assert_fails('cexpr "1\n2\n3\ntest_quickfix.mnv:1:msg"', 'E925:')
   call setqflist([], 'f')
   augroup QF_Test
     au!
@@ -6481,7 +6481,7 @@ endfunc
 func Test_quickfix_buffer_contents()
   call setqflist([{'filename':'filename', 'pattern':'pattern', 'text':'text'}])
   copen
-  call assert_equal(['filename|pattern| text'], getline(1, '$'))  " The assert failed with Vim v9.0.0736; '| text' did not appear after the pattern.
+  call assert_equal(['filename|pattern| text'], getline(1, '$'))  " The assert failed with MNV v9.0.0736; '| text' did not appear after the pattern.
   call setqflist([], 'f')
 endfunc
 
@@ -6917,7 +6917,7 @@ func Test_quickfix_close_buffer_crash()
   wincmd q
 endfunc
 
-func Test_vimgrep_dummy_buffer_crash()
+func Test_mnvgrep_dummy_buffer_crash()
   augroup DummyCrash
     autocmd!
     " Make the dummy buffer non-current, but still open in a window.
@@ -6929,7 +6929,7 @@ func Test_vimgrep_dummy_buffer_crash()
           \ call assert_notequal(s:dummy_buf, str2nr(expand('<abuf>')))
   augroup END
 
-  silent! vimgrep /./ .
+  silent! mnvgrep /./ .
   redraw! " Window to freed dummy buffer used to remain; heap UAF.
   call assert_equal([], win_findbuf(s:dummy_buf))
   call assert_equal(0, bufexists(s:dummy_buf))
@@ -6939,7 +6939,7 @@ func Test_vimgrep_dummy_buffer_crash()
   %bw!
 endfunc
 
-func Test_vimgrep_dummy_buffer_keep()
+func Test_mnvgrep_dummy_buffer_keep()
   augroup DummyKeep
     autocmd!
     " Trigger a wipe of the dummy buffer by aborting script processing. Prevent
@@ -6948,7 +6948,7 @@ func Test_vimgrep_dummy_buffer_keep()
           \| tab split | call interrupt()
   augroup END
 
-  call assert_fails('vimgrep /./ .')
+  call assert_fails('mnvgrep /./ .')
   call assert_equal(1, bufexists(s:dummy_buf))
   " Ensure it's no longer considered a dummy; should be able to switch to it.
   execute s:dummy_buf 'sbuffer'
@@ -6979,7 +6979,7 @@ func Test_quickfixtextfunc_wipes_buffer()
     set quickfixtextfunc=QFexpr
     lad "['0:4:e']"
     lw
-  catch /^Vim\%((\S\+)\)\=:E565:/
+  catch /^MNV\%((\S\+)\)\=:E565:/
     let g:crash='caught'
   endtry
   " close location list window
@@ -7001,9 +7001,9 @@ func Test_quickfix_longline_noeol()
   [CODE]
   defer delete("XDONE")
   call writefile([repeat('A', 1024)], qf, 'bD')
-  call RunVim([], after, args)
+  call RunMNV([], after, args)
   call WaitForAssert({-> assert_true(filereadable("XDONE"))})
   call assert_equal(['okay'], readfile("XDONE"))
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_quotestar.vim b/uvim/src/testdir/test_quotestar.mnv
index 7ccee43a53..8898026a59 100644
--- a/uvim/src/testdir/test_quotestar.vim
+++ b/uvim/src/testdir/test_quotestar.mnv
@@ -9,15 +9,15 @@ func Do_test_quotestar_for_macunix()
 
   let @* = ''
 
-  " Test #1: Pasteboard to Vim
-  let test_msg = "text from pasteboard to vim via quotestar"
+  " Test #1: Pasteboard to MNV
+  let test_msg = "text from pasteboard to mnv via quotestar"
   " Write a piece of text to the pasteboard.
   call system('/bin/echo -n "' . test_msg . '" | pbcopy')
   " See if the *-register is changed as expected.
   call assert_equal(test_msg, @*)
 
-  " Test #2: Vim to Pasteboard
-  let test_msg = "text from vim to pasteboard via quotestar"
+  " Test #2: MNV to Pasteboard
+  let test_msg = "text from mnv to pasteboard via quotestar"
   " Write a piece of text to the *-register.
   let @* = test_msg
   " See if the pasteboard is changed as expected.
@@ -31,9 +31,9 @@ func Do_test_quotestar_for_x11()
     return 'Test requires the client-server and job features'
   endif
 
-  let cmd = GetVimCommand()
+  let cmd = GetMNVCommand()
   if cmd == ''
-    throw 'GetVimCommand() failed'
+    throw 'GetMNVCommand() failed'
   endif
   try
     call remote_send('xxx', '')
@@ -45,7 +45,7 @@ func Do_test_quotestar_for_x11()
     " ignore other errors
   endtry
 
-  let name = 'XVIMCLIPBOARD'
+  let name = 'XMNVCLIPBOARD'
 
   " Make sure a previous server has exited
   try
@@ -65,7 +65,7 @@ func Do_test_quotestar_for_x11()
   " always sufficient.
   call WaitForAssert({-> assert_notequal('', remote_expr(name, "v:version", "", 2))})
 
-  " Clear the *-register of this vim instance and wait for it to be picked up
+  " Clear the *-register of this mnv instance and wait for it to be picked up
   " by the server.
   let @* = 'no'
   call remote_foreground(name)
@@ -75,7 +75,7 @@ func Do_test_quotestar_for_x11()
   call remote_send(name, ":let @* = 'yes'\<CR>")
   call WaitForAssert({-> assert_equal("yes", remote_expr(name, "@*", "", 1))})
 
-  " Check that the *-register of this vim instance is changed as expected.
+  " Check that the *-register of this mnv instance is changed as expected.
   call WaitForAssert({-> assert_equal("yes", @*)})
 
   " Handle the large selection over 262040 byte.
@@ -152,4 +152,4 @@ func Test_quotestar()
   endif
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_random.vim b/uvim/src/testdir/test_random.mnv
index 02a4624c1d..03f56decfc 100644
--- a/uvim/src/testdir/test_random.vim
+++ b/uvim/src/testdir/test_random.mnv
@@ -37,7 +37,7 @@ endfunc
 func Test_srand()
   CheckNotGui
 
-  let cmd = GetVimCommand() .. ' -V -es -c "echo rand()" -c qa!'
+  let cmd = GetMNVCommand() .. ' -V -es -c "echo rand()" -c qa!'
   let bad = 0
   for _ in range(10)
     echo cmd
@@ -50,4 +50,4 @@ func Test_srand()
   call assert_inrange(0, 4, bad)
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_recover.vim b/uvim/src/testdir/test_recover.mnv
index b36d23e18d..4286d9daea 100644
--- a/uvim/src/testdir/test_recover.vim
+++ b/uvim/src/testdir/test_recover.mnv
@@ -188,7 +188,7 @@ func Test_recover_empty_swap_file()
 
   " :recover from an empty buffer
   call assert_fails('recover', 'E305:')
-  set dir&vim
+  set dir&mnv
 endfunc
 
 " Test for :recover using a corrupted swap file
@@ -356,20 +356,20 @@ func Test_recover_encrypted_swap_file()
 
   " Recover an encrypted file from the swap file without the original file
   new Xfile1
-  call feedkeys(":X\<CR>vim\<CR>vim\<CR>", 'xt')
+  call feedkeys(":X\<CR>mnv\<CR>mnv\<CR>", 'xt')
   call setline(1, ['aaa', 'bbb', 'ccc'])
   preserve
   let b = readblob('.Xfile1.swp')
   call writefile(b, '.Xfile1.swm')
   bw!
-  call feedkeys(":recover Xfile1\<CR>vim\<CR>\<CR>", 'xt')
+  call feedkeys(":recover Xfile1\<CR>mnv\<CR>\<CR>", 'xt')
   call assert_equal(['aaa', 'bbb', 'ccc'], getline(1, '$'))
   bw!
   call delete('.Xfile1.swm')
 
   " Recover an encrypted file from the swap file with the original file
   new Xfile1
-  call feedkeys(":X\<CR>vim\<CR>vim\<CR>", 'xt')
+  call feedkeys(":X\<CR>mnv\<CR>mnv\<CR>", 'xt')
   call setline(1, ['aaa', 'bbb', 'ccc'])
   update
   call setline(1, ['111', '222', '333'])
@@ -377,7 +377,7 @@ func Test_recover_encrypted_swap_file()
   let b = readblob('.Xfile1.swp')
   call writefile(b, '.Xfile1.swm')
   bw!
-  call feedkeys(":recover Xfile1\<CR>vim\<CR>\<CR>", 'xt')
+  call feedkeys(":recover Xfile1\<CR>mnv\<CR>\<CR>", 'xt')
   call assert_equal(['111', '222', '333'], getline(1, '$'))
   call assert_true(&modified)
   bw!
@@ -492,7 +492,7 @@ func Test_recover_corrupted_swap_file1()
   call filecopy(sample, target)
   try
     sil recover! Xpoc1
-  catch /^Vim\%((\S\+)\)\=:E1364:/
+  catch /^MNV\%((\S\+)\)\=:E1364:/
   endtry
   let content = getline(1, '$')->join()
   call assert_match('???ILLEGAL BLOCK NUMBER', content)
@@ -506,7 +506,7 @@ func Test_recover_corrupted_swap_file1()
   call filecopy(sample, target)
   try
     sil recover! Xpoc2
-  catch /^Vim\%((\S\+)\)\=:E1364:/
+  catch /^MNV\%((\S\+)\)\=:E1364:/
   endtry
   let content = getline(1, '$')->join()
   call assert_match('???ILLEGAL BLOCK NUMBER', content)
@@ -515,4 +515,4 @@ func Test_recover_corrupted_swap_file1()
   bw!
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_regex_char_classes.vim b/uvim/src/testdir/test_regex_char_classes.mnv
index 5e77c857f0..b368315c04 100644
--- a/uvim/src/testdir/test_regex_char_classes.vim
+++ b/uvim/src/testdir/test_regex_char_classes.mnv
@@ -64,22 +64,22 @@ func Test_regex_char_classes()
   let save_enc = &encoding
   set encoding=utf-8
 
-  let input = "\t\<C-L>\<C-M> !\"#$%&'()#+'-./0123456789:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz{|}~\<C-?>\u0080\u0082\u0090\u009b¦±¼ÇÓé"
+  let input = "\t\<C-L>\<C-M> !\"#$%&'()#+'-./0123456789:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz{|}~\<C-?>\u0080\u0082\u0090\u009b������"
 
   " Format is [cmd_to_run, expected_output]
   let tests = [
     \ [':s/\%#=0\d//g',
-    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz{|}~\<C-?>\u0080\u0082\u0090\u009b¦±¼ÇÓé"],
+    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz{|}~\<C-?>\u0080\u0082\u0090\u009b������"],
     \ [':s/\%#=1\d//g',
-    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz{|}~\<C-?>\u0080\u0082\u0090\u009b¦±¼ÇÓé"],
+    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz{|}~\<C-?>\u0080\u0082\u0090\u009b������"],
     \ [':s/\%#=2\d//g',
-    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz{|}~\<C-?>\u0080\u0082\u0090\u009b¦±¼ÇÓé"],
+    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz{|}~\<C-?>\u0080\u0082\u0090\u009b������"],
     \ [':s/\%#=0[0-9]//g',
-    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz{|}~\<C-?>\u0080\u0082\u0090\u009b¦±¼ÇÓé"],
+    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz{|}~\<C-?>\u0080\u0082\u0090\u009b������"],
     \ [':s/\%#=1[0-9]//g',
-    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz{|}~\<C-?>\u0080\u0082\u0090\u009b¦±¼ÇÓé"],
+    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz{|}~\<C-?>\u0080\u0082\u0090\u009b������"],
     \ [':s/\%#=2[0-9]//g',
-    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz{|}~\<C-?>\u0080\u0082\u0090\u009b¦±¼ÇÓé"],
+    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz{|}~\<C-?>\u0080\u0082\u0090\u009b������"],
     \ [':s/\%#=0\D//g',
     \ "0123456789"],
     \ [':s/\%#=1\D//g',
@@ -93,17 +93,17 @@ func Test_regex_char_classes()
     \ [':s/\%#=2[^0-9]//g',
     \ "0123456789"],
     \ [':s/\%#=0\o//g',
-    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./89:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz{|}~\<C-?>\u0080\u0082\u0090\u009b¦±¼ÇÓé"],
+    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./89:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz{|}~\<C-?>\u0080\u0082\u0090\u009b������"],
     \ [':s/\%#=1\o//g',
-    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./89:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz{|}~\<C-?>\u0080\u0082\u0090\u009b¦±¼ÇÓé"],
+    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./89:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz{|}~\<C-?>\u0080\u0082\u0090\u009b������"],
     \ [':s/\%#=2\o//g',
-    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./89:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz{|}~\<C-?>\u0080\u0082\u0090\u009b¦±¼ÇÓé"],
+    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./89:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz{|}~\<C-?>\u0080\u0082\u0090\u009b������"],
     \ [':s/\%#=0[0-7]//g',
-    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./89:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz{|}~\<C-?>\u0080\u0082\u0090\u009b¦±¼ÇÓé"],
+    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./89:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz{|}~\<C-?>\u0080\u0082\u0090\u009b������"],
     \ [':s/\%#=1[0-7]//g',
-    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./89:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz{|}~\<C-?>\u0080\u0082\u0090\u009b¦±¼ÇÓé"],
+    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./89:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz{|}~\<C-?>\u0080\u0082\u0090\u009b������"],
     \ [':s/\%#=2[0-7]//g',
-    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./89:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz{|}~\<C-?>\u0080\u0082\u0090\u009b¦±¼ÇÓé"],
+    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./89:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz{|}~\<C-?>\u0080\u0082\u0090\u009b������"],
     \ [':s/\%#=0\O//g',
     \ "01234567"],
     \ [':s/\%#=1\O//g',
@@ -117,17 +117,17 @@ func Test_regex_char_classes()
     \ [':s/\%#=2[^0-7]//g',
     \ "01234567"],
     \ [':s/\%#=0\x//g',
-    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./:;<=>?@GHIXYZ[\]^_`ghiwxyz{|}~\<C-?>\u0080\u0082\u0090\u009b¦±¼ÇÓé"],
+    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./:;<=>?@GHIXYZ[\]^_`ghiwxyz{|}~\<C-?>\u0080\u0082\u0090\u009b������"],
     \ [':s/\%#=1\x//g',
-    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./:;<=>?@GHIXYZ[\]^_`ghiwxyz{|}~\<C-?>\u0080\u0082\u0090\u009b¦±¼ÇÓé"],
+    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./:;<=>?@GHIXYZ[\]^_`ghiwxyz{|}~\<C-?>\u0080\u0082\u0090\u009b������"],
     \ [':s/\%#=2\x//g',
-    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./:;<=>?@GHIXYZ[\]^_`ghiwxyz{|}~\<C-?>\u0080\u0082\u0090\u009b¦±¼ÇÓé"],
+    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./:;<=>?@GHIXYZ[\]^_`ghiwxyz{|}~\<C-?>\u0080\u0082\u0090\u009b������"],
     \ [':s/\%#=0[0-9A-Fa-f]//g',
-    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./:;<=>?@GHIXYZ[\]^_`ghiwxyz{|}~\<C-?>\u0080\u0082\u0090\u009b¦±¼ÇÓé"],
+    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./:;<=>?@GHIXYZ[\]^_`ghiwxyz{|}~\<C-?>\u0080\u0082\u0090\u009b������"],
     \ [':s/\%#=1[0-9A-Fa-f]//g',
-    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./:;<=>?@GHIXYZ[\]^_`ghiwxyz{|}~\<C-?>\u0080\u0082\u0090\u009b¦±¼ÇÓé"],
+    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./:;<=>?@GHIXYZ[\]^_`ghiwxyz{|}~\<C-?>\u0080\u0082\u0090\u009b������"],
     \ [':s/\%#=2[0-9A-Fa-f]//g',
-    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./:;<=>?@GHIXYZ[\]^_`ghiwxyz{|}~\<C-?>\u0080\u0082\u0090\u009b¦±¼ÇÓé"],
+    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./:;<=>?@GHIXYZ[\]^_`ghiwxyz{|}~\<C-?>\u0080\u0082\u0090\u009b������"],
     \ [':s/\%#=0\X//g',
     \ "0123456789ABCDEFabcdef"],
     \ [':s/\%#=1\X//g',
@@ -141,17 +141,17 @@ func Test_regex_char_classes()
     \ [':s/\%#=2[^0-9A-Fa-f]//g',
     \ "0123456789ABCDEFabcdef"],
     \ [':s/\%#=0\w//g',
-    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./:;<=>?@[\]^`{|}~\<C-?>\u0080\u0082\u0090\u009b¦±¼ÇÓé"],
+    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./:;<=>?@[\]^`{|}~\<C-?>\u0080\u0082\u0090\u009b������"],
     \ [':s/\%#=1\w//g',
-    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./:;<=>?@[\]^`{|}~\<C-?>\u0080\u0082\u0090\u009b¦±¼ÇÓé"],
+    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./:;<=>?@[\]^`{|}~\<C-?>\u0080\u0082\u0090\u009b������"],
     \ [':s/\%#=2\w//g',
-    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./:;<=>?@[\]^`{|}~\<C-?>\u0080\u0082\u0090\u009b¦±¼ÇÓé"],
+    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./:;<=>?@[\]^`{|}~\<C-?>\u0080\u0082\u0090\u009b������"],
     \ [':s/\%#=0[0-9A-Za-z_]//g',
-    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./:;<=>?@[\]^`{|}~\<C-?>\u0080\u0082\u0090\u009b¦±¼ÇÓé"],
+    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./:;<=>?@[\]^`{|}~\<C-?>\u0080\u0082\u0090\u009b������"],
     \ [':s/\%#=1[0-9A-Za-z_]//g',
-    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./:;<=>?@[\]^`{|}~\<C-?>\u0080\u0082\u0090\u009b¦±¼ÇÓé"],
+    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./:;<=>?@[\]^`{|}~\<C-?>\u0080\u0082\u0090\u009b������"],
     \ [':s/\%#=2[0-9A-Za-z_]//g',
-    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./:;<=>?@[\]^`{|}~\<C-?>\u0080\u0082\u0090\u009b¦±¼ÇÓé"],
+    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./:;<=>?@[\]^`{|}~\<C-?>\u0080\u0082\u0090\u009b������"],
     \ [':s/\%#=0\W//g',
     \ "0123456789ABCDEFGHIXYZ_abcdefghiwxyz"],
     \ [':s/\%#=1\W//g',
@@ -165,17 +165,17 @@ func Test_regex_char_classes()
     \ [':s/\%#=2[^0-9A-Za-z_]//g',
     \ "0123456789ABCDEFGHIXYZ_abcdefghiwxyz"],
     \ [':s/\%#=0\h//g',
-    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./0123456789:;<=>?@[\]^`{|}~\<C-?>\u0080\u0082\u0090\u009b¦±¼ÇÓé"],
+    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./0123456789:;<=>?@[\]^`{|}~\<C-?>\u0080\u0082\u0090\u009b������"],
     \ [':s/\%#=1\h//g',
-    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./0123456789:;<=>?@[\]^`{|}~\<C-?>\u0080\u0082\u0090\u009b¦±¼ÇÓé"],
+    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./0123456789:;<=>?@[\]^`{|}~\<C-?>\u0080\u0082\u0090\u009b������"],
     \ [':s/\%#=2\h//g',
-    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./0123456789:;<=>?@[\]^`{|}~\<C-?>\u0080\u0082\u0090\u009b¦±¼ÇÓé"],
+    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./0123456789:;<=>?@[\]^`{|}~\<C-?>\u0080\u0082\u0090\u009b������"],
     \ [':s/\%#=0[A-Za-z_]//g',
-    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./0123456789:;<=>?@[\]^`{|}~\<C-?>\u0080\u0082\u0090\u009b¦±¼ÇÓé"],
+    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./0123456789:;<=>?@[\]^`{|}~\<C-?>\u0080\u0082\u0090\u009b������"],
     \ [':s/\%#=1[A-Za-z_]//g',
-    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./0123456789:;<=>?@[\]^`{|}~\<C-?>\u0080\u0082\u0090\u009b¦±¼ÇÓé"],
+    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./0123456789:;<=>?@[\]^`{|}~\<C-?>\u0080\u0082\u0090\u009b������"],
     \ [':s/\%#=2[A-Za-z_]//g',
-    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./0123456789:;<=>?@[\]^`{|}~\<C-?>\u0080\u0082\u0090\u009b¦±¼ÇÓé"],
+    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./0123456789:;<=>?@[\]^`{|}~\<C-?>\u0080\u0082\u0090\u009b������"],
     \ [':s/\%#=0\H//g',
     \ "ABCDEFGHIXYZ_abcdefghiwxyz"],
     \ [':s/\%#=1\H//g',
@@ -189,17 +189,17 @@ func Test_regex_char_classes()
     \ [':s/\%#=2[^A-Za-z_]//g',
     \ "ABCDEFGHIXYZ_abcdefghiwxyz"],
     \ [':s/\%#=0\a//g',
-    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./0123456789:;<=>?@[\]^_`{|}~\<C-?>\u0080\u0082\u0090\u009b¦±¼ÇÓé"],
+    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./0123456789:;<=>?@[\]^_`{|}~\<C-?>\u0080\u0082\u0090\u009b������"],
     \ [':s/\%#=1\a//g',
-    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./0123456789:;<=>?@[\]^_`{|}~\<C-?>\u0080\u0082\u0090\u009b¦±¼ÇÓé"],
+    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./0123456789:;<=>?@[\]^_`{|}~\<C-?>\u0080\u0082\u0090\u009b������"],
     \ [':s/\%#=2\a//g',
-    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./0123456789:;<=>?@[\]^_`{|}~\<C-?>\u0080\u0082\u0090\u009b¦±¼ÇÓé"],
+    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./0123456789:;<=>?@[\]^_`{|}~\<C-?>\u0080\u0082\u0090\u009b������"],
     \ [':s/\%#=0[A-Za-z]//g',
-    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./0123456789:;<=>?@[\]^_`{|}~\<C-?>\u0080\u0082\u0090\u009b¦±¼ÇÓé"],
+    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./0123456789:;<=>?@[\]^_`{|}~\<C-?>\u0080\u0082\u0090\u009b������"],
     \ [':s/\%#=1[A-Za-z]//g',
-    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./0123456789:;<=>?@[\]^_`{|}~\<C-?>\u0080\u0082\u0090\u009b¦±¼ÇÓé"],
+    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./0123456789:;<=>?@[\]^_`{|}~\<C-?>\u0080\u0082\u0090\u009b������"],
     \ [':s/\%#=2[A-Za-z]//g',
-    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./0123456789:;<=>?@[\]^_`{|}~\<C-?>\u0080\u0082\u0090\u009b¦±¼ÇÓé"],
+    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./0123456789:;<=>?@[\]^_`{|}~\<C-?>\u0080\u0082\u0090\u009b������"],
     \ [':s/\%#=0\A//g',
     \ "ABCDEFGHIXYZabcdefghiwxyz"],
     \ [':s/\%#=1\A//g',
@@ -213,17 +213,17 @@ func Test_regex_char_classes()
     \ [':s/\%#=2[^A-Za-z]//g',
     \ "ABCDEFGHIXYZabcdefghiwxyz"],
     \ [':s/\%#=0\l//g',
-    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./0123456789:;<=>?@ABCDEFGHIXYZ[\]^_`{|}~\<C-?>\u0080\u0082\u0090\u009b¦±¼ÇÓé"],
+    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./0123456789:;<=>?@ABCDEFGHIXYZ[\]^_`{|}~\<C-?>\u0080\u0082\u0090\u009b������"],
     \ [':s/\%#=1\l//g',
-    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./0123456789:;<=>?@ABCDEFGHIXYZ[\]^_`{|}~\<C-?>\u0080\u0082\u0090\u009b¦±¼ÇÓé"],
+    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./0123456789:;<=>?@ABCDEFGHIXYZ[\]^_`{|}~\<C-?>\u0080\u0082\u0090\u009b������"],
     \ [':s/\%#=2\l//g',
-    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./0123456789:;<=>?@ABCDEFGHIXYZ[\]^_`{|}~\<C-?>\u0080\u0082\u0090\u009b¦±¼ÇÓé"],
+    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./0123456789:;<=>?@ABCDEFGHIXYZ[\]^_`{|}~\<C-?>\u0080\u0082\u0090\u009b������"],
     \ [':s/\%#=0[a-z]//g',
-    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./0123456789:;<=>?@ABCDEFGHIXYZ[\]^_`{|}~\<C-?>\u0080\u0082\u0090\u009b¦±¼ÇÓé"],
+    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./0123456789:;<=>?@ABCDEFGHIXYZ[\]^_`{|}~\<C-?>\u0080\u0082\u0090\u009b������"],
     \ [':s/\%#=1[a-z]//g',
-    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./0123456789:;<=>?@ABCDEFGHIXYZ[\]^_`{|}~\<C-?>\u0080\u0082\u0090\u009b¦±¼ÇÓé"],
+    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./0123456789:;<=>?@ABCDEFGHIXYZ[\]^_`{|}~\<C-?>\u0080\u0082\u0090\u009b������"],
     \ [':s/\%#=2[a-z]//g',
-    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./0123456789:;<=>?@ABCDEFGHIXYZ[\]^_`{|}~\<C-?>\u0080\u0082\u0090\u009b¦±¼ÇÓé"],
+    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./0123456789:;<=>?@ABCDEFGHIXYZ[\]^_`{|}~\<C-?>\u0080\u0082\u0090\u009b������"],
     \ [':s/\%#=0\L//g',
     \ "abcdefghiwxyz"],
     \ [':s/\%#=1\L//g',
@@ -237,17 +237,17 @@ func Test_regex_char_classes()
     \ [':s/\%#=2[^a-z]//g',
     \ "abcdefghiwxyz"],
     \ [':s/\%#=0\u//g',
-    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./0123456789:;<=>?@[\]^_`abcdefghiwxyz{|}~\<C-?>\u0080\u0082\u0090\u009b¦±¼ÇÓé"],
+    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./0123456789:;<=>?@[\]^_`abcdefghiwxyz{|}~\<C-?>\u0080\u0082\u0090\u009b������"],
     \ [':s/\%#=1\u//g',
-    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./0123456789:;<=>?@[\]^_`abcdefghiwxyz{|}~\<C-?>\u0080\u0082\u0090\u009b¦±¼ÇÓé"],
+    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./0123456789:;<=>?@[\]^_`abcdefghiwxyz{|}~\<C-?>\u0080\u0082\u0090\u009b������"],
     \ [':s/\%#=2\u//g',
-    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./0123456789:;<=>?@[\]^_`abcdefghiwxyz{|}~\<C-?>\u0080\u0082\u0090\u009b¦±¼ÇÓé"],
+    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./0123456789:;<=>?@[\]^_`abcdefghiwxyz{|}~\<C-?>\u0080\u0082\u0090\u009b������"],
     \ [':s/\%#=0[A-Z]//g',
-    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./0123456789:;<=>?@[\]^_`abcdefghiwxyz{|}~\<C-?>\u0080\u0082\u0090\u009b¦±¼ÇÓé"],
+    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./0123456789:;<=>?@[\]^_`abcdefghiwxyz{|}~\<C-?>\u0080\u0082\u0090\u009b������"],
     \ [':s/\%#=1[A-Z]//g',
-    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./0123456789:;<=>?@[\]^_`abcdefghiwxyz{|}~\<C-?>\u0080\u0082\u0090\u009b¦±¼ÇÓé"],
+    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./0123456789:;<=>?@[\]^_`abcdefghiwxyz{|}~\<C-?>\u0080\u0082\u0090\u009b������"],
     \ [':s/\%#=2[A-Z]//g',
-    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./0123456789:;<=>?@[\]^_`abcdefghiwxyz{|}~\<C-?>\u0080\u0082\u0090\u009b¦±¼ÇÓé"],
+    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./0123456789:;<=>?@[\]^_`abcdefghiwxyz{|}~\<C-?>\u0080\u0082\u0090\u009b������"],
     \ [':s/\%#=0\U//g',
     \ "ABCDEFGHIXYZ"],
     \ [':s/\%#=1\U//g',
@@ -261,17 +261,17 @@ func Test_regex_char_classes()
     \ [':s/\%#=2[^A-Z]//g',
     \ "ABCDEFGHIXYZ"],
     \ [':s/\%#=0\%' . line('.') . 'l^\t...//g',
-    \ "!\"#$%&'()#+'-./0123456789:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz{|}~\<C-?>\u0080\u0082\u0090\u009b¦±¼ÇÓé"],
+    \ "!\"#$%&'()#+'-./0123456789:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz{|}~\<C-?>\u0080\u0082\u0090\u009b������"],
     \ [':s/\%#=1\%' . line('.') . 'l^\t...//g',
-    \ "!\"#$%&'()#+'-./0123456789:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz{|}~\<C-?>\u0080\u0082\u0090\u009b¦±¼ÇÓé"],
+    \ "!\"#$%&'()#+'-./0123456789:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz{|}~\<C-?>\u0080\u0082\u0090\u009b������"],
     \ [':s/\%#=2\%' . line('.') . 'l^\t...//g',
-    \ "!\"#$%&'()#+'-./0123456789:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz{|}~\<C-?>\u0080\u0082\u0090\u009b¦±¼ÇÓé"],
+    \ "!\"#$%&'()#+'-./0123456789:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz{|}~\<C-?>\u0080\u0082\u0090\u009b������"],
     \ [':s/\%#=0[0-z]//g',
-    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./{|}~\<C-?>\u0080\u0082\u0090\u009b¦±¼ÇÓé"],
+    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./{|}~\<C-?>\u0080\u0082\u0090\u009b������"],
     \ [':s/\%#=1[0-z]//g',
-    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./{|}~\<C-?>\u0080\u0082\u0090\u009b¦±¼ÇÓé"],
+    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./{|}~\<C-?>\u0080\u0082\u0090\u009b������"],
     \ [':s/\%#=2[0-z]//g',
-    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./{|}~\<C-?>\u0080\u0082\u0090\u009b¦±¼ÇÓé"],
+    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./{|}~\<C-?>\u0080\u0082\u0090\u009b������"],
     \ [':s/\%#=0[^0-z]//g',
     \ "0123456789:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz"],
     \ [':s/\%#=1[^0-z]//g',
@@ -292,4 +292,4 @@ func Test_regex_char_classes()
   close
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_regexp_latin.vim b/uvim/src/testdir/test_regexp_latin.mnv
index 573cf139ba..e88045db38 100644
--- a/uvim/src/testdir/test_regexp_latin.vim
+++ b/uvim/src/testdir/test_regexp_latin.mnv
@@ -4,8 +4,8 @@ set encoding=latin1
 scriptencoding latin1
 
 func s:equivalence_test()
-  let str = 'AÀÁÂÃÄÅ B C D EÈÉÊË F G H IÌÍÎÏ J K L M NÑ OÒÓÔÕÖØ P Q R S T UÙÚÛÜ V W X YÝ Z '
-  \      .. 'aàáâãäå b c d eèéêë f g h iìíîï j k l m nñ oòóôõöø p q r s t uùúûü v w x yýÿ z '
+  let str = 'A������ B C D E���� F G H I���� J K L M N� O������ P Q R S T U���� V W X Y� Z '
+  \      .. 'a������ b c d e���� f g h i���� j k l m n� o������ p q r s t u���� v w x y�� z '
   \      .. "0 1 2 3 4 5 6 7 8 9 "
   \      .. "` ~ ! ? ; : . , / \\ ' \" | < > [ ] { } ( ) @ # $ % ^ & * _ - + \b \e \f \n \r \t"
   let groups = split(str)
@@ -404,7 +404,7 @@ func Test_regexp_single_line_pat()
   call add(tl, [2, '\v((ab)|c*)+', 'abcccaba', 'abcccab', '', 'ab'])
   call add(tl, [2, '\v(a(c*)+b)+', 'acbababaaa', 'acbabab', 'ab', ''])
   call add(tl, [2, '\v(a|b*)+', 'aaaa', 'aaaa', ''])
-  call add(tl, [2, '\p*', 'aá 	', 'aá '])
+  call add(tl, [2, '\p*', 'a� 	', 'a� '])
 
   " Test greedy-ness and lazy-ness
   call add(tl, [2, 'a\{-2,7}','aaaaaaaaaaaaa', 'aa'])
@@ -933,7 +933,7 @@ endfunc
 
 " Test for matching the start and end of a buffer
 func Regex_start_end_buffer()
-  call setline(1, repeat(['vim edit'], 20))
+  call setline(1, repeat(['mnv edit'], 20))
   /\%^
   call assert_equal([0, 1, 1, 0], getpos('.'))
   exe "normal 50%/\\%^..\<CR>"
@@ -993,12 +993,12 @@ endfunc
 " Check patterns matching cursor position.
 func s:curpos_test2()
   new
-  call setline(1, ['1', '2 foobar eins zwei drei vier fünf sechse',
-        \ '3 foobar eins zwei drei vier fünf sechse',
-        \ '4 foobar eins zwei drei vier fünf sechse',
-        \ '5	foobar eins zwei drei vier fünf sechse',
-        \ '6	foobar eins zwei drei vier fünf sechse',
-        \ '7	foobar eins zwei drei vier fünf sechse'])
+  call setline(1, ['1', '2 foobar eins zwei drei vier f�nf sechse',
+        \ '3 foobar eins zwei drei vier f�nf sechse',
+        \ '4 foobar eins zwei drei vier f�nf sechse',
+        \ '5	foobar eins zwei drei vier f�nf sechse',
+        \ '6	foobar eins zwei drei vier f�nf sechse',
+        \ '7	foobar eins zwei drei vier f�nf sechse'])
   call setpos('.', [0, 2, 10, 0])
   s/\%.c.*//g
   call setpos('.', [0, 3, 15, 0])
@@ -1008,10 +1008,10 @@ func s:curpos_test2()
   call assert_equal(['1',
         \ '2 foobar ',
         \ '',
-        \ '4 foobar eins zwei drei vier fünf sechse',
+        \ '4 foobar eins zwei drei vier f�nf sechse',
         \ '5	_',
-        \ '6	foobar eins zwei drei vier fünf sechse',
-        \ '7	foobar eins zwei drei vier fünf sechse'],
+        \ '6	foobar eins zwei drei vier f�nf sechse',
+        \ '7	foobar eins zwei drei vier f�nf sechse'],
         \ getline(1, '$'))
   call assert_fails('call search("\\%.1l")', 'E1204:')
   call assert_fails('call search("\\%.1c")', 'E1204:')
@@ -1022,12 +1022,12 @@ endfunc
 " Check patterns matching before or after cursor position.
 func s:curpos_test3()
   new
-  call setline(1, ['1', '2 foobar eins zwei drei vier fünf sechse',
-        \ '3 foobar eins zwei drei vier fünf sechse',
-        \ '4 foobar eins zwei drei vier fünf sechse',
-        \ '5	foobar eins zwei drei vier fünf sechse',
-        \ '6	foobar eins zwei drei vier fünf sechse',
-        \ '7	foobar eins zwei drei vier fünf sechse'])
+  call setline(1, ['1', '2 foobar eins zwei drei vier f�nf sechse',
+        \ '3 foobar eins zwei drei vier f�nf sechse',
+        \ '4 foobar eins zwei drei vier f�nf sechse',
+        \ '5	foobar eins zwei drei vier f�nf sechse',
+        \ '6	foobar eins zwei drei vier f�nf sechse',
+        \ '7	foobar eins zwei drei vier f�nf sechse'])
   call setpos('.', [0, 2, 10, 0])
   " Note: This removes all columns, except for the column directly in front of
   " the cursor. Bug????
@@ -1041,27 +1041,27 @@ func s:curpos_test3()
   call setpos('.', [0, 6, 4, 0])
   :s/\%>.v.*$/_/
   call assert_equal(['1',
-        \ ' eins zwei drei vier fünf sechse',
+        \ ' eins zwei drei vier f�nf sechse',
         \ '3 foobar e',
-        \ '4 foobar eins zwei drei vier fünf sechse',
-        \ '_foobar eins zwei drei vier fünf sechse',
+        \ '4 foobar eins zwei drei vier f�nf sechse',
+        \ '_foobar eins zwei drei vier f�nf sechse',
         \ '6	fo_',
-        \ '7	foobar eins zwei drei vier fünf sechse'],
+        \ '7	foobar eins zwei drei vier f�nf sechse'],
         \ getline(1, '$'))
   sil %d
-  call setline(1, ['1', '2 foobar eins zwei drei vier fünf sechse',
-        \ '3 foobar eins zwei drei vier fünf sechse',
-        \ '4 foobar eins zwei drei vier fünf sechse',
-        \ '5	foobar eins zwei drei vier fünf sechse',
-        \ '6	foobar eins zwei drei vier fünf sechse',
-        \ '7	foobar eins zwei drei vier fünf sechse'])
+  call setline(1, ['1', '2 foobar eins zwei drei vier f�nf sechse',
+        \ '3 foobar eins zwei drei vier f�nf sechse',
+        \ '4 foobar eins zwei drei vier f�nf sechse',
+        \ '5	foobar eins zwei drei vier f�nf sechse',
+        \ '6	foobar eins zwei drei vier f�nf sechse',
+        \ '7	foobar eins zwei drei vier f�nf sechse'])
   call setpos('.', [0, 4, 4, 0])
   %s/\%<.l.*//
   call setpos('.', [0, 5, 4, 0])
   %s/\%>.l.*//
   call assert_equal(['', '', '',
-        \ '4 foobar eins zwei drei vier fünf sechse',
-        \ '5	foobar eins zwei drei vier fünf sechse',
+        \ '4 foobar eins zwei drei vier f�nf sechse',
+        \ '5	foobar eins zwei drei vier f�nf sechse',
         \ '', ''],
         \ getline(1, '$'))
   bwipe!
@@ -1172,4 +1172,4 @@ def Test_compare_column_matchstr()
 enddef
 
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_regexp_utf8.vim b/uvim/src/testdir/test_regexp_utf8.mnv
index d33c03c421..35698ef579 100644
--- a/uvim/src/testdir/test_regexp_utf8.vim
+++ b/uvim/src/testdir/test_regexp_utf8.mnv
@@ -387,8 +387,8 @@ func Run_regexp_multibyte_magic()
     b �カヨ�
     c x ¬€x
     d 天使x
-    e ü’�…™¸y
-    f ü’�Š¯�z
+    e ������y
+    f ������z
     g aå•·bb
     j 0123�x
     k combinations
@@ -562,7 +562,7 @@ func Test_match_illegal_byte()
   " Text has illegal bytes which need to be set explicitly
   let lines = ["norm :set no\x01\<CR>", "silent n\xff", "silent norm :b\xff\<CR>"]
   call writefile(lines, 'Xregexp', 'D')
-  call system(GetVimCommand() .. ' -X -Z -e -s -S Xregexp -c qa!')
+  call system(GetMNVCommand() .. ' -X -Z -e -s -S Xregexp -c qa!')
 endfunc
 
 func Test_match_too_complicated()
@@ -614,7 +614,7 @@ func Test_search_multibyte_match_ascii()
     call assert_equal(['s', 'ss', 'Å¿Å¿', 'Å¿'], ic_match3, "Ignorecase Collection Regex-engine: " .. &re)
     call assert_equal(['Å¿Å¿','Å¿'], noic_match3, "No-Ignorecase Collection Regex-engine: " .. &re)
   endfor
-  set re&vim
+  set re&mnv
   bw!
 endfunc
 
@@ -630,7 +630,7 @@ func Test_replace_multibyte_match_in_multi_lines()
     call assert_equal(expected, getline(1, '$'))
   endfor
   bw!
-  set ignorecase&vim re&vim
+  set ignorecase&mnv re&mnv
 endfun
 
 func Test_regex_collection_range_with_composing_crash()
@@ -651,4 +651,4 @@ func Test_regex_collection_range_with_composing_crash()
   bwipe!
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_registers.vim b/uvim/src/testdir/test_registers.mnv
index 245340c82a..84067951fc 100644
--- a/uvim/src/testdir/test_registers.vim
+++ b/uvim/src/testdir/test_registers.mnv
@@ -294,7 +294,7 @@ func Test_recording_with_super_mod()
 
   nnoremap <D-j> <Ignore>
   let s = repeat("\<D-j>", 1000)
-  " This used to crash Vim
+  " This used to crash MNV
   call feedkeys($'qr{s}q', 'tx')
   call assert_equal(s, @r)
   nunmap <D-j>
@@ -304,16 +304,16 @@ endfunc
 func Test_last_used_exec_reg()
   " Test for the @: command
   let a = ''
-  call feedkeys(":let a ..= 'Vim'\<CR>", 'xt')
+  call feedkeys(":let a ..= 'MNV'\<CR>", 'xt')
   normal @:
-  call assert_equal('VimVim', a)
+  call assert_equal('MNVMNV', a)
 
   " Test for the @= command
   let x = ''
-  let a = ":let x ..= 'Vim'\<CR>"
+  let a = ":let x ..= 'MNV'\<CR>"
   exe "normal @=a\<CR>"
   normal @@
-  call assert_equal('VimVim', x)
+  call assert_equal('MNVMNV', x)
 
   " Test for the @. command
   let a = ''
@@ -432,10 +432,10 @@ func Test_set_register()
 
   " Test for gP with multiple lines selected using characterwise motion
   %delete
-  call append(0, ['vim editor', 'vim editor'])
+  call append(0, ['mnv editor', 'mnv editor'])
   let @r = ''
-  exe "normal ggwy/vim /e\<CR>gP"
-  call assert_equal(['vim editor', 'vim editor', 'vim editor'], getline(1, 3))
+  exe "normal ggwy/mnv /e\<CR>gP"
+  call assert_equal(['mnv editor', 'mnv editor', 'mnv editor'], getline(1, 3))
 
   " Test for gP with . register
   %delete
@@ -516,7 +516,7 @@ func Test_clipboard_regs()
   normal ggwviwy
   call assert_equal('for', @+)
 
-  set clipboard&vim
+  set clipboard&mnv
   bwipe!
 endfunc
 
@@ -548,7 +548,7 @@ func Test_clipboard_regs_separate()
     call assert_equal('xxx', getreg('*'))
   endfor
 
-  set clipboard&vim
+  set clipboard&mnv
   bwipe!
 endfunc
 
@@ -578,7 +578,7 @@ func Test_clipboard_regs_both_unnamed()
   call assert_equal('foo', getreg('*'))
   call assert_equal('bar', getreg('+'))
 
-  set clipboard&vim
+  set clipboard&mnv
   bwipe!
 endfunc
 
@@ -588,14 +588,14 @@ func Test_put_reg_restart_mode()
   new
   call append(0, 'editor')
   normal gg
-  let @r = "ivim \<Esc>"
+  let @r = "imnv \<Esc>"
   call feedkeys("i\<C-O>@r\<C-R>=mode()\<CR>", 'xt')
-  call assert_equal('vimi editor', getline(1))
+  call assert_equal('mnvi editor', getline(1))
 
   call setline(1, 'editor')
   normal gg
   call feedkeys("gR\<C-O>@r\<C-R>=mode()\<CR>", 'xt')
-  call assert_equal('vimReditor', getline(1))
+  call assert_equal('mnvReditor', getline(1))
 
   bwipe!
 endfunc
@@ -912,7 +912,7 @@ func Test_clipboard_nul()
   let b = split(execute(":reg *"), "\n")
   call assert_match('"\*\s*\^@test\^J',b[1])
 
-  set clipboard&vim
+  set clipboard&mnv
   bwipe!
 endfunc
 
@@ -930,7 +930,7 @@ func Test_ve_blockpaste()
   norm! $3lP
   call assert_equal(5, col('.'))
   call assert_equal(['TZ  QWER', 'GH  ASDF'], getline(1, 2))
-  set ve&vim
+  set ve&mnv
   bwipe!
 endfunc
 
@@ -1059,7 +1059,7 @@ endfunc
 
 " This was causing a crash because y_append was ending up being NULL
 func Test_zero_y_append()
-  " Run in a separate Vim instance because changing 'encoding' may cause
+  " Run in a separate MNV instance because changing 'encoding' may cause
   " trouble for later tests.
   let lines =<< trim END
       d
@@ -1071,7 +1071,7 @@ func Test_zero_y_append()
        
   END
   call writefile(lines, 'XTest_zero_y_append', 'D')
-  call RunVim([], [], '-u NONE -i NONE -e -s -S XTest_zero_y_append -c qa\!')
+  call RunMNV([], [], '-u NONE -i NONE -e -s -S XTest_zero_y_append -c qa\!')
 endfunc
 
 " Make sure that y_append is correctly reset
@@ -1170,14 +1170,14 @@ func Test_clipboard_regs_not_working()
   endif
 endfunc
 
-" Check for W23 with a Vim with clipboard support,
+" Check for W23 with a MNV with clipboard support,
 " but when there is no available clipmethod
 func Test_clipboard_regs_not_working2()
   CheckNotMac
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
   CheckFeature clipboard
   set clipmethod=
-  " Run in a separate Vim instance because changing 'encoding' may cause
+  " Run in a separate MNV instance because changing 'encoding' may cause
   " trouble for later tests.
   let lines =<< trim END
       set clipmethod=
@@ -1187,9 +1187,9 @@ func Test_clipboard_regs_not_working2()
       set clipmethod&
   END
   call writefile(lines, 'XTest_clipboard', 'D')
-  let buf = RunVimInTerminal('-S XTest_clipboard', {})
+  let buf = RunMNVInTerminal('-S XTest_clipboard', {})
   call term_sendkeys(buf, "\"+yy")
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
   let result = readfile('Xclipboard_result.txt')
   call assert_match("^\\nW23:", result[0])
   set clipmethod&
@@ -1218,7 +1218,7 @@ endfunc
 
 " this caused an illegal memory access and a crash
 func Test_register_cursor_column_negative()
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
   let script =<< trim END
     f XREGISTER
     call setline(1, 'abcdef a')
@@ -1227,10 +1227,10 @@ func Test_register_cursor_column_negative()
     call feedkeys("i\<C-R>\<C-P>azyx$#\<esc>", 't')
   END
   call writefile(script, 'XRegister123', 'D')
-  let buf = RunVimInTerminal('-S XRegister123', {})
+  let buf = RunMNVInTerminal('-S XRegister123', {})
   call term_sendkeys(buf, "\<c-g>")
   call WaitForAssert({-> assert_match('XREGISTER', term_getline(buf, 19))})
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 " test '] mark generated by op_yank
@@ -1299,4 +1299,4 @@ func Test_writing_readonly_regs()
   call assert_fails('let @~ = "foo"', 'E354:')
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_reltime.vim b/uvim/src/testdir/test_reltime.mnv
index 14d0d7e6f8..ad35d07df1 100644
--- a/uvim/src/testdir/test_reltime.vim
+++ b/uvim/src/testdir/test_reltime.mnv
@@ -27,4 +27,4 @@ func Test_reltime()
   call assert_equal([], reltime({}, {}))
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_remote.vim b/uvim/src/testdir/test_remote.mnv
index ad959e629c..2dae5e2869 100644
--- a/uvim/src/testdir/test_remote.vim
+++ b/uvim/src/testdir/test_remote.mnv
@@ -3,24 +3,24 @@
 CheckFeature clientserver
 CheckFeature terminal
 
-source util/screendump.vim
-source util/mouse.vim
+source util/screendump.mnv
+source util/mouse.mnv
 
 let s:remote_works = 0
 let s:skip = 'Skipped: --remote feature is not possible'
 
-" needs to be run as first test to verify, that vim --servername works
+" needs to be run as first test to verify, that mnv --servername works
 func Verify_remote_feature_works()
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
   enew
-  let buf = RunVimInTerminal('--servername XVIMTEST', {'rows': 8})
+  let buf = RunMNVInTerminal('--servername XMNVTEST', {'rows': 8})
   call TermWait(buf)
 
-  " For some reason when the socket server is being used, the terminal Vim never
-  " receives the `:w! XVimRemoteTest.txt` command from term_sendkeys.
+  " For some reason when the socket server is being used, the terminal MNV never
+  " receives the `:w! XMNVRemoteTest.txt` command from term_sendkeys.
   if has('socketserver') && !has('X11')
-    if match(serverlist(), "XVIMTEST") == -1
-      call StopVimInTerminal(buf)
+    if match(serverlist(), "XMNVTEST") == -1
+      call StopMNVInTerminal(buf)
       throw s:skip
     endif
 
@@ -28,16 +28,16 @@ func Verify_remote_feature_works()
     return
   endif
 
-  let cmd = GetVimCommandCleanTerm() .. '--serverlist'
+  let cmd = GetMNVCommandCleanTerm() .. '--serverlist'
   call term_sendkeys(buf, ":r! " .. cmd .. "\<CR>")
   call TermWait(buf)
-  call term_sendkeys(buf, ":w! XVimRemoteTest.txt\<CR>")
+  call term_sendkeys(buf, ":w! XMNVRemoteTest.txt\<CR>")
   call TermWait(buf)
   call term_sendkeys(buf, ":q\<CR>")
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
   bw!
-  let result = readfile('XVimRemoteTest.txt')
-  call delete('XVimRemoteTest.txt')
+  let result = readfile('XMNVRemoteTest.txt')
+  call delete('XMNVRemoteTest.txt')
   if empty(result)
     throw s:skip
   endif
@@ -51,7 +51,7 @@ if !s:remote
 endif
 
 func Test_remote_servername()
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   " That is the file we want the server to open,
   " despite the wildignore setting
@@ -59,18 +59,18 @@ func Test_remote_servername()
   " just a dummy file, so that the ':wq' further down is successful
   call writefile(range(1, 20), 'Xdummy.log', 'D')
 
-  " Run Vim in a terminal and open a terminal window to run Vim in.
+  " Run MNV in a terminal and open a terminal window to run MNV in.
   let lines =<< trim END
     set wildignore=*.txt
   END
-  call writefile(lines, 'XRemoteEditing.vim', 'D')
-  let buf = RunVimInTerminal('--servername XVIMTEST -S XRemoteEditing.vim  Xdummy.log', {'rows': 8})
+  call writefile(lines, 'XRemoteEditing.mnv', 'D')
+  let buf = RunMNVInTerminal('--servername XMNVTEST -S XRemoteEditing.mnv  Xdummy.log', {'rows': 8})
   call TermWait(buf)
   botright new
-  " wildignore setting should be ignored and the XVIMTEST server should now
+  " wildignore setting should be ignored and the XMNVTEST server should now
   " open XTEST.txt, if wildignore setting is not ignored, the server
   " will continue with the Xdummy.log file
-  let buf2 = RunVimInTerminal('--servername XVIMTEST --remote-silent XTEST.txt', {'rows': 5, 'wait_for_ruler': 0})
+  let buf2 = RunMNVInTerminal('--servername XMNVTEST --remote-silent XTEST.txt', {'rows': 5, 'wait_for_ruler': 0})
   " job should be no-longer running, so we can just close it
   exe buf2 .. 'bw!'
   call term_sendkeys(buf, ":sil :3,$d\<CR>")
@@ -78,7 +78,7 @@ func Test_remote_servername()
   call term_sendkeys(buf, ":wq!\<CR>")
   call TermWait(buf)
   if term_getstatus(buf) == 'running'
-    call StopVimInTerminal(buf)
+    call StopMNVInTerminal(buf)
   endif
   let buf_contents = readfile('XTEST.txt')
   call assert_equal(2, len(buf_contents))
@@ -89,11 +89,11 @@ endfunc
 func Test_remote_servername_shellslash()
   " Note this test does not currently run on Windows
   " because:
-  " 1) we cannot run the gui version of Vim inside a terminal
-  " 2) Running Windows vim.exe inside a terminal would work, but is
+  " 1) we cannot run the gui version of MNV inside a terminal
+  " 2) Running Windows mnv.exe inside a terminal would work, but is
   "    disabled because of the limited colors inside the default Windows
-  "    console (see CanRunVimInTerminal in term_util.vim)
-  CheckRunVimInTerminal
+  "    console (see CanRunMNVInTerminal in term_util.mnv)
+  CheckRunMNVInTerminal
   CheckMSWindows
 
   " That is the file we want the server to open,
@@ -103,19 +103,19 @@ func Test_remote_servername_shellslash()
   " just a dummy file, so that the ':wq' further down is successful
   call writefile(range(1, 20), 'Xdummy.log', 'D')
 
-  " Run Vim in a terminal and open a terminal window to run Vim in.
+  " Run MNV in a terminal and open a terminal window to run MNV in.
   let lines =<< trim END
     set shellslash
     cd ~/remote
   END
-  call writefile(lines, 'XRemoteEditing1.vim', 'D')
-  let buf = RunVimInTerminal('--servername XVIMTEST -S XRemoteEditing1.vim  Xdummy.log', {'rows': 10})
+  call writefile(lines, 'XRemoteEditing1.mnv', 'D')
+  let buf = RunMNVInTerminal('--servername XMNVTEST -S XRemoteEditing1.mnv  Xdummy.log', {'rows': 10})
   call TermWait(buf)
 
-  " wildignore setting should be ignored and the XVIMTEST server should now
+  " wildignore setting should be ignored and the XMNVTEST server should now
   " open XTEST.txt, if wildignore setting is not ignored, the server
   " will continue with the Xdummy.log file
-  let buf2 = RunVimInTerminal('--servername XVIMTEST --remote-silent ~/remote/XTEST.txt', {'rows': 5, 'wait_for_ruler': 0})
+  let buf2 = RunMNVInTerminal('--servername XMNVTEST --remote-silent ~/remote/XTEST.txt', {'rows': 5, 'wait_for_ruler': 0})
   " job should be no-longer running, so we can just close it
   exe buf2 .. 'bw!'
 
@@ -125,7 +125,7 @@ func Test_remote_servername_shellslash()
   call term_sendkeys(buf, ":q!\<CR>")
   call TermWait(buf)
   if term_getstatus(buf) == 'running'
-    call StopVimInTerminal(buf)
+    call StopMNVInTerminal(buf)
   endif
   bw!
   close
@@ -137,13 +137,13 @@ func Test_remote_servername_itself()
     call writefile([serverlist()], "XTest")
   END
   defer delete("XTest")
-  call writefile(lines, 'XRemote.vim', 'D')
-  let buf = RunVimInTerminal('--servername XVIMTEST -S XRemote.vim', {'rows': 8})
+  call writefile(lines, 'XRemote.mnv', 'D')
+  let buf = RunMNVInTerminal('--servername XMNVTEST -S XRemote.mnv', {'rows': 8})
   call TermWait(buf)
 
-  call WaitForAssert({-> assert_match("XVIMTEST", readfile("XTest")[0])})
+  call WaitForAssert({-> assert_match("XMNVTEST", readfile("XTest")[0])})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_rename.vim b/uvim/src/testdir/test_rename.mnv
index b1264a6c4b..45d7a511c9 100644
--- a/uvim/src/testdir/test_rename.vim
+++ b/uvim/src/testdir/test_rename.mnv
@@ -108,4 +108,4 @@ func Test_rename_fails()
   call assert_fails('call rename(0z, "Xrenamefile")', 'E976:')
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_restricted.vim b/uvim/src/testdir/test_restricted.mnv
index 2d8c8ce5f7..458ce1d405 100644
--- a/uvim/src/testdir/test_restricted.vim
+++ b/uvim/src/testdir/test_restricted.mnv
@@ -1,4 +1,4 @@
-" Test for "rvim" or "vim -Z"
+" Test for "rmnv" or "mnv -Z"
 
 "if has('win32') && has('gui')
 "  " Win32 GUI shows a dialog instead of displaying the error in the last line.
@@ -8,7 +8,7 @@
 func Test_restricted_mode()
   let lines =<< trim END
     if has('lua')
-      call assert_fails('lua print("Hello, Vim!")', 'E981:')
+      call assert_fails('lua print("Hello, MNV!")', 'E981:')
       call assert_fails('luado return "hello"', 'E981:')
       call assert_fails('luafile somefile', 'E981:')
       call assert_fails('call luaeval("expression")', 'E145:')
@@ -57,13 +57,13 @@ func Test_restricted_mode()
     if has('clientserver')
       call assert_fails('let s=remote_peek(10)', 'E145:')
       call assert_fails('let s=remote_read(10)', 'E145:')
-      call assert_fails('let s=remote_send("vim", "abc")', 'E145:')
+      call assert_fails('let s=remote_send("mnv", "abc")', 'E145:')
       call assert_fails('let s=server2client(10, "abc")', 'E145:')
     endif
 
     if has('terminal')
       call assert_fails('terminal', 'E145:')
-      call assert_fails('call term_start("vim")', 'E145:')
+      call assert_fails('call term_start("mnv")', 'E145:')
       call assert_fails('call term_dumpwrite(1, "Xfile")', 'E145:')
     endif
 
@@ -73,7 +73,7 @@ func Test_restricted_mode()
     endif
 
     if has('job')
-      call assert_fails("call job_start('vim')", 'E145:')
+      call assert_fails("call job_start('mnv')", 'E145:')
     endif
 
     if has('unix') && has('libcall')
@@ -100,15 +100,15 @@ func Test_restricted_mode()
     qa!
   END
   call writefile(lines, 'Xrestricted', 'D')
-  if RunVim([], [], '-Z --clean -S Xrestricted')
+  if RunMNV([], [], '-Z --clean -S Xrestricted')
     call assert_equal([], readfile('Xresult'))
   endif
   call delete('Xresult')
-  if has('unix') && RunVimPiped([], [], '--clean -S Xrestricted', 'SHELL=/bin/false ')
+  if has('unix') && RunMNVPiped([], [], '--clean -S Xrestricted', 'SHELL=/bin/false ')
     call assert_equal([], readfile('Xresult'))
   endif
   call delete('Xresult')
-  if has('unix') && RunVimPiped([], [], '--clean -S Xrestricted', 'SHELL=/sbin/nologin')
+  if has('unix') && RunMNVPiped([], [], '--clean -S Xrestricted', 'SHELL=/sbin/nologin')
     call assert_equal([], readfile('Xresult'))
   endif
 
@@ -132,7 +132,7 @@ func Test_restricted_diff()
     qa!
   END
   call writefile(lines, 'Xrestricteddiff', 'D')
-  if RunVim([], [], '-Z --clean -S Xrestricteddiff')
+  if RunMNV([], [], '-Z --clean -S Xrestricteddiff')
     call assert_equal([], readfile('Xresult'))
   endif
   call delete('Xresult')
@@ -140,21 +140,21 @@ endfunc
 
 func Test_restricted_env()
   let lines =<< trim END
-      vim9script
+      mnv9script
       def SetEnv()
           $ENV = '123'
       enddef
       var result = 'okay'
       try
         SetEnv()
-      catch /^Vim\%((\S\+)\)\=:E145:/
+      catch /^MNV\%((\S\+)\)\=:E145:/
         result = 'not-allowed'
       endtry
       writefile([result], 'XResult_env')
       qa!
   END
-  call writefile(lines, 'Xrestrictedvim9', 'D')
-  if RunVim([], [], '-Z --clean -S Xrestrictedvim9')
+  call writefile(lines, 'Xrestrictedmnv9', 'D')
+  if RunMNV([], [], '-Z --clean -S Xrestrictedmnv9')
     call assert_equal(['not-allowed'], readfile('XResult_env'))
   endif
   call delete('XResult_env')
@@ -163,14 +163,14 @@ func Test_restricted_env()
       try
         let $ENV_TEST = 'val'
         let result = 'okay'
-      catch /^Vim\%((\S\+)\)\=:E145:/
+      catch /^MNV\%((\S\+)\)\=:E145:/
         let result = 'not-allowed'
       endtry
       call writefile([result], 'XResult_env')
       qa!
   END
   call writefile(lines, 'Xrestricted_legacy', 'D')
-  if RunVim([], [], '-Z --clean -S Xrestricted_legacy')
+  if RunMNV([], [], '-Z --clean -S Xrestricted_legacy')
     call assert_equal(['not-allowed'], readfile('XResult_env'))
   endif
   call delete('XResult_env')
@@ -183,8 +183,8 @@ func Test_restricted_grep()
     let result = 'okay'
     try
       " Try to use grep to execute an external command
-      grep 'Vim' ./*.vim
-    catch /^Vim\%((\S\+)\)\=:E145:/
+      grep 'MNV' ./*.mnv
+    catch /^MNV\%((\S\+)\)\=:E145:/
       let result = 'grep-blocked'
     endtry
     call writefile([result], 'XResult_grep')
@@ -192,7 +192,7 @@ func Test_restricted_grep()
   END
 
   call writefile(lines, 'Xrestricted_grep', 'D')
-  if RunVim([], [], '-Z --clean -S Xrestricted_grep')
+  if RunMNV([], [], '-Z --clean -S Xrestricted_grep')
     call assert_equal(['grep-blocked'], readfile('XResult_grep'))
   endif
   call delete('XResult_grep')
@@ -206,7 +206,7 @@ func Test_restricted_cscope()
     let result = 'okay'
     try
       cscope add Xfoobar.out
-    catch /^Vim\%((\S\+)\)\=:E145:/
+    catch /^MNV\%((\S\+)\)\=:E145:/
       let result = 'blocked'
     endtry
     call writefile([result], 'XResult_cscope')
@@ -214,10 +214,10 @@ func Test_restricted_cscope()
   END
 
   call writefile(lines, 'Xrestricted_cscope', 'D')
-  if RunVim([], [], '-Z --clean -S Xrestricted_cscope')
+  if RunMNV([], [], '-Z --clean -S Xrestricted_cscope')
     call assert_equal(['blocked'], readfile('XResult_cscope'))
   endif
   call delete('XResult_cscope')
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_retab.vim b/uvim/src/testdir/test_retab.mnv
index 47a718ff16..f354c83b38 100644
--- a/uvim/src/testdir/test_retab.vim
+++ b/uvim/src/testdir/test_retab.mnv
@@ -182,4 +182,4 @@ func Test_nocatch_retab_endless()
 endfunc
 
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_ruby.vim b/uvim/src/testdir/test_ruby.mnv
index fcdfe89295..a05bd69c05 100644
--- a/uvim/src/testdir/test_ruby.vim
+++ b/uvim/src/testdir/test_ruby.mnv
@@ -4,7 +4,7 @@ CheckFeature ruby
 
 func Test_ruby_change_buffer()
   call setline(line('$'), ['1 line 1'])
-  ruby Vim.command("normal /^1\n")
+  ruby MNV.command("normal /^1\n")
   ruby $curbuf.line = "1 changed line 1"
   call assert_equal('1 changed line 1', getline('$'))
 endfunc
@@ -14,19 +14,19 @@ func Test_rubydo()
 
   " Check deleting lines does not trigger ml_get error.
   call setline(1, ['one', 'two', 'three'])
-  rubydo Vim.command("%d_")
+  rubydo MNV.command("%d_")
   call assert_equal(['one'], getline(1, '$'))
 
   call setline(1, ['one', 'two', 'three'])
-  rubydo Vim.command("1,2d_")
+  rubydo MNV.command("1,2d_")
   call assert_equal(['one'], getline(1, '$'))
 
   call setline(1, ['one', 'two', 'three'])
-  rubydo Vim.command("2,3d_"); $_ = "REPLACED"
+  rubydo MNV.command("2,3d_"); $_ = "REPLACED"
   call assert_equal(['REPLACED'], getline(1, '$'))
 
   call setline(1, ['one', 'two', 'three'])
-  2,3rubydo Vim.command("1,2d_"); $_ = "REPLACED"
+  2,3rubydo MNV.command("1,2d_"); $_ = "REPLACED"
   call assert_equal(['three'], getline(1, '$'))
 
   bwipe!
@@ -35,7 +35,7 @@ func Test_rubydo()
   new
   let wincount = winnr('$')
   call setline(1, ['one', 'two', 'three'])
-  rubydo Vim.command("new")
+  rubydo MNV.command("new")
   call assert_equal(wincount + 1, winnr('$'))
   %bwipe!
 endfunc
@@ -55,7 +55,7 @@ endfunc
 func Test_rubyfile()
   " Check :rubyfile does not SEGV with Ruby level exception but just fails
   let tempfile = tempname() . '.rb'
-  call writefile(['raise "vim!"'], tempfile)
+  call writefile(['raise "mnv!"'], tempfile)
   call assert_fails('rubyfile ' . tempfile)
   call delete(tempfile)
 endfunc
@@ -234,131 +234,131 @@ func Test_ruby_window_buffer()
   %bwipe
 endfunc
 
-" Test Vim::Window.current (get current window object)
-func Test_ruby_Vim_window_current()
+" Test MNV::Window.current (get current window object)
+func Test_ruby_MNV_window_current()
   let cw = rubyeval('$curwin')
-  call assert_equal(cw, rubyeval('Vim::Window.current'))
-  call assert_match('^#<Vim::Window:0x\x\+>$', cw)
+  call assert_equal(cw, rubyeval('MNV::Window.current'))
+  call assert_match('^#<MNV::Window:0x\x\+>$', cw)
 endfunc
 
-" Test Vim::Window.count (number of windows)
-func Test_ruby_Vim_window_count()
+" Test MNV::Window.count (number of windows)
+func Test_ruby_MNV_window_count()
   new Xfoo1
   new Xfoo2
   split
-  call assert_equal(4, rubyeval('Vim::Window.count'))
+  call assert_equal(4, rubyeval('MNV::Window.count'))
   %bwipe
-  call assert_equal(1, rubyeval('Vim::Window.count'))
+  call assert_equal(1, rubyeval('MNV::Window.count'))
 endfunc
 
-" Test Vim::Window[n] (get window object of window n)
-func Test_ruby_Vim_window_get()
+" Test MNV::Window[n] (get window object of window n)
+func Test_ruby_MNV_window_get()
   new Xfoo1
   new Xfoo2
-  call assert_match('Xfoo2$', rubyeval('Vim::Window[0].buffer.name'))
+  call assert_match('Xfoo2$', rubyeval('MNV::Window[0].buffer.name'))
   wincmd j
-  call assert_match('Xfoo1$', rubyeval('Vim::Window[1].buffer.name'))
+  call assert_match('Xfoo1$', rubyeval('MNV::Window[1].buffer.name'))
   wincmd j
-  call assert_equal(v:null,   rubyeval('Vim::Window[2].buffer.name'))
+  call assert_equal(v:null,   rubyeval('MNV::Window[2].buffer.name'))
   %bwipe
 endfunc
 
-" Test Vim::Buffer.current (return the buffer object of current buffer)
-func Test_ruby_Vim_buffer_current()
+" Test MNV::Buffer.current (return the buffer object of current buffer)
+func Test_ruby_MNV_buffer_current()
   let cb = rubyeval('$curbuf')
-  call assert_equal(cb, rubyeval('Vim::Buffer.current'))
-  call assert_match('^#<Vim::Buffer:0x\x\+>$', cb)
+  call assert_equal(cb, rubyeval('MNV::Buffer.current'))
+  call assert_match('^#<MNV::Buffer:0x\x\+>$', cb)
 endfunc
 
-" Test Vim::Buffer:.count (return the number of buffers)
-func Test_ruby_Vim_buffer_count()
+" Test MNV::Buffer:.count (return the number of buffers)
+func Test_ruby_MNV_buffer_count()
   new Xfoo1
   new Xfoo2
-  call assert_equal(3, rubyeval('Vim::Buffer.count'))
+  call assert_equal(3, rubyeval('MNV::Buffer.count'))
   %bwipe
-  call assert_equal(1, rubyeval('Vim::Buffer.count'))
+  call assert_equal(1, rubyeval('MNV::Buffer.count'))
 endfunc
 
-" Test Vim::buffer[n] (return the buffer object of buffer number n)
-func Test_ruby_Vim_buffer_get()
+" Test MNV::buffer[n] (return the buffer object of buffer number n)
+func Test_ruby_MNV_buffer_get()
   new Xfoo1
   new Xfoo2
 
-  " Index of Vim::Buffer[n] goes from 0 to the number of buffers.
-  call assert_equal(v:null,   rubyeval('Vim::Buffer[0].name'))
-  call assert_match('Xfoo1$', rubyeval('Vim::Buffer[1].name'))
-  call assert_match('Xfoo2$', rubyeval('Vim::Buffer[2].name'))
-  call assert_fails('ruby print Vim::Buffer[3].name',
+  " Index of MNV::Buffer[n] goes from 0 to the number of buffers.
+  call assert_equal(v:null,   rubyeval('MNV::Buffer[0].name'))
+  call assert_match('Xfoo1$', rubyeval('MNV::Buffer[1].name'))
+  call assert_match('Xfoo2$', rubyeval('MNV::Buffer[2].name'))
+  call assert_fails('ruby print MNV::Buffer[3].name',
         \           "NoMethodError")
   %bwipe
 endfunc
 
-" Test Vim::command({cmd}) (execute a Ex command))
-" Test Vim::command({cmd})
-func Test_ruby_Vim_command()
+" Test MNV::command({cmd}) (execute a Ex command))
+" Test MNV::command({cmd})
+func Test_ruby_MNV_command()
   new
   call setline(1, ['one', 'two', 'three', 'four'])
-  ruby Vim::command('2,3d')
+  ruby MNV::command('2,3d')
   call assert_equal(['one', 'four'], getline(1, '$'))
   bwipe!
 endfunc
 
-" Test Vim::set_option (set a vim option)
-func Test_ruby_Vim_set_option()
+" Test MNV::set_option (set a mnv option)
+func Test_ruby_MNV_set_option()
   call assert_equal(0, &number)
-  ruby Vim::set_option('number')
+  ruby MNV::set_option('number')
   call assert_equal(1, &number)
-  ruby Vim::set_option('nonumber')
+  ruby MNV::set_option('nonumber')
   call assert_equal(0, &number)
 endfunc
 
-func Test_ruby_Vim_evaluate()
-  call assert_equal(123,        rubyeval('Vim::evaluate("123")'))
-  " Vim::evaluate("123").class gives Integer or Fixnum depending
+func Test_ruby_MNV_evaluate()
+  call assert_equal(123,        rubyeval('MNV::evaluate("123")'))
+  " MNV::evaluate("123").class gives Integer or Fixnum depending
   " on versions of Ruby.
-  call assert_match('^Integer\|Fixnum$', rubyeval('Vim::evaluate("123").class'))
+  call assert_match('^Integer\|Fixnum$', rubyeval('MNV::evaluate("123").class'))
 
-  call assert_equal(1.23,       rubyeval('Vim::evaluate("1.23")'))
-  call assert_equal('Float',    rubyeval('Vim::evaluate("1.23").class'))
+  call assert_equal(1.23,       rubyeval('MNV::evaluate("1.23")'))
+  call assert_equal('Float',    rubyeval('MNV::evaluate("1.23").class'))
 
-  call assert_equal('foo',      rubyeval('Vim::evaluate("\"foo\"")'))
-  call assert_equal('String',   rubyeval('Vim::evaluate("\"foo\"").class'))
+  call assert_equal('foo',      rubyeval('MNV::evaluate("\"foo\"")'))
+  call assert_equal('String',   rubyeval('MNV::evaluate("\"foo\"").class'))
 
-  call assert_equal(["\x01\xAB"],   rubyeval('Vim::evaluate("0z01ab").unpack("M")'))
-  call assert_equal('String',       rubyeval('Vim::evaluate("0z01ab").class'))
+  call assert_equal(["\x01\xAB"],   rubyeval('MNV::evaluate("0z01ab").unpack("M")'))
+  call assert_equal('String',       rubyeval('MNV::evaluate("0z01ab").class'))
 
-  call assert_equal([1, 2],     rubyeval('Vim::evaluate("[1, 2]")'))
-  call assert_equal('Array',    rubyeval('Vim::evaluate("[1, 2]").class'))
+  call assert_equal([1, 2],     rubyeval('MNV::evaluate("[1, 2]")'))
+  call assert_equal('Array',    rubyeval('MNV::evaluate("[1, 2]").class'))
 
-  call assert_equal({'1': 2},   rubyeval('Vim::evaluate("{1:2}")'))
-  call assert_equal('Hash',     rubyeval('Vim::evaluate("{1:2}").class'))
+  call assert_equal({'1': 2},   rubyeval('MNV::evaluate("{1:2}")'))
+  call assert_equal('Hash',     rubyeval('MNV::evaluate("{1:2}").class'))
 
-  call assert_equal(v:null,     rubyeval('Vim::evaluate("v:null")'))
-  call assert_equal('NilClass', rubyeval('Vim::evaluate("v:null").class'))
+  call assert_equal(v:null,     rubyeval('MNV::evaluate("v:null")'))
+  call assert_equal('NilClass', rubyeval('MNV::evaluate("v:null").class'))
 
-  call assert_equal(v:null,     rubyeval('Vim::evaluate("v:none")'))
-  call assert_equal('NilClass', rubyeval('Vim::evaluate("v:none").class'))
+  call assert_equal(v:null,     rubyeval('MNV::evaluate("v:none")'))
+  call assert_equal('NilClass', rubyeval('MNV::evaluate("v:none").class'))
 
-  call assert_equal(v:true,      rubyeval('Vim::evaluate("v:true")'))
-  call assert_equal('TrueClass', rubyeval('Vim::evaluate("v:true").class'))
-  call assert_equal(v:false,     rubyeval('Vim::evaluate("v:false")'))
-  call assert_equal('FalseClass',rubyeval('Vim::evaluate("v:false").class'))
+  call assert_equal(v:true,      rubyeval('MNV::evaluate("v:true")'))
+  call assert_equal('TrueClass', rubyeval('MNV::evaluate("v:true").class'))
+  call assert_equal(v:false,     rubyeval('MNV::evaluate("v:false")'))
+  call assert_equal('FalseClass',rubyeval('MNV::evaluate("v:false").class'))
 endfunc
 
-func Test_ruby_Vim_blob()
-  call assert_equal('0z',         rubyeval('Vim::blob("")'))
-  call assert_equal('0z31326162', rubyeval('Vim::blob("12ab")'))
-  call assert_equal('0z00010203', rubyeval('Vim::blob("\x00\x01\x02\x03")'))
-  call assert_equal('0z8081FEFF', rubyeval('Vim::blob("\x80\x81\xfe\xff")'))
+func Test_ruby_MNV_blob()
+  call assert_equal('0z',         rubyeval('MNV::blob("")'))
+  call assert_equal('0z31326162', rubyeval('MNV::blob("12ab")'))
+  call assert_equal('0z00010203', rubyeval('MNV::blob("\x00\x01\x02\x03")'))
+  call assert_equal('0z8081FEFF', rubyeval('MNV::blob("\x80\x81\xfe\xff")'))
 endfunc
 
-func Test_ruby_Vim_evaluate_list()
+func Test_ruby_MNV_evaluate_list()
   call setline(line('$'), ['2 line 2'])
-  ruby Vim.command("normal /^2\n")
+  ruby MNV.command("normal /^2\n")
   let l = ["abc", "def"]
   ruby << trim EOF
     curline = $curbuf.line_number
-    l = Vim.evaluate("l");
+    l = MNV.evaluate("l");
     $curbuf.append(curline, l.join("\n"))
   EOF
   normal j
@@ -366,17 +366,17 @@ func Test_ruby_Vim_evaluate_list()
   call assert_equal('abc/def', getline('$'))
 endfunc
 
-func Test_ruby_Vim_evaluate_dict()
+func Test_ruby_MNV_evaluate_dict()
   let d = {'a': 'foo', 'b': 123}
   redir => l:out
-  ruby d = Vim.evaluate("d"); print d
+  ruby d = MNV.evaluate("d"); print d
   redir END
   call assert_equal(['{"a"=>"foo","b"=>123}'], split(substitute(l:out, '\s', '', 'g'), "\n"))
 endfunc
 
-" Test Vim::message({msg}) (display message {msg})
-func Test_ruby_Vim_message()
-  ruby Vim::message('A message')
+" Test MNV::message({msg}) (display message {msg})
+func Test_ruby_MNV_message()
+  ruby MNV::message('A message')
   let messages = split(execute('message'), "\n")
   call assert_equal('A message', messages[-1])
 endfunc
@@ -394,8 +394,8 @@ func Test_ruby_print()
   call assert_equal('true', RubyPrint('true'))
   call assert_equal('false', RubyPrint('false'))
   call assert_equal('', RubyPrint('nil'))
-  call assert_match('Vim', RubyPrint('Vim'))
-  call assert_match('Module', RubyPrint('Vim.class'))
+  call assert_match('MNV', RubyPrint('MNV'))
+  call assert_match('Module', RubyPrint('MNV.class'))
 
   delfunc RubyPrint
 endfunc
@@ -435,24 +435,24 @@ endfunc
 " Test for various heredoc syntax
 func Test_ruby_heredoc()
   ruby << END
-Vim.command('let s = "A"')
+MNV.command('let s = "A"')
 END
   ruby <<
-Vim.command('let s ..= "B"')
+MNV.command('let s ..= "B"')
 .
   ruby << trim END
-    Vim.command('let s ..= "C"')
+    MNV.command('let s ..= "C"')
   END
   ruby << trim
-    Vim.command('let s ..= "D"')
+    MNV.command('let s ..= "D"')
   .
   ruby << trim eof
-    Vim.command('let s ..= "E"')
+    MNV.command('let s ..= "E"')
   eof
 ruby << trimm
-Vim.command('let s ..= "F"')
+MNV.command('let s ..= "F"')
 trimm
   call assert_equal('ABCDEF', s)
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_scriptnames.vim b/uvim/src/testdir/test_scriptnames.mnv
index a5b38ea20f..6ce8a4125d 100644
--- a/uvim/src/testdir/test_scriptnames.vim
+++ b/uvim/src/testdir/test_scriptnames.mnv
@@ -97,10 +97,10 @@ func Test_getscriptinfo()
   call assert_fails("echo getscriptinfo({'sid': -999})", 'E475:')
 
   echo getscriptinfo({'sid': '1'})
-  call assert_fails("vim9cmd echo getscriptinfo({'sid': '1'})", 'E1030:')
+  call assert_fails("mnv9cmd echo getscriptinfo({'sid': '1'})", 'E1030:')
 
   let max_sid = max(map(getscriptinfo(), { k, v -> v.sid }))
   call assert_equal([], getscriptinfo({'sid': max_sid + 1}))
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_scroll_opt.vim b/uvim/src/testdir/test_scroll_opt.mnv
index 99fd32a009..08ed534561 100644
--- a/uvim/src/testdir/test_scroll_opt.vim
+++ b/uvim/src/testdir/test_scroll_opt.mnv
@@ -1,7 +1,7 @@
 " Test for 'scroll', 'scrolloff', 'smoothscroll', etc.
 
-source util/screendump.vim
-source util/mouse.vim
+source util/screendump.mnv
+source util/mouse.mnv
 
 func Test_reset_scroll()
   let scr = &l:scroll
@@ -125,7 +125,7 @@ func Test_smoothscroll_CtrlE_CtrlY()
   CheckScreendump
 
   let lines =<< trim END
-      vim9script
+      mnv9script
       setline(1, [
         'line one',
         'word '->repeat(20),
@@ -139,7 +139,7 @@ func Test_smoothscroll_CtrlE_CtrlY()
       :5
   END
   call writefile(lines, 'XSmoothScroll', 'D')
-  let buf = RunVimInTerminal('-S XSmoothScroll', #{rows: 12, cols: 40})
+  let buf = RunMNVInTerminal('-S XSmoothScroll', #{rows: 12, cols: 40})
 
   call term_sendkeys(buf, "\<C-E>")
   call VerifyScreenDump(buf, 'Test_smoothscroll_1', {})
@@ -174,7 +174,7 @@ func Test_smoothscroll_CtrlE_CtrlY()
     call VerifyScreenDump(buf, 'Test_smoothscroll_8', {})
   endif
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_smoothscroll_multibyte()
@@ -186,17 +186,17 @@ func Test_smoothscroll_multibyte()
       exe "normal G35l\<C-E>k"
   END
   call writefile(lines, 'XSmoothMultibyte', 'D')
-  let buf = RunVimInTerminal('-S XSmoothMultibyte', #{rows: 6, cols: 40})
+  let buf = RunMNVInTerminal('-S XSmoothMultibyte', #{rows: 6, cols: 40})
   call VerifyScreenDump(buf, 'Test_smoothscroll_multi_1', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_smoothscroll_number()
   CheckScreendump
 
   let lines =<< trim END
-      vim9script
+      mnv9script
       setline(1, [
         'one ' .. 'word '->repeat(20),
         'two ' .. 'long word '->repeat(7),
@@ -221,7 +221,7 @@ func Test_smoothscroll_number()
       enddef
   END
   call writefile(lines, 'XSmoothNumber', 'D')
-  let buf = RunVimInTerminal('-S XSmoothNumber', #{rows: 12, cols: 40})
+  let buf = RunMNVInTerminal('-S XSmoothNumber', #{rows: 12, cols: 40})
 
   call VerifyScreenDump(buf, 'Test_smooth_number_1', {})
   call term_sendkeys(buf, "\<C-E>")
@@ -247,14 +247,14 @@ func Test_smoothscroll_number()
   call term_sendkeys(buf, ":call DoRel()\<CR>")
   call VerifyScreenDump(buf, 'Test_smooth_number_10', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_smoothscroll_list()
   CheckScreendump
 
   let lines =<< trim END
-      vim9script
+      mnv9script
       set smoothscroll scrolloff=0
       set list
       setline(1, [
@@ -265,14 +265,14 @@ func Test_smoothscroll_list()
       exe "normal 2Gzt\<C-E>"
   END
   call writefile(lines, 'XSmoothList', 'D')
-  let buf = RunVimInTerminal('-S XSmoothList', #{rows: 8, cols: 40})
+  let buf = RunMNVInTerminal('-S XSmoothList', #{rows: 8, cols: 40})
 
   call VerifyScreenDump(buf, 'Test_smooth_list_1', {})
 
   call term_sendkeys(buf, ":set listchars+=precedes:#\<CR>")
   call VerifyScreenDump(buf, 'Test_smooth_list_2', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_smoothscroll_diff_mode()
@@ -280,7 +280,7 @@ func Test_smoothscroll_diff_mode()
   CheckFeature diff
 
   let lines =<< trim END
-      vim9script
+      mnv9script
       var text = 'just some text here'
       setline(1, text)
       set smoothscroll
@@ -291,7 +291,7 @@ func Test_smoothscroll_diff_mode()
       diffthis
   END
   call writefile(lines, 'XSmoothDiff', 'D')
-  let buf = RunVimInTerminal('-S XSmoothDiff', #{rows: 8})
+  let buf = RunMNVInTerminal('-S XSmoothDiff', #{rows: 8})
 
   call VerifyScreenDump(buf, 'Test_smooth_diff_1', {})
   call term_sendkeys(buf, "\<C-Y>")
@@ -299,7 +299,7 @@ func Test_smoothscroll_diff_mode()
   call term_sendkeys(buf, "\<C-E>")
   call VerifyScreenDump(buf, 'Test_smooth_diff_1', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_smoothscroll_diff_change_line_default()
@@ -321,7 +321,7 @@ func Test_smoothscroll_diff_change_line_default()
     windo diffthis
   END
   call writefile(lines, 'XSmoothDiffChangeLine', 'D')
-  let buf = RunVimInTerminal('-S XSmoothDiffChangeLine', #{rows: 20, columns: 55})
+  let buf = RunMNVInTerminal('-S XSmoothDiffChangeLine', #{rows: 20, columns: 55})
 
   call VerifyScreenDump(buf, 'Test_smooth_diff_change_line_1', {})
   call term_sendkeys(buf, "Abar")
@@ -331,7 +331,7 @@ func Test_smoothscroll_diff_change_line_default()
   call term_sendkeys(buf, "yyp")
   call VerifyScreenDump(buf, 'Test_smooth_diff_change_line_4', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_smoothscroll_diff_change_line()
@@ -353,7 +353,7 @@ func Test_smoothscroll_diff_change_line()
     windo diffthis
   END
   call writefile(lines, 'XSmoothDiffChangeLine', 'D')
-  let buf = RunVimInTerminal('-S XSmoothDiffChangeLine', #{rows: 20, columns: 55})
+  let buf = RunMNVInTerminal('-S XSmoothDiffChangeLine', #{rows: 20, columns: 55})
 
   call VerifyScreenDump(buf, 'Test_smooth_diff_change_line_1', {})
   call term_sendkeys(buf, "Abar")
@@ -363,20 +363,20 @@ func Test_smoothscroll_diff_change_line()
   call term_sendkeys(buf, "yyp")
   call VerifyScreenDump(buf, 'Test_smooth_diff_change_line_4', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_smoothscroll_wrap_scrolloff_zero()
   CheckScreendump
 
   let lines =<< trim END
-      vim9script
+      mnv9script
       setline(1, ['Line' .. (' with some text'->repeat(7))]->repeat(7))
       set smoothscroll scrolloff=0
       :3
   END
   call writefile(lines, 'XSmoothWrap', 'D')
-  let buf = RunVimInTerminal('-S XSmoothWrap', #{rows: 8, cols: 40})
+  let buf = RunMNVInTerminal('-S XSmoothWrap', #{rows: 8, cols: 40})
 
   call VerifyScreenDump(buf, 'Test_smooth_wrap_1', {})
 
@@ -401,20 +401,20 @@ func Test_smoothscroll_wrap_scrolloff_zero()
   call term_sendkeys(buf, "2j02k")
   call VerifyScreenDump(buf, 'Test_smooth_wrap_6', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_smoothscroll_wrap_long_line()
   CheckScreendump
 
   let lines =<< trim END
-      vim9script
+      mnv9script
       setline(1, ['one', 'two', 'Line' .. (' with lots of text'->repeat(30)) .. ' end', 'four'])
       set smoothscroll scrolloff=0
       normal 3G10|zt
   END
   call writefile(lines, 'XSmoothWrap', 'D')
-  let buf = RunVimInTerminal('-S XSmoothWrap', #{rows: 6, cols: 40})
+  let buf = RunMNVInTerminal('-S XSmoothWrap', #{rows: 6, cols: 40})
   call VerifyScreenDump(buf, 'Test_smooth_long_1', {})
 
   " scrolling up, cursor moves screen line down
@@ -469,7 +469,7 @@ func Test_smoothscroll_wrap_long_line()
   " Repeat the step and move the cursor down again.
   " This time, use a shorter long line that is barely long enough to span more
   " than one window. Note that the cursor is at the bottom this time because
-  " Vim prefers to do so if we are scrolling a few lines only.
+  " MNV prefers to do so if we are scrolling a few lines only.
   call term_sendkeys(buf, ":call setline(1, ['one', 'two', 'Line' .. (' with lots of text'->repeat(10)) .. ' end', 'four'])\<CR>")
   " Currently visible lines were replaced, test that the lines and cursor
   " are correctly displayed.
@@ -486,19 +486,19 @@ func Test_smoothscroll_wrap_long_line()
   call term_sendkeys(buf, "\<C-E>j")
   call VerifyScreenDump(buf, 'Test_smooth_long_16', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_smoothscroll_one_long_line()
   CheckScreendump
 
   let lines =<< trim END
-      vim9script
+      mnv9script
       setline(1, 'with lots of text '->repeat(7))
       set smoothscroll scrolloff=0
   END
   call writefile(lines, 'XSmoothOneLong', 'D')
-  let buf = RunVimInTerminal('-S XSmoothOneLong', #{rows: 6, cols: 40})
+  let buf = RunMNVInTerminal('-S XSmoothOneLong', #{rows: 6, cols: 40})
   call VerifyScreenDump(buf, 'Test_smooth_one_long_1', {})
 
   call term_sendkeys(buf, "\<C-E>")
@@ -507,21 +507,21 @@ func Test_smoothscroll_one_long_line()
   call term_sendkeys(buf, "0")
   call VerifyScreenDump(buf, 'Test_smooth_one_long_1', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_smoothscroll_long_line_showbreak()
   CheckScreendump
 
   let lines =<< trim END
-      vim9script
+      mnv9script
       # a line that spans four screen lines
       setline(1, 'with lots of text in one line '->repeat(6))
       set smoothscroll scrolloff=0
       &showbreak = '+++ '
   END
   call writefile(lines, 'XSmoothLongShowbreak', 'D')
-  let buf = RunVimInTerminal('-S XSmoothLongShowbreak', #{rows: 6, cols: 40})
+  let buf = RunMNVInTerminal('-S XSmoothLongShowbreak', #{rows: 6, cols: 40})
   call VerifyScreenDump(buf, 'Test_smooth_long_showbreak_1', {})
 
   call term_sendkeys(buf, "\<C-E>")
@@ -530,13 +530,13 @@ func Test_smoothscroll_long_line_showbreak()
   call term_sendkeys(buf, "0")
   call VerifyScreenDump(buf, 'Test_smooth_long_showbreak_1', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 " Check that 'smoothscroll' marker is drawn over double-width char correctly.
 " Run with multiple encodings.
 func Test_smoothscroll_marker_over_double_width()
-  " Run this in a separate Vim instance to avoid messing up.
+  " Run this in a separate MNV instance to avoid messing up.
   let after =<< trim [CODE]
     scriptencoding utf-8
     call setline(1, 'a'->repeat(&columns) .. '�'->repeat(10))
@@ -565,7 +565,7 @@ func Test_smoothscroll_marker_over_double_width()
   endif
   for enc in encodings
     let msg = 'enc=' .. enc
-    if RunVim([], after, $'--clean --cmd "set encoding={enc}"')
+    if RunMNV([], after, $'--clean --cmd "set encoding={enc}"')
       call assert_equal([], readfile('Xresult'), msg)
     endif
     call delete('Xresult')
@@ -582,13 +582,13 @@ func Test_smoothscroll_marker_over_double_width_dump()
     setlocal smoothscroll
   END
   call writefile(lines, 'XSmoothMarkerOverDoubleWidth', 'D')
-  let buf = RunVimInTerminal('-S XSmoothMarkerOverDoubleWidth', #{rows: 6, cols: 40})
+  let buf = RunMNVInTerminal('-S XSmoothMarkerOverDoubleWidth', #{rows: 6, cols: 40})
   call VerifyScreenDump(buf, 'Test_smooth_marker_over_double_width_1', {})
 
   call term_sendkeys(buf, "\<C-E>")
   call VerifyScreenDump(buf, 'Test_smooth_marker_over_double_width_2', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func s:check_col_calc(win_col, win_line, buf_col)
@@ -823,13 +823,13 @@ func Test_smoothscroll_zero_width()
       set number
   END
   call writefile(lines, 'XSmoothScrollZero', 'D')
-  let buf = RunVimInTerminal('-u NONE -i NONE -n -m -X -Z -e -s -S XSmoothScrollZero', #{rows: 6, cols: 60, wait_for_ruler: 0})
+  let buf = RunMNVInTerminal('-u NONE -i NONE -n -m -X -Z -e -s -S XSmoothScrollZero', #{rows: 6, cols: 60, wait_for_ruler: 0})
   call VerifyScreenDump(buf, 'Test_smoothscroll_zero_1', {})
 
   call term_sendkeys(buf, ":sil norm \<C-V>\<C-W>\<C-V>\<C-N>\<CR>")
   call VerifyScreenDump(buf, 'Test_smoothscroll_zero_2', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 " this was unnecessarily inserting lines
@@ -850,12 +850,12 @@ func Test_smoothscroll_ins_lines()
       \])
   END
   call writefile(lines, 'XSmoothScrollInsLines', 'D')
-  let buf = RunVimInTerminal('-S XSmoothScrollInsLines', #{rows: 6, cols: 40})
+  let buf = RunMNVInTerminal('-S XSmoothScrollInsLines', #{rows: 6, cols: 40})
 
   call term_sendkeys(buf, "\<C-E>gjgk")
   call VerifyScreenDump(buf, 'Test_smooth_ins_lines', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 " this placed the cursor in the command line
@@ -873,11 +873,11 @@ func Test_smoothscroll_cursormoved_line()
       call search('xxx')
   END
   call writefile(lines, 'XSmoothCursorMovedLine', 'D')
-  let buf = RunVimInTerminal('-S XSmoothCursorMovedLine', #{rows: 6})
+  let buf = RunMNVInTerminal('-S XSmoothCursorMovedLine', #{rows: 6})
 
   call VerifyScreenDump(buf, 'Test_smooth_cursormoved_line', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_smoothscroll_eob()
@@ -889,7 +889,7 @@ func Test_smoothscroll_eob()
       norm G
   END
   call writefile(lines, 'XSmoothEob', 'D')
-  let buf = RunVimInTerminal('-S XSmoothEob', #{rows: 10})
+  let buf = RunMNVInTerminal('-S XSmoothEob', #{rows: 10})
 
   " does not scroll halfway when scrolling to end of buffer
   call VerifyScreenDump(buf, 'Test_smooth_eob_1', {})
@@ -898,7 +898,7 @@ func Test_smoothscroll_eob()
   call term_sendkeys(buf, ":call setline(92, 'a'->repeat(100))\<CR>\<C-L>\<C-B>G")
   call VerifyScreenDump(buf, 'Test_smooth_eob_2', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 " skipcol should not reset when doing incremental search on the same word
@@ -912,7 +912,7 @@ func Test_smoothscroll_incsearch()
       call setline(14, 'bbbb')
   END
   call writefile(lines, 'XSmoothIncsearch', 'D')
-  let buf = RunVimInTerminal('-S XSmoothIncsearch', #{rows: 8, cols: 40})
+  let buf = RunMNVInTerminal('-S XSmoothIncsearch', #{rows: 8, cols: 40})
 
   call term_sendkeys(buf, "/b")
   call VerifyScreenDump(buf, 'Test_smooth_incsearch_1', {})
@@ -924,7 +924,7 @@ func Test_smoothscroll_incsearch()
   call VerifyScreenDump(buf, 'Test_smooth_incsearch_4', {})
   call term_sendkeys(buf, "\<CR>")
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 " Test scrolling multiple lines and stopping at non-zero skipcol.
@@ -941,7 +941,7 @@ func Test_smoothscroll_multi_skipcol()
       redraw
   END
   call writefile(lines, 'XSmoothMultiSkipcol', 'D')
-  let buf = RunVimInTerminal('-S XSmoothMultiSkipcol', #{rows: 10, cols: 40})
+  let buf = RunMNVInTerminal('-S XSmoothMultiSkipcol', #{rows: 10, cols: 40})
   call VerifyScreenDump(buf, 'Test_smooth_multi_skipcol_1', {})
 
   call term_sendkeys(buf, "3\<C-E>")
@@ -950,7 +950,7 @@ func Test_smoothscroll_multi_skipcol()
   call term_sendkeys(buf, "2\<C-E>")
   call VerifyScreenDump(buf, 'Test_smooth_multi_skipcol_3', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 " this was dividing by zero bug in scroll_cursor_bot
@@ -970,10 +970,10 @@ func Test_smoothscroll_zero_width_scroll_cursor_bot_noruler()
       silent normal 20G
   END
   call writefile(lines, 'XSmoothScrollZeroBot', 'D')
-  let buf = RunVimInTerminal('-u NONE -S XSmoothScrollZeroBot', #{rows: 19})
+  let buf = RunMNVInTerminal('-u NONE -S XSmoothScrollZeroBot', #{rows: 19})
   call VerifyScreenDump(buf, 'Test_smoothscroll_zero_bot', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_smoothscroll_zero_width_scroll_cursor_bot_ruler()
@@ -992,10 +992,10 @@ func Test_smoothscroll_zero_width_scroll_cursor_bot_ruler()
       silent normal 20G
   END
   call writefile(lines, 'XSmoothScrollZeroBot', 'D')
-  let buf = RunVimInTerminal('-u NONE -S XSmoothScrollZeroBot', #{rows: 19})
+  let buf = RunMNVInTerminal('-u NONE -S XSmoothScrollZeroBot', #{rows: 19})
   call VerifyScreenDump(buf, 'Test_smoothscroll_zero_bot_ruler', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 " scroll_cursor_top() should reset skipcol when it changes topline
@@ -1009,10 +1009,10 @@ func Test_smoothscroll_cursor_top_noruler()
       exe "norm G3\<C-E>k"
   END
   call writefile(lines, 'XSmoothScrollCursorTop', 'D')
-  let buf = RunVimInTerminal('-u NONE -S XSmoothScrollCursorTop', #{rows: 12, cols: 40})
+  let buf = RunMNVInTerminal('-u NONE -S XSmoothScrollCursorTop', #{rows: 12, cols: 40})
   call VerifyScreenDump(buf, 'Test_smoothscroll_cursor_top', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_smoothscroll_cursor_top_ruler()
@@ -1025,10 +1025,10 @@ func Test_smoothscroll_cursor_top_ruler()
       exe "norm G3\<C-E>k"
   END
   call writefile(lines, 'XSmoothScrollCursorTop', 'D')
-  let buf = RunVimInTerminal('-u NONE -S XSmoothScrollCursorTop', #{rows: 12, cols: 40})
+  let buf = RunMNVInTerminal('-u NONE -S XSmoothScrollCursorTop', #{rows: 12, cols: 40})
   call VerifyScreenDump(buf, 'Test_smoothscroll_cursor_ru_top', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 " Division by zero, shouldn't crash
@@ -1044,10 +1044,10 @@ func Test_smoothscroll_crash()
       exe "norm! 0\<c-e>"
   END
   call writefile(lines, 'XSmoothScrollCrash', 'D')
-  let buf = RunVimInTerminal('-u NONE -S XSmoothScrollCrash', #{rows: 12, cols: 40})
+  let buf = RunMNVInTerminal('-u NONE -S XSmoothScrollCrash', #{rows: 12, cols: 40})
   call term_sendkeys(buf, "2\<C-E>\<C-L>")
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_smoothscroll_insert_bottom_noruler()
@@ -1058,11 +1058,11 @@ func Test_smoothscroll_insert_bottom_noruler()
     set wrap smoothscroll scrolloff=0 noruler
   END
   call writefile(lines, 'XSmoothScrollInsertBottom', 'D')
-  let buf = RunVimInTerminal('-u NONE -S XSmoothScrollInsertBottom', #{rows: 9, cols: 40})
+  let buf = RunMNVInTerminal('-u NONE -S XSmoothScrollInsertBottom', #{rows: 9, cols: 40})
   call term_sendkeys(buf, "Go123456789\<CR>")
   call VerifyScreenDump(buf, 'Test_smoothscroll_insert_bottom', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_smoothscroll_insert_bottom_ruler()
@@ -1073,11 +1073,11 @@ func Test_smoothscroll_insert_bottom_ruler()
     set wrap smoothscroll scrolloff=0 ruler
   END
   call writefile(lines, 'XSmoothScrollInsertBottom', 'D')
-  let buf = RunVimInTerminal('-u NONE -S XSmoothScrollInsertBottom', #{rows: 9, cols: 40})
+  let buf = RunMNVInTerminal('-u NONE -S XSmoothScrollInsertBottom', #{rows: 9, cols: 40})
   call term_sendkeys(buf, "Go123456789\<CR>")
   call VerifyScreenDump(buf, 'Test_smoothscroll_insert_bottom_ruler', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_smoothscroll_in_qf_window_noruler()
@@ -1095,7 +1095,7 @@ func Test_smoothscroll_in_qf_window_noruler()
     let g:l1 = [{'text': join(range(1000))}]
   END
   call writefile(lines, 'XSmoothScrollInQfWindow', 'D')
-  let buf = RunVimInTerminal('-u NONE -S XSmoothScrollInQfWindow', #{rows: 20, cols: 60})
+  let buf = RunMNVInTerminal('-u NONE -S XSmoothScrollInQfWindow', #{rows: 20, cols: 60})
   call VerifyScreenDump(buf, 'Test_smoothscroll_in_qf_window_1', {})
 
   call term_sendkeys(buf, ":call setqflist([], 'r')\<CR>")
@@ -1122,7 +1122,7 @@ func Test_smoothscroll_in_qf_window_noruler()
   call term_sendkeys(buf, ":call setqflist(g:l, 'r')\<CR>")
   call VerifyScreenDump(buf, 'Test_smoothscroll_in_qf_window_3', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_smoothscroll_in_qf_window_ruler()
@@ -1140,7 +1140,7 @@ func Test_smoothscroll_in_qf_window_ruler()
     let g:l1 = [{'text': join(range(1000))}]
   END
   call writefile(lines, 'XSmoothScrollInQfWindow', 'D')
-  let buf = RunVimInTerminal('-u NONE -S XSmoothScrollInQfWindow', #{rows: 20, cols: 60})
+  let buf = RunMNVInTerminal('-u NONE -S XSmoothScrollInQfWindow', #{rows: 20, cols: 60})
   call VerifyScreenDump(buf, 'Test_smoothscroll_in_qf_window_ru_1', {})
 
   call term_sendkeys(buf, ":call setqflist([], 'r')\<CR>")
@@ -1167,7 +1167,7 @@ func Test_smoothscroll_in_qf_window_ruler()
   call term_sendkeys(buf, ":call setqflist(g:l, 'r')\<CR>")
   call VerifyScreenDump(buf, 'Test_smoothscroll_in_qf_window_ru_3', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_smoothscroll_in_zero_width_window()
@@ -1326,7 +1326,7 @@ func Test_smooth_long_scrolloff_noruler()
     call setline(1, ['one', 'two long '->repeat(100), 'three', 'four', 'five', 'six'])
   END
   call writefile(lines, 'XSmoothLongScrolloff', 'D')
-  let buf = RunVimInTerminal('-u NONE -S XSmoothLongScrolloff', #{rows: 8, cols: 40})
+  let buf = RunMNVInTerminal('-u NONE -S XSmoothLongScrolloff', #{rows: 8, cols: 40})
   call term_sendkeys(buf, ":norm j721|\<CR>")
   call VerifyScreenDump(buf, 'Test_smooth_long_scrolloff_1', {})
 
@@ -1348,7 +1348,7 @@ func Test_smooth_long_scrolloff_noruler()
   call term_sendkeys(buf, "gk")
   call VerifyScreenDump(buf, 'Test_smooth_long_scrolloff_7', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_smooth_long_scrolloff_ruler()
@@ -1359,7 +1359,7 @@ func Test_smooth_long_scrolloff_ruler()
     call setline(1, ['one', 'two long '->repeat(100), 'three', 'four', 'five', 'six'])
   END
   call writefile(lines, 'XSmoothLongScrolloff', 'D')
-  let buf = RunVimInTerminal('-u NONE -S XSmoothLongScrolloff', #{rows: 8, cols: 40})
+  let buf = RunMNVInTerminal('-u NONE -S XSmoothLongScrolloff', #{rows: 8, cols: 40})
   call term_sendkeys(buf, ":norm j721|\<CR>")
   call VerifyScreenDump(buf, 'Test_smooth_long_scrolloff_ru_1', {})
 
@@ -1381,7 +1381,7 @@ func Test_smooth_long_scrolloff_ruler()
   call term_sendkeys(buf, "gk")
   call VerifyScreenDump(buf, 'Test_smooth_long_scrolloff_ru_7', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_smoothscroll_listchars_eol()
@@ -1439,4 +1439,4 @@ func Test_smoothscroll_listchars_eol()
   bwipe!
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_scrollbind.vim b/uvim/src/testdir/test_scrollbind.mnv
index 211b05ea0d..e1b36639e2 100644
--- a/uvim/src/testdir/test_scrollbind.vim
+++ b/uvim/src/testdir/test_scrollbind.mnv
@@ -272,4 +272,4 @@ end of window 2
   set scrollbind& scrollopt& scrolloff& wrap& equalalways& splitbelow&
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_search.vim b/uvim/src/testdir/test_search.mnv
index 725d08b59a..f0b7fc816c 100644
--- a/uvim/src/testdir/test_search.vim
+++ b/uvim/src/testdir/test_search.mnv
@@ -1,6 +1,6 @@
 " Test for the search command
 
-source util/screendump.vim
+source util/screendump.mnv
 
 func Test_search_cmdline()
   CheckOption incsearch
@@ -261,8 +261,8 @@ func Test_search_cmdline2()
   norm! 1gg0
   " unfortunately, neither "/foo\<c-w>\<cr>", nor "/foo\<bs>\<bs>\<bs>\<cr>",
   " nor "/foo\<c-u>\<cr>" works to delete the commandline.
-  " In that case Vim should return "E35 no previous regular expression",
-  " but it looks like Vim still sees /foo and therefore the test fails.
+  " In that case MNV should return "E35 no previous regular expression",
+  " but it looks like MNV still sees /foo and therefore the test fails.
   " Therefore, disabling this test
   "call assert_fails(feedkeys("/foo\<c-w>\<cr>", 'tx'), 'E35:')
   "call assert_equal({'lnum': 1, 'leftcol': 0, 'col': 0, 'topfill': 0, 'topline': 1, 'coladd': 0, 'skipcol': 0, 'curswant': 0}, winsaveview())
@@ -639,7 +639,7 @@ func Test_search_cmdline6()
   " so that expansion of commandline works
   call test_override("char_avail", 1)
   new
-  call setline(1, [' bbvimb', ''])
+  call setline(1, [' bbmnvb', ''])
   set incsearch
   " first match
   norm! gg0
@@ -663,7 +663,7 @@ func Test_search_cmdline6()
   call feedkeys("/b\<c-g>\<c-g>\<c-g>\<cr>", 'tx')
   call assert_equal([0,1,7,0], getpos('.'))
   " clean up
-  set wrapscan&vim
+  set wrapscan&mnv
   set noincsearch
   call test_override("char_avail", 0)
   bw!
@@ -679,7 +679,7 @@ func Test_search_cmdline7()
   call test_override("char_avail", 1)
   new
   let @/ = 'b'
-  call setline(1, [' bbvimb', ''])
+  call setline(1, [' bbmnvb', ''])
   set incsearch
   " first match
   norm! gg0
@@ -695,10 +695,10 @@ func Test_search_cmdline7()
 
   " using an offset uses the last search pattern
   call cursor(1, 1)
-  call setline(1, ['1 bbvimb', ' 2 bbvimb'])
+  call setline(1, ['1 bbmnvb', ' 2 bbmnvb'])
   let @/ = 'b'
   call feedkeys("//e\<c-g>\<cr>", 'tx')
-  call assert_equal('1 bbvimb', getline('.'))
+  call assert_equal('1 bbmnvb', getline('.'))
   call assert_equal(4, col('.'))
 
   set noincsearch
@@ -721,15 +721,15 @@ func Test_search_cmdline8()
     return
   endif
   " Prepare buffer text
-  let lines = ['abb vim vim vi', 'vimvivim']
+  let lines = ['abb mnv mnv vi', 'mnvmnvnv']
   call writefile(lines, 'Xsearch.txt', 'D')
-  let buf = term_start([GetVimProg(), '--clean', '-c', 'set noswapfile', 'Xsearch.txt'], {'term_rows': 3})
+  let buf = term_start([GetMNVProg(), '--clean', '-c', 'set noswapfile', 'Xsearch.txt'], {'term_rows': 3})
 
   call WaitForAssert({-> assert_equal(lines, [term_getline(buf, 1), term_getline(buf, 2)])})
 
   call term_sendkeys(buf, ":set incsearch hlsearch\<cr>")
   call term_sendkeys(buf, ":14vsp\<cr>")
-  call term_sendkeys(buf, "/vim\<cr>")
+  call term_sendkeys(buf, "/mnv\<cr>")
   call term_sendkeys(buf, "/b\<esc>")
   call term_sendkeys(buf, "gg0")
   call TermWait(buf, 250)
@@ -856,12 +856,12 @@ func Test_search_cmdline_incsearch_highlight_attr()
   endif
 
   " Prepare buffer text
-  let lines = ['abb vim vim vi', 'vimvivim']
+  let lines = ['abb mnv mnv vi', 'mnvmnvnv']
   call writefile(lines, 'Xsearch.txt', 'D')
-  let buf = term_start([GetVimProg(), '--clean', '-c', 'set noswapfile', 'Xsearch.txt'], {'term_rows': 3})
+  let buf = term_start([GetMNVProg(), '--clean', '-c', 'set noswapfile', 'Xsearch.txt'], {'term_rows': 3})
 
   call WaitForAssert({-> assert_equal(lines, [term_getline(buf, 1), term_getline(buf, 2)])})
-  " wait for vim to complete initialization
+  " wait for mnv to complete initialization
   call TermWait(buf)
 
   " Get attr of normal(a0), incsearch(a1), hlsearch(a2) highlight
@@ -882,12 +882,12 @@ func Test_search_cmdline_incsearch_highlight_attr()
   call term_sendkeys(buf, "\<cr>gg0")
 
   " Test incremental highlight search
-  call term_sendkeys(buf, "/vim")
+  call term_sendkeys(buf, "/mnv")
   call TermWait(buf, 100)
   " Buffer:
-  " abb vim vim vi
-  " vimvivim
-  " Search: /vim
+  " abb mnv mnv vi
+  " mnvmnvnv
+  " Search: /mnv
   let attr_line1 = [a0,a0,a0,a0,a1,a1,a1,a0,a2,a2,a2,a0,a0,a0]
   let attr_line2 = [a2,a2,a2,a0,a0,a2,a2,a2]
   call assert_equal(attr_line1, map(term_scrape(buf, 1)[:len(attr_line1)-1], 'v:val.attr'))
@@ -920,7 +920,7 @@ func Test_search_cmdline_incsearch_highlight_attr()
   " Test nohlsearch. a2(hlsearch highlight) should become a0(normal highlight)
   call term_sendkeys(buf, ":1\<cr>")
   call term_sendkeys(buf, ":set nohlsearch\<cr>")
-  call term_sendkeys(buf, "/vim")
+  call term_sendkeys(buf, "/mnv")
   call TermWait(buf, 100)
   let attr_line1 = [a0,a0,a0,a0,a1,a1,a1,a0,a0,a0,a0,a0,a0,a0]
   let attr_line2 = [a0,a0,a0,a0,a0,a0,a0,a0]
@@ -945,7 +945,7 @@ endfunc
 
 func Test_incsearch_scrolling()
   CheckScreendump
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
   call assert_equal(0, &scrolloff)
   call writefile([
 	\ 'let dots = repeat(".", 120)',
@@ -954,7 +954,7 @@ func Test_incsearch_scrolling()
 	\ 'normal gg',
 	\ 'redraw',
 	\ ], 'Xscript', 'D')
-  let buf = RunVimInTerminal('-S Xscript', {'rows': 9, 'cols': 70})
+  let buf = RunMNVInTerminal('-S Xscript', {'rows': 9, 'cols': 70})
   " Need to send one key at a time to force a redraw
   call term_sendkeys(buf, '/')
   sleep 100m
@@ -968,7 +968,7 @@ func Test_incsearch_scrolling()
   call VerifyScreenDump(buf, 'Test_incsearch_scrolling_01', {})
 
   call term_sendkeys(buf, "\<Esc>")
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_incsearch_search_dump()
@@ -982,8 +982,8 @@ func Test_incsearch_search_dump()
 	\ 'endfor',
 	\ '3',
 	\ ], 'Xis_search_script', 'D')
-  let buf = RunVimInTerminal('-S Xis_search_script', {'rows': 9, 'cols': 70})
-  " Give Vim a chance to redraw to get rid of the spaces in line 2 caused by
+  let buf = RunMNVInTerminal('-S Xis_search_script', {'rows': 9, 'cols': 70})
+  " Give MNV a chance to redraw to get rid of the spaces in line 2 caused by
   " the 'ambiwidth' check.
   sleep 100m
 
@@ -997,7 +997,7 @@ func Test_incsearch_search_dump()
   call VerifyScreenDump(buf, 'Test_incsearch_search_02', {})
   call term_sendkeys(buf, "\<Esc>")
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_hlsearch_dump()
@@ -1010,13 +1010,13 @@ func Test_hlsearch_dump()
 	\ '/.*',
 	\ '2',
 	\ ], 'Xhlsearch_script', 'D')
-  let buf = RunVimInTerminal('-S Xhlsearch_script', {'rows': 6, 'cols': 50})
+  let buf = RunMNVInTerminal('-S Xhlsearch_script', {'rows': 6, 'cols': 50})
   call VerifyScreenDump(buf, 'Test_hlsearch_1', {})
 
   call term_sendkeys(buf, "/\\_.*\<CR>")
   call VerifyScreenDump(buf, 'Test_hlsearch_2', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_hlsearch_and_visual()
@@ -1030,12 +1030,12 @@ func Test_hlsearch_and_visual()
 	\ '/yyy',
 	\ 'call cursor(1, 6)',
 	\ ], 'Xhlvisual_script', 'D')
-  let buf = RunVimInTerminal('-S Xhlvisual_script', {'rows': 6, 'cols': 40})
+  let buf = RunMNVInTerminal('-S Xhlvisual_script', {'rows': 6, 'cols': 40})
   call term_sendkeys(buf, "vjj")
   call VerifyScreenDump(buf, 'Test_hlsearch_visual_1', {})
   call term_sendkeys(buf, "\<Esc>")
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_hlsearch_block_visual_match()
@@ -1046,7 +1046,7 @@ func Test_hlsearch_block_visual_match()
     call setline(1, ['aa', 'bbbb', 'cccccc'])
   END
   call writefile(lines, 'Xhlsearch_block', 'D')
-  let buf = RunVimInTerminal('-S Xhlsearch_block', {'rows': 9, 'cols': 60})
+  let buf = RunMNVInTerminal('-S Xhlsearch_block', {'rows': 9, 'cols': 60})
 
   call term_sendkeys(buf, "G\<C-V>$kk\<Esc>")
   sleep 100m
@@ -1054,7 +1054,7 @@ func Test_hlsearch_block_visual_match()
   sleep 100m
   call VerifyScreenDump(buf, 'Test_hlsearch_block_visual_match', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_incsearch_substitute()
@@ -1101,7 +1101,7 @@ func Test_hlsearch_cursearch()
     hi CurSearch ctermbg=blue
   END
   call writefile(lines, 'Xhlsearch_cursearch', 'D')
-  let buf = RunVimInTerminal('-S Xhlsearch_cursearch', {'rows': 9, 'cols': 60})
+  let buf = RunMNVInTerminal('-S Xhlsearch_cursearch', {'rows': 9, 'cols': 60})
 
   call term_sendkeys(buf, "gg/foo\<CR>")
   call VerifyScreenDump(buf, 'Test_hlsearch_cursearch_single_line_1', {})
@@ -1137,7 +1137,7 @@ func Test_hlsearch_cursearch()
   call term_sendkeys(buf, "kkP")
   call VerifyScreenDump(buf, 'Test_hlsearch_cursearch_changed_1', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 " Similar to Test_incsearch_substitute() but with a screendump halfway.
@@ -1153,8 +1153,8 @@ func Test_incsearch_substitute_dump()
 	\ 'call setline(11, "bar 11")',
 	\ '3',
 	\ ], 'Xis_subst_script', 'D')
-  let buf = RunVimInTerminal('-S Xis_subst_script', {'rows': 9, 'cols': 70})
-  " Give Vim a chance to redraw to get rid of the spaces in line 2 caused by
+  let buf = RunMNVInTerminal('-S Xis_subst_script', {'rows': 9, 'cols': 70})
+  " Give MNV a chance to redraw to get rid of the spaces in line 2 caused by
   " the 'ambiwidth' check.
   sleep 100m
 
@@ -1246,7 +1246,7 @@ func Test_incsearch_substitute_dump()
   call VerifyScreenDump(buf, 'Test_incsearch_substitute_14', {})
   call term_sendkeys(buf, "<Esc>")
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_incsearch_highlighting()
@@ -1257,8 +1257,8 @@ func Test_incsearch_highlighting()
 	\ 'set incsearch hlsearch',
 	\ 'call setline(1, "hello/there")',
 	\ ], 'Xis_subst_hl_script', 'D')
-  let buf = RunVimInTerminal('-S Xis_subst_hl_script', {'rows': 4, 'cols': 20})
-  " Give Vim a chance to redraw to get rid of the spaces in line 2 caused by
+  let buf = RunMNVInTerminal('-S Xis_subst_hl_script', {'rows': 4, 'cols': 20})
+  " Give MNV a chance to redraw to get rid of the spaces in line 2 caused by
   " the 'ambiwidth' check.
   sleep 300m
 
@@ -1268,7 +1268,7 @@ func Test_incsearch_highlighting()
   call VerifyScreenDump(buf, 'Test_incsearch_substitute_15', {})
   call term_sendkeys(buf, "<Esc>")
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_incsearch_with_change()
@@ -1281,8 +1281,8 @@ func Test_incsearch_with_change()
 	\ 'call setline(1, ["one", "two ------ X", "three"])',
 	\ 'call timer_start(200, { _ -> setline(2, "x")})',
 	\ ], 'Xis_change_script', 'D')
-  let buf = RunVimInTerminal('-S Xis_change_script', {'rows': 9, 'cols': 70})
-  " Give Vim a chance to redraw to get rid of the spaces in line 2 caused by
+  let buf = RunMNVInTerminal('-S Xis_change_script', {'rows': 9, 'cols': 70})
+  " Give MNV a chance to redraw to get rid of the spaces in line 2 caused by
   " the 'ambiwidth' check.
   sleep 300m
 
@@ -1291,7 +1291,7 @@ func Test_incsearch_with_change()
   call VerifyScreenDump(buf, 'Test_incsearch_change_01', {})
   call term_sendkeys(buf, "\<Esc>")
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 " Similar to Test_incsearch_substitute_dump() for :sort
@@ -1303,8 +1303,8 @@ func Test_incsearch_sort_dump()
 	\ 'set incsearch hlsearch scrolloff=0',
 	\ 'call setline(1, ["another one 2", "that one 3", "the one 1"])',
 	\ ], 'Xis_sort_script', 'D')
-  let buf = RunVimInTerminal('-S Xis_sort_script', {'rows': 9, 'cols': 70})
-  " Give Vim a chance to redraw to get rid of the spaces in line 2 caused by
+  let buf = RunMNVInTerminal('-S Xis_sort_script', {'rows': 9, 'cols': 70})
+  " Give MNV a chance to redraw to get rid of the spaces in line 2 caused by
   " the 'ambiwidth' check.
   sleep 100m
 
@@ -1316,7 +1316,7 @@ func Test_incsearch_sort_dump()
   call VerifyScreenDump(buf, 'Test_incsearch_sort_02', {})
   call term_sendkeys(buf, "\<Esc>")
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 " Similar to Test_incsearch_sort_dump() for :uniq
@@ -1328,8 +1328,8 @@ func Test_incsearch_uniq_dump()
 	\ 'set incsearch hlsearch scrolloff=0',
 	\ 'call setline(1, ["another one 2", "that one 3", "the one 1"])',
 	\ ], 'Xis_uniq_script', 'D')
-  let buf = RunVimInTerminal('-S Xis_uniq_script', {'rows': 9, 'cols': 70})
-  " Give Vim a chance to redraw to get rid of the spaces in line 2 caused by
+  let buf = RunMNVInTerminal('-S Xis_uniq_script', {'rows': 9, 'cols': 70})
+  " Give MNV a chance to redraw to get rid of the spaces in line 2 caused by
   " the 'ambiwidth' check.
   sleep 100m
 
@@ -1341,45 +1341,45 @@ func Test_incsearch_uniq_dump()
   call VerifyScreenDump(buf, 'Test_incsearch_uniq_02', {})
   call term_sendkeys(buf, "\<Esc>")
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
-" Similar to Test_incsearch_substitute_dump() for :vimgrep famiry
-func Test_incsearch_vimgrep_dump()
+" Similar to Test_incsearch_substitute_dump() for :mnvgrep famiry
+func Test_incsearch_mnvgrep_dump()
   CheckOption incsearch
   CheckScreendump
 
   call writefile([
 	\ 'set incsearch hlsearch scrolloff=0',
 	\ 'call setline(1, ["another one 2", "that one 3", "the one 1"])',
-	\ ], 'Xis_vimgrep_script', 'D')
-  let buf = RunVimInTerminal('-S Xis_vimgrep_script', {'rows': 9, 'cols': 70})
-  " Give Vim a chance to redraw to get rid of the spaces in line 2 caused by
+	\ ], 'Xis_mnvgrep_script', 'D')
+  let buf = RunMNVInTerminal('-S Xis_mnvgrep_script', {'rows': 9, 'cols': 70})
+  " Give MNV a chance to redraw to get rid of the spaces in line 2 caused by
   " the 'ambiwidth' check.
   sleep 100m
 
   " Need to send one key at a time to force a redraw.
-  call term_sendkeys(buf, ':vimgrep on')
-  call VerifyScreenDump(buf, 'Test_incsearch_vimgrep_01', {})
+  call term_sendkeys(buf, ':mnvgrep on')
+  call VerifyScreenDump(buf, 'Test_incsearch_mnvgrep_01', {})
   call term_sendkeys(buf, "\<Esc>")
 
-  call term_sendkeys(buf, ':vimg /on/ *.txt')
-  call VerifyScreenDump(buf, 'Test_incsearch_vimgrep_02', {})
+  call term_sendkeys(buf, ':mnvg /on/ *.txt')
+  call VerifyScreenDump(buf, 'Test_incsearch_mnvgrep_02', {})
   call term_sendkeys(buf, "\<Esc>")
 
-  call term_sendkeys(buf, ':vimgrepadd "\<on')
-  call VerifyScreenDump(buf, 'Test_incsearch_vimgrep_03', {})
+  call term_sendkeys(buf, ':mnvgrepadd "\<on')
+  call VerifyScreenDump(buf, 'Test_incsearch_mnvgrep_03', {})
   call term_sendkeys(buf, "\<Esc>")
 
   call term_sendkeys(buf, ':lv "tha')
-  call VerifyScreenDump(buf, 'Test_incsearch_vimgrep_04', {})
+  call VerifyScreenDump(buf, 'Test_incsearch_mnvgrep_04', {})
   call term_sendkeys(buf, "\<Esc>")
 
-  call term_sendkeys(buf, ':lvimgrepa "the" **/*.txt')
-  call VerifyScreenDump(buf, 'Test_incsearch_vimgrep_05', {})
+  call term_sendkeys(buf, ':lmnvgrepa "the" **/*.txt')
+  call VerifyScreenDump(buf, 'Test_incsearch_mnvgrep_05', {})
   call term_sendkeys(buf, "\<Esc>")
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_keep_last_search_pattern()
@@ -1460,7 +1460,7 @@ func Test_search_undefined_behaviour()
     return
   endif
   " did cause an undefined left shift
-  let g:buf = term_start([GetVimProg(), '--clean', '-e', '-s', '-c', 'call search(getline("."))', 'samples/test000'], {'term_rows': 3})
+  let g:buf = term_start([GetMNVProg(), '--clean', '-e', '-s', '-c', 'call search(getline("."))', 'samples/test000'], {'term_rows': 3})
   call assert_equal([''], getline(1, '$'))
   call term_sendkeys(g:buf, ":qa!\<cr>")
   bwipe!
@@ -1517,10 +1517,10 @@ endfunc
 " Test that there is no crash when there is a last search pattern but no last
 " substitute pattern.
 func Test_no_last_substitute_pat()
-  " Use viminfo to set the last search pattern to a string and make the last
+  " Use mnvinfo to set the last search pattern to a string and make the last
   " substitute pattern the most recent used and make it empty (NULL).
-  call writefile(['~MSle0/bar', '~MSle0~&'], 'Xviminfo', 'D')
-  rviminfo! Xviminfo
+  call writefile(['~MSle0/bar', '~MSle0~&'], 'Xmnvinfo', 'D')
+  rmnvinfo! Xmnvinfo
   call assert_fails('normal n', 'E35:')
 endfunc
 
@@ -1766,7 +1766,7 @@ func Test_search_special()
 endfunc
 
 " Test for command failures when the last search pattern is not set.
-" Need to run this in a new vim instance where last search pattern is not set.
+" Need to run this in a new mnv instance where last search pattern is not set.
 func Test_search_with_no_last_pat()
   let lines =<< trim [SCRIPT]
     call assert_fails("normal i\<C-R>/\e", 'E35:')
@@ -1795,7 +1795,7 @@ func Test_search_with_no_last_pat()
   [SCRIPT]
   call writefile(lines, 'Xscript', 'D')
 
-  if RunVim([], [], '--clean -S Xscript')
+  if RunMNV([], [], '--clean -S Xscript')
     call assert_equal([], readfile('Xresult'))
   endif
   call delete('Xresult')
@@ -1826,7 +1826,7 @@ func Test_search_with_last_substitute_pat()
   [SCRIPT]
   call writefile(lines, 'Xscript', 'D')
 
-  if RunVim([], [], '--clean -S Xscript')
+  if RunMNV([], [], '--clean -S Xscript')
     call assert_equal([], readfile('Xresult'))
   endif
   call delete('Xresult')
@@ -1847,7 +1847,7 @@ func Test_search_tilde_pat()
     qall!
   [SCRIPT]
   call writefile(lines, 'Xscript', 'D')
-  if RunVim([], [], '--clean -S Xscript')
+  if RunMNV([], [], '--clean -S Xscript')
     call assert_equal([], readfile('Xresult'))
   endif
   call delete('Xresult')
@@ -2156,18 +2156,18 @@ endfunc
 " Test for searching a pattern and stopping before a specified line
 func Test_search_stopline()
   new
-  call setline(1, ['', '', '', 'vim'])
-  call assert_equal(0, search('vim', 'n', 3))
-  call assert_equal(4, search('vim', 'n', 4))
-  call setline(1, ['vim', '', '', ''])
+  call setline(1, ['', '', '', 'mnv'])
+  call assert_equal(0, search('mnv', 'n', 3))
+  call assert_equal(4, search('mnv', 'n', 4))
+  call setline(1, ['mnv', '', '', ''])
   call cursor(4, 1)
-  call assert_equal(0, search('vim', 'bn', 2))
-  call assert_equal(1, search('vim', 'bn', 1))
+  call assert_equal(0, search('mnv', 'bn', 2))
+  call assert_equal(1, search('mnv', 'bn', 1))
   bw!
 endfunc
 
 func Test_incsearch_highlighting_newline()
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
   CheckOption incsearch
   CheckScreendump
   new
@@ -2178,7 +2178,7 @@ func Test_incsearch_highlighting_newline()
     call setline(1, ['test', 'xxx'])
   [CODE]
   call writefile(commands, 'Xincsearch_nl', 'D')
-  let buf = RunVimInTerminal('-S Xincsearch_nl', {'rows': 5, 'cols': 10})
+  let buf = RunMNVInTerminal('-S Xincsearch_nl', {'rows': 5, 'cols': 10})
   call term_sendkeys(buf, '/test')
   call VerifyScreenDump(buf, 'Test_incsearch_newline1', {})
   " Need to send one key at a time to force a redraw
@@ -2190,7 +2190,7 @@ func Test_incsearch_highlighting_newline()
   call VerifyScreenDump(buf, 'Test_incsearch_newline4', {})
   call term_sendkeys(buf, "\<CR>")
   call VerifyScreenDump(buf, 'Test_incsearch_newline5', {})
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 
   " clean up
   call test_override("char_avail", 0)
@@ -2209,7 +2209,7 @@ func Test_incsearch_substitute_dump2()
 	\ 'call setline(5, "abc|def")',
 	\ '3',
 	\ ], 'Xis_subst_script2', 'D')
-  let buf = RunVimInTerminal('-S Xis_subst_script2', {'rows': 9, 'cols': 70})
+  let buf = RunMNVInTerminal('-S Xis_subst_script2', {'rows': 9, 'cols': 70})
 
   call term_sendkeys(buf, ':%s/\vabc|')
   sleep 100m
@@ -2222,7 +2222,7 @@ func Test_incsearch_substitute_dump2()
   call VerifyScreenDump(buf, 'Test_incsearch_sub_02', {})
 
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_incsearch_restore_view()
@@ -2236,7 +2236,7 @@ func Test_incsearch_restore_view()
     call feedkeys("2\<C-E>", 't')
   [CODE]
   call writefile(lines, 'Xincsearch_restore_view', 'D')
-  let buf = RunVimInTerminal('-S Xincsearch_restore_view', {'rows': 6, 'cols': 20})
+  let buf = RunMNVInTerminal('-S Xincsearch_restore_view', {'rows': 6, 'cols': 20})
 
   call VerifyScreenDump(buf, 'Test_incsearch_restore_view_01', {})
   call term_sendkeys(buf, '/xx')
@@ -2246,7 +2246,7 @@ func Test_incsearch_restore_view()
   call term_sendkeys(buf, "\<Esc>")
   call VerifyScreenDump(buf, 'Test_incsearch_restore_view_01', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_pattern_is_uppercase_smartcase()
@@ -2342,15 +2342,15 @@ endfunc
 func Test_incsearch_delimiter_ctrlg()
   CheckOption incsearch
   CheckScreendump
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
   call assert_equal(0, &scrolloff)
   call writefile([
 	\ 'set incsearch hls',
-  \ 'call setline(1, ["1 vim inc", "2 vim /", "3 vim /", "4 vim ?", "5 vim ?"])',
+  \ 'call setline(1, ["1 mnv inc", "2 mnv /", "3 mnv /", "4 mnv ?", "5 mnv ?"])',
 	\ 'normal gg',
 	\ 'redraw',
 	\ ], 'Xscript_incsearch_delim', 'D')
-  let buf = RunVimInTerminal('-S Xscript_incsearch_delim', {'rows': 6})
+  let buf = RunMNVInTerminal('-S Xscript_incsearch_delim', {'rows': 6})
 
   call term_sendkeys(buf, '/')
   sleep 100m
@@ -2418,7 +2418,7 @@ func Test_incsearch_delimiter_ctrlg()
   call VerifyScreenDump(buf, 'Test_incsearch_delim_04', {})
   call term_sendkeys(buf, "\<Esc>")
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_search_stat.vim b/uvim/src/testdir/test_search_stat.mnv
index b2a81070b6..ecaefaddc2 100644
--- a/uvim/src/testdir/test_search_stat.vim
+++ b/uvim/src/testdir/test_search_stat.mnv
@@ -1,6 +1,6 @@
 " Tests for search_stats, when "S" is not in 'shortmess'
 
-source util/screendump.vim
+source util/screendump.mnv
 
 func Test_search_stat()
   new
@@ -170,7 +170,7 @@ func Test_search_stat()
   let g:a = ''
   try
     let g:a = execute(':unsilent :norm! n')
-  catch /^Vim\%((\a\+)\)\=:E486/
+  catch /^MNV\%((\a\+)\)\=:E486/
     let stat = ''
     " error message is not redir'ed to g:a, it is empty
     call assert_true(empty(g:a))
@@ -268,7 +268,7 @@ func Test_searchcount_fails()
 endfunc
 
 func Test_search_stat_narrow_screen()
-  " This used to crash Vim
+  " This used to crash MNV
   let save_columns = &columns
   try
     let after =<< trim [CODE]
@@ -277,10 +277,10 @@ func Test_search_stat_narrow_screen()
       set shortmess-=S showcmd
       call setline(1, 'abc')
       call feedkeys("/abc\<CR>:quit!\<CR>")
-      autocmd VimLeavePre * call writefile(["done"], "Xdone")
+      autocmd MNVLeavePre * call writefile(["done"], "Xdone")
     [CODE]
 
-    if !RunVim([], after, '--clean')
+    if !RunMNV([], after, '--clean')
       return
     endif
     call assert_equal("done", readfile("Xdone")[0])
@@ -308,13 +308,13 @@ func Test_searchcount_in_statusline()
     set laststatus=2 statusline+=%{TestSearchCount()}
   END
   call writefile(lines, 'Xsearchstatusline', 'D')
-  let buf = RunVimInTerminal('-S Xsearchstatusline', #{rows: 10})
+  let buf = RunMNVInTerminal('-S Xsearchstatusline', #{rows: 10})
   call TermWait(buf)
   call term_sendkeys(buf, "/something")
   call VerifyScreenDump(buf, 'Test_searchstat_4', {})
 
   call term_sendkeys(buf, "\<Esc>")
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_search_stat_foldopen()
@@ -330,7 +330,7 @@ func Test_search_stat_foldopen()
   END
   call writefile(lines, 'Xsearchstat1', 'D')
 
-  let buf = RunVimInTerminal('-S Xsearchstat1', #{rows: 10})
+  let buf = RunMNVInTerminal('-S Xsearchstat1', #{rows: 10})
   call VerifyScreenDump(buf, 'Test_searchfoldopen_1', {})
 
   call term_sendkeys(buf, "n")
@@ -339,7 +339,7 @@ func Test_search_stat_foldopen()
   call term_sendkeys(buf, "n")
   call VerifyScreenDump(buf, 'Test_searchfoldopen_2', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func! Test_search_stat_screendump()
@@ -357,14 +357,14 @@ func! Test_search_stat_screendump()
     norm n
   END
   call writefile(lines, 'Xsearchstat', 'D')
-  let buf = RunVimInTerminal('-S Xsearchstat', #{rows: 10})
+  let buf = RunMNVInTerminal('-S Xsearchstat', #{rows: 10})
   call VerifyScreenDump(buf, 'Test_searchstat_1', {})
 
   call term_sendkeys(buf, ":nnoremap <silent> n n\<cr>")
   call term_sendkeys(buf, "gg0n")
   call VerifyScreenDump(buf, 'Test_searchstat_2', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_search_stat_then_gd()
@@ -377,14 +377,14 @@ func Test_search_stat_then_gd()
   END
   call writefile(lines, 'Xsearchstatgd', 'D')
 
-  let buf = RunVimInTerminal('-S Xsearchstatgd', #{rows: 10})
+  let buf = RunMNVInTerminal('-S Xsearchstatgd', #{rows: 10})
   call term_sendkeys(buf, "/dog\<CR>")
   call VerifyScreenDump(buf, 'Test_searchstatgd_1', {})
 
   call term_sendkeys(buf, "G0gD")
   call VerifyScreenDump(buf, 'Test_searchstatgd_2', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_search_stat_and_incsearch()
@@ -410,7 +410,7 @@ func Test_search_stat_and_incsearch()
   END
   call writefile(lines, 'Xsearchstat_inc', 'D')
 
-  let buf = RunVimInTerminal('-S Xsearchstat_inc', #{rows: 10})
+  let buf = RunMNVInTerminal('-S Xsearchstat_inc', #{rows: 10})
   call term_sendkeys(buf, "/abc")
   call TermWait(buf)
   call VerifyScreenDump(buf, 'Test_searchstat_inc_1', {})
@@ -426,7 +426,7 @@ func Test_search_stat_and_incsearch()
   call term_sendkeys(buf, "\<esc>:qa\<cr>")
   call TermWait(buf)
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_search_stat_backwards()
@@ -438,7 +438,7 @@ func Test_search_stat_backwards()
   END
   call writefile(lines, 'Xsearchstat_back', 'D')
 
-  let buf = RunVimInTerminal('-S Xsearchstat_back', #{rows: 10})
+  let buf = RunMNVInTerminal('-S Xsearchstat_back', #{rows: 10})
   call term_sendkeys(buf, "*")
   call TermWait(buf)
   call VerifyScreenDump(buf, 'Test_searchstat_back_1', {})
@@ -455,11 +455,11 @@ func Test_search_stat_backwards()
   call term_sendkeys(buf, "\<esc>:qa\<cr>")
   call TermWait(buf)
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_search_stat_smartcase_ignorecase()
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   let lines =<< trim END
     set shm-=S ignorecase smartcase
@@ -467,14 +467,14 @@ func Test_search_stat_smartcase_ignorecase()
   END
   call writefile(lines, 'Xsearchstat_ignorecase', '5')
 
-  let buf = RunVimInTerminal('-S Xsearchstat_ignorecase', #{rows: 10})
+  let buf = RunMNVInTerminal('-S Xsearchstat_ignorecase', #{rows: 10})
   call term_sendkeys(buf, "/main\<cr>nnnn")
   call WaitForAssert({-> assert_match('\[5\/5\]', term_getline(buf, 10))}, 1000)
 
   call term_sendkeys(buf, "/mAin\<cr>")
   call WaitForAssert({-> assert_match('\[1\/1\]', term_getline(buf, 10))}, 1000)
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_search_stat_option_values()
@@ -486,7 +486,7 @@ func Test_search_stat_option_values()
   call assert_equal(1, &msc)
   set maxsearchcount=999
   call assert_equal(999, &msc)
-  set maxsearchcount&vim
+  set maxsearchcount&mnv
 endfunc
 
 func Test_search_stat_option()
@@ -631,7 +631,7 @@ func Test_search_stat_option()
   let g:a = ''
   try
     let g:a = execute(':unsilent :norm! n')
-  catch /^Vim\%((\a\+)\)\=:E486/
+  catch /^MNV\%((\a\+)\)\=:E486/
     let stat = ''
     " error message is not redir'ed to g:a, it is empty
     call assert_true(empty(g:a))
@@ -641,9 +641,9 @@ func Test_search_stat_option()
 
   " Clean up
   set shortmess+=S
-  set maxsearchcount&vim
+  set maxsearchcount&mnv
   " close the window
   bwipe!
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_searchpos.vim b/uvim/src/testdir/test_searchpos.mnv
index dd13c305c5..acfdc0daf9 100644
--- a/uvim/src/testdir/test_searchpos.vim
+++ b/uvim/src/testdir/test_searchpos.mnv
@@ -27,4 +27,4 @@ func Test_searchpos()
 
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_selectmode.vim b/uvim/src/testdir/test_selectmode.mnv
index 285ccb47bb..65a3bc8683 100644
--- a/uvim/src/testdir/test_selectmode.vim
+++ b/uvim/src/testdir/test_selectmode.mnv
@@ -4,7 +4,7 @@
 CheckNotGui
 CheckUnix
 
-source util/mouse.vim
+source util/mouse.mnv
 
 " Test for select mode
 func Test_selectmode_basic()
@@ -336,4 +336,4 @@ func Test_selectmode_keypad_lmap()
   bwipe!
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_set.vim b/uvim/src/testdir/test_set.mnv
index 199cdd45c7..7de5791cc7 100644
--- a/uvim/src/testdir/test_set.vim
+++ b/uvim/src/testdir/test_set.mnv
@@ -73,4 +73,4 @@ func Test_set_termcap()
   call assert_true(len(more_lines) - i > len(lines) - keys_idx)
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_sha256.vim b/uvim/src/testdir/test_sha256.mnv
index 16cfac8945..8115396810 100644
--- a/uvim/src/testdir/test_sha256.vim
+++ b/uvim/src/testdir/test_sha256.mnv
@@ -31,4 +31,4 @@ function Test_sha256()
   call assert_equal('5f78c33274e43fa9de5659265c1d917e25c03722dcb0b8d27db8d5feaa813953', sha256(0zdeadbeef))
 endfunction
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_shell.vim b/uvim/src/testdir/test_shell.mnv
index 647d34870d..40a8aefd9c 100644
--- a/uvim/src/testdir/test_shell.vim
+++ b/uvim/src/testdir/test_shell.mnv
@@ -45,7 +45,7 @@ func Test_shell_options()
           \ ['tcsh.exe', '-c', '>&', '', '>&', '"&|<>()@^', '"']]
   endif
 
-  " start a new Vim instance with 'shell' set to each of the supported shells
+  " start a new MNV instance with 'shell' set to each of the supported shells
   " and check the default shell option settings
   let after =<< trim END
     let l = [&shell, &shellcmdflag, &shellpipe, &shellquote]
@@ -54,7 +54,7 @@ func Test_shell_options()
     qall!
   END
   for e in shells
-    if RunVim([], after, '--cmd "set shell=' .. e[0] .. '"')
+    if RunMNV([], after, '--cmd "set shell=' .. e[0] .. '"')
       call assert_equal(e, json_decode(readfile('Xtestout')[0]))
     endif
   endfor
@@ -245,7 +245,7 @@ func Test_set_shell()
     let expected = '/bin/with\ space/sh'
   endif
 
-  if RunVimPiped([], after, '', '')
+  if RunMNVPiped([], after, '', '')
     let lines = readfile('Xtestout')
     call assert_equal(expected, lines[0])
   endif
@@ -290,7 +290,7 @@ func Test_shell_no_prevcmd()
     call writefile([v:errmsg, 'done'], 'Xtestdone')
     qall!
   END
-  if RunVim([], after, '--clean')
+  if RunMNV([], after, '--clean')
     call assert_equal(['E34: No previous command', 'done'], readfile('Xtestdone'))
   endif
   call delete('Xtestdone')
@@ -310,4 +310,4 @@ func Test_shell_filter_buffer_with_nul_bytes()
   bwipe!
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_shift.vim b/uvim/src/testdir/test_shift.mnv
index da9a006208..89c0bbf5cc 100644
--- a/uvim/src/testdir/test_shift.vim
+++ b/uvim/src/testdir/test_shift.mnv
@@ -911,4 +911,4 @@ func Test_shift_ins_vartabs()
   bw!
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_shortpathname.vim b/uvim/src/testdir/test_shortpathname.mnv
index b3d7b82be5..c8074abc54 100644
--- a/uvim/src/testdir/test_shortpathname.vim
+++ b/uvim/src/testdir/test_shortpathname.mnv
@@ -42,7 +42,7 @@ func Test_ColonEight()
 
   let file1 = dir1 . '/zz.y.txt'
   let nofile1 = dir1 . '/z.y.txt'
-  let dir2 = dir1 . '/VimIsTheGreatestSinceSlicedBread'
+  let dir2 = dir1 . '/MNVIsTheGreatestSinceSlicedBread'
   let file2 = dir2 . '/z.txt'
   let nofile2 = dir2 . '/zz.txt'
 
@@ -52,7 +52,7 @@ func Test_ColonEight()
 
   let resfile1 = resdir1 . '/ZZY~1.TXT'
   let resnofile1 = resdir1 . '/z.y.txt'
-  let resdir2 = resdir1 . '/VIMIST~1'
+  let resdir2 = resdir1 . '/MNVIST~1'
   let resfile2 = resdir2 . '/z.txt'
   let resnofile2 = resdir2 . '/zz.txt'
 
@@ -101,4 +101,4 @@ func Test_ColonEight_notexists()
   call assert_equal(non_exists, fnamemodify(non_exists, ':p:8'))
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_signals.vim b/uvim/src/testdir/test_signals.mnv
index 351560024e..11b24e9baa 100644
--- a/uvim/src/testdir/test_signals.vim
+++ b/uvim/src/testdir/test_signals.mnv
@@ -75,29 +75,29 @@ endfunc
 
 " Test signal INT. Handler sets got_int. It should be like typing CTRL-C.
 func Test_signal_INT()
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
   if !HasSignal('INT')
     throw 'Skipped: INT signal not supported'
   endif
 
-  let buf = RunVimInTerminal('', {'rows': 6})
-  let pid_vim = term_getjob(buf)->job_info().process
+  let buf = RunMNVInTerminal('', {'rows': 6})
+  let pid_mnv = term_getjob(buf)->job_info().process
 
-  " Check that an endless loop in Vim is interrupted by signal INT.
+  " Check that an endless loop in MNV is interrupted by signal INT.
   call term_sendkeys(buf, ":call setline(1, 'running')\n")
   call term_sendkeys(buf, ":while 1 | endwhile\n")
   call WaitForAssert({-> assert_equal(':while 1 | endwhile', term_getline(buf, 6))})
-  exe 'silent !kill -s INT ' .. pid_vim
+  exe 'silent !kill -s INT ' .. pid_mnv
   sleep 50m
   call term_sendkeys(buf, ":call setline(1, 'INTERRUPTED')\n")
   call WaitForAssert({-> assert_equal('INTERRUPTED', term_getline(buf, 1))})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 " Test signal TSTP. Handler sets got_tstp.
 func Test_signal_TSTP()
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
   if !HasSignal('TSTP')
     throw 'Skipped: TSTP signal not supported'
   endif
@@ -109,13 +109,13 @@ func Test_signal_TSTP()
   call delete('XautoOut1')
   call delete('XautoOut2')
   let lines =<< trim END
-    au VimSuspend * call writefile(["VimSuspend triggered"], "XautoOut1", "as")
-    au VimResume * call writefile(["VimResume triggered"], "XautoOut2", "as")
+    au MNVSuspend * call writefile(["MNVSuspend triggered"], "XautoOut1", "as")
+    au MNVResume * call writefile(["MNVResume triggered"], "XautoOut2", "as")
   END
   call writefile(lines, 'XsetupAucmd', 'D')
 
-  let buf = RunVimInTerminal('-S XsetupAucmd Xsig_TERM', {'rows': 6})
-  let pid_vim = term_getjob(buf)->job_info().process
+  let buf = RunMNVInTerminal('-S XsetupAucmd Xsig_TERM', {'rows': 6})
+  let pid_mnv = term_getjob(buf)->job_info().process
 
   call term_sendkeys(buf, ":call setline(1, 'foo')\n")
   call WaitForAssert({-> assert_equal('foo', term_getline(buf, 1))})
@@ -123,22 +123,22 @@ func Test_signal_TSTP()
   call assert_false(filereadable('Xsig_TERM'))
 
   " After TSTP the file is not saved (same function as ^Z)
-  exe 'silent !kill -s TSTP ' .. pid_vim
+  exe 'silent !kill -s TSTP ' .. pid_mnv
   call WaitForAssert({-> assert_true(filereadable('.Xsig_TERM.swp'))})
   sleep 100m
 
   " We resume after the suspend.  Sleep a bit for the signal to take effect,
   " also when running under valgrind.
-  exe 'silent !kill -s CONT ' .. pid_vim
+  exe 'silent !kill -s CONT ' .. pid_mnv
   call WaitForAssert({-> assert_true(filereadable('XautoOut2'))})
   sleep 10m
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 
   let result = readfile('XautoOut1')
-  call assert_equal(["VimSuspend triggered"], result)
+  call assert_equal(["MNVSuspend triggered"], result)
   let result = readfile('XautoOut2')
-  call assert_equal(["VimResume triggered"], result)
+  call assert_equal(["MNVResume triggered"], result)
 
   %bwipe!
   call delete('.Xsig_TERM.swp')
@@ -152,14 +152,14 @@ endfunc
 " Test uses signal SIGTERM as it does not create a core
 " dump file unlike SIGSEGV, SIGBUS, etc. See "man 7 signals.
 "
-" Vim should exit with a deadly signal and unsaved changes
+" MNV should exit with a deadly signal and unsaved changes
 " should be recoverable from the swap file preserved as a
 " result of the deadly signal handler.
 func Test_deadly_signal_TERM()
   if !HasSignal('TERM')
     throw 'Skipped: TERM signal not supported'
   endif
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   " If test fails once, it can leave temporary files and trying to rerun
   " the test would then fail again if they are not deleted first.
@@ -167,22 +167,22 @@ func Test_deadly_signal_TERM()
   call delete('XsetupAucmd')
   call delete('XautoOut')
   let lines =<< trim END
-    au VimLeave * call writefile(["VimLeave triggered"], "XautoOut", "as")
-    au VimLeavePre * call writefile(["VimLeavePre triggered"], "XautoOut", "as")
+    au MNVLeave * call writefile(["MNVLeave triggered"], "XautoOut", "as")
+    au MNVLeavePre * call writefile(["MNVLeavePre triggered"], "XautoOut", "as")
   END
   call writefile(lines, 'XsetupAucmd', 'D')
 
-  let buf = RunVimInTerminal('-S XsetupAucmd Xsig_TERM', {'rows': 6})
-  let pid_vim = term_getjob(buf)->job_info().process
+  let buf = RunMNVInTerminal('-S XsetupAucmd Xsig_TERM', {'rows': 6})
+  let pid_mnv = term_getjob(buf)->job_info().process
 
   call term_sendkeys(buf, ":call setline(1, 'foo')\n")
   call WaitForAssert({-> assert_equal('foo', term_getline(buf, 1))})
 
   call assert_false(filereadable('Xsig_TERM'))
-  exe 'silent !kill -s TERM '  .. pid_vim
+  exe 'silent !kill -s TERM '  .. pid_mnv
   call WaitForAssert({-> assert_true(filereadable('.Xsig_TERM.swp'))})
 
-  " Don't call StopVimInTerminal() as it expects job to be still running.
+  " Don't call StopMNVInTerminal() as it expects job to be still running.
   call WaitForAssert({-> assert_equal("finished", term_getstatus(buf))})
 
   new
@@ -190,11 +190,11 @@ func Test_deadly_signal_TERM()
   call assert_equal(['foo'], getline(1, '$'))
 
   let result = readfile('XautoOut')
-  call assert_equal(["VimLeavePre triggered", "VimLeave triggered"], result)
+  call assert_equal(["MNVLeavePre triggered", "MNVLeave triggered"], result)
 
   %bwipe!
   call delete('.Xsig_TERM.swp')
   call delete('XautoOut')
 endfunc
 
-" vim: ts=8 sw=2 sts=2 tw=80 fdm=marker
+" mnv: ts=8 sw=2 sts=2 tw=80 fdm=marker
diff --git a/uvim/src/testdir/test_signs.vim b/uvim/src/testdir/test_signs.mnv
index 870acd10dc..e41cce9232 100644
--- a/uvim/src/testdir/test_signs.vim
+++ b/uvim/src/testdir/test_signs.mnv
@@ -2,24 +2,24 @@
 
 CheckFeature signs
 
-source util/screendump.vim
+source util/screendump.mnv
 
 func Test_sign()
   new
   call setline(1, ['a', 'b', 'c', 'd'])
 
   " Define some signs.
-  " We can specify icons even if not all versions of vim support icons as
+  " We can specify icons even if not all versions of mnv support icons as
   " icon is ignored when not supported.  "(not supported)" is shown after
   " the icon name when listing signs.
   sign define Sign1 text=x
 
-  call Sign_command_ignore_error('sign define Sign2 text=xy texthl=Title linehl=Error culhl=Search numhl=Number icon=../../pixmaps/stock_vim_find_help.png')
+  call Sign_command_ignore_error('sign define Sign2 text=xy texthl=Title linehl=Error culhl=Search numhl=Number icon=../../pixmaps/stock_mnv_find_help.png')
 
   " Test listing signs.
   let a=execute('sign list')
   call assert_match('^\nsign Sign1 text=x \nsign Sign2 ' .
-	      \ 'icon=../../pixmaps/stock_vim_find_help.png .*text=xy ' .
+	      \ 'icon=../../pixmaps/stock_mnv_find_help.png .*text=xy ' .
 	      \ 'linehl=Error texthl=Title culhl=Search numhl=Number$', a)
 
   let a=execute('sign list Sign1')
@@ -433,7 +433,7 @@ func Sign_define_ignore_error(name, attr)
   endtry
 endfunc
 
-" Test for Vim script functions for managing signs
+" Test for MNV script functions for managing signs
 func Test_sign_funcs()
   " Remove all the signs
   call sign_unplace('*')
@@ -1815,7 +1815,7 @@ endfunc
 " Test for correct cursor position after the sign column appears or disappears.
 func Test_sign_cursor_position()
   CheckScreendump
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   let lines =<< trim END
 	call setline(1, [repeat('x', 75), 'mmmm', 'yyyy'])
@@ -1826,7 +1826,7 @@ func Test_sign_cursor_position()
 	sign place 10 line=2 name=s1
   END
   call writefile(lines, 'XtestSigncolumn', 'D')
-  let buf = RunVimInTerminal('-S XtestSigncolumn', {'rows': 6})
+  let buf = RunMNVInTerminal('-S XtestSigncolumn', {'rows': 6})
   call VerifyScreenDump(buf, 'Test_sign_cursor_1', {})
 
   " Change the sign text
@@ -1864,7 +1864,7 @@ func Test_sign_cursor_position()
   call VerifyScreenDump(buf, 'Test_sign_cursor_6', {})
 
   " clean up
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 " Return the 'len' characters in screen starting from (row,col)
@@ -2106,7 +2106,7 @@ endfunc
 
 func Test_sign_number_without_signtext()
   CheckScreendump
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   let lines =<< trim END
       set number signcolumn=number
@@ -2117,10 +2117,10 @@ func Test_sign_number_without_signtext()
       sign place 2 line=2 name=SignB  buffer=1
   END
   call writefile(lines, 'XtestSigncolumnNumber', 'D')
-  let buf = RunVimInTerminal('-S XtestSigncolumnNumber', {'rows': 5})
+  let buf = RunMNVInTerminal('-S XtestSigncolumnNumber', {'rows': 5})
   call VerifyScreenDump(buf, 'Test_sign_number_without_signtext', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_sign_signcolumn_change_no_clear()
@@ -2163,4 +2163,4 @@ func Test_sign_signcolumn_change_no_clear()
   bwipe!
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_sleep.vim b/uvim/src/testdir/test_sleep.mnv
index 4326877bd6..1fd9e9afa7 100644
--- a/uvim/src/testdir/test_sleep.vim
+++ b/uvim/src/testdir/test_sleep.mnv
@@ -20,4 +20,4 @@ func! Test_sleep_bang()
   call s:assert_takes_longer('normal 1gs', 1000)
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_smartindent.vim b/uvim/src/testdir/test_smartindent.mnv
index 9bb7b9c227..fe6760e913 100644
--- a/uvim/src/testdir/test_smartindent.vim
+++ b/uvim/src/testdir/test_smartindent.mnv
@@ -156,4 +156,4 @@ func Test_no_si_after_completion()
   bwipe!
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_sort.vim b/uvim/src/testdir/test_sort.mnv
index 1c60e8e42a..3b47e4c9ad 100644
--- a/uvim/src/testdir/test_sort.vim
+++ b/uvim/src/testdir/test_sort.mnv
@@ -1,6 +1,6 @@
 " Tests for the "sort()" function and for the ":sort" command.
 
-import './util/vim9.vim' as v9
+import './util/mnv9.mnv' as v9
 
 func Compare1(a, b) abort
   call sort(range(3), 'Compare2')
@@ -58,7 +58,7 @@ endfunc
 func Test_sort_numbers()
   call assert_equal([3, 13, 28], sort([13, 28, 3], 'N'))
   call assert_equal(['3', '13', '28'], sort(['13', '28', '3'], 'N'))
-  vim9cmd call assert_equal(['3', '13', '28'], sort(['13', '28', '3'], 'N'))
+  mnv9cmd call assert_equal(['3', '13', '28'], sort(['13', '28', '3'], 'N'))
   call assert_equal([3997, 4996], sort([4996, 3997], 'Compare1'))
 endfunc
 
@@ -1478,7 +1478,7 @@ func Test_sort_cmd_report()
     enew!
     call append(0, repeat([1], 3) + repeat([2], 3) + repeat([3], 3))
     $delete _
-    setl report&vim
+    setl report&mnv
     setlocal nomodified
     let res = execute('1g/^/%sort u')
 
@@ -1522,7 +1522,7 @@ func Test_sort_with_no_last_search_pat()
     qall!
   [SCRIPT]
   call writefile(lines, 'Xscript', 'D')
-  if RunVim([], [], '--clean -S Xscript')
+  if RunMNV([], [], '--clean -S Xscript')
     call assert_equal([], readfile('Xresult'))
   endif
   call delete('Xresult')
@@ -1582,7 +1582,7 @@ func Test_sort_funcref_with_large_number()
         \  (535474757750378, 535849288071548)
         \ ]->sort(LSTART a, b LMIDDLE a[0] - b[0] LEND))
   END
-  call v9.CheckSourceLegacyAndVim9Success(lines)
+  call v9.CheckSourceLegacyAndMNV9Success(lines)
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_sound.vim b/uvim/src/testdir/test_sound.mnv
index 852b5931da..4db34d6168 100644
--- a/uvim/src/testdir/test_sound.vim
+++ b/uvim/src/testdir/test_sound.mnv
@@ -101,4 +101,4 @@ func Test_play_event_error()
   call assert_equal(0, sound_playfile(test_null_string(), test_null_function()))
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_source.vim b/uvim/src/testdir/test_source.mnv
index b7b0d11753..ae44456275 100644
--- a/uvim/src/testdir/test_source.vim
+++ b/uvim/src/testdir/test_source.mnv
@@ -46,7 +46,7 @@ func Test_source_sandbox()
 endfunc
 
 " When deleting a file and immediately creating a new one the inode may be
-" recycled.  Vim should not recognize it as the same script.
+" recycled.  MNV should not recognize it as the same script.
 func Test_different_script()
   call writefile(['let s:var = "asdf"'], 'XoneScript', 'D')
   source XoneScript
@@ -54,10 +54,10 @@ func Test_different_script()
   call assert_fails('source XtwoScript', 'E121:')
 endfunc
 
-" When sourcing a Vim script, shebang should be ignored.
+" When sourcing a MNV script, shebang should be ignored.
 func Test_source_ignore_shebang()
-  call writefile(['#!./xyzabc', 'let g:val=369'], 'Xsisfile.vim', 'D')
-  source Xsisfile.vim
+  call writefile(['#!./xyzabc', 'let g:val=369'], 'Xsisfile.mnv', 'D')
+  source Xsisfile.mnv
   call assert_equal(g:val, 369)
 endfunc
 
@@ -74,9 +74,9 @@ func Test_source_autocmd_sfile()
     let g:Sflnum = expand('<sflnum>')
     augroup! sfiletest
   [CODE]
-  call writefile(code, 'Xscript.vim', 'D')
-  source Xscript.vim
-  call assert_equal('Xscript.vim', g:Sfile)
+  call writefile(code, 'Xscript.mnv', 'D')
+  source Xscript.mnv
+  call assert_equal('Xscript.mnv', g:Sfile)
   call assert_equal('7', g:Slnum)
   call assert_equal('8', g:Sflnum)
 endfunc
@@ -88,22 +88,22 @@ func Test_source_error()
   call assert_fails('source!', 'E471:')
   new
   call setline(1, ['', '', '', ''])
-  call assert_fails('1,3source Xscript.vim', 'E481:')
-  call assert_fails('1,3source! Xscript.vim', 'E481:')
+  call assert_fails('1,3source Xscript.mnv', 'E481:')
+  call assert_fails('1,3source! Xscript.mnv', 'E481:')
   bw!
 endfunc
 
 " Test for sourcing a script recursively
 func Test_nested_script()
-  CheckRunVimInTerminal
-  call writefile([':source! Xscript.vim', ''], 'Xscript.vim', 'D')
-  let buf = RunVimInTerminal('', {'rows': 6})
+  CheckRunMNVInTerminal
+  call writefile([':source! Xscript.mnv', ''], 'Xscript.mnv', 'D')
+  let buf = RunMNVInTerminal('', {'rows': 6})
   call term_wait(buf)
   call term_sendkeys(buf, ":set noruler\n")
-  call term_sendkeys(buf, ":source! Xscript.vim\n")
+  call term_sendkeys(buf, ":source! Xscript.mnv\n")
   call term_wait(buf)
   call WaitForAssert({-> assert_match('E22: Scripts nested too deep\s*', term_getline(buf, 6))})
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 " Test for sourcing a script from the current buffer
@@ -386,14 +386,14 @@ func Test_source_buffer()
   %bw!
 endfunc
 
-" Test for sourcing a Vim9 script from the current buffer
-func Test_source_buffer_vim9()
+" Test for sourcing a MNV9 script from the current buffer
+func Test_source_buffer_mnv9()
   new
 
-  " test for sourcing a Vim9 script
+  " test for sourcing a MNV9 script
   %d _
   let lines =<< trim END
-     vim9script
+     mnv9script
 
      # check dict
      var x: number = 10
@@ -405,10 +405,10 @@ func Test_source_buffer_vim9()
   source
   call assert_equal(10, Xtestfunc())
 
-  " test for sourcing a Vim9 script with line continuation
+  " test for sourcing a MNV9 script with line continuation
   %d _
   let lines =<< trim END
-     vim9script
+     mnv9script
 
      g:Str1 = "hello "
               .. "world"
@@ -498,7 +498,7 @@ func Test_source_buffer_vim9()
   " test for sourcing the same buffer multiple times after changing a function
   %d _
   let lines =<< trim END
-     vim9script
+     mnv9script
      def g:Xtestfunc(): string
        return "one"
      enddef
@@ -520,7 +520,7 @@ func Test_source_buffer_vim9()
   let lines =<< trim END
      Line 1
      Line 2
-     vim9script
+     mnv9script
      def g:Xtestfunc(): string
        return expand("<sflnum>")
      enddef
@@ -535,7 +535,7 @@ func Test_source_buffer_vim9()
   " test for sourcing a heredoc
   %d _
   let lines =<< trim END
-    vim9script
+    mnv9script
     var a = 1
     g:heredoc =<< trim DATA
        red
@@ -548,7 +548,7 @@ func Test_source_buffer_vim9()
   source
   call assert_equal(['red', '  green', 'blue'], g:heredoc)
 
-  " test for using the :vim9cmd modifier
+  " test for using the :mnv9cmd modifier
   %d _
   let lines =<< trim END
     first line
@@ -557,28 +557,28 @@ func Test_source_buffer_vim9()
          e: 2.71828
       }
     g:Editors = [
-      'vim',
+      'mnv',
       # comment
       'nano'
       ]
     last line
   END
   call setline(1, lines)
-  vim9cmd :2,10source
+  mnv9cmd :2,10source
   call assert_equal(#{pi: 3.12, e: 2.71828}, g:Math)
-  call assert_equal(['vim', 'nano'], g:Editors)
+  call assert_equal(['mnv', 'nano'], g:Editors)
 
   " '<,'> range before the cmd modifier works
   unlet g:Math
   unlet g:Editors
-  exe "normal 6GV4j:vim9cmd source\<CR>"
-  call assert_equal(['vim', 'nano'], g:Editors)
+  exe "normal 6GV4j:mnv9cmd source\<CR>"
+  call assert_equal(['mnv', 'nano'], g:Editors)
   unlet g:Editors
 
   " test for using try/catch
   %d _
   let lines =<< trim END
-     vim9script
+     mnv9script
      g:Trace = '1'
      try
        a1 = b1
@@ -595,7 +595,7 @@ func Test_source_buffer_vim9()
   " test with the finish command
   %d _
   let lines =<< trim END
-     vim9script
+     mnv9script
      g:Color = 'red'
      finish
      g:Color = 'blue'
@@ -617,20 +617,20 @@ func Test_source_buffer_vim9()
      enddef
   END
   call setline(1, lines)
-  vim9cmd source
+  mnv9cmd source
   call assert_false(g:MyFuncFound)
   call assert_false(g:ScriptVarFound)
-  vim9cmd source
+  mnv9cmd source
   call assert_true(g:MyFuncFound)
   call assert_true(g:ScriptVarFound)
-  vim9cmd source ++clear
+  mnv9cmd source ++clear
   call assert_false(g:MyFuncFound)
   call assert_false(g:ScriptVarFound)
-  vim9cmd source ++clear
+  mnv9cmd source ++clear
   call assert_false(g:MyFuncFound)
   call assert_false(g:ScriptVarFound)
-  call assert_fails('vim9cmd source ++clearx', 'E475:')
-  call assert_fails('vim9cmd source ++abcde', 'E484:')
+  call assert_fails('mnv9cmd source ++clearx', 'E475:')
+  call assert_fails('mnv9cmd source ++abcde', 'E484:')
 
   %bw!
 endfunc
@@ -648,8 +648,8 @@ func Test_source_buffer_long_line()
       norm i0000000000000000000
       silent! so
   END
-  call writefile(lines, 'Xtest.vim', 'D')
-  source Xtest.vim
+  call writefile(lines, 'Xtest.mnv', 'D')
+  source Xtest.mnv
   bwipe!
 endfunc
 
@@ -662,7 +662,7 @@ func Test_source_buffer_with_NUL_char()
       endif
   END
   " Can't have a NL in heredoc
-  let lines += ["silent! vim9 echo [0 \<NL> ? 'a' : 'b']"]
+  let lines += ["silent! mnv9 echo [0 \<NL> ? 'a' : 'b']"]
   call writefile(lines, 'XsourceNul', 'D')
   edit XsourceNul
   source
@@ -671,4 +671,4 @@ func Test_source_buffer_with_NUL_char()
 endfunc
 
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_source_utf8.vim b/uvim/src/testdir/test_source_utf8.mnv
index 13758164f4..bc3700595e 100644
--- a/uvim/src/testdir/test_source_utf8.vim
+++ b/uvim/src/testdir/test_source_utf8.mnv
@@ -58,4 +58,4 @@ func Test_source_ctrl_v()
   unmap __5
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_spell.vim b/uvim/src/testdir/test_spell.mnv
index 58a2d58707..41fff49583 100644
--- a/uvim/src/testdir/test_spell.vim
+++ b/uvim/src/testdir/test_spell.mnv
@@ -3,7 +3,7 @@
 
 CheckFeature spell
 
-source util/screendump.vim
+source util/screendump.mnv
 
 func TearDown()
   set nospell
@@ -74,7 +74,7 @@ endfunc
 func Test_z_equal_on_single_character()
   " this was decrementing the index below zero
   new
-  norm a0\Ê
+  norm a0\�
   norm zW
   norm z=
 
@@ -414,13 +414,13 @@ endfunc
 " Test 'spellsuggest' option with value file:{filename}
 func Test_spellsuggest_option_file()
   set spell spellsuggest=file:Xspellsuggest
-  call writefile(['emacs/vim',
+  call writefile(['emacs/mnv',
         \         'theribal/terrible',
         \         'teribal/terrrible',
         \         'terribal'],
         \         'Xspellsuggest')
 
-  call assert_equal(['vim'],      spellsuggest('emacs', 2))
+  call assert_equal(['mnv'],      spellsuggest('emacs', 2))
   call assert_equal(['terrible'], spellsuggest('theribal',2))
 
   " If the suggestion is misspelled (*terrrible* with 3 r),
@@ -430,13 +430,13 @@ func Test_spellsuggest_option_file()
   call assert_equal([], spellsuggest('terribal', 2))
 
   set spell spellsuggest=best,file:Xspellsuggest
-  call assert_equal(['vim', 'Emacs'],       spellsuggest('emacs', 2))
+  call assert_equal(['mnv', 'Emacs'],       spellsuggest('emacs', 2))
   call assert_equal(['terrible', 'tribal'], spellsuggest('theribal', 2))
   call assert_equal(['tribal'],             spellsuggest('teribal', 1))
   call assert_equal(['tribal'],             spellsuggest('terribal', 1))
 
   call delete('Xspellsuggest')
-  call assert_fails("call spellsuggest('vim')", "E484: Can't open file Xspellsuggest")
+  call assert_fails("call spellsuggest('mnv')", "E484: Can't open file Xspellsuggest")
 
   set spellsuggest& spell&
 endfunc
@@ -580,7 +580,7 @@ endfunc
 
 func Test_spellinfo()
   new
-  let runtime = substitute($VIMRUNTIME, '\\', '/', 'g')
+  let runtime = substitute($MNVRUNTIME, '\\', '/', 'g')
 
   set enc=latin1 spell spelllang=en
   call assert_match("^\nfile: " .. runtime .. "/spell/en.latin1.spl\n$", execute('spellinfo'))
@@ -632,7 +632,7 @@ func Test_zz_basic()
         \ )
 
   call assert_equal("gebletegek", soundfold('goobledygoook'))
-  call assert_equal("kepereneven", 'kóopërÿnôven'->soundfold())
+  call assert_equal("kepereneven", 'k�op�r�n�ven'->soundfold())
   call assert_equal("everles gesvets etele", soundfold('oeverloos gezwets edale'))
 endfunc
 
@@ -812,7 +812,7 @@ func Test_zz_sal_and_addition()
   mkspell! Xtest Xtest
   set spl=Xtest.latin1.spl spell
   call assert_equal('kbltykk', soundfold('goobledygoook'))
-  call assert_equal('kprnfn', soundfold('kóopërÿnôven'))
+  call assert_equal('kprnfn', soundfold('k�op�r�n�ven'))
   call assert_equal('*fls kswts tl', soundfold('oeverloos gezwets edale'))
 
   "also use an addition file
@@ -911,7 +911,7 @@ endfunc
 func Test_spellsuggest_too_deep()
   " This was incrementing "depth" over MAXWLEN.
   new
-  norm s000G00ý000000000000
+  norm s000G00�000000000000
   sil norm ..vzG................vvzG0     v z=
   bwipe!
 endfunc
@@ -1002,11 +1002,11 @@ func Test_spell_screendump()
        set spell spelllang=en_nz
   END
   call writefile(lines, 'XtestSpell', 'D')
-  let buf = RunVimInTerminal('-S XtestSpell', {'rows': 8})
+  let buf = RunMNVInTerminal('-S XtestSpell', {'rows': 8})
   call VerifyScreenDump(buf, 'Test_spell_1', {})
 
   " clean up
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_spell_screendump_spellcap()
@@ -1025,7 +1025,7 @@ func Test_spell_screendump_spellcap()
        set spell spelllang=en
   END
   call writefile(lines, 'XtestSpellCap', 'D')
-  let buf = RunVimInTerminal('-S XtestSpellCap', {'rows': 8})
+  let buf = RunMNVInTerminal('-S XtestSpellCap', {'rows': 8})
   call VerifyScreenDump(buf, 'Test_spell_2', {})
 
   " After adding word missing Cap in next line is updated
@@ -1062,7 +1062,7 @@ func Test_spell_screendump_spellcap()
   call VerifyScreenDump(buf, 'Test_spell_10', {})
 
   " clean up
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_spell_compatible()
@@ -1078,7 +1078,7 @@ func Test_spell_compatible()
        set spell cpo+=$
   END
   call writefile(lines, 'XtestSpellComp', 'D')
-  let buf = RunVimInTerminal('-S XtestSpellComp', {'rows': 8})
+  let buf = RunMNVInTerminal('-S XtestSpellComp', {'rows': 8})
 
   call term_sendkeys(buf, "51|C")
   call VerifyScreenDump(buf, 'Test_spell_compatible_1', {})
@@ -1087,7 +1087,7 @@ func Test_spell_compatible()
   call VerifyScreenDump(buf, 'Test_spell_compatible_2', {})
 
   " clean up
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_z_equal_with_large_count()
@@ -1581,4 +1581,4 @@ func Test_suggest_spell_restore()
   bwipe!
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_spell_utf8.vim b/uvim/src/testdir/test_spell_utf8.mnv
index fa9284be15..8675b38e29 100644
--- a/uvim/src/testdir/test_spell_utf8.vim
+++ b/uvim/src/testdir/test_spell_utf8.mnv
@@ -828,4 +828,4 @@ func Test_spell_suggest_too_long()
 endfunc
 
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_spellfile.vim b/uvim/src/testdir/test_spellfile.mnv
index b72974ed07..2c679fabb8 100644
--- a/uvim/src/testdir/test_spellfile.vim
+++ b/uvim/src/testdir/test_spellfile.mnv
@@ -185,7 +185,7 @@ endfunc
 " then check for error.
 func Spellfile_Test(content, emsg)
   let splfile = './Xtest/spell/Xtest.utf-8.spl'
-  " Add the spell file header and version (VIMspell2)
+  " Add the spell file header and version (MNVspell2)
   let v = 0z56494D7370656C6C32 + a:content
   call writefile(v, splfile, 'b')
 
@@ -809,7 +809,7 @@ func Test_aff_file_format_error()
 
   " duplicate word in the .dic file
   call writefile(['2', 'good', 'good', 'good'], 'Xtest.dic')
-  call writefile(['NAME vim'], 'Xtest.aff')
+  call writefile(['NAME mnv'], 'Xtest.aff')
   let output = execute('mkspell! Xtest.spl Xtest')
   call assert_match('First duplicate word in Xtest.dic line 3: good', output)
   call assert_match('2 duplicate word(s) in Xtest.dic', output)
@@ -1122,7 +1122,7 @@ func Test_init_spellfile()
   let save_rtp = &rtp
   let save_encoding = &encoding
   call mkdir('Xrtp/spell', 'pR')
-  call writefile(['vim'], 'Xrtp/spell/Xtest.dic')
+  call writefile(['mnv'], 'Xrtp/spell/Xtest.dic')
   silent mkspell Xrtp/spell/Xtest.utf-8.spl Xrtp/spell/Xtest.dic
   set runtimepath=./Xrtp
   set spelllang=Xtest
@@ -1166,4 +1166,4 @@ func Test_mkspell_empty_dic()
 endfunc
 
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_spellrare.vim b/uvim/src/testdir/test_spellrare.mnv
index 9dcd12c970..2ef9d02366 100644
--- a/uvim/src/testdir/test_spellrare.vim
+++ b/uvim/src/testdir/test_spellrare.mnv
@@ -57,4 +57,4 @@ func Test_spellrareword()
   set encoding=utf-8
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_stacktrace.vim b/uvim/src/testdir/test_stacktrace.mnv
index 77ea28f94f..31baf85fbe 100644
--- a/uvim/src/testdir/test_stacktrace.vim
+++ b/uvim/src/testdir/test_stacktrace.mnv
@@ -1,6 +1,6 @@
 " Test for getstacktrace() and v:stacktrace
 
-import './util/vim9.vim' as v9
+import './util/mnv9.mnv' as v9
 
 let s:thisfile = expand('%:p')
 let s:testdir = s:thisfile->fnamemodify(':h')
@@ -10,7 +10,7 @@ func Filepath(name)
 endfunc
 
 func AssertStacktrace(expect, actual)
-  call assert_equal(Filepath('runtest.vim'), a:actual[0]['filepath'])
+  call assert_equal(Filepath('runtest.mnv'), a:actual[0]['filepath'])
   call assert_equal(a:expect, a:actual[-len(a:expect):])
 endfunc
 
@@ -118,7 +118,7 @@ func Test_vstacktrace()
   call assert_equal(stacktrace, stacktrace_after)
 endfunc
 
-func Test_stacktrace_vim9()
+func Test_stacktrace_mnv9()
   let lines =<< trim [SCRIPT]
   var stacktrace = getstacktrace()
   assert_notequal([], stacktrace)
@@ -139,4 +139,4 @@ func Test_stacktrace_vim9()
   call v9.CheckDefSuccess(lines)
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_startup.vim b/uvim/src/testdir/test_startup.mnv
index 4e0d5cf98a..d514bb7b8a 100644
--- a/uvim/src/testdir/test_startup.vim
+++ b/uvim/src/testdir/test_startup.mnv
@@ -1,11 +1,11 @@
 " Tests for startup.
 
-source util/screendump.vim
+source util/screendump.mnv
 
-" Check that loading startup.vim works.
+" Check that loading startup.mnv works.
 func Test_startup_script()
   set compatible
-  source $VIMRUNTIME/defaults.vim
+  source $MNVRUNTIME/defaults.mnv
 
   call assert_equal(0, &compatible)
   " Restore some options, so that the following tests doesn't break
@@ -20,7 +20,7 @@ endfunc
 func Test_after_comes_later()
   CheckFeature packages
   let before =<< trim [CODE]
-    set nocp viminfo+=nviminfo
+    set nocp mnvinfo+=nmnvinfo
     set guioptions+=M
     let $HOME = "/does/not/exist"
     set loadplugins
@@ -41,19 +41,19 @@ func Test_after_comes_later()
   [CODE]
 
   call mkdir('Xhere/plugin', 'pR')
-  call writefile(['let g:sequence .= "here "'], 'Xhere/plugin/here.vim')
+  call writefile(['let g:sequence .= "here "'], 'Xhere/plugin/here.mnv')
   call mkdir('Xanother/plugin', 'pR')
-  call writefile(['let g:sequence .= "another "'], 'Xanother/plugin/another.vim')
+  call writefile(['let g:sequence .= "another "'], 'Xanother/plugin/another.mnv')
   call mkdir('Xhere/pack/foo/start/foobar/plugin', 'p')
-  call writefile(['let g:sequence .= "pack "'], 'Xhere/pack/foo/start/foobar/plugin/foo.vim')
+  call writefile(['let g:sequence .= "pack "'], 'Xhere/pack/foo/start/foobar/plugin/foo.mnv')
 
   call mkdir('Xafter/plugin', 'pR')
-  call writefile(['let g:sequence .= "after "'], 'Xafter/plugin/later.vim')
+  call writefile(['let g:sequence .= "after "'], 'Xafter/plugin/later.mnv')
 
-  if RunVim(before, after, '')
+  if RunMNV(before, after, '')
 
     let lines = readfile('Xtestout')
-    let expected = ['Xbefore.vim', 'here.vim', 'another.vim', 'foo.vim', 'later.vim', 'Xafter.vim']
+    let expected = ['Xbefore.mnv', 'here.mnv', 'another.mnv', 'foo.mnv', 'later.mnv', 'Xafter.mnv']
     let found = []
     for line in lines
       for one in expected
@@ -71,9 +71,9 @@ func Test_after_comes_later()
   call delete('Xsequence')
 endfunc
 
-func Test_vim_did_init()
+func Test_mnv_did_init()
   let before =<< trim [CODE]
-    set nocp viminfo+=nviminfo
+    set nocp mnvinfo+=nmnvinfo
     set guioptions+=M
     set loadplugins
     set rtp=Xhere
@@ -82,17 +82,17 @@ func Test_vim_did_init()
 
   let after =<< trim [CODE]
     redir! > Xtestout
-    echo g:var_vimrc
+    echo g:var_mnvrc
     echo g:var_plugin
     redir END
     quit
   [CODE]
 
-  call writefile(['let g:var_vimrc=v:vim_did_init'], 'Xvimrc', 'D')
+  call writefile(['let g:var_mnvrc=v:mnv_did_init'], 'Xmnvrc', 'D')
   call mkdir('Xhere/plugin', 'pR')
-  call writefile(['let g:var_plugin=v:vim_did_init'], 'Xhere/plugin/here.vim')
+  call writefile(['let g:var_plugin=v:mnv_did_init'], 'Xhere/plugin/here.mnv')
 
-  if RunVim(before, after, '-u Xvimrc')
+  if RunMNV(before, after, '-u Xmnvrc')
     let lines = readfile('Xtestout')
     call assert_equal('0', lines[1])
     call assert_equal('1', lines[2])
@@ -104,7 +104,7 @@ endfunc
 func Test_pack_in_rtp_when_plugins_run()
   CheckFeature packages
   let before =<< trim [CODE]
-    set nocp viminfo+=nviminfo
+    set nocp mnvinfo+=nmnvinfo
     set guioptions+=M
     let $HOME = "/does/not/exist"
     set loadplugins
@@ -117,11 +117,11 @@ func Test_pack_in_rtp_when_plugins_run()
 	\ 'quit',
 	\ ]
   call mkdir('Xhere/plugin', 'pR')
-  call writefile(['redir! > Xtestout', 'silent set runtimepath?', 'silent! call foo#Trigger()', 'redir END'], 'Xhere/plugin/here.vim')
+  call writefile(['redir! > Xtestout', 'silent set runtimepath?', 'silent! call foo#Trigger()', 'redir END'], 'Xhere/plugin/here.mnv')
   call mkdir('Xhere/pack/foo/start/foobar/autoload', 'p')
-  call writefile(['function! foo#Trigger()', 'echo "autoloaded foo"', 'endfunction'], 'Xhere/pack/foo/start/foobar/autoload/foo.vim')
+  call writefile(['function! foo#Trigger()', 'echo "autoloaded foo"', 'endfunction'], 'Xhere/pack/foo/start/foobar/autoload/foo.mnv')
 
-  if RunVim(before, after, '')
+  if RunMNV(before, after, '')
 
     let lines = filter(readfile('Xtestout'), '!empty(v:val)')
     call assert_match('Xhere[/\\]pack[/\\]foo[/\\]start[/\\]foobar', get(lines, 0))
@@ -135,10 +135,10 @@ func Test_help_arg()
   " This does not work with a GUI-only binary, such as on MS-Windows.
   CheckAnyOf Unix NotGui
 
-  if RunVim([], [], '--help >Xtestout')
+  if RunMNV([], [], '--help >Xtestout')
     let lines = readfile('Xtestout')
     call assert_true(len(lines) > 20)
-    call assert_match('Vi IMproved', lines[0])
+    call assert_match('MNV is not Vim', lines[0])
 
     " check if  couple of lines are there
     let found = []
@@ -160,10 +160,10 @@ func Test_version_arg()
   " This does not work with a GUI-only binary, such as on MS-Windows.
   CheckAnyOf Unix NotGui
 
-  if RunVim([], [], '--version >Xtestout')
+  if RunMNV([], [], '--version >Xtestout')
     let lines = readfile('Xtestout')
     call assert_true(len(lines) > 10)
-    call assert_match('Vi IMproved', lines[0])
+    call assert_match('MNV is not Vim', lines[0])
 
     let idx = indexof(lines, 'v:val =~# "Features included.*:"')
     call assert_true(idx >= 0)
@@ -179,16 +179,16 @@ endfunc
 func Test_compatible_args()
   let after =<< trim [CODE]
     call writefile([string(&compatible)], "Xtestout")
-    set viminfo+=nviminfo
+    set mnvinfo+=nmnvinfo
     quit
   [CODE]
 
-  if RunVim([], after, '-C')
+  if RunMNV([], after, '-C')
     let lines = readfile('Xtestout')
     call assert_equal('1', lines[0])
   endif
 
-  if RunVim([], after, '-N')
+  if RunMNV([], after, '-N')
     let lines = readfile('Xtestout')
     call assert_equal('0', lines[0])
   endif
@@ -200,7 +200,7 @@ endfunc
 " horizontally or vertically.
 func Test_o_arg()
   let after =<< trim [CODE]
-    set cpo&vim
+    set cpo&mnv
     call writefile([winnr("$"),
 		\ winheight(1), winheight(2), &lines,
 		\ winwidth(1), winwidth(2), &columns,
@@ -209,7 +209,7 @@ func Test_o_arg()
     qall
   [CODE]
 
-  if RunVim([], after, '-o2')
+  if RunMNV([], after, '-o2')
     " Open 2 windows split horizontally. Expect:
     " - 2 windows
     " - both windows should have the same or almost the same height
@@ -228,7 +228,7 @@ func Test_o_arg()
     call assert_equal('', bn2)
   endif
 
-  if RunVim([], after, '-o foo bar')
+  if RunMNV([], after, '-o foo bar')
     " Same expectations as for -o2 but buffer names should be foo and bar
     let [wn, wh1, wh2, ln, ww1, ww2, cn, bn1, bn2] = readfile('Xtestout')
     call assert_equal('2', wn)
@@ -240,7 +240,7 @@ func Test_o_arg()
     call assert_equal('bar', bn2)
   endif
 
-  if RunVim([], after, '-O2')
+  if RunMNV([], after, '-O2')
     " Open 2 windows split vertically. Expect:
     " - 2 windows
     " - both windows should have the same or almost the same width
@@ -260,7 +260,7 @@ func Test_o_arg()
     call assert_equal('', bn2)
   endif
 
-  if RunVim([], after, '-O foo bar')
+  if RunMNV([], after, '-O foo bar')
     " Same expectations as for -O2 but buffer names should be foo and bar
     let [wn, wh1, wh2, ln, ww1, ww2, cn, bn1, bn2] = readfile('Xtestout')
     call assert_equal('2', wn)
@@ -281,7 +281,7 @@ func Test_p_arg()
     qall
   [CODE]
 
-  if RunVim([], after, '-p2')
+  if RunMNV([], after, '-p2')
     let lines = readfile('Xtestout')
     call assert_equal(4, len(lines))
     call assert_equal('Tab page 1',    lines[0])
@@ -290,7 +290,7 @@ func Test_p_arg()
     call assert_equal('    [No Name]', lines[3])
   endif
 
-  if RunVim([], after, '-p foo bar')
+  if RunMNV([], after, '-p foo bar')
     let lines = readfile('Xtestout')
     call assert_equal(4, len(lines))
     call assert_equal('Tab page 1', lines[0])
@@ -304,34 +304,34 @@ endfunc
 
 " Test the -V[N] argument to set the 'verbose' option to [N]
 func Test_V_arg()
-  " Can't catch the output of gvim.
+  " Can't catch the output of gmnv.
   CheckNotGui
 
-  let out = system(GetVimCommand() . ' --clean -es -X -V0 -c "set verbose?" -cq')
+  let out = system(GetMNVCommand() . ' --clean -es -X -V0 -c "set verbose?" -cq')
   call assert_equal("  verbose=0\n", out)
 
-  let out = system(GetVimCommand() . ' --clean -es -X -V2 -c "set verbose?" -cq')
-  call assert_match("sourcing \"$VIMRUNTIME[\\/]defaults\.vim\"\r\nline \\d\\+: sourcing \"[^\"]*runtime[\\/]filetype\.vim\".*\n", out)
+  let out = system(GetMNVCommand() . ' --clean -es -X -V2 -c "set verbose?" -cq')
+  call assert_match("sourcing \"$MNVRUNTIME[\\/]defaults\.mnv\"\r\nline \\d\\+: sourcing \"[^\"]*runtime[\\/]filetype\.mnv\".*\n", out)
   call assert_match("  verbose=2\n", out)
 
-  let out = system(GetVimCommand() . ' --clean -es -X -V15 -c "set verbose?" -cq')
-   call assert_match("sourcing \"$VIMRUNTIME[\\/]defaults\.vim\"\r\nline 1: \" The default vimrc file\..*  verbose=15\n", out)
+  let out = system(GetMNVCommand() . ' --clean -es -X -V15 -c "set verbose?" -cq')
+   call assert_match("sourcing \"$MNVRUNTIME[\\/]defaults\.mnv\"\r\nline 1: \" The default mnvrc file\..*  verbose=15\n", out)
 endfunc
 
-" Test that an error is shown when the defaults.vim file could not be read
+" Test that an error is shown when the defaults.mnv file could not be read
 func Test_defaults_error()
-  " Can't catch the output of gvim.
+  " Can't catch the output of gmnv.
   CheckNotGui
   CheckNotMSWindows
   " For unknown reasons freeing all memory does not work here, even though
   " EXITFREE is defined.
   CheckNotAsan
 
-  let out = system('VIMRUNTIME=/tmp ' .. GetVimCommand() .. ' --clean -cq')
-  call assert_match("E1187: Failed to source defaults.vim", out)
+  let out = system('MNVRUNTIME=/tmp ' .. GetMNVCommand() .. ' --clean -cq')
+  call assert_match("E1187: Failed to source defaults.mnv", out)
 
-  let out = system('VIMRUNTIME=/tmp ' .. GetVimCommand() .. ' -u DEFAULTS -cq')
-  call assert_match("E1187: Failed to source defaults.vim", out)
+  let out = system('MNVRUNTIME=/tmp ' .. GetMNVCommand() .. ' -u DEFAULTS -cq')
+  call assert_match("E1187: Failed to source defaults.mnv", out)
 endfunc
 
 " Test the '-q [errorfile]' argument.
@@ -357,7 +357,7 @@ func Test_q_arg()
   " Test with default argument '-q'.
   call assert_equal('errors.err', &errorfile)
   call writefile(["Xbadfile.c:4:12: error: expected ';' before '}' token"], 'errors.err', 'D')
-  if RunVim([], after, '-q')
+  if RunMNV([], after, '-q')
     let lines = readfile('XtestoutQarg')
     call assert_equal(['errors.err',
 	\              '[0, 4, 12, 0]',
@@ -368,7 +368,7 @@ func Test_q_arg()
 
   " Test with explicit argument '-q XerrorsQarg' (with space).
   call writefile(["Xbadfile.c:4:12: error: expected ';' before '}' token"], 'XerrorsQarg', 'D')
-  if RunVim([], after, '-q XerrorsQarg')
+  if RunMNV([], after, '-q XerrorsQarg')
     let lines = readfile('XtestoutQarg')
     call assert_equal(['XerrorsQarg',
 	\              '[0, 4, 12, 0]',
@@ -378,7 +378,7 @@ func Test_q_arg()
   call delete('XtestoutQarg')
 
   " Test with explicit argument '-qXerrorsQarg' (without space).
-  if RunVim([], after, '-qXerrorsQarg')
+  if RunMNV([], after, '-qXerrorsQarg')
     let lines = readfile('XtestoutQarg')
     call assert_equal(['XerrorsQarg',
 	\              '[0, 4, 12, 0]',
@@ -387,7 +387,7 @@ func Test_q_arg()
   endif
 
   " Test with a non-existing error file (exits with value 3)
-  let out = system(GetVimCommand() .. ' -q xyz.err')
+  let out = system(GetMNVCommand() .. ' -q xyz.err')
   call assert_equal(3, v:shell_error)
 
   call delete('XtestoutQarg')
@@ -396,9 +396,9 @@ endfunc
 " Test the -V[N]{filename} argument to set the 'verbose' option to N
 " and set 'verbosefile' to filename.
 func Test_V_file_arg()
-  if RunVim([], [], ' --clean -V2Xverbosefile -c "set verbose? verbosefile?" -cq')
+  if RunMNV([], [], ' --clean -V2Xverbosefile -c "set verbose? verbosefile?" -cq')
     let out = join(readfile('Xverbosefile'), "\n")
-    call assert_match("sourcing \"$VIMRUNTIME[\\/]defaults\.vim\"\n", out)
+    call assert_match("sourcing \"$MNVRUNTIME[\\/]defaults\.mnv\"\n", out)
     call assert_match("\n  verbose=2\n", out)
     call assert_match("\n  verbosefile=Xverbosefile", out)
   endif
@@ -416,19 +416,19 @@ func Test_m_M_R()
     qall
   [CODE]
 
-  if RunVim([], after, '')
+  if RunMNV([], after, '')
     let lines = readfile('Xtestout')
     call assert_equal(['1', '1', '0', '200'], lines)
   endif
-  if RunVim([], after, '-m')
+  if RunMNV([], after, '-m')
     let lines = readfile('Xtestout')
     call assert_equal(['0', '1', '0', '200'], lines)
   endif
-  if RunVim([], after, '-M')
+  if RunMNV([], after, '-M')
     let lines = readfile('Xtestout')
     call assert_equal(['0', '0', '0', '200'], lines)
   endif
-  if RunVim([], after, '-R')
+  if RunMNV([], after, '-R')
     let lines = readfile('Xtestout')
     call assert_equal(['1', '1', '1', '10000'], lines)
   endif
@@ -445,12 +445,12 @@ func Test_A_H_arg()
 
   " Use silent Ex mode to avoid the hit-Enter prompt for the warning that
   " 'encoding' is not utf-8.
-  if has('arabic') && &encoding == 'utf-8' && RunVim([], after, '-e -s -A')
+  if has('arabic') && &encoding == 'utf-8' && RunMNV([], after, '-e -s -A')
     let lines = readfile('Xtestout')
     call assert_equal(['1', '1', '0', '0'], lines)
   endif
 
-  if has('rightleft') && RunVim([], after, '-H')
+  if has('rightleft') && RunMNV([], after, '-H')
     let lines = readfile('Xtestout')
     call assert_equal(['1', '0', '0', '1'], lines)
   endif
@@ -463,7 +463,7 @@ func Test_echo_wid()
   CheckCanRunGui
   CheckFeature gui_gtk
 
-  if RunVim([], [], '-g --echo-wid -cq >Xtest_echo_wid')
+  if RunMNV([], [], '-g --echo-wid -cq >Xtest_echo_wid')
     let lines = readfile('Xtest_echo_wid')
     call assert_equal(1, len(lines))
     call assert_match('^WID: \d\+$', lines[0])
@@ -481,11 +481,11 @@ func Test_reverse()
     call writefile([&background], "Xtest_reverse")
     qall
   [CODE]
-  if RunVim([], after, '-f -g -reverse')
+  if RunMNV([], after, '-f -g -reverse')
     let lines = readfile('Xtest_reverse')
     call assert_equal(['dark'], lines)
   endif
-  if RunVim([], after, '-f -g +reverse')
+  if RunMNV([], after, '-f -g +reverse')
     let lines = readfile('Xtest_reverse')
     call assert_equal(['light'], lines)
   endif
@@ -504,11 +504,11 @@ func Test_background_foreground()
     call writefile([&background], "Xtest_fg_bg")
     qall
   [CODE]
-  if RunVim([], after, '-f -g -background darkred -foreground yellow')
+  if RunMNV([], after, '-f -g -background darkred -foreground yellow')
     let lines = readfile('Xtest_fg_bg')
     call assert_equal(['dark'], lines)
   endif
-  if RunVim([], after, '-f -g -background ivory -foreground darkgreen')
+  if RunMNV([], after, '-f -g -background ivory -foreground darkgreen')
     let lines = readfile('Xtest_fg_bg')
     call assert_equal(['light'], lines)
   endif
@@ -534,7 +534,7 @@ func Test_font()
     qall
   [CODE]
 
-  if RunVim([], after, '--nofork -g -font "' .. font .. '"')
+  if RunMNV([], after, '--nofork -g -font "' .. font .. '"')
     let lines = readfile('Xtest_font')
     call assert_equal([font], lines)
   endif
@@ -556,7 +556,7 @@ func Test_geometry()
       call writefile([&columns, &lines], "Xtest_geometry")
       qall
     [CODE]
-    if RunVim([], after, '-f -g -geometry 31x13+41+43')
+    if RunMNV([], after, '-f -g -geometry 31x13+41+43')
       let lines = readfile('Xtest_geometry')
       call assert_equal(['31', '13'], lines)
     endif
@@ -568,7 +568,7 @@ func Test_geometry()
     " Hide menu because gtk insists to make the window wide enough to show it completely
     " Some window managers have a bar at the top that pushes windows down,
     " need to use at least 130, let's do 150
-    if RunVim(['set guioptions-=m'], after, '-f -g -geometry 31x13+41+150')
+    if RunMNV(['set guioptions-=m'], after, '-f -g -geometry 31x13+41+150')
       let lines = readfile('Xtest_geometry')
       " Depending on the GUI library and the windowing system the final size
       " might be a bit different, allow for some tolerance.  Tuned based on
@@ -594,32 +594,32 @@ func Test_iconic()
   CheckCanRunGui
   CheckAnyOf Feature:gui_gtk Feature:gui_motif
 
-  call RunVim([], [], '-f -g -iconic -cq')
+  call RunMNV([], [], '-f -g -iconic -cq')
 
-  " TODO: currently only start vim iconified, but does not
-  "       check that vim is iconified. How could this be checked?
+  " TODO: currently only start mnv iconified, but does not
+  "       check that mnv is iconified. How could this be checked?
 endfunc
 
 
 func Test_invalid_args()
-  " must be able to get the output of Vim.
+  " must be able to get the output of MNV.
   CheckUnix
   CheckNotGui
 
   for opt in ['-K', '--does-not-exist']
-    let out = split(system(GetVimCommand() .. ' ' .. opt), "\n")
+    let out = split(system(GetMNVCommand() .. ' ' .. opt), "\n")
     call assert_equal(1, v:shell_error)
-    call assert_match('^VIM - Vi IMproved .* (.*)$',              out[0])
+    call assert_match('^MNV - MNV is not Vim .* (.*)$',              out[0])
     call assert_equal('Unknown option argument: "' .. opt .. '"', out[1])
-    call assert_equal('More info with: "vim -h"',                 out[2])
+    call assert_equal('More info with: "mnv -h"',                 out[2])
   endfor
 
   for opt in ['-c', '-i', '-s', '-t', '-T', '-u', '-U', '-w', '-W', '--cmd', '--startuptime']
-    let out = split(system(GetVimCommand() .. ' '  .. opt), "\n")
+    let out = split(system(GetMNVCommand() .. ' '  .. opt), "\n")
     call assert_equal(1, v:shell_error)
-    call assert_match('^VIM - Vi IMproved .* (.*)$',             out[0])
+    call assert_match('^MNV - MNV is not Vim .* (.*)$',             out[0])
     call assert_equal('Argument missing after: "' .. opt .. '"', out[1])
-    call assert_equal('More info with: "vim -h"',                out[2])
+    call assert_equal('More info with: "mnv -h"',                out[2])
   endfor
 
   if has('clientserver')
@@ -629,76 +629,76 @@ func Test_invalid_args()
           \     '--remote-wait', '--remote-wait-silent',
           \     '--servername',
           \    ]
-      let out = split(system(GetVimCommand() .. ' '  .. opt), "\n")
+      let out = split(system(GetMNVCommand() .. ' '  .. opt), "\n")
       call assert_equal(1, v:shell_error)
-      call assert_match('^VIM - Vi IMproved .* (.*)$',             out[0])
+      call assert_match('^MNV - MNV is not Vim .* (.*)$',             out[0])
       call assert_equal('Argument missing after: "' .. opt .. '"', out[1])
-      call assert_equal('More info with: "vim -h"',                out[2])
+      call assert_equal('More info with: "mnv -h"',                out[2])
     endfor
   endif
 
   if has('gui_gtk')
-    let out = split(system(GetVimCommand() .. ' --display'), "\n")
+    let out = split(system(GetMNVCommand() .. ' --display'), "\n")
     call assert_equal(1, v:shell_error)
-    call assert_match('^VIM - Vi IMproved .* (.*)$',         out[0])
+    call assert_match('^MNV - MNV is not Vim .* (.*)$',         out[0])
     call assert_equal('Argument missing after: "--display"', out[1])
-    call assert_equal('More info with: "vim -h"',            out[2])
+    call assert_equal('More info with: "mnv -h"',            out[2])
   endif
 
   if has('xterm_clipboard')
-    let out = split(system(GetVimCommand() .. ' -display'), "\n")
+    let out = split(system(GetMNVCommand() .. ' -display'), "\n")
     call assert_equal(1, v:shell_error)
-    call assert_match('^VIM - Vi IMproved .* (.*)$',         out[0])
+    call assert_match('^MNV - MNV is not Vim .* (.*)$',         out[0])
     call assert_equal('Argument missing after: "-display"', out[1])
-    call assert_equal('More info with: "vim -h"',            out[2])
+    call assert_equal('More info with: "mnv -h"',            out[2])
   endif
 
-  let out = split(system(GetVimCommand() .. ' -ix'), "\n")
+  let out = split(system(GetMNVCommand() .. ' -ix'), "\n")
   call assert_equal(1, v:shell_error)
-  call assert_match('^VIM - Vi IMproved .* (.*)$',          out[0])
+  call assert_match('^MNV - MNV is not Vim .* (.*)$',          out[0])
   call assert_equal('Garbage after option argument: "-ix"', out[1])
-  call assert_equal('More info with: "vim -h"',             out[2])
+  call assert_equal('More info with: "mnv -h"',             out[2])
 
-  let out = split(system(GetVimCommand() .. ' - xxx'), "\n")
+  let out = split(system(GetMNVCommand() .. ' - xxx'), "\n")
   call assert_equal(1, v:shell_error)
-  call assert_match('^VIM - Vi IMproved .* (.*)$',    out[0])
+  call assert_match('^MNV - MNV is not Vim .* (.*)$',    out[0])
   call assert_equal('Too many edit arguments: "xxx"', out[1])
-  call assert_equal('More info with: "vim -h"',       out[2])
+  call assert_equal('More info with: "mnv -h"',       out[2])
 
   if has('quickfix')
     " Detect invalid repeated arguments '-t foo -t foo', '-q foo -q foo'.
     for opt in ['-t', '-q']
-      let out = split(system(GetVimCommand() .. repeat(' ' .. opt .. ' foo', 2)), "\n")
+      let out = split(system(GetMNVCommand() .. repeat(' ' .. opt .. ' foo', 2)), "\n")
       call assert_equal(1, v:shell_error)
-      call assert_match('^VIM - Vi IMproved .* (.*)$',              out[0])
+      call assert_match('^MNV - MNV is not Vim .* (.*)$',              out[0])
       call assert_equal('Too many edit arguments: "' .. opt .. '"', out[1])
-      call assert_equal('More info with: "vim -h"',                 out[2])
+      call assert_equal('More info with: "mnv -h"',                 out[2])
     endfor
   endif
 
   for opt in [' -cq', ' --cmd q', ' +', ' -S foo']
-    let out = split(system(GetVimCommand() .. repeat(opt, 11)), "\n")
+    let out = split(system(GetMNVCommand() .. repeat(opt, 11)), "\n")
     call assert_equal(1, v:shell_error)
-    " FIXME: The error message given by Vim is not ideal in case of repeated
+    " FIXME: The error message given by MNV is not ideal in case of repeated
     " -S foo since it does not mention -S.
-    call assert_match('^VIM - Vi IMproved .* (.*)$',                                    out[0])
+    call assert_match('^MNV - MNV is not Vim .* (.*)$',                                    out[0])
     call assert_equal('Too many "+command", "-c command" or "--cmd command" arguments', out[1])
-    call assert_equal('More info with: "vim -h"',                                       out[2])
+    call assert_equal('More info with: "mnv -h"',                                       out[2])
   endfor
 
   if has('gui_gtk')
-    let out = split(system(GetVimCommand() .. ' --socketid'), "\n")
+    let out = split(system(GetMNVCommand() .. ' --socketid'), "\n")
     call assert_equal(1, v:shell_error)
-    call assert_match('^VIM - Vi IMproved .* (.*)$',          out[0])
+    call assert_match('^MNV - MNV is not Vim .* (.*)$',          out[0])
     call assert_equal('Argument missing after: "--socketid"', out[1])
-    call assert_equal('More info with: "vim -h"',             out[2])
+    call assert_equal('More info with: "mnv -h"',             out[2])
 
     for opt in ['--socketid x', '--socketid 0xg']
-      let out = split(system(GetVimCommand() .. ' ' .. opt), "\n")
+      let out = split(system(GetMNVCommand() .. ' ' .. opt), "\n")
       call assert_equal(1, v:shell_error)
-      call assert_match('^VIM - Vi IMproved .* (.*)$',        out[0])
+      call assert_match('^MNV - MNV is not Vim .* (.*)$',        out[0])
       call assert_equal('Invalid argument for: "--socketid"', out[1])
-      call assert_equal('More info with: "vim -h"',           out[2])
+      call assert_equal('More info with: "mnv -h"',           out[2])
     endfor
 
   endif
@@ -710,18 +710,18 @@ func Test_file_args()
     qall
   [CODE]
 
-  if RunVim([], after, '')
+  if RunMNV([], after, '')
     let lines = readfile('Xtestout')
     call assert_equal(0, len(lines))
   endif
 
-  if RunVim([], after, 'one')
+  if RunMNV([], after, 'one')
     let lines = readfile('Xtestout')
     call assert_equal(1, len(lines))
     call assert_equal('one', lines[0])
   endif
 
-  if RunVim([], after, 'one two three')
+  if RunMNV([], after, 'one two three')
     let lines = readfile('Xtestout')
     call assert_equal(3, len(lines))
     call assert_equal('one', lines[0])
@@ -729,14 +729,14 @@ func Test_file_args()
     call assert_equal('three', lines[2])
   endif
 
-  if RunVim([], after, 'one -c echo two')
+  if RunMNV([], after, 'one -c echo two')
     let lines = readfile('Xtestout')
     call assert_equal(2, len(lines))
     call assert_equal('one', lines[0])
     call assert_equal('two', lines[1])
   endif
 
-  if RunVim([], after, 'one -- -c echo two')
+  if RunMNV([], after, 'one -- -c echo two')
     let lines = readfile('Xtestout')
     call assert_equal(4, len(lines))
     call assert_equal('one', lines[0])
@@ -751,9 +751,9 @@ endfunc
 func Test_startuptime()
   CheckFeature startuptime
   let after = ['qall']
-  if RunVim([], after, '--startuptime Xtestout one')
+  if RunMNV([], after, '--startuptime Xtestout one')
     let lines = readfile('Xtestout')
-    let expected = ['--- VIM STARTING ---', 'parsing arguments',
+    let expected = ['--- MNV STARTING ---', 'parsing arguments',
 	  \ 'shell init', 'inits 3', 'start termcap', 'opening buffers']
     let found = []
     for line in lines
@@ -773,12 +773,12 @@ func Test_log()
 
   call assert_false(filereadable('Xlogfile'))
   let after = ['qall']
-  if RunVim([], after, '--log Xlogfile')
+  if RunMNV([], after, '--log Xlogfile')
     call assert_equal(1, readfile('Xlogfile')
           \ ->filter({i, l -> l =~ '==== start log session'})
           \ ->len())
     " second time appends to the log
-    if RunVim([], after, '--log Xlogfile')
+    if RunMNV([], after, '--log Xlogfile')
       call assert_equal(2, readfile('Xlogfile')
             \ ->filter({i, l -> l =~ '==== start log session'})
             \ ->len())
@@ -788,13 +788,13 @@ func Test_log()
 endfunc
 
 func Test_log_nonexistent()
-  " this used to crash Vim
-  CheckRunVimInTerminal
+  " this used to crash MNV
+  CheckRunMNVInTerminal
   CheckUnix
   let args = ' -u NONE -i NONE -U NONE --log /X/Xlogfile -X -c qa!'
   let options = {'term_finish': 'open', 'cmd':
-        \  'sh -c "' .. GetVimCommand() .. args .. '"'}
-  let buf = RunVimInTerminal('', options)
+        \  'sh -c "' .. GetMNVCommand() .. args .. '"'}
+  let buf = RunMNVInTerminal('', options)
   call WaitForAssert({-> assert_match('E484: Can''t open file.*Xlogfile', term_getline(buf, 1))})
   " terminal job has already finished, so just close the buffer
   exe buf .. "bw!"
@@ -806,7 +806,7 @@ func Test_read_stdin()
     quit!
   [CODE]
 
-  if RunVimPiped([], after, '-', 'echo something | ')
+  if RunMNVPiped([], after, '-', 'echo something | ')
     let lines = readfile('Xtestout')
     " MS-Windows adds a space after the word
     call assert_equal(['something'], split(lines[0]))
@@ -815,7 +815,7 @@ func Test_read_stdin()
 endfunc
 
 func Test_progpath()
-  " Tests normally run with "./vim" or "../vim", these must have been expanded
+  " Tests normally run with "./mnv" or "../mnv", these must have been expanded
   " to a full path.
   if has('unix')
     call assert_equal('/', v:progpath[0])
@@ -824,8 +824,8 @@ func Test_progpath()
     call assert_match('[/\\]', v:progpath[2])
   endif
 
-  " Only expect "vim" to appear in v:progname.
-  call assert_match('vim\c', v:progname)
+  " Only expect "mnv" to appear in v:progname.
+  call assert_match('mnv\c', v:progname)
 endfunc
 
 func Test_stdin_no_newline()
@@ -837,14 +837,14 @@ func Test_stdin_no_newline()
   CheckNotBSD
 
   let $PS1 = 'TEST_PROMPT> '
-  let buf = RunVimInTerminal('', #{rows: 20, cmd: 'bash --noprofile --norc'})
+  let buf = RunMNVInTerminal('', #{rows: 20, cmd: 'bash --noprofile --norc'})
   call TermWait(buf, 100)
 
   " Write input to temp file
   call term_sendkeys(buf, "echo hello > temp.txt\<CR>")
   call TermWait(buf, 200)
 
-  call term_sendkeys(buf, "bash -c '../vim --not-a-term -u NONE -c \":q!\" -' < temp.txt\<CR>")
+  call term_sendkeys(buf, "bash -c '../mnv --not-a-term -u NONE -c \":q!\" -' < temp.txt\<CR>")
   call TermWait(buf, 200)
 
   " Capture terminal output
@@ -856,7 +856,7 @@ func Test_stdin_no_newline()
   " Find the command line in output
   let cmd_line = -1
   for i in range(len(lines))
-    if lines[i] =~ '.*vim.*--not-a-term.*'
+    if lines[i] =~ '.*mnv.*--not-a-term.*'
       let cmd_line = i
       break
     endif
@@ -887,30 +887,30 @@ func Test_stdin_no_newline()
   call TermWait(buf, 200)
 
   if job_status(term_getjob(buf)) ==# 'run'
-    call StopVimInTerminal(buf)
+    call StopMNVInTerminal(buf)
   endif
 
   unlet $PS1
 endfunc
 
 func Test_silent_ex_mode()
-  " must be able to get the output of Vim.
+  " must be able to get the output of MNV.
   CheckUnix
   CheckNotGui
 
   " This caused an ml_get error.
-  let out = system(GetVimCommand() . '-u NONE -es -c''set verbose=1|h|exe "%norm\<c-y>\<c-d>"'' -c cq')
+  let out = system(GetMNVCommand() . '-u NONE -es -c''set verbose=1|h|exe "%norm\<c-y>\<c-d>"'' -c cq')
   call assert_notmatch('E315:', out)
 endfunc
 
 func Test_default_term()
-  " must be able to get the output of Vim.
+  " must be able to get the output of MNV.
   CheckUnix
   CheckNotGui
 
   let save_term = $TERM
   let $TERM = 'unknownxxx'
-  let out = system(GetVimCommand() . ' -c''set term'' -c cq')
+  let out = system(GetMNVCommand() . ' -c''set term'' -c cq')
   call assert_match("defaulting to 'ansi'", out)
   let $TERM = save_term
 endfunc
@@ -923,7 +923,7 @@ func Test_zzz_startinsert()
     call feedkeys("foobar\<c-o>:wq\<cr>","t")
   [CODE]
 
-  if RunVim([], after, 'Xtestout')
+  if RunMNV([], after, 'Xtestout')
     let lines = readfile('Xtestout')
     call assert_equal(['foobar123456'], lines)
   endif
@@ -934,50 +934,50 @@ func Test_zzz_startinsert()
     call feedkeys("foobar\<c-o>:wq\<cr>","t")
   [CODE]
 
-  if RunVim([], after, 'Xtestout')
+  if RunMNV([], after, 'Xtestout')
     let lines = readfile('Xtestout')
     call assert_equal(['123456foobar'], lines)
   endif
 endfunc
 
 func Test_issue_3969()
-  " Can't catch the output of gvim.
+  " Can't catch the output of gmnv.
   CheckNotGui
 
   " Check that message is not truncated.
-  let out = system(GetVimCommand() . ' -es -X -V1 -c "echon ''hello''" -cq')
+  let out = system(GetMNVCommand() . ' -es -X -V1 -c "echon ''hello''" -cq')
   call assert_equal('hello', out)
 endfunc
 
 func Test_start_with_tabs()
   CheckScreendump
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
-  let buf = RunVimInTerminal('-p a b c', {})
+  let buf = RunMNVInTerminal('-p a b c', {})
   call VerifyScreenDump(buf, 'Test_start_with_tabs', {})
 
   " clean up
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_start_in_minimal_window()
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
-  let buf = RunVimInTerminal('-c "set nomore"', {'cols': 12, 'rows': 2, 'keep_t_u7': 1})
+  let buf = RunMNVInTerminal('-c "set nomore"', {'cols': 12, 'rows': 2, 'keep_t_u7': 1})
   call term_sendkeys(buf, "ahello\<Esc>")
   call WaitForAssert({-> assert_match('^hello', term_getline(buf, 1))})
 
   " clean up
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_v_argv()
-  " Can't catch the output of gvim.
+  " Can't catch the output of gmnv.
   CheckNotGui
 
-  let out = system(GetVimCommand() . ' -es -V1 -X arg1 --cmd "echo v:argv" --cmd q')
+  let out = system(GetMNVCommand() . ' -es -V1 -X arg1 --cmd "echo v:argv" --cmd q')
   let list = out->split("', '")
-  call assert_match('vim', list[0])
+  call assert_match('mnv', list[0])
   let idx = index(list, 'arg1')
   call assert_true(idx > 2)
   call assert_equal(['arg1', '--cmd', 'echo v:argv', '--cmd', 'q'']'], list[idx:])
@@ -985,11 +985,11 @@ endfunc
 
 " Test for the "-r" recovery mode option
 func Test_r_arg()
-  " Can't catch the output of gvim.
+  " Can't catch the output of gmnv.
   CheckNotGui
   CheckUnix
   CheckEnglish
-  let cmd = GetVimCommand()
+  let cmd = GetMNVCommand()
   " There can be swap files anywhere, only check for the headers.
   let expected =<< trim END
     Swap files found:.*
@@ -1020,7 +1020,7 @@ func Test_t_arg()
   call writefile(['    first', '    second', '    third'], 'Xfile1', 'D')
 
   for t_arg in ['-t second', '-tsecond']
-    if RunVim(before, after, t_arg)
+    if RunMNV(before, after, t_arg)
       call assert_equal(['Xfile1:L2C5'], readfile('Xtestout'), t_arg)
       call delete('Xtestout')
     endif
@@ -1036,7 +1036,7 @@ func Test_T_arg()
   [CODE]
 
   for t in ['builtin_dumb', 'builtin_ansi']
-    if RunVim([], after, '-T ' .. t)
+    if RunMNV([], after, '-T ' .. t)
       let lines = readfile('Xtest_T_arg')
       call assert_equal([t], lines)
     endif
@@ -1047,11 +1047,11 @@ endfunc
 
 " Test the '-x' argument to read/write encrypted files.
 func Test_x_arg()
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
   CheckFeature cryptv
 
   " Create an encrypted file Xtest_x_arg.
-  let buf = RunVimInTerminal('-n -x Xtest_x_arg', #{rows: 10, wait_for_ruler: 0})
+  let buf = RunMNVInTerminal('-n -x Xtest_x_arg', #{rows: 10, wait_for_ruler: 0})
   call WaitForAssert({-> assert_match('^Enter encryption key: ', term_getline(buf, 10))})
   call term_sendkeys(buf, "foo\n")
   call WaitForAssert({-> assert_match('^Enter same key again: ', term_getline(buf, 10))})
@@ -1060,16 +1060,16 @@ func Test_x_arg()
   call term_sendkeys(buf, "itest\<Esc>:w\<Enter>")
   call WaitForAssert({-> assert_match('"Xtest_x_arg" \[New\]\[blowfish2\] 1L, 5B written',
         \            term_getline(buf, 10))})
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 
   " Read the encrypted file and check that it contains the expected content "test"
-  let buf = RunVimInTerminal('-n -x Xtest_x_arg', #{rows: 10, wait_for_ruler: 0})
+  let buf = RunMNVInTerminal('-n -x Xtest_x_arg', #{rows: 10, wait_for_ruler: 0})
   call WaitForAssert({-> assert_match('^Enter encryption key: ', term_getline(buf, 10))})
   call term_sendkeys(buf, "foo\n")
   call WaitForAssert({-> assert_match('^Enter same key again: ', term_getline(buf, 10))})
   call term_sendkeys(buf, "foo\n")
   call WaitForAssert({-> assert_match('^test', term_getline(buf, 1))})
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 
   call delete('Xtest_x_arg')
 endfunc
@@ -1083,7 +1083,7 @@ func Test_start_insertmode()
     call writefile(['insertmode=' .. &insertmode], 'Xtestout')
     qall
   [CODE]
-  if RunVim(before, after, '')
+  if RunMNV(before, after, '')
     call assert_equal(['insertmode=1'], readfile('Xtestout'))
     call delete('Xtestout')
   endif
@@ -1095,7 +1095,7 @@ func Test_b_arg()
     call writefile(['binary=' .. &binary], 'Xtestout')
     qall
   [CODE]
-  if RunVim([], after, '-b')
+  if RunMNV([], after, '-b')
     call assert_equal(['binary=1'], readfile('Xtestout'))
     call delete('Xtestout')
   endif
@@ -1108,45 +1108,45 @@ func Test_l_arg()
     call writefile([s], 'Xtestout')
     qall
   [CODE]
-  if RunVim([], after, '-l')
+  if RunMNV([], after, '-l')
     call assert_equal(['lisp=1, showmatch=1'], readfile('Xtestout'))
     call delete('Xtestout')
   endif
 endfunc
 
-" Test for specifying a non-existing vimrc file using "-u"
-func Test_missing_vimrc()
-  CheckRunVimInTerminal
+" Test for specifying a non-existing mnvrc file using "-u"
+func Test_missing_mnvrc()
+  CheckRunMNVInTerminal
   let after =<< trim [CODE]
     call assert_match('^E282:', v:errmsg)
     call writefile(v:errors, 'Xtestout')
   [CODE]
   call writefile(after, 'Xafter', 'D')
 
-  let cmd = GetVimCommandCleanTerm() . ' -u Xvimrc_missing -S Xafter'
+  let cmd = GetMNVCommandCleanTerm() . ' -u Xmnvrc_missing -S Xafter'
   let buf = term_start(cmd, {'term_rows' : 10})
   call WaitForAssert({-> assert_equal("running", term_getstatus(buf))})
   call TermWait(buf)
   call term_sendkeys(buf, "\n:")
   call TermWait(buf)
   call WaitForAssert({-> assert_match(':', term_getline(buf, 10))})
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
   call assert_equal([], readfile('Xtestout'))
 
   call delete('Xtestout')
 endfunc
 
-" Test for using the $VIMINIT environment variable
-func Test_VIMINIT()
+" Test for using the $MNVINIT environment variable
+func Test_MNVINIT()
   let after =<< trim [CODE]
-    call assert_equal(1, exists('viminit_found'))
-    call assert_equal('yes', viminit_found)
+    call assert_equal(1, exists('mnvinit_found'))
+    call assert_equal('yes', mnvinit_found)
     call writefile(v:errors, 'Xtestout')
     qall
   [CODE]
   call writefile(after, 'Xafter', 'D')
-  let cmd = GetVimProg() . ' --not-a-term -S Xafter --cmd "set enc=utf8"'
-  call setenv('VIMINIT', 'let viminit_found="yes"')
+  let cmd = GetMNVProg() . ' --not-a-term -S Xafter --cmd "set enc=utf8"'
+  call setenv('MNVINIT', 'let mnvinit_found="yes"')
   exe "silent !" . cmd
   call assert_equal([], readfile('Xtestout'))
 
@@ -1162,7 +1162,7 @@ func Test_EXINIT()
     qall
   [CODE]
   call writefile(after, 'Xafter', 'D')
-  let cmd = GetVimProg() . ' --not-a-term -S Xafter --cmd "set enc=utf8"'
+  let cmd = GetMNVProg() . ' --not-a-term -S Xafter --cmd "set enc=utf8"'
   call setenv('HOME', '/non-existing')
   call setenv('XDG_CONFIG_HOME', '/non-existing')
   call setenv('EXINIT', 'let exinit_found="yes"')
@@ -1184,20 +1184,20 @@ func Test_exrc()
   call mkdir('Xrcdir', 'R')
   call writefile(['let exrc_found=37'], 'Xrcdir/.exrc')
   call writefile(after, 'Xrcdir/Xafter')
-  let cmd = GetVimProg() . ' --not-a-term -S Xafter --cmd "cd Xrcdir" --cmd "set enc=utf8 exrc secure"'
+  let cmd = GetMNVProg() . ' --not-a-term -S Xafter --cmd "cd Xrcdir" --cmd "set enc=utf8 exrc secure"'
   exe "silent !" . cmd
   call assert_equal([], readfile('Xrcdir/Xtestout'))
 endfunc
 
-" Test for starting Vim with a non-terminal as input/output
+" Test for starting MNV with a non-terminal as input/output
 func Test_io_not_a_terminal()
-  " Can't catch the output of gvim.
+  " Can't catch the output of gmnv.
   CheckNotGui
   CheckUnix
   CheckEnglish
-  let l = systemlist(GetVimProg() .. ' --ttyfail')
-  call assert_equal(['Vim: Warning: Output is not to a terminal',
-        \ 'Vim: Warning: Input is not from a terminal'], l)
+  let l = systemlist(GetMNVProg() .. ' --ttyfail')
+  call assert_equal(['MNV: Warning: Output is not to a terminal',
+        \ 'MNV: Warning: Input is not from a terminal'], l)
 endfunc
 
 " Test for --not-a-term avoiding escape codes.
@@ -1206,36 +1206,36 @@ func Test_not_a_term()
   CheckNotGui
 
   if &shellredir =~ '%s'
-    let redir = printf(&shellredir,  'Xvimout')
+    let redir = printf(&shellredir,  'Xmnvout')
   else
-    let redir = &shellredir .. ' Xvimout'
+    let redir = &shellredir .. ' Xmnvout'
   endif
 
   " Without --not-a-term there are a few escape sequences.
   " This will take 2 seconds because of the missing --not-a-term
-  let cmd = GetVimProg() .. ' --cmd quit ' .. redir
+  let cmd = GetMNVProg() .. ' --cmd quit ' .. redir
   exe "silent !" . cmd
-  call assert_match("\<Esc>", readfile('Xvimout')->join())
-  call delete('Xvimout')
+  call assert_match("\<Esc>", readfile('Xmnvout')->join())
+  call delete('Xmnvout')
 
   " With --not-a-term there are no escape sequences.
-  let cmd = GetVimProg() .. ' --not-a-term --cmd quit ' .. redir
+  let cmd = GetMNVProg() .. ' --not-a-term --cmd quit ' .. redir
   exe "silent !" . cmd
-  call assert_notmatch("\<Esc>", readfile('Xvimout')->join())
-  call delete('Xvimout')
+  call assert_notmatch("\<Esc>", readfile('Xmnvout')->join())
+  call delete('Xmnvout')
 endfunc
 
 " Test quitting with CTRL-C when output is redirected.
 func Test_redirect_Ctrl_C()
   CheckUnix
   CheckNotGui
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   let buf = Run_shell_in_terminal({})
   " Wait for the shell to display a prompt
   call WaitForAssert({-> assert_notequal('', term_getline(buf, 1))})
 
-  call term_sendkeys(buf, GetVimProg() .. " | grep word\<CR>")
+  call term_sendkeys(buf, GetMNVProg() .. " | grep word\<CR>")
   call WaitForAssert({-> assert_match("Output is not to a terminal", getline(1, 4)->join())})
   " wait for the hard coded delay, otherwise the CTRL-C interrupts startup
   sleep 2
@@ -1251,12 +1251,12 @@ endfunc
 
 " Test for the "-w scriptout" argument
 func Test_w_arg()
-  " Can't catch the output of gvim.
+  " Can't catch the output of gmnv.
   CheckNotGui
 
-  call writefile(["iVim Editor\<Esc>:q!\<CR>"], 'Xscriptin', 'bD')
-  if RunVim([], [], '-s Xscriptin -w Xscriptout')
-    call assert_equal(["iVim Editor\e:q!\r"], readfile('Xscriptout'))
+  call writefile(["iMNV Editor\<Esc>:q!\<CR>"], 'Xscriptin', 'bD')
+  if RunMNV([], [], '-s Xscriptin -w Xscriptout')
+    call assert_equal(["iMNV Editor\e:q!\r"], readfile('Xscriptout'))
     call delete('Xscriptout')
   endif
   call delete('Xscriptin')
@@ -1265,7 +1265,7 @@ func Test_w_arg()
   " the language is English.
   if v:lang == "C" || v:lang =~ '^[Ee]n'
     call mkdir("Xargdir")
-    let m = system(GetVimCommand() .. " -w Xargdir")
+    let m = system(GetMNVCommand() .. " -w Xargdir")
     call assert_equal("Cannot open for script output: \"Xargdir\"\n", m)
     call delete("Xargdir", 'rf')
   endif
@@ -1273,7 +1273,7 @@ func Test_w_arg()
   " A number argument sets the 'window' option
   call writefile(["iwindow \<C-R>=&window\<CR>\<Esc>:wq! Xresult\<CR>"], 'Xscriptin', 'b')
   for w_arg in ['-w 17', '-w17']
-    if RunVim([], [], '-s Xscriptin ' .. w_arg)
+    if RunMNV([], [], '-s Xscriptin ' .. w_arg)
       call assert_equal(["window 17"], readfile('Xresult'), w_arg)
       call delete('Xresult')
     endif
@@ -1282,15 +1282,15 @@ endfunc
 
 " Test for the "-s scriptin" argument
 func Test_s_arg()
-  " Can't catch the output of gvim.
+  " Can't catch the output of gmnv.
   CheckNotGui
   CheckEnglish
   " Test for failing to open the script input file.
-  let m = system(GetVimCommand() .. " -s abcxyz")
+  let m = system(GetMNVCommand() .. " -s abcxyz")
   call assert_equal("Cannot open for reading: \"abcxyz\"\n", m)
 
   call writefile([], 'Xinput', 'D')
-  let m = system(GetVimCommand() .. " -s Xinput -s Xinput")
+  let m = system(GetMNVCommand() .. " -s Xinput -s Xinput")
   call assert_equal("Attempt to open script file again: \"-s Xinput\"\n", m)
 endfunc
 
@@ -1301,7 +1301,7 @@ func Test_n_arg()
     call writefile(v:errors, 'Xtestout')
     qall
   [CODE]
-  if RunVim([], after, '-n')
+  if RunMNV([], after, '-n')
     call assert_equal([], readfile('Xtestout'))
     call delete('Xtestout')
   endif
@@ -1309,19 +1309,19 @@ endfunc
 
 " Test for the "-h" (help) argument
 func Test_h_arg()
-  " Can't catch the output of gvim.
+  " Can't catch the output of gmnv.
   CheckNotGui
-  let l = systemlist(GetVimProg() .. ' -h')
-  call assert_match('^VIM - Vi IMproved', l[0])
-  let l = systemlist(GetVimProg() .. ' -?')
-  call assert_match('^VIM - Vi IMproved', l[0])
+  let l = systemlist(GetMNVProg() .. ' -h')
+  call assert_match('^MNV - MNV is not Vim', l[0])
+  let l = systemlist(GetMNVProg() .. ' -?')
+  call assert_match('^MNV - MNV is not Vim', l[0])
 endfunc
 
 " Test for the "-F" (farsi) argument
 func Test_F_arg()
-  " Can't catch the output of gvim.
+  " Can't catch the output of gmnv.
   CheckNotGui
-  let l = systemlist(GetVimProg() .. ' -F')
+  let l = systemlist(GetMNVProg() .. ' -F')
   call assert_match('^E27:', l[0])
 endfunc
 
@@ -1332,7 +1332,7 @@ func Test_E_arg()
     call writefile(v:errors, 'Xtestout')
     qall
   [CODE]
-  if RunVim([], after, '-E')
+  if RunMNV([], after, '-E')
     call assert_equal([], readfile('Xtestout'))
     call delete('Xtestout')
   endif
@@ -1340,9 +1340,9 @@ endfunc
 
 " Test for the "-D" (debugger) argument
 func Test_D_arg()
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
-  let cmd = GetVimCommandCleanTerm() .. ' -D'
+  let cmd = GetMNVCommandCleanTerm() .. ' -D'
   let buf = term_start(cmd, {'term_rows' : 10})
   call WaitForAssert({-> assert_equal("running", term_getstatus(buf))})
 
@@ -1350,19 +1350,19 @@ func Test_D_arg()
   \                  term_getline(buf, 7))})
   call WaitForAssert({-> assert_equal('>', term_getline(buf, 10))})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 " Test for too many edit argument errors
 func Test_too_many_edit_args()
-  " Can't catch the output of gvim.
+  " Can't catch the output of gmnv.
   CheckNotGui
   CheckEnglish
-  let l = systemlist(GetVimProg() .. ' - -')
+  let l = systemlist(GetMNVProg() .. ' - -')
   call assert_match('^Too many edit arguments: "-"', l[1])
 endfunc
 
-" Test starting vim with various names: vim, ex, view, evim, etc.
+" Test starting mnv with various names: mnv, ex, view, emnv, etc.
 func Test_progname()
   CheckUnix
 
@@ -1382,34 +1382,34 @@ func Test_progname()
   "  |            |     |    |    |        |    +--- :messages
   "  |            |     |    |    |        |    |
   let expectations = {
-  \ 'vim':      ['n',  '0', '0', '0',   '200', ''],
-  \ 'gvim':     ['n',  '0', '0', '0',   '200', ''],
+  \ 'mnv':      ['n',  '0', '0', '0',   '200', ''],
+  \ 'gmnv':     ['n',  '0', '0', '0',   '200', ''],
   \ 'ex':       ['ce', '0', '0', '0',   '200', ''],
   \ 'exim':     ['cv', '0', '0', '0',   '200', ''],
   \ 'view':     ['n',  '0', '0', '1', '10000', ''],
   \ 'gview':    ['n',  '0', '0', '1', '10000', ''],
-  \ 'evim':     ['n',  '1', '0', '0',   '200', ''],
+  \ 'emnv':     ['n',  '1', '0', '0',   '200', ''],
   \ 'eview':    ['n',  '1', '0', '1', '10000', ''],
-  \ 'rvim':     ['n',  '0', '0', '0',   '200', 'line    1: E145: Shell commands and some functionality not allowed in rvim'],
-  \ 'rgvim':    ['n',  '0', '0', '0',   '200', 'line    1: E145: Shell commands and some functionality not allowed in rvim'],
-  \ 'rview':    ['n',  '0', '0', '1', '10000', 'line    1: E145: Shell commands and some functionality not allowed in rvim'],
-  \ 'rgview':   ['n',  '0', '0', '1', '10000', 'line    1: E145: Shell commands and some functionality not allowed in rvim'],
-  \ 'vimdiff':  ['n',  '0', '1', '0',   '200', ''],
-  \ 'gvimdiff': ['n',  '0', '1', '0',   '200', '']}
+  \ 'rmnv':     ['n',  '0', '0', '0',   '200', 'line    1: E145: Shell commands and some functionality not allowed in rmnv'],
+  \ 'rgmnv':    ['n',  '0', '0', '0',   '200', 'line    1: E145: Shell commands and some functionality not allowed in rmnv'],
+  \ 'rview':    ['n',  '0', '0', '1', '10000', 'line    1: E145: Shell commands and some functionality not allowed in rmnv'],
+  \ 'rgview':   ['n',  '0', '0', '1', '10000', 'line    1: E145: Shell commands and some functionality not allowed in rmnv'],
+  \ 'mnvdiff':  ['n',  '0', '1', '0',   '200', ''],
+  \ 'gmnvdiff': ['n',  '0', '1', '0',   '200', '']}
 
-  let prognames = ['vim', 'gvim', 'ex', 'exim', 'view', 'gview',
-  \                'evim', 'eview', 'rvim', 'rgvim', 'rview', 'rgview',
-  \                'vimdiff', 'gvimdiff']
+  let prognames = ['mnv', 'gmnv', 'ex', 'exim', 'view', 'gview',
+  \                'emnv', 'eview', 'rmnv', 'rgmnv', 'rview', 'rgview',
+  \                'mnvdiff', 'gmnvdiff']
 
   for progname in prognames
-    let run_with_gui = (progname =~# 'g') || (has('gui') && (progname ==# 'evim' || progname ==# 'eview'))
+    let run_with_gui = (progname =~# 'g') || (has('gui') && (progname ==# 'emnv' || progname ==# 'eview'))
 
     if empty($DISPLAY) && run_with_gui
-      " Can't run gvim, gview  (etc.) if $DISPLAY is not setup.
+      " Can't run gmnv, gview  (etc.) if $DISPLAY is not setup.
       continue
     endif
 
-    exe 'silent !ln -s -f ' ..exepath(GetVimProg()) .. ' Xprogname/' .. progname
+    exe 'silent !ln -s -f ' ..exepath(GetMNVProg()) .. ' Xprogname/' .. progname
 
     let stdout_stderr = ''
     if progname =~# 'g'
@@ -1440,15 +1440,15 @@ func Test_progname()
   call delete('Xprogname_after')
 endfunc
 
-" Test for doing a write from .vimrc
-func Test_write_in_vimrc()
-  call writefile(['silent! write'], 'Xvimrc', 'D')
+" Test for doing a write from .mnvrc
+func Test_write_in_mnvrc()
+  call writefile(['silent! write'], 'Xmnvrc', 'D')
   let after =<< trim [CODE]
     call assert_match('E32: ', v:errmsg)
     call writefile(v:errors, 'Xtestout')
     qall
   [CODE]
-  if RunVim([], after, '-u Xvimrc')
+  if RunMNV([], after, '-u Xmnvrc')
     call assert_equal([], readfile('Xtestout'))
     call delete('Xtestout')
   endif
@@ -1463,7 +1463,7 @@ func Test_echo_true_in_cmd()
       quit
   END
   call writefile(lines, 'Xscript', 'D')
-  if RunVim([], [], '--cmd "source Xscript"')
+  if RunMNV([], [], '--cmd "source Xscript"')
     call assert_equal(['done'], readfile('Xresult'))
   endif
 
@@ -1478,7 +1478,7 @@ func Test_rename_buffer_on_startup()
       qa!
   END
   call writefile(lines, 'Xscript', 'D')
-  if RunVim([], [], "--clean -e -s --cmd 'file x|new|file x' --cmd 'so Xscript'")
+  if RunMNV([], [], "--clean -e -s --cmd 'file x|new|file x' --cmd 'so Xscript'")
     call assert_equal(['done'], readfile('Xresult'))
   endif
 
@@ -1490,14 +1490,14 @@ func Test_cq_zero_exmode()
   CheckFeature channel
 
   let logfile = 'Xcq_log.txt'
-  let out = system(GetVimCommand() .. ' --clean --log ' .. logfile .. ' -es -X -c "argdelete foobar" -c"7cq"')
+  let out = system(GetMNVCommand() .. ' --clean --log ' .. logfile .. ' -es -X -c "argdelete foobar" -c"7cq"')
   call assert_equal(8, v:shell_error)
   let log = filter(readfile(logfile), {idx, val -> val =~ "E480:"})
   call assert_match('E480: No match: foobar', log[0])
   call delete(logfile)
 
   " wrap-around on Unix
-  let out = system(GetVimCommand() .. ' --clean --log ' .. logfile .. ' -es -X -c "argdelete foobar" -c"255cq"')
+  let out = system(GetMNVCommand() .. ' --clean --log ' .. logfile .. ' -es -X -c "argdelete foobar" -c"255cq"')
   if !has('win32')
     call assert_equal(0, v:shell_error)
   else
@@ -1508,4 +1508,4 @@ func Test_cq_zero_exmode()
   call delete('Xcq_log.txt')
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_startup_utf8.vim b/uvim/src/testdir/test_startup_utf8.mnv
index 55888e8dfd..84e56de6f7 100644
--- a/uvim/src/testdir/test_startup_utf8.vim
+++ b/uvim/src/testdir/test_startup_utf8.mnv
@@ -1,6 +1,6 @@
 " Tests for startup using utf-8.
 
-source util/screendump.vim
+source util/screendump.mnv
 
 func Test_read_stdin_utf8()
   let linesin = ['テスト', '€ÀÈÌÒÙ']
@@ -18,11 +18,11 @@ func Test_read_stdin_utf8()
   else
     let pipecmd = 'cat Xtestin | '
   endif
-  if RunVimPiped(before, after, '-', pipecmd)
+  if RunMNVPiped(before, after, '-', pipecmd)
     let lines = readfile('Xtestout')
     call assert_equal(linesin, lines)
   else
-    call assert_equal('', 'RunVimPiped failed.')
+    call assert_equal('', 'RunMNVPiped failed.')
   endif
 
   call delete('Xtestout')
@@ -48,11 +48,11 @@ func Test_read_fifo_utf8()
 	\ 'write ++enc=utf-8 Xtestout',
 	\ 'quit!',
 	\ ]
-  if RunVim(before, after, '<(cat Xtestin)')
+  if RunMNV(before, after, '<(cat Xtestin)')
     let lines = readfile('Xtestout')
     call assert_equal(linesin, lines)
   else
-    call assert_equal('', 'RunVim failed.')
+    call assert_equal('', 'RunMNV failed.')
   endif
 
   call delete('Xtestout')
@@ -76,19 +76,19 @@ func Test_detect_fifo()
 	\ 'call writefile(split(execute(":mess"), "\\n"), "Xtestout")',
 	\ 'quit!',
 	\ ]
-  if RunVim([], after, '<(cat Xtestin_fifo)')
+  if RunMNV([], after, '<(cat Xtestin_fifo)')
     let lines = readfile('Xtestout')
     call assert_match('\[fifo\]', lines[0])
     call assert_match('\[fifo\]', lines[1])
   else
-    call assert_equal('', 'RunVim failed.')
+    call assert_equal('', 'RunMNV failed.')
   endif
 
   call delete('Xtestout')
 endfunc
 
 func Test_detect_ambiwidth()
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   " Use the title termcap entries to output the escape sequence.
   call writefile([
@@ -97,12 +97,12 @@ func Test_detect_ambiwidth()
 	\ 'call test_option_not_set("ambiwidth")',
 	\ 'redraw',
 	\ ], 'Xscript', 'D')
-  let buf = RunVimInTerminal('-S Xscript', #{keep_t_u7: 1})
+  let buf = RunMNVInTerminal('-S Xscript', #{keep_t_u7: 1})
   call TermWait(buf)
   call term_sendkeys(buf, "S\<C-R>=&ambiwidth\<CR>\<Esc>")
   call WaitForAssert({-> assert_match('single', term_getline(buf, 1))})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_stat.vim b/uvim/src/testdir/test_stat.mnv
index b616870efe..085f9337d1 100644
--- a/uvim/src/testdir/test_stat.vim
+++ b/uvim/src/testdir/test_stat.mnv
@@ -219,4 +219,4 @@ func Test_win32_symlink_dir()
   endif
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_statusline.vim b/uvim/src/testdir/test_statusline.mnv
index 174c1a4754..e5766f422c 100644
--- a/uvim/src/testdir/test_statusline.vim
+++ b/uvim/src/testdir/test_statusline.mnv
@@ -3,7 +3,7 @@
 " Not tested yet:
 "   %N
 
-source util/screendump.vim
+source util/screendump.mnv
 
 func SetUp()
   set laststatus=2
@@ -234,12 +234,12 @@ func Test_statusline()
   call assert_match('^\[Preview\],PRV\s*$', s:get_statusline())
   pclose
 
-  " %y: Type of file in the buffer, e.g., "[vim]". See 'filetype'.
-  " %Y: Type of file in the buffer, e.g., ",VIM". See 'filetype'.
+  " %y: Type of file in the buffer, e.g., "[mnv]". See 'filetype'.
+  " %Y: Type of file in the buffer, e.g., ",MNV". See 'filetype'.
   set statusline=%y\ %Y
   call assert_match('^\s*$', s:get_statusline())
-  setfiletype vim
-  call assert_match('^\[vim\] VIM\s*$', s:get_statusline())
+  setfiletype mnv
+  call assert_match('^\[mnv\] MNV\s*$', s:get_statusline())
 
   " %=: Separation point between left and right aligned items.
   set statusline=foo%=bar
@@ -277,9 +277,9 @@ func Test_statusline()
   let s:expected_curbuf = string(bufnr(''))
   let s:expected_curwin = string(win_getid())
   set statusline=%{SyntaxItem()}
-  call assert_match('^vimNumber\s*$', s:get_statusline())
+  call assert_match('^mnvNumber\s*$', s:get_statusline())
   s/^/"/
-  call assert_match('^vimLineComment\s*$', s:get_statusline())
+  call assert_match('^mnvLineComment\s*$', s:get_statusline())
   syntax off
 
   "%{%expr%}: evaluates expressions present in result of expr
@@ -496,11 +496,11 @@ func Test_statusline_removed_group()
   END
   call writefile(lines, 'XTest_statusline', 'D')
 
-  let buf = RunVimInTerminal('-S XTest_statusline', {'rows': 10, 'cols': 50})
+  let buf = RunMNVInTerminal('-S XTest_statusline', {'rows': 10, 'cols': 50})
   call VerifyScreenDump(buf, 'Test_statusline_1', {})
 
   " clean up
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_statusline_using_mode()
@@ -513,7 +513,7 @@ func Test_statusline_using_mode()
   END
   call writefile(lines, 'XTest_statusline', 'D')
 
-  let buf = RunVimInTerminal('-S XTest_statusline', {'rows': 7, 'cols': 50})
+  let buf = RunMNVInTerminal('-S XTest_statusline', {'rows': 7, 'cols': 50})
   call VerifyScreenDump(buf, 'Test_statusline_mode_1', {})
 
   call term_sendkeys(buf, ":")
@@ -521,7 +521,7 @@ func Test_statusline_using_mode()
 
   " clean up
   call term_sendkeys(buf, "close\<CR>")
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_statusline_after_split_vsplit()
@@ -576,10 +576,10 @@ func Test_statusline_highlight_truncate()
   END
   call writefile(lines, 'XTest_statusline', 'D')
 
-  let buf = RunVimInTerminal('-S XTest_statusline', {'rows': 6})
+  let buf = RunMNVInTerminal('-S XTest_statusline', {'rows': 6})
   call VerifyScreenDump(buf, 'Test_statusline_hl', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_statusline_showcmd()
@@ -600,7 +600,7 @@ func Test_statusline_showcmd()
   END
   call writefile(lines, 'XTest_statusline', 'D')
 
-  let buf = RunVimInTerminal('-S XTest_statusline', {'rows': 6})
+  let buf = RunMNVInTerminal('-S XTest_statusline', {'rows': 6})
 
   call term_sendkeys(buf, "g")
   call VerifyScreenDump(buf, 'Test_statusline_showcmd_1', {})
@@ -620,7 +620,7 @@ func Test_statusline_showcmd()
   call term_sendkeys(buf, "1234")
   call VerifyScreenDump(buf, 'Test_statusline_showcmd_5', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_statusline_highlight_group_cleared()
@@ -637,11 +637,11 @@ func Test_statusline_highlight_group_cleared()
   END
   call writefile(lines, 'XTest_statusline_stl', 'D')
 
-  let buf = RunVimInTerminal('-S XTest_statusline_stl', {})
+  let buf = RunMNVInTerminal('-S XTest_statusline_stl', {})
 
   call VerifyScreenDump(buf, 'Test_statusline_stl_1', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 " Test for setting both global and local 'statusline' values in a sandbox
@@ -707,7 +707,7 @@ func Test_statusline_in_sandbox()
   delfunc Check_statusline_in_sandbox
 endfunc
 
-" This used to call memmove with a negative size and crash Vim
+" This used to call memmove with a negative size and crash MNV
 func Test_statusline_singlebyte_negative()
   let [_columns, _ls, _stl, _enc]  = [&columns, &ls, &stl, &enc]
   set encoding=latin1
@@ -721,4 +721,4 @@ func Test_statusline_singlebyte_negative()
   let [&columns, &ls, &stl, &enc] = [_columns, _ls, _stl, _enc]
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_statuslineopt.vim b/uvim/src/testdir/test_statuslineopt.mnv
index 6454dbff87..8166b3ee6a 100644
--- a/uvim/src/testdir/test_statuslineopt.vim
+++ b/uvim/src/testdir/test_statuslineopt.mnv
@@ -1,7 +1,7 @@
 " Test 'statuslineopt' with 'statusline'
 "
 
-source util/screendump.vim
+source util/screendump.mnv
 
 def SetUp()
   set laststatus=2
@@ -224,7 +224,7 @@ func Test_multistatusline_highlight()
   END
   call writefile(lines, 'XTest_multistatusline_highlight', 'D')
 
-  let buf = g:RunVimInTerminal('-S XTest_multistatusline_highlight', {'rows': 6})
+  let buf = g:RunMNVInTerminal('-S XTest_multistatusline_highlight', {'rows': 6})
   call term_sendkeys(buf, "\<C-L>")
   call VerifyScreenDump(buf, 'Test_multistatusline_highlight_01', {})
   call term_sendkeys(buf, ":hi link User2 Error\<CR>\<C-L>")
@@ -232,7 +232,7 @@ func Test_multistatusline_highlight()
   call term_sendkeys(buf, ":hi link User2 NONE\<CR>\<C-L>")
   call VerifyScreenDump(buf, 'Test_multistatusline_highlight_01', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_statuslineopt_default_stl()
@@ -246,11 +246,11 @@ func Test_statuslineopt_default_stl()
   END
   call writefile(lines, 'XTest_statuslineopt_default_stl', 'D')
 
-  let buf = g:RunVimInTerminal('-S XTest_statuslineopt_default_stl', {'rows': 8})
+  let buf = g:RunMNVInTerminal('-S XTest_statuslineopt_default_stl', {'rows': 8})
   call term_sendkeys(buf, "\<C-L>")
   call VerifyScreenDump(buf, 'Test_statuslineopt_default_stl_01', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 def Test_statuslineopt_default_stl_maxheight()
@@ -289,11 +289,11 @@ func Test_statuslineopt_new_split()
   END
   call writefile(lines, 'XTest_statuslineopt_new_split', 'D')
 
-  let buf = g:RunVimInTerminal('-S XTest_statuslineopt_new_split', {'rows': 20})
+  let buf = g:RunMNVInTerminal('-S XTest_statuslineopt_new_split', {'rows': 20})
   call term_sendkeys(buf, ":new\<CR>\<C-L>")
   call VerifyScreenDump(buf, 'Test_statuslineopt_new_split_01', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_statuslineopt_sp_split()
@@ -308,11 +308,11 @@ func Test_statuslineopt_sp_split()
   END
   call writefile(lines, 'XTest_statuslineopt_sp_split', 'D')
 
-  let buf = g:RunVimInTerminal('-S XTest_statuslineopt_sp_split', {'rows': 15})
+  let buf = g:RunMNVInTerminal('-S XTest_statuslineopt_sp_split', {'rows': 15})
   call term_sendkeys(buf, ":sp\<CR>\<C-L>")
   call VerifyScreenDump(buf, 'Test_statuslineopt_sp_split_01', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_statuslineopt_sp_foo()
@@ -328,11 +328,11 @@ func Test_statuslineopt_sp_foo()
   END
   call writefile(lines, 'XTest_statuslineopt_sp_foo', 'D')
 
-  let buf = g:RunVimInTerminal('-S XTest_statuslineopt_sp_foo', {'rows': 20})
+  let buf = g:RunMNVInTerminal('-S XTest_statuslineopt_sp_foo', {'rows': 20})
   call term_sendkeys(buf, ":sp Xfoo\<CR>\<C-L>")
   call VerifyScreenDump(buf, 'Test_statuslineopt_sp_foo_01', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_statuslineopt_wincmd_eq()
@@ -351,11 +351,11 @@ func Test_statuslineopt_wincmd_eq()
   END
   call writefile(lines, 'XTest_statuslineopt_wincmd_eq', 'D')
 
-  let buf = g:RunVimInTerminal('-S XTest_statuslineopt_wincmd_eq', {'rows': 12})
+  let buf = g:RunMNVInTerminal('-S XTest_statuslineopt_wincmd_eq', {'rows': 12})
   call term_sendkeys(buf, "\<C-W>=\<C-L>")
   call VerifyScreenDump(buf, 'Test_statuslineopt_wincmd_eq_01', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_statuslineopt_wincmd_underscore()
@@ -372,11 +372,11 @@ func Test_statuslineopt_wincmd_underscore()
   END
   call writefile(lines, 'XTest_statuslineopt_wincmd_underscore', 'D')
 
-  let buf = g:RunVimInTerminal('-S XTest_statuslineopt_wincmd_underscore', {'rows': 14})
+  let buf = g:RunMNVInTerminal('-S XTest_statuslineopt_wincmd_underscore', {'rows': 14})
   call term_sendkeys(buf, "\<C-W>_\<C-L>")
   call VerifyScreenDump(buf, 'Test_statuslineopt_wincmd_underscore_01', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 def Test_statuslineopt_besteff_order()
@@ -412,4 +412,4 @@ def Test_statuslineopt_besteff_order()
   only
 enddef
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_substitute.vim b/uvim/src/testdir/test_substitute.mnv
index 7108143863..e633423cde 100644
--- a/uvim/src/testdir/test_substitute.vim
+++ b/uvim/src/testdir/test_substitute.mnv
@@ -1,6 +1,6 @@
 " Tests for the substitute (:s) command
 
-source util/screendump.vim
+source util/screendump.mnv
 
 " NOTE: This needs to be the first test to be
 "       run in the file, since it depends on
@@ -22,7 +22,7 @@ func Test_aaaa_substitute_expr_recursive_special()
     "call assert_fails(':s/./~\=R()/0', 'E939:')
     let @/='.'
     ~g
-  catch /^Vim\%((\a\+)\)\=:E565:/
+  catch /^MNV\%((\a\+)\)\=:E565:/
   endtry
   delfunc R
   exe bufnr .. "bw!"
@@ -499,7 +499,7 @@ endfunc
 
 func Test_substitute_float()
   call assert_equal('number 1.23', substitute('number ', '$', { -> 1.23 }, ''))
-  vim9 assert_equal('number 1.23', substitute('number ', '$', () => 1.23, ''))
+  mnv9 assert_equal('number 1.23', substitute('number ', '$', () => 1.23, ''))
 endfunc
 
 " Tests for *sub-replace-special* and *sub-replace-expression* on :substitute.
@@ -727,18 +727,18 @@ endfunc
 
 func Test_sub_highlight_zero_match()
   CheckScreendump
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   let lines =<< trim END
     call setline(1, ['one', 'two', 'three'])
   END
   call writefile(lines, 'XscriptSubHighlight', 'D')
-  let buf = RunVimInTerminal('-S XscriptSubHighlight', #{rows: 8, cols: 60})
+  let buf = RunMNVInTerminal('-S XscriptSubHighlight', #{rows: 8, cols: 60})
   call term_sendkeys(buf, ":%s/^/   /c\<CR>")
   call VerifyScreenDump(buf, 'Test_sub_highlight_zer_match_1', {})
 
   call term_sendkeys(buf, "\<Esc>")
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_nocatch_sub_failure_handling()
@@ -876,9 +876,9 @@ func Test_sub_vi_compatibility()
   call assert_equal('amber green yellow white green', getline(1))
   close!
 
-  call assert_fails('vim9cmd s\/white/', 'E1270:')
-  call assert_fails('vim9cmd s\?white?', 'E1270:')
-  call assert_fails('vim9cmd s\&white&', 'E1270:')
+  call assert_fails('mnv9cmd s\/white/', 'E1270:')
+  call assert_fails('mnv9cmd s\?white?', 'E1270:')
+  call assert_fails('mnv9cmd s\&white&', 'E1270:')
 endfunc
 
 " Test for substitute with the new text longer than the original text
@@ -901,7 +901,7 @@ func Test_sub_with_no_last_pat()
     qall!
   [SCRIPT]
   call writefile(lines, 'Xscript', 'D')
-  if RunVim([], [], '--clean -S Xscript')
+  if RunMNV([], [], '--clean -S Xscript')
     call assert_equal([], readfile('Xresult'))
   endif
 
@@ -912,7 +912,7 @@ func Test_sub_with_no_last_pat()
     qall!
   [SCRIPT]
   call writefile(lines, 'Xscript')
-  if RunVim([], [], '--clean -S Xscript')
+  if RunMNV([], [], '--clean -S Xscript')
     call assert_equal([], readfile('Xresult'))
   endif
 
@@ -948,7 +948,7 @@ func Test_substitute_expr()
 endfunc
 
 func Test_invalid_submatch()
-  " This was causing invalid memory access in Vim-7.4.2232 and older
+  " This was causing invalid memory access in MNV-7.4.2232 and older
   call assert_fails("call substitute('x', '.', {-> submatch(10)}, '')", 'E935:')
   call assert_fails('eval submatch(-1)', 'E935:')
   call assert_equal('', submatch(0))
@@ -1100,7 +1100,7 @@ endfunc
 
 " This was opening a command line window from the expression
 func Test_sub_open_cmdline_win()
-  " the error only happens in a very specific setup, run a new Vim instance to
+  " the error only happens in a very specific setup, run a new MNV instance to
   " get a clean starting point.
   let lines =<< trim [SCRIPT]
     set vb t_vb=
@@ -1115,7 +1115,7 @@ func Test_sub_open_cmdline_win()
     qall!
   [SCRIPT]
   call writefile(lines, 'Xscript', 'D')
-  if RunVim([], [], '-u NONE -S Xscript')
+  if RunMNV([], [], '-u NONE -S Xscript')
     call assert_match('E565: Not allowed to change text or change window',
           \ readfile('Xresult')->join('XX'))
   endif
@@ -1168,7 +1168,7 @@ func Test_recursive_expr_substitute()
       qall!
   END
   call writefile(lines, 'XexprSubst', 'D')
-  call RunVim([], [], '--clean -S XexprSubst')
+  call RunMNV([], [], '--clean -S XexprSubst')
 endfunc
 
 " Test for the 2-letter and 3-letter :substitute commands
@@ -1469,7 +1469,7 @@ endfunc
 "  bwipe!
 "endfunc
 
-" This should be done last to reveal a memory leak when vim_regsub_both() is
+" This should be done last to reveal a memory leak when mnv_regsub_both() is
 " called to evaluate an expression but it is not used in a second call.
 func Test_z_substitute_expr_leak()
   func SubExpr()
@@ -1526,4 +1526,4 @@ func Test_substitute_expr_cpo()
   delfunc XSubExpr
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_suspend.vim b/uvim/src/testdir/test_suspend.mnv
index ae05dd21f2..3e0b5a7f64 100644
--- a/uvim/src/testdir/test_suspend.vim
+++ b/uvim/src/testdir/test_suspend.mnv
@@ -33,7 +33,7 @@ func Test_suspend()
         \               . " -c 'set nu keyprotocol='"
         \               . " -c 'call setline(1, \"foo\")'"
         \               . " Xfoo\<CR>")
-  " Cursor in terminal buffer should be on first line in spawned vim.
+  " Cursor in terminal buffer should be on first line in spawned mnv.
   call WaitForAssert({-> assert_equal('  1 foo', term_getline(buf, '.'))})
 
   for suspend_cmd in [":suspend\<CR>",
@@ -56,7 +56,7 @@ func Test_suspend()
   " Quit gracefully to dump coverage information.
   call term_sendkeys(buf, ":qall!\<CR>")
   call TermWait(buf)
-  " Wait until Vim actually exited and shell shows a prompt
+  " Wait until MNV actually exited and shell shows a prompt
   call WaitForAssert({-> assert_match('[$#] $', term_getline(buf, '.'))})
   call StopShellInTerminal(buf)
 
@@ -82,11 +82,11 @@ func Test_suspend_autocmd()
         \               . " --clean -X"
         \               . " -c 'set nu keyprotocol='"
         \               . " -c 'let g:count = 0'"
-        \               . " -c 'au VimSuspend * let g:count += 1'"
-        \               . " -c 'au VimResume * let g:count += 1'"
+        \               . " -c 'au MNVSuspend * let g:count += 1'"
+        \               . " -c 'au MNVResume * let g:count += 1'"
         \               . " -c 'call setline(1, \"foo\")'"
         \               . " Xfoo\<CR>")
-  " Cursor in terminal buffer should be on first line in spawned vim.
+  " Cursor in terminal buffer should be on first line in spawned mnv.
   call WaitForAssert({-> assert_equal('  1 foo', term_getline(buf, '.'))})
 
   for suspend_cmd in [":suspend\<CR>",
@@ -94,7 +94,7 @@ func Test_suspend_autocmd()
         \             ":suspend!\<CR>",
         \             ":stop!\<CR>",
         \             "\<C-Z>"]
-    " Suspend and wait for shell prompt.  Then "fg" will restore Vim.
+    " Suspend and wait for shell prompt.  Then "fg" will restore MNV.
     call term_sendkeys(buf, suspend_cmd)
     call CheckSuspended(buf, 0)
   endfor
@@ -106,7 +106,7 @@ func Test_suspend_autocmd()
   " Quit gracefully to dump coverage information.
   call term_sendkeys(buf, ":qall!\<CR>")
   call TermWait(buf)
-  " Wait until Vim actually exited and shell shows a prompt
+  " Wait until MNV actually exited and shell shows a prompt
   call WaitForAssert({-> assert_match('[$#] $', term_getline(buf, '.'))})
   call StopShellInTerminal(buf)
 
@@ -114,4 +114,4 @@ func Test_suspend_autocmd()
   call delete('Xfoo')
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_swap.vim b/uvim/src/testdir/test_swap.mnv
index b599bf76ee..af6ce5b5ec 100644
--- a/uvim/src/testdir/test_swap.vim
+++ b/uvim/src/testdir/test_swap.mnv
@@ -119,7 +119,7 @@ func Test_swapinfo()
   call assert_equal(1, nr, 'not found in ' .. string(swapfilelist()))
 
   let info = fname->swapinfo()
-  let ver = printf('VIM %d.%d', v:version / 100, v:version % 100)
+  let ver = printf('MNV %d.%d', v:version / 100, v:version % 100)
   call assert_equal(ver, info.version)
 
   call assert_match('\w', info.user)
@@ -347,13 +347,13 @@ endfunc
 
 " Test for selecting 'q' in the attention prompt
 func Test_swap_prompt_splitwin()
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   call writefile(['foo bar'], 'Xfile1', 'D')
   edit Xfile1
   preserve  " should help to make sure the swap file exists
 
-  let buf = RunVimInTerminal('', {'rows': 20})
+  let buf = RunMNVInTerminal('', {'rows': 20})
   call term_sendkeys(buf, ":set nomore\n")
   call term_sendkeys(buf, ":set noruler\n")
 
@@ -367,21 +367,21 @@ func Test_swap_prompt_splitwin()
   call term_sendkeys(buf, ":echomsg winnr('$')\<CR>")
   call TermWait(buf)
   call WaitForAssert({-> assert_match('^1$', term_getline(buf, 20))})
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 
-  " This caused Vim to crash when typing "q" at the swap file prompt.
-  let buf = RunVimInTerminal('-c "au bufadd * let foo_w = wincol()"', {'rows': 18})
+  " This caused MNV to crash when typing "q" at the swap file prompt.
+  let buf = RunMNVInTerminal('-c "au bufadd * let foo_w = wincol()"', {'rows': 18})
   call term_sendkeys(buf, ":e Xfile1\<CR>")
   call WaitForAssert({-> assert_match('More', term_getline(buf, 18))})
   call term_sendkeys(buf, " ")
   call WaitForAssert({-> assert_match('^\[O\]pen Read-Only, (E)dit anyway, (R)ecover, (Q)uit, (A)bort:', term_getline(buf, 18))})
   call term_sendkeys(buf, "q")
   call TermWait(buf)
-  " check that Vim is still running
+  " check that MNV is still running
   call term_sendkeys(buf, ":echo 'hello'\<CR>")
   call WaitForAssert({-> assert_match('^hello', term_getline(buf, 18))})
   call term_sendkeys(buf, ":%bwipe!\<CR>")
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 
   %bwipe!
 endfunc
@@ -541,7 +541,7 @@ func Test_swapchoice()
   augroup END
   try
     edit Xfile5
-  catch /^Vim:Interrupt$/
+  catch /^MNV:Interrupt$/
   endtry
   call assert_equal('', @%)
   call assert_true(bufexists('Xfile5'))
@@ -569,4 +569,4 @@ func Test_no_swap_file()
   call assert_equal("\nNo swap file", execute('swapname'))
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_syn_attr.vim b/uvim/src/testdir/test_syn_attr.mnv
index bf4dfbcaf0..8f2aa2520d 100644
--- a/uvim/src/testdir/test_syn_attr.vim
+++ b/uvim/src/testdir/test_syn_attr.mnv
@@ -831,4 +831,4 @@ func Test_color_names()
   hi Mine guifg=BLANCHEDALMOND
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_syntax.vim b/uvim/src/testdir/test_syntax.mnv
index e4d46911d0..99a451b471 100644
--- a/uvim/src/testdir/test_syntax.vim
+++ b/uvim/src/testdir/test_syntax.mnv
@@ -2,7 +2,7 @@
 
 CheckFeature syntax
 
-source util/screendump.vim
+source util/screendump.mnv
 
 func GetSyntaxItem(pat)
   let c = ''
@@ -630,7 +630,7 @@ endfunc
 " Check highlighting for a small piece of C code with a screen dump.
 func Test_syntax_c()
   CheckScreendump
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
   call writefile([
 	\ '/* comment line at the top */',
 	\ 'int main(int argc, char **argv) { // another comment',
@@ -657,7 +657,7 @@ func Test_syntax_c()
   " response to t_RB corrects it to "light".
   let $COLORFGBG = '15;0'
 
-  let buf = RunVimInTerminal('Xtest.c', {})
+  let buf = RunMNVInTerminal('Xtest.c', {})
   call term_sendkeys(buf, ":syn keyword Search Note\r")
   call term_sendkeys(buf, ":syn match Error /^\\s\\+$/\r")
   call term_sendkeys(buf, ":set hlsearch\r")
@@ -666,7 +666,7 @@ func Test_syntax_c()
   call VerifyScreenDump(buf, 'Test_syntax_c_01', {})
 
   call term_sendkeys(buf, "\<Esc>")
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 
   let $COLORFGBG = ''
 endfun
@@ -823,9 +823,9 @@ func Test_search_syntax_skip()
   new
   let lines =<< trim END
 
-        /* This is VIM */
-        Another Text for VIM
-         let a = "VIM"
+        /* This is MNV */
+        Another Text for MNV
+         let a = "MNV"
   END
   call setline(1, lines)
   syntax on
@@ -834,21 +834,21 @@ func Test_search_syntax_skip()
 
   " Skip argument using string evaluation.
   1
-  call search('VIM', 'w', '', 0, 'synIDattr(synID(line("."), col("."), 1), "name") =~? "comment"')
-  call assert_equal('Another Text for VIM', getline('.'))
+  call search('MNV', 'w', '', 0, 'synIDattr(synID(line("."), col("."), 1), "name") =~? "comment"')
+  call assert_equal('Another Text for MNV', getline('.'))
 
   1
-  call search('VIM', 'cw', '', 0, 'synIDattr(synID(line("."), col("."), 1), "name") !~? "string"')
-  call assert_equal(' let a = "VIM"', getline('.'))
+  call search('MNV', 'cw', '', 0, 'synIDattr(synID(line("."), col("."), 1), "name") !~? "string"')
+  call assert_equal(' let a = "MNV"', getline('.'))
 
   " Skip argument using Lambda.
   1
-  call search('VIM', 'w', '', 0, { -> synIDattr(synID(line("."), col("."), 1), "name") =~? "comment"})
-  call assert_equal('Another Text for VIM', getline('.'))
+  call search('MNV', 'w', '', 0, { -> synIDattr(synID(line("."), col("."), 1), "name") =~? "comment"})
+  call assert_equal('Another Text for MNV', getline('.'))
 
   1
-  call search('VIM', 'cw', '', 0, { -> synIDattr(synID(line("."), col("."), 1), "name") !~? "string"})
-  call assert_equal(' let a = "VIM"', getline('.'))
+  call search('MNV', 'cw', '', 0, { -> synIDattr(synID(line("."), col("."), 1), "name") !~? "string"})
+  call assert_equal(' let a = "MNV"', getline('.'))
 
   " Skip argument using funcref.
   func InComment()
@@ -859,12 +859,12 @@ func Test_search_syntax_skip()
   endfunc
 
   1
-  call search('VIM', 'w', '', 0, function('InComment'))
-  call assert_equal('Another Text for VIM', getline('.'))
+  call search('MNV', 'w', '', 0, function('InComment'))
+  call assert_equal('Another Text for MNV', getline('.'))
 
   1
-  call search('VIM', 'cw', '', 0, function('NotInString'))
-  call assert_equal(' let a = "VIM"', getline('.'))
+  call search('MNV', 'cw', '', 0, function('NotInString'))
+  call assert_equal(' let a = "MNV"', getline('.'))
 
   delfunc InComment
   delfunc NotInString
@@ -950,7 +950,7 @@ endfunc
 func Test_syn_include_contains_TOP()
   let l:case = "TOP in included syntax refers to top level of that included syntax"
   new
-  syntax include @INCLUDED syntax/c.vim
+  syntax include @INCLUDED syntax/c.mnv
   syntax region FencedCodeBlockC start=/```c/ end=/```/ contains=@INCLUDED
 
   call setline(1,  ['```c', '#if 0', 'int', '#else', 'int', '#endif', '```' ])
@@ -965,7 +965,7 @@ endfunc
 
 func Test_syn_include_contains_TOP_excluding()
   new
-  syntax include @INCLUDED syntax/c.vim
+  syntax include @INCLUDED syntax/c.mnv
   syntax region FencedCodeBlockC start=/```c/ end=/```/ contains=@INCLUDED
 
   call setline(1,  ['```c', '#if 0', 'int', '#else', 'int', '#if', '#endif', '```' ])
@@ -989,4 +989,4 @@ func Test_WinEnter_synstack_synID()
 endfunc
 
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_system.vim b/uvim/src/testdir/test_system.mnv
index 1b1d024006..b3f05d779d 100644
--- a/uvim/src/testdir/test_system.vim
+++ b/uvim/src/testdir/test_system.mnv
@@ -53,7 +53,7 @@ func Test_system_exmode()
     " Need to put this in a script, "catch" isn't found after an unknown
     " function.
     call writefile(['try', 'call doesnotexist()', 'catch', 'endtry'], 'Xscript', 'D')
-    let a = system(GetVimCommand() . cmd)
+    let a = system(GetMNVCommand() . cmd)
     call assert_match('result=0', a)
     call assert_equal(0, v:shell_error)
   endif
@@ -61,32 +61,32 @@ func Test_system_exmode()
   " Error before try does set error flag.
   call writefile(['call nosuchfunction()', 'try', 'call doesnotexist()', 'catch', 'endtry'], 'Xscript')
   if has('unix') " echo $? only works on Unix
-    let a = system(GetVimCommand() . cmd)
+    let a = system(GetMNVCommand() . cmd)
     call assert_notequal('0', a[0])
   endif
 
   let cmd = ' -es -c "source Xscript" +q'
-  let a = system(GetVimCommand() . cmd)
+  let a = system(GetMNVCommand() . cmd)
   call assert_notequal(0, v:shell_error)
 
   if has('unix') " echo $? only works on Unix
     let cmd = ' -es -c "call doesnotexist()" +q; echo $?'
-    let a = system(GetVimCommand() . cmd)
+    let a = system(GetMNVCommand() . cmd)
     call assert_notequal(0, a[0])
   endif
 
   let cmd = ' -es -c "call doesnotexist()" +q'
-  let a = system(GetVimCommand(). cmd)
+  let a = system(GetMNVCommand(). cmd)
   call assert_notequal(0, v:shell_error)
 
   if has('unix') " echo $? only works on Unix
     let cmd = ' -es -c "call doesnotexist()|let a=1" +q; echo $?'
-    let a = system(GetVimCommand() . cmd)
+    let a = system(GetMNVCommand() . cmd)
     call assert_notequal(0, a[0])
   endif
 
   let cmd = ' -es -c "call doesnotexist()|let a=1" +q'
-  let a = system(GetVimCommand() . cmd)
+  let a = system(GetMNVCommand() . cmd)
   call assert_notequal(0, v:shell_error)
 endfunc
 
@@ -140,7 +140,7 @@ func Test_system_with_shell_quote()
   endtry
 endfunc
 
-" Check that Vim does not execute anything from current directory
+" Check that MNV does not execute anything from current directory
 func Test_windows_external_cmd_in_cwd()
   CheckMSWindows
 
@@ -253,4 +253,4 @@ func Test_system_list_arg()
   call assert_fails('call systemlist([])', 'E474:')
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_tab.vim b/uvim/src/testdir/test_tab.mnv
index da630f00e5..fd96987a72 100644
--- a/uvim/src/testdir/test_tab.vim
+++ b/uvim/src/testdir/test_tab.mnv
@@ -89,4 +89,4 @@ func Test_softtabstop()
   bwipe!
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_tabline.vim b/uvim/src/testdir/test_tabline.mnv
index 21f66cfcde..ab774f1943 100644
--- a/uvim/src/testdir/test_tabline.vim
+++ b/uvim/src/testdir/test_tabline.mnv
@@ -1,6 +1,6 @@
 " Test for tabline
 
-source util/screendump.vim
+source util/screendump.mnv
 
 func TablineWithCaughtError()
   let s:func_in_tabline_called = 1
@@ -155,7 +155,7 @@ func Test_mouse_click_in_tab()
       exe "norm \<LeftMouse>"
   END
   call writefile(lines, 'Xclickscript', 'D')
-  call RunVim([], [], "-e -s -S Xclickscript -c qa")
+  call RunMNV([], [], "-e -s -S Xclickscript -c qa")
 endfunc
 
 func Test_tabline_TabPageIdxs_overflow()
@@ -168,8 +168,8 @@ func Test_tabline_TabPageIdxs_overflow()
       \ 'set tabline=foo',
       \ 'call feedkeys(":qa!\<CR>")',
       \ ]
-  call RunVim(before, [], '-p Xtabline_overflow_a Xtabline_overflow_b')
-  call assert_equal(0, v:shell_error, 'Vim subprocess must not crash (TabPageIdxs overflow)')
+  call RunMNV(before, [], '-p Xtabline_overflow_a Xtabline_overflow_b')
+  call assert_equal(0, v:shell_error, 'MNV subprocess must not crash (TabPageIdxs overflow)')
 endfunc
 
 func Test_tabline_showcmd()
@@ -190,7 +190,7 @@ func Test_tabline_showcmd()
   END
   call writefile(lines, 'XTest_tabline', 'D')
 
-  let buf = RunVimInTerminal('-S XTest_tabline', {'rows': 6})
+  let buf = RunMNVInTerminal('-S XTest_tabline', {'rows': 6})
 
   call term_sendkeys(buf, "g")
   call VerifyScreenDump(buf, 'Test_tabline_showcmd_1', {})
@@ -210,7 +210,7 @@ func Test_tabline_showcmd()
   call term_sendkeys(buf, "1234")
   call VerifyScreenDump(buf, 'Test_tabline_showcmd_5', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func TruncTabLine()
@@ -250,4 +250,4 @@ func Test_tabline_mouse_enable()
   endfor
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_tabpage.vim b/uvim/src/testdir/test_tabpage.mnv
index 05c5669673..443f511fcd 100644
--- a/uvim/src/testdir/test_tabpage.vim
+++ b/uvim/src/testdir/test_tabpage.mnv
@@ -1,6 +1,6 @@
 " Tests for tabpage
 
-source util/screendump.vim
+source util/screendump.mnv
 
 function Test_tabpage()
   CheckFeature quickfix
@@ -688,7 +688,7 @@ endfunc
 
 func Test_tabpage_cmdheight()
   CheckScreendump
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
   call writefile([
         \ 'set laststatus=2',
         \ 'set cmdheight=2',
@@ -701,10 +701,10 @@ func Test_tabpage_cmdheight()
         \ 'redraw',
 	\ ], 'XTest_tabpage_cmdheight', 'D')
   " Check that cursor line is concealed
-  let buf = RunVimInTerminal('-S XTest_tabpage_cmdheight', {'statusoff': 3})
+  let buf = RunMNVInTerminal('-S XTest_tabpage_cmdheight', {'statusoff': 3})
   call VerifyScreenDump(buf, 'Test_tabpage_cmdheight', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 " Test for closing the tab page from a command window
@@ -1074,4 +1074,4 @@ func Test_lastused_tabpage_settabvar()
   bwipe!
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_tabpanel.vim b/uvim/src/testdir/test_tabpanel.mnv
index 0329dd7a4c..e3705d8f9a 100644
--- a/uvim/src/testdir/test_tabpanel.vim
+++ b/uvim/src/testdir/test_tabpanel.mnv
@@ -1,6 +1,6 @@
 " Tests for tabpanel
 
-source util/screendump.vim
+source util/screendump.mnv
 CheckFeature tabpanel
 
 function s:reset()
@@ -20,7 +20,7 @@ function Test_tabpanel_showtabpanel_eq_0()
   END
   call writefile(lines, 'XTest_tabpanel_stpl_eq_0', 'D')
 
-  let buf = RunVimInTerminal('-S XTest_tabpanel_stpl_eq_0', {'rows': 10, 'cols': 78})
+  let buf = RunMNVInTerminal('-S XTest_tabpanel_stpl_eq_0', {'rows': 10, 'cols': 78})
   call term_sendkeys(buf, ":set showtabpanel=0\<CR>\<C-L>")
   call VerifyScreenDump(buf, 'Test_tabpanel_stpl_eq_0_0', {})
   call term_sendkeys(buf, ":tabnext\<CR>\<C-L>")
@@ -33,7 +33,7 @@ function Test_tabpanel_showtabpanel_eq_0()
   call term_sendkeys(buf, ":wincmd |\<CR>")
   call term_sendkeys(buf, ":set showtabpanel=2\<CR>\<C-L>")
   call VerifyScreenDump(buf, 'Test_tabpanel_stpl_eq_0_2', {})
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 function Test_tabpanel_showtabpanel_eq_1()
@@ -45,7 +45,7 @@ function Test_tabpanel_showtabpanel_eq_1()
   END
   call writefile(lines, 'XTest_tabpanel_stpl_eq_1', 'D')
 
-  let buf = RunVimInTerminal('-S XTest_tabpanel_stpl_eq_1', {'rows': 10, 'cols': 78})
+  let buf = RunMNVInTerminal('-S XTest_tabpanel_stpl_eq_1', {'rows': 10, 'cols': 78})
   call term_sendkeys(buf, "\<C-L>")
   call VerifyScreenDump(buf, 'Test_tabpanel_stpl_eq_1_0', {})
   call term_sendkeys(buf, ":tabnew\<CR>\<C-L>")
@@ -63,7 +63,7 @@ function Test_tabpanel_showtabpanel_eq_1()
   call VerifyScreenDump(buf, 'Test_tabpanel_stpl_eq_1_4', {})
   call term_sendkeys(buf, ":tabclose\<CR>\<C-L>")
   call VerifyScreenDump(buf, 'Test_tabpanel_stpl_eq_1_0', {})
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 function Test_tabpanel_with_vsplit()
@@ -77,7 +77,7 @@ function Test_tabpanel_with_vsplit()
   END
   call writefile(lines, 'XTest_tabpanel_with_vsplit', 'D')
 
-  let buf = RunVimInTerminal('-S XTest_tabpanel_with_vsplit', {'rows': 10, 'cols': 78})
+  let buf = RunMNVInTerminal('-S XTest_tabpanel_with_vsplit', {'rows': 10, 'cols': 78})
   call VerifyScreenDump(buf, 'Test_tabpanel_with_vsplit_0', {})
   call term_sendkeys(buf, ":vsplit\<CR>")
   call VerifyScreenDump(buf, 'Test_tabpanel_with_vsplit_1', {})
@@ -91,7 +91,7 @@ function Test_tabpanel_with_vsplit()
   call VerifyScreenDump(buf, 'Test_tabpanel_with_vsplit_4', {})
   call term_sendkeys(buf, ":vsplit\<CR>")
   call VerifyScreenDump(buf, 'Test_tabpanel_with_vsplit_5', {})
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Call_cmd_funcs()
@@ -144,7 +144,7 @@ function Test_tabpanel_cmdline_compl()
   END
   call writefile(lines, 'XTest_tabpanel_cmdline_compl', 'D')
 
-  let buf = RunVimInTerminal('-S XTest_tabpanel_cmdline_compl', {'rows': 10, 'cols': 45})
+  let buf = RunMNVInTerminal('-S XTest_tabpanel_cmdline_compl', {'rows': 10, 'cols': 45})
   call term_sendkeys(buf, ":ab\<Tab>")
   call VerifyScreenDump(buf, 'Test_tabpanel_cmdline_compl_0', {})
 
@@ -153,7 +153,7 @@ function Test_tabpanel_cmdline_compl()
   call term_sendkeys(buf, ":ab\<Tab>")
   call VerifyScreenDump(buf, 'Test_tabpanel_cmdline_compl_1', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 function Test_tabpanel_mouse()
@@ -279,7 +279,7 @@ function Test_tabpanel_drawing()
   END
   call writefile(lines, 'XTest_tabpanel', 'D')
 
-  let buf = RunVimInTerminal('-S XTest_tabpanel', {'rows': 6, 'cols': 45})
+  let buf = RunMNVInTerminal('-S XTest_tabpanel', {'rows': 6, 'cols': 45})
 
   call VerifyScreenDump(buf, 'Test_tabpanel_drawing_00', {})
 
@@ -289,7 +289,7 @@ function Test_tabpanel_drawing()
     call VerifyScreenDump(buf, 'Test_tabpanel_drawing_' .. n, {})
   endfor
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 function Test_tabpanel_drawing_2()
@@ -302,7 +302,7 @@ function Test_tabpanel_drawing_2()
   END
   call writefile(lines, 'XTest_tabpanel_drawing_2', 'D')
 
-  let buf = RunVimInTerminal('-S XTest_tabpanel_drawing_2', {'rows': 10, 'cols': 78})
+  let buf = RunMNVInTerminal('-S XTest_tabpanel_drawing_2', {'rows': 10, 'cols': 78})
   call term_sendkeys(buf, "ggo")
   call VerifyScreenDump(buf, 'Test_tabpanel_drawing_2_0', {})
 
@@ -310,7 +310,7 @@ function Test_tabpanel_drawing_2()
   call term_sendkeys(buf, "ggo")
   call VerifyScreenDump(buf, 'Test_tabpanel_drawing_2_1', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 function Test_tabpanel_drawing_with_popupwin()
@@ -341,7 +341,7 @@ function Test_tabpanel_drawing_with_popupwin()
       \ })
   END
   call writefile(lines, 'XTest_tabpanel_with_popupwin', 'D')
-  let buf = RunVimInTerminal('-S XTest_tabpanel_with_popupwin', {'rows': 10, 'cols': tcols})
+  let buf = RunMNVInTerminal('-S XTest_tabpanel_with_popupwin', {'rows': 10, 'cols': tcols})
   call VerifyScreenDump(buf, 'Test_tabpanel_drawing_with_popupwin_0', {})
   call term_sendkeys(buf, ":set showtabpanel=2\<CR>\<C-L>")
   call VerifyScreenDump(buf, 'Test_tabpanel_drawing_with_popupwin_1', {})
@@ -349,7 +349,7 @@ function Test_tabpanel_drawing_with_popupwin()
   call VerifyScreenDump(buf, 'Test_tabpanel_drawing_with_popupwin_2', {})
   call term_sendkeys(buf, ":set showtabpanel=0\<CR>\<C-L>")
   call VerifyScreenDump(buf, 'Test_tabpanel_drawing_with_popupwin_0', {})
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 function Test_tabpanel_drawing_fill_tailing()
@@ -369,7 +369,7 @@ function Test_tabpanel_drawing_fill_tailing()
   END
   call writefile(lines, 'XTest_tabpanel_fill_tailing', 'D')
 
-  let buf = RunVimInTerminal('-S XTest_tabpanel_fill_tailing', {'rows': 10, 'cols': 45})
+  let buf = RunMNVInTerminal('-S XTest_tabpanel_fill_tailing', {'rows': 10, 'cols': 45})
   call VerifyScreenDump(buf, 'Test_tabpanel_drawing_fill_tailing_0', {})
 
   " TODO: If line breaks within 'tabpanel' using "\n" are no longer supported,
@@ -377,7 +377,7 @@ function Test_tabpanel_drawing_fill_tailing()
   call term_sendkeys(buf, ':let &tabpanel = "\nTOP\n%f\nBOTTOM"' .. "\<CR>")
   call VerifyScreenDump(buf, 'Test_tabpanel_drawing_fill_tailing_0', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 function Test_tabpanel_drawing_pum()
@@ -393,7 +393,7 @@ function Test_tabpanel_drawing_pum()
   END
   call writefile(lines, 'XTest_tabpanel_pum', 'D')
 
-  let buf = RunVimInTerminal('-S XTest_tabpanel_pum', {'rows': 10, 'cols': 45})
+  let buf = RunMNVInTerminal('-S XTest_tabpanel_pum', {'rows': 10, 'cols': 45})
 
   call term_sendkeys(buf, "i\<CR>aa\<CR>aaaa\<CR>aaac\<CR>aaab\<CR>\<Esc>")
   call term_sendkeys(buf, "ggi\<C-X>\<C-N>")
@@ -409,7 +409,7 @@ function Test_tabpanel_drawing_pum()
   call term_sendkeys(buf, "a\<C-X>\<C-N>")
   call VerifyScreenDump(buf, 'Test_tabpanel_drawing_pum_2', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 function Test_tabpanel_scrolling()
@@ -430,7 +430,7 @@ function Test_tabpanel_scrolling()
   END
   call writefile(lines, 'XTest_tabpanel_scrolling', 'D')
 
-  let buf = RunVimInTerminal('-S XTest_tabpanel_scrolling', {'rows': 10, 'cols': 45})
+  let buf = RunMNVInTerminal('-S XTest_tabpanel_scrolling', {'rows': 10, 'cols': 45})
   let n = 0
   for c in ['H', 'J', 'K', 'L']
     call term_sendkeys(buf, ":wincmd " .. c ..  "\<CR>")
@@ -440,7 +440,7 @@ function Test_tabpanel_scrolling()
     let n += 1
   endfor
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 function Test_tabpanel_many_tabpages()
@@ -455,7 +455,7 @@ function Test_tabpanel_many_tabpages()
   END
   call writefile(lines, 'XTest_tabpanel_many_tabpages', 'D')
 
-  let buf = RunVimInTerminal('-S XTest_tabpanel_many_tabpages', {'rows': 10, 'cols': 45})
+  let buf = RunMNVInTerminal('-S XTest_tabpanel_many_tabpages', {'rows': 10, 'cols': 45})
   for n in range(0, 3)
     call term_sendkeys(buf, "gt")
     call VerifyScreenDump(buf, 'Test_tabpanel_many_tabpages_' .. n, {})
@@ -464,7 +464,7 @@ function Test_tabpanel_many_tabpages()
   call term_sendkeys(buf, ":tabnext -3\<CR>")
   call VerifyScreenDump(buf, 'Test_tabpanel_many_tabpages_4', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 function Test_tabpanel_visual()
@@ -479,7 +479,7 @@ function Test_tabpanel_visual()
   END
   call writefile(lines, 'XTest_tabpanel_visual', 'D')
 
-  let buf = RunVimInTerminal('-S XTest_tabpanel_visual', {'rows': 10, 'cols': 45})
+  let buf = RunMNVInTerminal('-S XTest_tabpanel_visual', {'rows': 10, 'cols': 45})
   call term_sendkeys(buf, "v2w")
   call VerifyScreenDump(buf, 'Test_tabpanel_visual_0', {})
   call term_sendkeys(buf, "\<Esc>0jw")
@@ -488,7 +488,7 @@ function Test_tabpanel_visual()
   call term_sendkeys(buf, "y:echo @\"\<CR>")
   call VerifyScreenDump(buf, 'Test_tabpanel_visual_2', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 function Test_tabpanel_with_tabline()
@@ -507,10 +507,10 @@ function Test_tabpanel_with_tabline()
   END
   call writefile(lines, 'XTest_tabpanel_with_tabline', 'D')
 
-  let buf = RunVimInTerminal('-S XTest_tabpanel_with_tabline', {'rows': 10, 'cols': 45})
+  let buf = RunMNVInTerminal('-S XTest_tabpanel_with_tabline', {'rows': 10, 'cols': 45})
   call VerifyScreenDump(buf, 'Test_tabpanel_with_tabline_0', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 function Test_tabpanel_dont_overflow_into_tabpanel()
@@ -526,10 +526,10 @@ function Test_tabpanel_dont_overflow_into_tabpanel()
   END
   call writefile(lines, 'XTest_tabpanel_dont_overflow_into_tabpanel', 'D')
 
-  let buf = RunVimInTerminal('-S XTest_tabpanel_dont_overflow_into_tabpanel', {'rows': 10, 'cols': 45})
+  let buf = RunMNVInTerminal('-S XTest_tabpanel_dont_overflow_into_tabpanel', {'rows': 10, 'cols': 45})
   call VerifyScreenDump(buf, 'Test_tabpanel_dont_overflow_into_tabpanel_0', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 """function Test_tabpanel_dont_vert_is_multibytes_left()
@@ -544,7 +544,7 @@ endfunc
 """  END
 """  call writefile(lines, 'XTest_tabpanel_vert_is_multibyte_lefts', 'D')
 """
-"""  let buf = RunVimInTerminal('-S XTest_tabpanel_vert_is_multibyte_lefts', {'rows': 10, 'cols': 45})
+"""  let buf = RunMNVInTerminal('-S XTest_tabpanel_vert_is_multibyte_lefts', {'rows': 10, 'cols': 45})
 """  call VerifyScreenDump(buf, 'Test_tabpanel_vert_is_multibytes_left_0', {})
 """
 """  call term_sendkeys(buf, ":set tabpanelopt=columns:1,vert\<CR>")
@@ -556,7 +556,7 @@ endfunc
 """  call term_sendkeys(buf, ":set tabpanelopt=columns:2,vert\<CR>")
 """  call VerifyScreenDump(buf, 'Test_tabpanel_vert_is_multibytes_left_3', {})
 """
-"""  call StopVimInTerminal(buf)
+"""  call StopMNVInTerminal(buf)
 """endfunc
 
 """function Test_tabpanel_dont_vert_is_multibytes_right()
@@ -571,7 +571,7 @@ endfunc
 """  END
 """  call writefile(lines, 'XTest_tabpanel_vert_is_multibytes_right', 'D')
 """
-"""  let buf = RunVimInTerminal('-S XTest_tabpanel_vert_is_multibytes_right', {'rows': 10, 'cols': 45})
+"""  let buf = RunMNVInTerminal('-S XTest_tabpanel_vert_is_multibytes_right', {'rows': 10, 'cols': 45})
 """  call VerifyScreenDump(buf, 'Test_tabpanel_vert_is_multibytes_right_0', {})
 """
 """  call term_sendkeys(buf, ":set tabpanelopt=align:right,columns:1,vert\<CR>")
@@ -583,7 +583,7 @@ endfunc
 """  call term_sendkeys(buf, ":set tabpanelopt=align:right,columns:2,vert\<CR>")
 """  call VerifyScreenDump(buf, 'Test_tabpanel_vert_is_multibytes_right_3', {})
 """
-"""  call StopVimInTerminal(buf)
+"""  call StopMNVInTerminal(buf)
 """endfunc
 
 function Test_tabpanel_eval()
@@ -608,12 +608,12 @@ function Test_tabpanel_eval()
   END
   call writefile(lines, 'XTest_tabpanel_eval', 'D')
 
-  let buf = RunVimInTerminal('-S XTest_tabpanel_eval', {'rows': 10, 'cols': 45})
+  let buf = RunMNVInTerminal('-S XTest_tabpanel_eval', {'rows': 10, 'cols': 45})
   call VerifyScreenDump(buf, 'Test_tabpanel_eval_0', {})
   call term_sendkeys(buf, ":set tabpanelopt+=align:right\<CR>")
   call VerifyScreenDump(buf, 'Test_tabpanel_eval_1', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 function Test_tabpanel_noeval()
@@ -635,12 +635,12 @@ function Test_tabpanel_noeval()
   END
   call writefile(lines, 'XTest_tabpanel_noeval', 'D')
 
-  let buf = RunVimInTerminal('-S XTest_tabpanel_noeval', {'rows': 10, 'cols': 45})
+  let buf = RunMNVInTerminal('-S XTest_tabpanel_noeval', {'rows': 10, 'cols': 45})
   call VerifyScreenDump(buf, 'Test_tabpanel_noeval_0', {})
   call term_sendkeys(buf, ":set tabpanelopt+=align:right\<CR>")
   call VerifyScreenDump(buf, 'Test_tabpanel_noeval_1', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 function Test_tabpanel_eval_with_linebreaks()
@@ -663,7 +663,7 @@ function Test_tabpanel_eval_with_linebreaks()
   END
   call writefile(lines, 'XTest_tabpanel_eval_with_linebreaks', 'D')
 
-  let buf = RunVimInTerminal('-S XTest_tabpanel_eval_with_linebreaks', {'rows': 10, 'cols': 45})
+  let buf = RunMNVInTerminal('-S XTest_tabpanel_eval_with_linebreaks', {'rows': 10, 'cols': 45})
   call term_sendkeys(buf, "\<C-L>")   " Clear cmdline area
   call VerifyScreenDump(buf, 'Test_tabpanel_eval_with_linebreaks_0', {})
   call term_sendkeys(buf, ":set tabpanelopt+=align:right\<CR>")
@@ -676,7 +676,7 @@ function Test_tabpanel_eval_with_linebreaks()
   call term_sendkeys(buf, ":set tabpanelopt+=align:right\<CR>")
   call VerifyScreenDump(buf, 'Test_tabpanel_eval_with_linebreaks_1', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 function Test_tabpanel_tabonly()
@@ -690,12 +690,12 @@ function Test_tabpanel_tabonly()
   END
   call writefile(lines, 'XTest_tabpanel_tabonly', 'D')
 
-  let buf = RunVimInTerminal('-S XTest_tabpanel_tabonly', {'rows': 10, 'cols': 78})
+  let buf = RunMNVInTerminal('-S XTest_tabpanel_tabonly', {'rows': 10, 'cols': 78})
   call VerifyScreenDump(buf, 'Test_tabpanel_only_0', {})
   call term_sendkeys(buf, ":tabonly\<CR>")
   call VerifyScreenDump(buf, 'Test_tabpanel_only_1', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 function Test_tabpanel_equalalways()
@@ -711,7 +711,7 @@ function Test_tabpanel_equalalways()
   END
   call writefile(lines, 'XTest_tabpanel_equalalways', 'D')
 
-  let buf = RunVimInTerminal('-S XTest_tabpanel_equalalways', {'rows': 10, 'cols': 78})
+  let buf = RunMNVInTerminal('-S XTest_tabpanel_equalalways', {'rows': 10, 'cols': 78})
   call VerifyScreenDump(buf, 'Test_tabpanel_equalalways_0', {})
   call term_sendkeys(buf, ":set tabpanelopt=columns:10\<CR>")
   call VerifyScreenDump(buf, 'Test_tabpanel_equalalways_1', {})
@@ -720,7 +720,7 @@ function Test_tabpanel_equalalways()
   call term_sendkeys(buf, ":set tabpanelopt=columns:5\<CR>")
   call VerifyScreenDump(buf, 'Test_tabpanel_equalalways_3', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 function Test_tabpanel_quitall()
@@ -736,10 +736,10 @@ function Test_tabpanel_quitall()
   END
   call writefile(lines, 'XTest_tabpanel_quitall', 'D')
 
-  let buf = RunVimInTerminal('-S XTest_tabpanel_quitall', {'rows': 10, 'cols': 45})
+  let buf = RunMNVInTerminal('-S XTest_tabpanel_quitall', {'rows': 10, 'cols': 45})
   call VerifyScreenDump(buf, 'Test_tabpanel_quitall_0', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 function Test_tabpanel_ruler()
@@ -753,10 +753,10 @@ function Test_tabpanel_ruler()
   END
   call writefile(lines, 'XTest_tabpanel_ruler', 'D')
 
-  let buf = RunVimInTerminal('-S XTest_tabpanel_ruler', {'rows': 10, 'cols': 45})
+  let buf = RunMNVInTerminal('-S XTest_tabpanel_ruler', {'rows': 10, 'cols': 45})
   call VerifyScreenDump(buf, 'Test_tabpanel_ruler_0', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 function Test_tabpanel_error()
@@ -764,19 +764,19 @@ function Test_tabpanel_error()
   try
     set showtabpanel=2
     redraw!
-  catch /^Vim\%((\a\+)\)\=:E117:/
+  catch /^MNV\%((\a\+)\)\=:E117:/
   endtry
   call assert_true(empty(&tabpanel))
 
   try
     set tabpanel=%{my#util#TabPanelHighlight}%t
     redraw!
-  catch /^Vim\%((\a\+)\)\=:E121:/
+  catch /^MNV\%((\a\+)\)\=:E121:/
   endtry
   call assert_true(empty(&tabpanel))
 
-  set tabpanel&vim
-  set showtabpanel&vim
+  set tabpanel&mnv
+  set showtabpanel&mnv
 endfunc
 
 function Test_tabpanel_with_msg_scrolled()
@@ -791,13 +791,13 @@ function Test_tabpanel_with_msg_scrolled()
   END
   call writefile(lines, 'XTest_tabpanel_with_msg_scrolled', 'D')
 
-  let buf = RunVimInTerminal('-S XTest_tabpanel_with_msg_scrolled', {'rows': 10, 'cols': 45})
+  let buf = RunMNVInTerminal('-S XTest_tabpanel_with_msg_scrolled', {'rows': 10, 'cols': 45})
   call VerifyScreenDump(buf, 'Test_tabpanel_with_msg_scrolled_0', {})
   call term_sendkeys(buf, ":qa\<CR>")
   call term_sendkeys(buf, "\<CR>")
   call VerifyScreenDump(buf, 'Test_tabpanel_with_msg_scrolled_1', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 function Test_tabpanel_with_cmdline_pum()
@@ -815,7 +815,7 @@ function Test_tabpanel_with_cmdline_pum()
   END
   call writefile(lines, 'XTest_tabpanel_with_cmdline_pum', 'D')
 
-  let buf = RunVimInTerminal('-S XTest_tabpanel_with_cmdline_pum', {'rows': 10, 'cols': 45})
+  let buf = RunMNVInTerminal('-S XTest_tabpanel_with_cmdline_pum', {'rows': 10, 'cols': 45})
   call term_sendkeys(buf, "\<C-L>")
   call VerifyScreenDump(buf, 'Test_tabpanel_with_cmdline_pum_0', {})
   call term_sendkeys(buf, ":set\<Tab>")
@@ -824,7 +824,7 @@ function Test_tabpanel_with_cmdline_pum()
   call term_sendkeys(buf, "\<Esc>:tabclose\<CR>\<C-L>")
   call VerifyScreenDump(buf, 'Test_tabpanel_with_cmdline_pum_0', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 function Test_tabpanel_with_cmdline_no_pum()
@@ -838,7 +838,7 @@ function Test_tabpanel_with_cmdline_no_pum()
   END
   call writefile(lines, 'XTest_tabpanel_with_cmdline_pum', 'D')
 
-  let buf = RunVimInTerminal('-S XTest_tabpanel_with_cmdline_pum', {'rows': 10, 'cols': 45})
+  let buf = RunMNVInTerminal('-S XTest_tabpanel_with_cmdline_pum', {'rows': 10, 'cols': 45})
   call term_sendkeys(buf, "\<C-L>")
   call VerifyScreenDump(buf, 'Test_tabpanel_with_cmdline_no_pum_0', {})
   call term_sendkeys(buf, ":tabne\<Tab>")
@@ -846,7 +846,7 @@ function Test_tabpanel_with_cmdline_no_pum()
   call term_sendkeys(buf, "\<Esc>\<C-L>")
   call VerifyScreenDump(buf, 'Test_tabpanel_with_cmdline_no_pum_0', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 " When showtabpanel=1 and a second tab is opened, all existing tab pages must
@@ -879,7 +879,7 @@ func Test_tabpanel_no_modeline()
   set nomodelineexpr
   setlocal modeline
   new
-  call writefile(['/* vim: set tabpanel=test: */'], 'Xtabpanel.txt', 'D')
+  call writefile(['/* mnv: set tabpanel=test: */'], 'Xtabpanel.txt', 'D')
   call assert_fails(':e Xtabpanel.txt', 'E992:')
 
   let &tabpanel = _tpl
@@ -892,4 +892,4 @@ func Test_tabpanel_large_columns()
   call assert_fails(':set tabpanelopt=columns:-1', 'E474:')
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_tagcase.vim b/uvim/src/testdir/test_tagcase.mnv
index f03a5fd35b..d244cbbf7d 100644
--- a/uvim/src/testdir/test_tagcase.vim
+++ b/uvim/src/testdir/test_tagcase.mnv
@@ -72,4 +72,4 @@ func Test_set_tagcase()
   setl tc&
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_tagfunc.vim b/uvim/src/testdir/test_tagfunc.mnv
index 4ce9d2164b..83d70aae75 100644
--- a/uvim/src/testdir/test_tagfunc.vim
+++ b/uvim/src/testdir/test_tagfunc.mnv
@@ -1,7 +1,7 @@
 " Test 'tagfunc'
 
-import './util/vim9.vim' as v9
-source util/screendump.vim
+import './util/mnv9.mnv' as v9
+source util/screendump.mnv
 
 func TagFunc(pat, flag, info)
   let g:tagfunc_args = [a:pat, a:flag, a:info]
@@ -288,7 +288,7 @@ func Test_tagfunc_callback()
     call assert_equal([23, 'a23', '', {}], g:TagFunc1Args)
     :%bw!
   END
-  call v9.CheckLegacyAndVim9Success(lines)
+  call v9.CheckLegacyAndMNV9Success(lines)
 
   " Test for using a script-local function name
   func s:TagFunc3(pat, flags, info)
@@ -313,7 +313,7 @@ func Test_tagfunc_callback()
   let &tagfunc = "{a -> 'abc'}"
   call assert_fails("echo taglist('a')", "E987:")
 
-  " Using Vim9 lambda expression in legacy context should fail
+  " Using MNV9 lambda expression in legacy context should fail
   set tagfunc=(a,\ b,\ c)\ =>\ g:TagFunc1(21,\ a,\ b,\ c)
   new
   let g:TagFunc1Args = []
@@ -367,21 +367,21 @@ func Test_tagfunc_callback()
   delfunc g:DictTagFunc
   delfunc SetTagFunc
 
-  " Vim9 tests
+  " MNV9 tests
   let lines =<< trim END
-    vim9script
+    mnv9script
 
-    def Vim9tagFunc(callnr: number, pat: string, flags: string, info: dict<any>): any
-      g:Vim9tagFuncArgs = [callnr, pat, flags, info]
+    def MNV9tagFunc(callnr: number, pat: string, flags: string, info: dict<any>): any
+      g:MNV9tagFuncArgs = [callnr, pat, flags, info]
       return null
     enddef
 
     # Test for using a def function with completefunc
-    set tagfunc=function('Vim9tagFunc',\ [60])
+    set tagfunc=function('MNV9tagFunc',\ [60])
     new
-    g:Vim9tagFuncArgs = []
+    g:MNV9tagFuncArgs = []
     assert_fails('tag a10', 'E433:')
-    assert_equal([60, 'a10', '', {}], g:Vim9tagFuncArgs)
+    assert_equal([60, 'a10', '', {}], g:MNV9tagFuncArgs)
 
     # Test for using a global function name
     &tagfunc = g:TagFunc2
@@ -456,4 +456,4 @@ func Test_tagfunc_deletes_lines()
   set tagfunc=
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_tagjump.vim b/uvim/src/testdir/test_tagjump.mnv
index bbab3c70e8..2e949857f3 100644
--- a/uvim/src/testdir/test_tagjump.vim
+++ b/uvim/src/testdir/test_tagjump.mnv
@@ -1,6 +1,6 @@
 " Tests for tagjump (tags and special searches)
 
-source util/screendump.vim
+source util/screendump.mnv
 
 " SEGV occurs in older versions.  (At least 7.4.1748 or older)
 func Test_ptag_with_notagstack()
@@ -8,7 +8,7 @@ func Test_ptag_with_notagstack()
 
   set notagstack
   call assert_fails('ptag does_not_exist_tag_name', 'E433:')
-  set tagstack&vim
+  set tagstack&mnv
 endfunc
 
 func Test_ptjump()
@@ -171,7 +171,7 @@ func Test_tagjump_switchbuf()
   tabclose!
   enew | only
   set tags&
-  set switchbuf&vim
+  set switchbuf&mnv
 endfunc
 
 " Tests for [ CTRL-I and CTRL-W CTRL-I commands
@@ -598,7 +598,7 @@ func Test_tag_line_toolong()
   call assert_fails('tj /foo', 'E426:')
   try
     tj /foo
-  catch /^Vim\%((\a\+)\)\=:E431/
+  catch /^MNV\%((\a\+)\)\=:E431/
     call assert_report(v:exception)
   catch /.*/
   endtry
@@ -610,7 +610,7 @@ func Test_tag_line_toolong()
   call assert_fails('tj /foo', 'E426:')
   try
     tj /foo
-  catch /^Vim\%((\a\+)\)\=:E431/
+  catch /^MNV\%((\a\+)\)\=:E431/
     call assert_report(v:exception)
   catch /.*/
   endtry
@@ -665,13 +665,13 @@ func Test_tselect()
     set tags=Xtags
   [SCRIPT]
   call writefile(lines, 'XTest_tselect', 'D')
-  let buf = RunVimInTerminal('-S XTest_tselect', {'rows': 10, 'cols': 50})
+  let buf = RunMNVInTerminal('-S XTest_tselect', {'rows': 10, 'cols': 50})
 
   call TermWait(buf, 50)
   call term_sendkeys(buf, ":tselect main\<CR>2\<CR>")
   call VerifyScreenDump(buf, 'Test_tselect_1', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_tagline()
@@ -1540,7 +1540,7 @@ func Test_stag_close_window_on_error()
         \ "foo\tXfile\t1"], 'Xtags', 'D')
   call writefile(['foo'], 'Xfile', 'D')
   call writefile([], '.Xfile.swp', 'D')
-  " Remove the catch-all that runtest.vim adds
+  " Remove the catch-all that runtest.mnv adds
   au! SwapExists
   augroup StagTest
     au!
@@ -1672,20 +1672,20 @@ func Test_tag_excmd_with_nostartofline()
   set startofline&
 endfunc
 
-func Test_tag_excmd_with_number_vim9script()
+func Test_tag_excmd_with_number_mnv9script()
   call writefile(["1#1\tXfile\t2;\"\ti"], 'Xtags', 'D')
   call writefile(['f', 'foobar'], 'Xfile', 'D')
   let list =<< trim END
-  vim9script
+  mnv9script
   command! Tag call Tag()
   def Tag(): void
     exe "tag 1#1"
   enddef
   END
-  call writefile(list, 'Xtags.vim', 'D')
+  call writefile(list, 'Xtags.mnv', 'D')
 
   setlocal tags=Xtags
-  so Xtags.vim
+  so Xtags.mnv
   :Tag
   call assert_equal('Xfile', bufname('%'))
   call assert_equal(2, line('.'))
@@ -1693,4 +1693,4 @@ func Test_tag_excmd_with_number_vim9script()
   bwipe!
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_taglist.vim b/uvim/src/testdir/test_taglist.mnv
index 42ecc4b76e..6b71462c5a 100644
--- a/uvim/src/testdir/test_taglist.vim
+++ b/uvim/src/testdir/test_taglist.mnv
@@ -101,7 +101,7 @@ func Test_tagfiles()
   " (e.g.: for EN and RU).
   " We may need to adjust this, if further translated help files are included.
   call assert_inrange(1, 2, len(tf))
-  call assert_equal(fnamemodify(expand('$VIMRUNTIME/doc/tags'), ':p:gs?\\?/?'),
+  call assert_equal(fnamemodify(expand('$MNVRUNTIME/doc/tags'), ':p:gs?\\?/?'),
 	\           fnamemodify(tf[0], ':p:gs?\\?/?'))
   helpclose
   call assert_equal(['Xtags1', 'Xtags2'], tagfiles())
@@ -301,7 +301,7 @@ func Test_tag_complete_with_overlong_line()
   set tags&
 endfunc
 
-" This used to crash Vim
+" This used to crash MNV
 func Test_evil_emacs_tagfile()
   CheckFeature emacs_tags
   let longline = repeat('a', 515)
@@ -316,7 +316,7 @@ func Test_evil_emacs_tagfile()
   set tags&
 endfunc
 
-" This used to crash Vim due to a heap-buffer-underflow
+" This used to crash MNV due to a heap-buffer-underflow
 func Test_emacs_tagfile_underflow()
   CheckFeature emacs_tags
   " The sequence from the crash artifact:
@@ -332,4 +332,4 @@ func Test_emacs_tagfile_underflow()
   set tags&
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_tcl.vim b/uvim/src/testdir/test_tcl.mnv
index a60c909859..97ed53abb3 100644
--- a/uvim/src/testdir/test_tcl.vim
+++ b/uvim/src/testdir/test_tcl.mnv
@@ -14,19 +14,19 @@ func Test_tcldo()
 
   " Check deleting lines does not trigger ml_get error.
   call setline(1, ['one', 'two', 'three'])
-  tcldo ::vim::command %d_
+  tcldo ::mnv::command %d_
   call assert_equal(['one'], getline(1, '$'))
 
   call setline(1, ['one', 'two', 'three'])
-  tcldo ::vim::command 1,2d_
+  tcldo ::mnv::command 1,2d_
   call assert_equal(['one'], getline(1, '$'))
 
   call setline(1, ['one', 'two', 'three'])
-  tcldo ::vim::command 2,3d_ ; set line REPLACED
+  tcldo ::mnv::command 2,3d_ ; set line REPLACED
   call assert_equal(['REPLACED'], getline(1, '$'))
 
   call setline(1, ['one', 'two', 'three'])
-  2,3tcldo ::vim::command 1,2d_ ; set line REPLACED
+  2,3tcldo ::mnv::command 1,2d_ ; set line REPLACED
   call assert_equal(['three'], getline(1, '$'))
 
   bwipe!
@@ -35,7 +35,7 @@ func Test_tcldo()
   new
   let wincount = winnr('$')
   call setline(1, ['one', 'two', 'three'])
-  tcldo ::vim::command new
+  tcldo ::mnv::command new
   call assert_equal(wincount + 1, winnr('$'))
 
   " Try to run a command in a 'nomodifiable' buffer
@@ -57,41 +57,41 @@ func Test_tcldo_range()
   bwipe!
 endfunc
 
-" Test ::vim::beep
-func Test_vim_beep()
-  call assert_beeps('tcl ::vim::beep')
-  call assert_fails('tcl ::vim::beep x', 'wrong # args: should be "::vim::beep"')
+" Test ::mnv::beep
+func Test_mnv_beep()
+  call assert_beeps('tcl ::mnv::beep')
+  call assert_fails('tcl ::mnv::beep x', 'wrong # args: should be "::mnv::beep"')
 endfunc
 
-" Test ::vim::buffer
-func Test_vim_buffer()
-  " Test ::vim::buffer {nr}
+" Test ::mnv::buffer
+func Test_mnv_buffer()
+  " Test ::mnv::buffer {nr}
   e Xfoo1
   call setline(1, ['foobar'])
   let bn1 = bufnr('%')
-  let b1 = TclEval('::vim::buffer ' . bn1)
-  call assert_equal(b1, TclEval('set ::vim::current(buffer)'))
+  let b1 = TclEval('::mnv::buffer ' . bn1)
+  call assert_equal(b1, TclEval('set ::mnv::current(buffer)'))
 
   new Xfoo2
   call setline(1, ['barfoo'])
   let bn2 = bufnr('%')
-  let b2 = TclEval('::vim::buffer ' . bn2)
-  call assert_equal(b2, TclEval('set ::vim::current(buffer)'))
+  let b2 = TclEval('::mnv::buffer ' . bn2)
+  call assert_equal(b2, TclEval('set ::mnv::current(buffer)'))
 
   call assert_match('Xfoo1$', TclEval(b1 . ' name'))
   call assert_match('Xfoo2$', TclEval(b2 . ' name'))
 
-  " Test ::vim::buffer exists {nr}
-  call assert_match('^[1-9]\d*$', TclEval('::vim::buffer exists ' . bn1))
-  call assert_match('^[1-9]\d*$', TclEval('::vim::buffer exists ' . bn2))
-  call assert_equal('0', TclEval('::vim::buffer exists 54321'))
+  " Test ::mnv::buffer exists {nr}
+  call assert_match('^[1-9]\d*$', TclEval('::mnv::buffer exists ' . bn1))
+  call assert_match('^[1-9]\d*$', TclEval('::mnv::buffer exists ' . bn2))
+  call assert_equal('0', TclEval('::mnv::buffer exists 54321'))
 
-  " Test ::vim::buffer list
-  call assert_equal('2',    TclEval('llength [::vim::buffer list]'))
-  call assert_equal(b1.' '.b2, TclEval('::vim::buffer list'))
+  " Test ::mnv::buffer list
+  call assert_equal('2',    TclEval('llength [::mnv::buffer list]'))
+  call assert_equal(b1.' '.b2, TclEval('::mnv::buffer list'))
   tcl << trim EOF
     proc eachbuf { cmd } {
-      foreach b [::vim::buffer list] { $b command $cmd }
+      foreach b [::mnv::buffer list] { $b command $cmd }
     }
   EOF
   tcl eachbuf %s/foo/FOO/g
@@ -100,108 +100,108 @@ func Test_vim_buffer()
   b! Xfoo2
   call assert_equal(['barFOO'], getline(1, '$'))
 
-  call assert_fails('tcl ::vim::buffer',
-        \           'wrong # args: should be "::vim::buffer option"')
-  call assert_fails('tcl ::vim::buffer ' . bn1 . ' x',
-        \           'wrong # args: should be "::vim::buffer bufNumber"')
-  call assert_fails('tcl ::vim::buffer 4321', 'invalid buffer number')
-  call assert_fails('tcl ::vim::buffer x',
+  call assert_fails('tcl ::mnv::buffer',
+        \           'wrong # args: should be "::mnv::buffer option"')
+  call assert_fails('tcl ::mnv::buffer ' . bn1 . ' x',
+        \           'wrong # args: should be "::mnv::buffer bufNumber"')
+  call assert_fails('tcl ::mnv::buffer 4321', 'invalid buffer number')
+  call assert_fails('tcl ::mnv::buffer x',
         \           'bad option "x": must be exists or list')
-  call assert_fails('tcl ::vim::buffer exists',
-        \           'wrong # args: should be "::vim::buffer exists bufNumber"')
-  call assert_fails('tcl ::vim::buffer exists x',
+  call assert_fails('tcl ::mnv::buffer exists',
+        \           'wrong # args: should be "::mnv::buffer exists bufNumber"')
+  call assert_fails('tcl ::mnv::buffer exists x',
         \           'expected integer but got "x"')
-  call assert_fails('tcl ::vim::buffer list x',
-        \           'wrong # args: should be "::vim::buffer list "')
+  call assert_fails('tcl ::mnv::buffer list x',
+        \           'wrong # args: should be "::mnv::buffer list "')
   " Invalid buffer command
-  call assert_fails('tcl $::vim::current(buffer) abcd',
+  call assert_fails('tcl $::mnv::current(buffer) abcd',
         \           'bad option "abcd":')
 
   tcl rename eachbuf ""
   %bwipe!
 endfunc
 
-" Test ::vim::option
-func Test_vim_option()
+" Test ::mnv::option
+func Test_mnv_option()
   set cc=3,5
 
   " Test getting option 'cc'
-  call assert_equal('3,5', TclEval('::vim::option cc'))
+  call assert_equal('3,5', TclEval('::mnv::option cc'))
   call assert_equal('3,5', &cc)
 
   " Test setting option 'cc' (it returns the old option value)
-  call assert_equal('3,5', TclEval('::vim::option cc +4'))
+  call assert_equal('3,5', TclEval('::mnv::option cc +4'))
   call assert_equal('+4', &cc)
-  call assert_equal('+4', TclEval('::vim::option cc'))
+  call assert_equal('+4', TclEval('::mnv::option cc'))
 
   " Test boolean option with 'toggle', 'on' and 'off' keywords.
-  call assert_equal('0', TclEval('::vim::option nu toggle'))
+  call assert_equal('0', TclEval('::mnv::option nu toggle'))
   call assert_equal(1, &nu)
-  call assert_equal('1', TclEval('::vim::option nu toggle'))
+  call assert_equal('1', TclEval('::mnv::option nu toggle'))
   call assert_equal(0, &nu)
-  call assert_equal('0', TclEval('::vim::option nu on'))
+  call assert_equal('0', TclEval('::mnv::option nu on'))
   call assert_equal(1, &nu)
-  call assert_equal('1', TclEval('::vim::option nu off'))
+  call assert_equal('1', TclEval('::mnv::option nu off'))
   call assert_equal(0, &nu)
 
-  call assert_fails('tcl ::vim::option nu x', 'expected integer but got "x"')
-  call assert_fails('tcl ::vim::option xxx', 'unknown vimOption')
-  call assert_fails('tcl ::vim::option',
-        \           'wrong # args: should be "::vim::option vimOption ?value?"')
+  call assert_fails('tcl ::mnv::option nu x', 'expected integer but got "x"')
+  call assert_fails('tcl ::mnv::option xxx', 'unknown mnvOption')
+  call assert_fails('tcl ::mnv::option',
+        \           'wrong # args: should be "::mnv::option mnvOption ?value?"')
 
   set cc&
 endfunc
 
-" Test ::vim::expr
-func Test_vim_expr()
+" Test ::mnv::expr
+func Test_mnv_expr()
   call assert_equal(string(char2nr('X')),
-        \           TclEval('::vim::expr char2nr("X")'))
+        \           TclEval('::mnv::expr char2nr("X")'))
 
-  call assert_fails('tcl ::vim::expr x y',
-        \           'wrong # args: should be "::vim::expr vimExpr"')
-  call assert_fails('tcl ::vim::expr 1-', 'E15: Invalid expression: "1-"')
+  call assert_fails('tcl ::mnv::expr x y',
+        \           'wrong # args: should be "::mnv::expr mnvExpr"')
+  call assert_fails('tcl ::mnv::expr 1-', 'E15: Invalid expression: "1-"')
 endfunc
 
-" Test ::vim::command
-func Test_vim_command()
+" Test ::mnv::command
+func Test_mnv_command()
   call assert_equal('hello world',
-        \           TclEval('::vim::command {echo "hello world"}'))
+        \           TclEval('::mnv::command {echo "hello world"}'))
 
-  " Check that if ::vim::command created a new Tcl interpreter, it is removed.
+  " Check that if ::mnv::command created a new Tcl interpreter, it is removed.
   tcl set foo 123
-  call assert_equal('321', TclEval('::vim::command "tcl set foo 321"'))
+  call assert_equal('321', TclEval('::mnv::command "tcl set foo 321"'))
   call assert_equal('123', TclEval('set foo'))
 
   " With the -quiet option, the error should silently be ignored.
-  call assert_equal('', TclEval('::vim::command -quiet xyz'))
+  call assert_equal('', TclEval('::mnv::command -quiet xyz'))
 
-  call assert_fails('tcl ::vim::command',
-       \            'wrong # args: should be "::vim::command ?-quiet? exCommand"')
-  call assert_fails('tcl ::vim::command -foo xyz', 'unknown flag: -foo')
-  call assert_fails('tcl ::vim::command xyz',
+  call assert_fails('tcl ::mnv::command',
+       \            'wrong # args: should be "::mnv::command ?-quiet? exCommand"')
+  call assert_fails('tcl ::mnv::command -foo xyz', 'unknown flag: -foo')
+  call assert_fails('tcl ::mnv::command xyz',
         \           'E492: Not an editor command: xyz')
 
   " With the -quiet option, the error should silently be ignored.
-  call assert_equal('', TclEval('::vim::command -quiet xyz'))
+  call assert_equal('', TclEval('::mnv::command -quiet xyz'))
 
   tcl unset foo
 endfunc
 
-" Test ::vim::window list
-func Test_vim_window_list()
+" Test ::mnv::window list
+func Test_mnv_window_list()
   e Xfoo1
   new Xfoo2
-  let w2 = TclEval('set ::vim::current(window)')
+  let w2 = TclEval('set ::mnv::current(window)')
   wincmd j
-  let w1 = TclEval('set ::vim::current(window)')
+  let w1 = TclEval('set ::mnv::current(window)')
 
-  call assert_equal('2', TclEval('llength [::vim::window list]'))
-  call assert_equal(w2.' '.w1, TclEval('::vim::window list'))
+  call assert_equal('2', TclEval('llength [::mnv::window list]'))
+  call assert_equal(w2.' '.w1, TclEval('::mnv::window list'))
 
-  call assert_fails('tcl ::vim::window x', 'unknown option')
-  call assert_fails('tcl ::vim::window list x',
-        \           'wrong # args: should be "::vim::window option"')
-  call assert_fails('tcl $::vim::current(window) abcd',
+  call assert_fails('tcl ::mnv::window x', 'unknown option')
+  call assert_fails('tcl ::mnv::window list x',
+        \           'wrong # args: should be "::mnv::window option"')
+  call assert_fails('tcl $::mnv::current(window) abcd',
         \           'bad option "abcd":')
 
   %bwipe
@@ -209,9 +209,9 @@ endfunc
 
 " Test output messages
 func Test_output()
-  call assert_fails('tcl puts vimerr "error #1"', 'error #1')
+  call assert_fails('tcl puts mnverr "error #1"', 'error #1')
   call assert_fails('tcl puts stderr "error #2"', 'error #2')
-  tcl puts vimout "message #1"
+  tcl puts mnvout "message #1"
   tcl puts stdout "message #2"
   tcl puts "message #3"
   let messages = split(execute('message'), "\n")
@@ -228,14 +228,14 @@ func Test_window_height()
   new
 
   " Test setting window height
-  tcl $::vim::current(window) height 2
+  tcl $::mnv::current(window) height 2
   call assert_equal(2, winheight(0))
 
   " Test getting window height
-  call assert_equal('2', TclEval('$::vim::current(window) height'))
+  call assert_equal('2', TclEval('$::mnv::current(window) height'))
 
-  call assert_fails('tcl $::vim::current(window) height 2 2', 'wrong # args:')
-  call assert_fails('tcl $::vim::current(window) height x',
+  call assert_fails('tcl $::mnv::current(window) height 2 2', 'wrong # args:')
+  call assert_fails('tcl $::mnv::current(window) height x',
         \ 'expected integer but got "x"')
   bwipe
 endfunc
@@ -244,21 +244,21 @@ endfunc
 func Test_window_cursor()
   new
   call setline(1, ['line1', 'line2', 'line3', 'line5'])
-  tcl set win $::vim::current(window)
+  tcl set win $::mnv::current(window)
 
   tcl $win cursor 2 4
   call assert_equal([0, 2, 4, 0], getpos('.'))
   call assert_equal('row 2 column 4', TclEval('$win cursor'))
 
-  " When setting ::vim::lbase to 0, line/col are counted from 0
+  " When setting ::mnv::lbase to 0, line/col are counted from 0
   " instead of 1.
-  tcl set ::vim::lbase 0
+  tcl set ::mnv::lbase 0
   call assert_equal([0, 2, 4, 0], getpos('.'))
   call assert_equal('row 1 column 3', TclEval('$win cursor'))
   tcl $win cursor 2 4
   call assert_equal([0, 3, 5, 0], getpos('.'))
   call assert_equal('row 2 column 4', TclEval('$win cursor'))
-  tcl set ::vim::lbase 1
+  tcl set ::mnv::lbase 1
   call assert_equal('row 3 column 5', TclEval('$win cursor'))
   call assert_equal([0, 3, 5, 0], getpos('.'))
 
@@ -298,11 +298,11 @@ endfunc
 func Test_window_buffer()
   new Xfoo1
   new Xfoo2
-  tcl set b2 $::vim::current(buffer)
-  tcl set w2 $::vim::current(window)
+  tcl set b2 $::mnv::current(buffer)
+  tcl set w2 $::mnv::current(window)
   wincmd j
-  tcl set b1 $::vim::current(buffer)
-  tcl set w1 $::vim::current(window)
+  tcl set b1 $::mnv::current(buffer)
+  tcl set w1 $::mnv::current(window)
 
   call assert_equal(TclEval('set b1'), TclEval('$w1 buffer'))
   call assert_equal(TclEval('set b2'), TclEval('$w2 buffer'))
@@ -321,9 +321,9 @@ func Test_window_command()
   call setline(1, ['FOObar'])
   new Xfoo2
   call setline(1, ['fooBAR'])
-  tcl set w2 $::vim::current(window)
+  tcl set w2 $::mnv::current(window)
   wincmd j
-  tcl set w1 $::vim::current(window)
+  tcl set w1 $::mnv::current(window)
 
   tcl $w1 command "norm VU"
   tcl $w2 command "norm Vu"
@@ -344,9 +344,9 @@ endfunc
 func Test_window_expr()
   new Xfoo1
   new Xfoo2
-  tcl set w2 $::vim::current(window)
+  tcl set w2 $::mnv::current(window)
   wincmd j
-  tcl set w1 $::vim::current(window)
+  tcl set w1 $::mnv::current(window)
 
   call assert_equal('Xfoo1', TclEval('$w1 expr bufname("%")'))
   call assert_equal('Xfoo2', TclEval('$w2 expr bufname("%")'))
@@ -362,9 +362,9 @@ endfunc
 func Test_window_option()
   new Xfoo1
   new Xfoo2
-  tcl set w2 $::vim::current(window)
+  tcl set w2 $::mnv::current(window)
   wincmd j
-  tcl set w1 $::vim::current(window)
+  tcl set w1 $::mnv::current(window)
 
   " Test setting window option
   tcl $w1 option syntax java
@@ -385,13 +385,13 @@ endfunc
 " Test $win delcmd {cmd}
 func Test_window_delcmd()
   new
-  tcl $::vim::current(window) delcmd [list set msg "window deleted"]
+  tcl $::mnv::current(window) delcmd [list set msg "window deleted"]
   call assert_fails('tcl set msg', "can't read \"msg\": no such variable")
   q
   call assert_equal('window deleted', TclEval('set msg'))
 
-  call assert_fails('tcl $::vim::current(window) delcmd', 'wrong # args')
-  call assert_fails('tcl $::vim::current(window) delcmd x x', 'wrong # args')
+  call assert_fails('tcl $::mnv::current(window) delcmd', 'wrong # args')
+  call assert_fails('tcl $::mnv::current(window) delcmd x x', 'wrong # args')
 
   tcl unset msg
   bwipe
@@ -401,14 +401,14 @@ endfunc
 func Test_buffer_name()
   " Test buffer name with a named buffer
   new Xfoo
-  call assert_equal(expand('%:p'), TclEval('$::vim::current(buffer) name'))
+  call assert_equal(expand('%:p'), TclEval('$::mnv::current(buffer) name'))
   bwipe
 
   " Test buffer name with an unnamed buffer
   new
-  call assert_equal('', TclEval('$::vim::current(buffer) name'))
+  call assert_equal('', TclEval('$::mnv::current(buffer) name'))
 
-  call assert_fails('tcl $::vim::current(buffer) name x', 'wrong # args:')
+  call assert_fails('tcl $::mnv::current(buffer) name x', 'wrong # args:')
 
   bwipe
 endfunc
@@ -416,11 +416,11 @@ endfunc
 " Test $buf number
 func Test_buffer_number()
   new
-  call assert_equal(string(bufnr('%')), TclEval('$::vim::current(buffer) number'))
+  call assert_equal(string(bufnr('%')), TclEval('$::mnv::current(buffer) number'))
   new
-  call assert_equal(string(bufnr('%')), TclEval('$::vim::current(buffer) number'))
+  call assert_equal(string(bufnr('%')), TclEval('$::mnv::current(buffer) number'))
 
-  call assert_fails('tcl $::vim::current(buffer) number x', 'wrong # args:')
+  call assert_fails('tcl $::mnv::current(buffer) number x', 'wrong # args:')
 
   %bwipe
 endfunc
@@ -429,18 +429,18 @@ endfunc
 func Test_buffer_count()
   new
   call setline(1, ['one', 'two', 'three'])
-  call assert_equal('3', TclEval('$::vim::current(buffer) count'))
-  call assert_equal('3', TclEval('$::vim::current(buffer) last'))
+  call assert_equal('3', TclEval('$::mnv::current(buffer) count'))
+  call assert_equal('3', TclEval('$::mnv::current(buffer) last'))
 
-  " Check that $buf count and $buf last differ when ::vim::lbase is 0.
-  tcl set ::vim::lbase 0
-  call assert_equal('3', TclEval('$::vim::current(buffer) count'))
-  call assert_equal('2', TclEval('$::vim::current(buffer) last'))
+  " Check that $buf count and $buf last differ when ::mnv::lbase is 0.
+  tcl set ::mnv::lbase 0
+  call assert_equal('3', TclEval('$::mnv::current(buffer) count'))
+  call assert_equal('2', TclEval('$::mnv::current(buffer) last'))
 
-  call assert_fails('tcl $::vim::current(buffer) count x', 'wrong # args:')
-  call assert_fails('tcl $::vim::current(buffer) last x',  'wrong # args:')
+  call assert_fails('tcl $::mnv::current(buffer) count x', 'wrong # args:')
+  call assert_fails('tcl $::mnv::current(buffer) last x',  'wrong # args:')
 
-  tcl set ::vim::lbase 1
+  tcl set ::mnv::lbase 1
   bwipe!
 endfunc
 
@@ -448,22 +448,22 @@ endfunc
 func Test_buffer_delete()
   new
   call setline(1, ['one', 'two', 'three', 'four', 'five', 'six', 'seven', 'eight'])
-  tcl $::vim::current(buffer) delete 4 6
-  tcl $::vim::current(buffer) delete 2
+  tcl $::mnv::current(buffer) delete 4 6
+  tcl $::mnv::current(buffer) delete 2
   call assert_equal(['one', 'three', 'seven', 'eight'], getline(1, '$'))
 
-  call assert_fails('tcl $::vim::current(buffer) delete -1', 'line number out of range')
-  call assert_fails('tcl $::vim::current(buffer) delete  0', 'line number out of range')
-  call assert_fails('tcl $::vim::current(buffer) delete  5', 'line number out of range')
+  call assert_fails('tcl $::mnv::current(buffer) delete -1', 'line number out of range')
+  call assert_fails('tcl $::mnv::current(buffer) delete  0', 'line number out of range')
+  call assert_fails('tcl $::mnv::current(buffer) delete  5', 'line number out of range')
 
-  call assert_fails('tcl $::vim::current(buffer) delete', 'wrong # args:')
-  call assert_fails('tcl $::vim::current(buffer) delete 1 2 3', 'wrong # args:')
-  call assert_fails('tcl $::vim::current(buffer) delete 1 abc',
+  call assert_fails('tcl $::mnv::current(buffer) delete', 'wrong # args:')
+  call assert_fails('tcl $::mnv::current(buffer) delete 1 2 3', 'wrong # args:')
+  call assert_fails('tcl $::mnv::current(buffer) delete 1 abc',
         \ 'expected integer but got "abc"')
 
   " Try to delete lines from an 'nomodifiable' buffer
   set nomodifiable
-  call assert_fails('tcl $::vim::current(buffer) delete 2 1',
+  call assert_fails('tcl $::mnv::current(buffer) delete 2 1',
         \ ['E21:', 'cannot save undo information'])
   set modifiable
 
@@ -473,7 +473,7 @@ endfunc
 " Test $buf insert (insert line(s) in buffer)
 func Test_buffer_insert()
   new
-  tcl set buf $::vim::current(buffer)
+  tcl set buf $::mnv::current(buffer)
   tcl $buf insert 1 "first"
   tcl $buf insert 2 "second"
   tcl $buf insert 2 "third"
@@ -492,7 +492,7 @@ endfunc
 " Test $buf append (append line in buffer)
 func Test_buffer_append()
   new
-  tcl set buf $::vim::current(buffer)
+  tcl set buf $::mnv::current(buffer)
   tcl $buf append 1 "first"
   tcl $buf append 2 "second"
   tcl $buf append 2 "third"
@@ -521,35 +521,35 @@ endfunc
 func Test_buffer_set()
   new
   call setline(1, ['line1', 'line2', 'line3', 'line4', 'line5'])
-  tcl $::vim::current(buffer) set 2 a
+  tcl $::mnv::current(buffer) set 2 a
   call assert_equal(['line1', 'a', 'line3', 'line4', 'line5'], getline(1, '$'))
 
   " Test with fewer replacing lines than replaced lines: lines get deleted.
-  tcl $::vim::current(buffer) set 3 4 b
+  tcl $::mnv::current(buffer) set 3 4 b
   call assert_equal(['line1', 'a', 'b', 'line5'], getline(1, '$'))
-  tcl $::vim::current(buffer) set 4 3 c
+  tcl $::mnv::current(buffer) set 4 3 c
   call assert_equal(['line1', 'a', 'c'], getline(1, '$'))
 
   " Test with more replacing lines than replaced lines: lines get added.
-  tcl $::vim::current(buffer) set 2 3 {x y z}
+  tcl $::mnv::current(buffer) set 2 3 {x y z}
   call assert_equal(['line1', 'x', 'y', 'z'], getline(1, '$'))
-  tcl $::vim::current(buffer) set 3 2 {X Y Z}
+  tcl $::mnv::current(buffer) set 3 2 {X Y Z}
   call assert_equal(['line1', 'X', 'Y', 'Z', 'z'], getline(1, '$'))
 
-  call assert_fails('tcl $::vim::current(buffer) set 0 "x"', 'line number out of range')
-  call assert_fails('tcl $::vim::current(buffer) set 6 "x"', 'line number out of range')
+  call assert_fails('tcl $::mnv::current(buffer) set 0 "x"', 'line number out of range')
+  call assert_fails('tcl $::mnv::current(buffer) set 6 "x"', 'line number out of range')
 
-  call assert_fails('tcl $::vim::current(buffer) set', 'wrong # args:')
-  call assert_fails('tcl $::vim::current(buffer) set 1 2 {[list "a" "b"]}',
+  call assert_fails('tcl $::mnv::current(buffer) set', 'wrong # args:')
+  call assert_fails('tcl $::mnv::current(buffer) set 1 2 {[list "a" "b"]}',
         \ 'list element in quotes followed by "]" instead of space')
 
   " Try to modify a 'nomodifiable' buffer
   set nomodifiable
-  call assert_fails('tcl $::vim::current(buffer) set 1 "x"',
+  call assert_fails('tcl $::mnv::current(buffer) set 1 "x"',
         \ ['E21:', 'cannot save undo information'])
-  call assert_fails('tcl $::vim::current(buffer) set 1 {a b}',
+  call assert_fails('tcl $::mnv::current(buffer) set 1 {a b}',
         \ ['E21:', 'cannot save undo information'])
-  call assert_fails('tcl $::vim::current(buffer) set 1 2 {a b}',
+  call assert_fails('tcl $::mnv::current(buffer) set 1 2 {a b}',
         \ ['E21:', 'cannot save undo information'])
   set modifiable
   bwipe!
@@ -559,7 +559,7 @@ endfunc
 func Test_buffer_get()
   new
   call setline(1, ['first line', 'two', 'three', 'last line'])
-  tcl set buf $::vim::current(buffer)
+  tcl set buf $::mnv::current(buffer)
 
   call assert_equal('first line', TclEval('$buf get top'))
   call assert_equal('first line', TclEval('$buf get begin'))
@@ -580,9 +580,9 @@ func Test_buffer_get()
   call assert_fails('tcl $buf get  5',   'line number out of range')
   call assert_fails('tcl $buf get  0 1', 'line number out of range')
 
-  call assert_fails('tcl $::vim::current(buffer) get x', 'expected integer but got "x"')
-  call assert_fails('tcl $::vim::current(buffer) get 1 x', 'expected integer but got "x"')
-  call assert_fails('tcl $::vim::current(buffer) get 1 1 1', 'wrong # args:')
+  call assert_fails('tcl $::mnv::current(buffer) get x', 'expected integer but got "x"')
+  call assert_fails('tcl $::mnv::current(buffer) get 1 x', 'expected integer but got "x"')
+  call assert_fails('tcl $::mnv::current(buffer) get 1 1 1', 'wrong # args:')
 
   tcl unset buf
   bwipe!
@@ -596,12 +596,12 @@ func Test_buffer_mark()
   norm! ma
   norm! jllmB
 
-  call assert_equal('row 3 column 1', TclEval('$::vim::current(buffer) mark a'))
-  call assert_equal('row 4 column 3', TclEval('$::vim::current(buffer) mark B'))
+  call assert_equal('row 3 column 1', TclEval('$::mnv::current(buffer) mark a'))
+  call assert_equal('row 4 column 3', TclEval('$::mnv::current(buffer) mark B'))
 
-  call assert_fails('tcl $::vim::current(buffer) mark /', 'invalid mark name')
-  call assert_fails('tcl $::vim::current(buffer) mark z', 'mark not set')
-  call assert_fails('tcl $::vim::current(buffer) mark', 'wrong # args:')
+  call assert_fails('tcl $::mnv::current(buffer) mark /', 'invalid mark name')
+  call assert_fails('tcl $::mnv::current(buffer) mark z', 'mark not set')
+  call assert_fails('tcl $::mnv::current(buffer) mark', 'wrong # args:')
 
   delmarks aB
   bwipe!
@@ -610,9 +610,9 @@ endfunc
 " Test $buf option (test and set option in context of a buffer)
 func Test_buffer_option()
   new Xfoo1
-  tcl set b1 $::vim::current(buffer)
+  tcl set b1 $::mnv::current(buffer)
   new Xfoo2
-  tcl set b2 $::vim::current(buffer)
+  tcl set b2 $::mnv::current(buffer)
 
   tcl $b1 option foldcolumn 2
   tcl $b2 option foldcolumn 3
@@ -624,22 +624,22 @@ func Test_buffer_option()
   call assert_equal('2', TclEval('$b1 option foldcolumn'))
   call assert_equal('3', TclEval('$b2 option foldcolumn'))
 
-  call assert_fails('tcl $::vim::current(buffer) option', 'wrong # args:')
+  call assert_fails('tcl $::mnv::current(buffer) option', 'wrong # args:')
 
   set foldcolumn&
   tcl unset b1 b2
   %bwipe
 endfunc
 
-" Test $buf expr (evaluate vim expression)
+" Test $buf expr (evaluate mnv expression)
 func Test_buffer_expr()
   new Xfoo1
   norm ifoo1
-  tcl set b1 $::vim::current(buffer)
+  tcl set b1 $::mnv::current(buffer)
 
   new Xfoo2
   norm ifoo2
-  tcl set b2 $::vim::current(buffer)
+  tcl set b2 $::mnv::current(buffer)
 
   call assert_equal('foo1', TclEval('$b1 expr getline(1)'))
   call assert_equal('foo2', TclEval('$b2 expr getline(1)'))
@@ -654,24 +654,24 @@ endfunc
 func Test_buffer_delcmd()
   new Xfoo
   split
-  tcl $::vim::current(buffer) delcmd [list set msg "buffer deleted"]
+  tcl $::mnv::current(buffer) delcmd [list set msg "buffer deleted"]
   q
   call assert_fails('tcl set msg', "can't read \"msg\": no such variable")
   q
   call assert_equal('buffer deleted', TclEval('set msg'))
 
-  call assert_fails('tcl $::vim::current(buffer) delcmd', 'wrong # args')
-  call assert_fails('tcl $::vim::current(buffer) delcmd x x', 'wrong # args')
+  call assert_fails('tcl $::mnv::current(buffer) delcmd', 'wrong # args')
+  call assert_fails('tcl $::mnv::current(buffer) delcmd x x', 'wrong # args')
 
   tcl unset msg
   %bwipe
 endfunc
 
-func Test_vim_current()
-  " Only test errors as ::vim::current(...) is already indirectly
+func Test_mnv_current()
+  " Only test errors as ::mnv::current(...) is already indirectly
   " tested by many other tests.
-  call assert_fails('tcl $::vim::current(buffer)', 'wrong # args:')
-  call assert_fails('tcl $::vim::current(window)', 'wrong # args:')
+  call assert_fails('tcl $::mnv::current(buffer)', 'wrong # args:')
+  call assert_fails('tcl $::mnv::current(window)', 'wrong # args:')
 endfunc
 
 " Test $buf windows (windows list of a buffer)
@@ -682,14 +682,14 @@ func Test_buffer_windows()
   split
   vsplit
 
-  tcl set bar_wl [$::vim::current(buffer) windows]
+  tcl set bar_wl [$::mnv::current(buffer) windows]
   2wincmd j
-  tcl set foo_wl [$::vim::current(buffer) windows]
+  tcl set foo_wl [$::mnv::current(buffer) windows]
 
   call assert_equal('2', TclEval('llength $foo_wl'))
   call assert_equal('3', TclEval('llength $bar_wl'))
 
-  call assert_fails('tcl $::vim::current(buffer) windows x', 'wrong # args:')
+  call assert_fails('tcl $::mnv::current(buffer) windows x', 'wrong # args:')
 
   tcl unset bar_wl foo_wl
   %bwipe
@@ -738,7 +738,7 @@ func Test_set_cursor()
   new
   call setline(1, ['first line', 'second line'])
   normal gg
-  tcldo $::vim::current(window) cursor 1 5
+  tcldo $::mnv::current(window) cursor 1 5
   call assert_equal([1, 5], [line('.'), col('.')])
 
   " Check that movement after setting cursor position keeps current column.
@@ -749,18 +749,18 @@ endfunc
 " Test for different syntax for ruby heredoc
 func Test_tcl_heredoc()
   tcl << END
-::vim::command {let s = "A"}
+::mnv::command {let s = "A"}
 END
   tcl <<
-::vim::command {let s ..= "B"}
+::mnv::command {let s ..= "B"}
 .
   tcl << trim END
-    ::vim::command {let s ..= "C"}
+    ::mnv::command {let s ..= "C"}
   END
   tcl << trim
-    ::vim::command {let s ..= "D"}
+    ::mnv::command {let s ..= "D"}
   .
   call assert_equal('ABCD', s)
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_termcodes.vim b/uvim/src/testdir/test_termcodes.mnv
index edf64d2830..26adb85eb6 100644
--- a/uvim/src/testdir/test_termcodes.vim
+++ b/uvim/src/testdir/test_termcodes.mnv
@@ -4,11 +4,11 @@
 CheckNotGui
 CheckUnix
 
-source util/mouse.vim
+source util/mouse.mnv
 
 func s:TermGuiColorsTest()
   CheckNotMSWindows
-  if !CanRunVimInTerminal()
+  if !CanRunMNVInTerminal()
     throw 'Skipped: cannot make screendumps'
   endif
   if !executable('tput')
@@ -372,13 +372,13 @@ func Test_term_mouse_switch_win_insert_mode()
   set mouse=a term=xterm ttymouse=xterm2
   call WaitForResponses()
 
-  call feedkeys('ivim' ..
+  call feedkeys('imnv' ..
         \ MouseLeftClickCode(8, 6) .. MouseLeftReleaseCode(8, 6) ..
         \ "\<C-C>", 'Lx!')
   call assert_equal(2, winnr())
   wincmd w
   call assert_equal('n', mode())
-  call assert_equal(['vim'], getline(1, '$'))
+  call assert_equal(['mnv'], getline(1, '$'))
 
   let &mouse = save_mouse
   let &term = save_term
@@ -2083,9 +2083,9 @@ func Test_get_termcode()
 endfunc
 
 func Test_list_builtin_terminals()
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
-  call RunVimInTerminal('', #{rows: 14})
+  call RunMNVInTerminal('', #{rows: 14})
   call term_sendkeys('', ":set cmdheight=3\<CR>")
   call TermWait('', 100)
   call term_sendkeys('', ":set term=xxx\<CR>")
@@ -2105,7 +2105,7 @@ func Test_list_builtin_terminals()
   call assert_match('builtin_debug', term_getline('', dumb_idx + 1))
   call assert_match('Not found in termcap', term_getline('', dumb_idx + 2))
 
-  call StopVimInTerminal('')
+  call StopMNVInTerminal('')
 endfunc
 
 " This checks the CSI sequences when in modifyOtherKeys mode.
@@ -2886,11 +2886,11 @@ func Test_xterm_direct_enables_termguicolors()
   let colors  = systemlist('tput -Txterm-direct colors')[0]
   defer delete('XTerm-direct.txt')
 
-  let buf = RunVimInTerminal('--cmd ":set noswapfile" --clean XTerm-direct.txt',
+  let buf = RunMNVInTerminal('--cmd ":set noswapfile" --clean XTerm-direct.txt',
         \  {'rows': 10, 'env': {'TERM': 'xterm-direct'}})
   call TermWait(buf)
   call term_sendkeys(buf, ":$put ='TERM: ' .. &term\<cr>")
-  " doesn't work. Vim cannot query xterm colors in the embedded terminal?
+  " doesn't work. MNV cannot query xterm colors in the embedded terminal?
   "call term_sendkeys(buf, ":$put ='Colors: ' .. &t_Co\<cr>")
   call term_sendkeys(buf, ":$put ='Termguicolors: ' .. &tgc\<cr>")
   call term_sendkeys(buf, ":wq\<cr>")
@@ -2915,7 +2915,7 @@ func Test_xterm_direct_no_termguicolors()
   call writefile(lines, 'XtermDirect', 'D')
   defer delete('XTerm-direct2.txt')
 
-  let buf = RunVimInTerminal('-S XtermDirect --clean XTerm-direct2.txt',
+  let buf = RunMNVInTerminal('-S XtermDirect --clean XTerm-direct2.txt',
         \  {'rows': 10, 'env': {'TERM': 'xterm-direct'}})
   call TermWait(buf)
   call term_sendkeys(buf, ":$put ='TERM: ' .. &term\<cr>")
@@ -2950,7 +2950,7 @@ endfunc
 
 " Test if xOSC key is emitted.
 func Test_term_response_xosc_key()
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   let lines =<< trim END
     func Test()
@@ -2962,14 +2962,14 @@ func Test_term_response_xosc_key()
   call writefile(lines, 'XTest', 'D')
   defer delete('XTestResult')
 
-  let buf = RunVimInTerminal("-S XTest", {'rows': 10})
+  let buf = RunMNVInTerminal("-S XTest", {'rows': 10})
   call TermWait(buf)
   call term_sendkeys(buf, "\<Esc>:call Test()\<CR>")
   call TermWait(buf)
   call term_sendkeys(buf, "\<Esc>]52;hello;\<Esc>\\")
   call TermWait(buf)
   call WaitForAssert({-> assert_equal(["done"], readfile('XTestResult'))})
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 " This only checks if the sequence is recognized.
@@ -3043,17 +3043,17 @@ endfunc
 " Test in-band window resize events (DEC mode 2048).
 " https://gist.github.com/rockorager/e695fb2924d36b2bcf1fff4a3704bd83
 func Test_term_win_resize()
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   let lines =<< trim END
-  vim9script
+  mnv9script
 
-  autocmd VimResized * writefile([$"{&lines} {&columns}"], "XTestWinResizeResult")
+  autocmd MNVResized * writefile([$"{&lines} {&columns}"], "XTestWinResizeResult")
   END
   call writefile(lines, 'XTestWinResize', 'D')
   defer delete("XTestWinResizeResult")
 
-  let buf = RunVimInTerminal('-S XTestWinResize', #{rows: 15, cols: 20})
+  let buf = RunMNVInTerminal('-S XTestWinResize', #{rows: 15, cols: 20})
 
   " Send status report
   call term_sendkeys(buf, "\<Esc>[?2048;1$y")
@@ -3116,7 +3116,7 @@ func Test_term_win_resize()
 
   call WaitForAssert({-> assert_equal(["5 20"], readfile("XTestWinResizeResult"))})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_termencoding.vim b/uvim/src/testdir/test_termencoding.mnv
index f4f523163c..34fe4c2396 100644
--- a/uvim/src/testdir/test_termencoding.vim
+++ b/uvim/src/testdir/test_termencoding.mnv
@@ -4,13 +4,13 @@
 " This only works with "iconv".
 CheckFeature iconv
 
-source util/screendump.vim
+source util/screendump.mnv
 
-if !CanRunVimInTerminal()
+if !CanRunMNVInTerminal()
   throw 'Skipped: cannot make screendumps'
 endif
 
-" This Vim is running with 'encoding' "utf-8", the Vim in the terminal is
+" This MNV is running with 'encoding' "utf-8", the MNV in the terminal is
 " running with 'encoding' "euc-jp".  We need to make sure the text is in the
 " right encoding, this is a bit tricky.
 func Test_termencoding_euc_jp()
@@ -27,12 +27,12 @@ func Test_termencoding_euc_jp()
 	\ 'exe "normal aE83: �ッファを作��������他�を使用���...\<Esc>"',
 	\ 'split Xeuc_jp.txt',
 	\ ], 'XTest_tenc_euc_jp', 'D')
-  let buf = RunVimInTerminal('-S XTest_tenc_euc_jp', {'rows': 10})
+  let buf = RunMNVInTerminal('-S XTest_tenc_euc_jp', {'rows': 10})
   call VerifyScreenDump(buf, 'Test_tenc_euc_jp_01', {})
 
   " clean up
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
   call delete('Xeuc_jp.txt')
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_terminal.vim b/uvim/src/testdir/test_terminal.mnv
index 6f8fb36626..09aff732d4 100644
--- a/uvim/src/testdir/test_terminal.vim
+++ b/uvim/src/testdir/test_terminal.mnv
@@ -1,11 +1,11 @@
 " Tests for the terminal window.
 " This is split in two, because it can take a lot of time.
-" See test_terminal2.vim and test_terminal3.vim for further tests.
+" See test_terminal2.mnv and test_terminal3.mnv for further tests.
 
 CheckFeature terminal
 
-source util/screendump.vim
-source util/mouse.vim
+source util/screendump.mnv
+source util/mouse.mnv
 
 let s:python = PythonProg()
 let $PROMPT_COMMAND=''
@@ -532,7 +532,7 @@ func Test_terminal_postponed_scrollback()
 	\ 'sleep 100m',
 	\ 'call feedkeys("\<C-W>N", "xt")',
 	\ ], 'XTest_postponed', 'D')
-  let buf = RunVimInTerminal('-S XTest_postponed', {})
+  let buf = RunMNVInTerminal('-S XTest_postponed', {})
   " Check that the Xtext lines are displayed and in Terminal-Normal mode
   call VerifyScreenDump(buf, 'Test_terminal_scrollback_1', {})
 
@@ -557,7 +557,7 @@ func Test_terminal_postponed_scrollback()
   " check type of term_sendkeys() return value
   echo type(tsk_ret)
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 " Run diff on two dumps with different size.
@@ -819,11 +819,11 @@ endfunc
 
 func Test_terminal_servername()
   CheckFeature clientserver
-  call s:test_environment("VIM_SERVERNAME", v:servername)
+  call s:test_environment("MNV_SERVERNAME", v:servername)
 endfunc
 
 func Test_terminal_version()
-  call s:test_environment("VIM_TERMINAL", string(v:version))
+  call s:test_environment("MNV_TERMINAL", string(v:version))
 endfunc
 
 func s:test_environment(name, value)
@@ -1299,7 +1299,7 @@ func Test_aa_terminal_focus_events()
   CheckScreendump
   CheckNotGui
   CheckUnix
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   let save_term = &term
   let save_ttymouse = &ttymouse
@@ -1311,7 +1311,7 @@ func Test_aa_terminal_focus_events()
       au FocusGained * call setline(1, 'I am back') | set nomod
   END
   call writefile(lines, 'XtermFocus', 'D')
-  let buf = RunVimInTerminal('-S XtermFocus', #{rows: 6})
+  let buf = RunMNVInTerminal('-S XtermFocus', #{rows: 6})
 
   " Send a focus event to ourselves, it should be forwarded to the terminal
   call feedkeys("\<Esc>[O", "Lx!")
@@ -1327,17 +1327,17 @@ func Test_aa_terminal_focus_events()
   call VerifyScreenDump(buf, 'Test_terminal_focus_3', {})
   call term_sendkeys(buf, "\<Esc>")
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
   let &term = save_term
   let &ttymouse = save_ttymouse
 endfunc
 
-" Run Vim, start a terminal in that Vim with the kill argument,
+" Run MNV, start a terminal in that MNV with the kill argument,
 " :qall works.
 func Run_terminal_qall_kill(line1, line2)
   " 1. Open a terminal window and wait for the prompt to appear
   " 2. set kill using term_setkill()
-  " 3. make Vim exit, it will kill the shell
+  " 3. make MNV exit, it will kill the shell
   let after = [
 	\ a:line1,
 	\ 'let buf = bufnr("%")',
@@ -1345,29 +1345,29 @@ func Run_terminal_qall_kill(line1, line2)
 	\ '  sleep 10m',
 	\ 'endwhile',
 	\ a:line2,
-	\ 'au VimLeavePre * call writefile(["done"], "Xdone")',
+	\ 'au MNVLeavePre * call writefile(["done"], "Xdone")',
 	\ 'qall',
 	\ ]
-  if !RunVim([], after, '')
+  if !RunMNV([], after, '')
     return
   endif
   call assert_equal("done", readfile("Xdone")[0])
   call delete("Xdone")
 endfunc
 
-" Run Vim in a terminal, then start a terminal in that Vim with a kill
+" Run MNV in a terminal, then start a terminal in that MNV with a kill
 " argument, check that :qall works.
 func Test_terminal_qall_kill_arg()
   call Run_terminal_qall_kill('term ++kill=kill', '')
 endfunc
 
-" Run Vim, start a terminal in that Vim, set the kill argument with
+" Run MNV, start a terminal in that MNV, set the kill argument with
 " term_setkill(), check that :qall works.
 func Test_terminal_qall_kill_func()
   call Run_terminal_qall_kill('term', 'eval buf->term_setkill("kill")')
 endfunc
 
-" Run Vim, start a terminal in that Vim without the kill argument,
+" Run MNV, start a terminal in that MNV without the kill argument,
 " check that :qall does not exit.
 func Test_terminal_qall_exit()
   let after =<< trim [CODE]
@@ -1377,13 +1377,13 @@ func Test_terminal_qall_exit()
       sleep 10m
     endwhile
     set nomore
-    au VimLeavePre * call writefile(["too early"], "Xdone")
+    au MNVLeavePre * call writefile(["too early"], "Xdone")
     qall
-    au! VimLeavePre * exe buf . "bwipe!" | call writefile(["done"], "Xdone")
+    au! MNVLeavePre * exe buf . "bwipe!" | call writefile(["done"], "Xdone")
     cquit
   [CODE]
 
-  if !RunVim([], after, '')
+  if !RunMNV([], after, '')
     return
   endif
   call assert_equal("done", readfile("Xdone")[0])
@@ -1400,11 +1400,11 @@ func Test_terminal_qall_wqall_bang_exit()
         sleep 10m
       endwhile
       set nomore
-      au VimLeavePre * call writefile(["done"], "Xdone")
+      au MNVLeavePre * call writefile(["done"], "Xdone")
       {cmd}
     [CODE]
 
-    if !RunVim([], after, '')
+    if !RunMNV([], after, '')
       continue
     endif
     call assert_equal("done", readfile("Xdone")[0])
@@ -1412,12 +1412,12 @@ func Test_terminal_qall_wqall_bang_exit()
   endfor
 endfunc
 
-" Run Vim in a terminal, then start a terminal in that Vim without a kill
+" Run MNV in a terminal, then start a terminal in that MNV without a kill
 " argument, check that :confirm qall works.
 func Test_terminal_qall_prompt()
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
-  let buf = RunVimInTerminal('', {})
+  let buf = RunMNVInTerminal('', {})
 
   " the shell may set the window title, we don't want that here
   call term_sendkeys(buf, ":call test_override('vterm_title', 1)\<CR>")
@@ -1427,20 +1427,20 @@ func Test_terminal_qall_prompt()
   call WaitForAssert({-> assert_match('\[running]', term_getline(buf, 10))})
   call WaitForAssert({-> assert_notmatch('^\s*$', term_getline(buf, 1))})
 
-  " make Vim exit, it will prompt to kill the shell
+  " make MNV exit, it will prompt to kill the shell
   call term_sendkeys(buf, "\<C-W>:confirm qall\<CR>")
   call WaitForAssert({-> assert_match('\[Y\]es, (N)o:', term_getline(buf, 20))})
   call term_sendkeys(buf, "y")
   call WaitForAssert({-> assert_equal('finished', term_getstatus(buf))})
 
-  " close the terminal window where Vim was running
+  " close the terminal window where MNV was running
   quit
 endfunc
 
-" Run Vim in a terminal, then start a terminal window with a shell and check
-" that Vim exits if it is closed.
+" Run MNV in a terminal, then start a terminal window with a shell and check
+" that MNV exits if it is closed.
 func Test_terminal_exit()
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   let lines =<< trim END
      let winid = win_getid()
@@ -1452,11 +1452,11 @@ func Test_terminal_exit()
      call win_gotoid(termid)
   END
   call writefile(lines, 'XtermExit', 'D')
-  let buf = RunVimInTerminal('-S XtermExit', #{rows: 10})
+  let buf = RunMNVInTerminal('-S XtermExit', #{rows: 10})
   let job = term_getjob(buf)
   call WaitForAssert({-> assert_equal("run", job_status(job))})
 
-  " quit the shell, it will make Vim exit
+  " quit the shell, it will make MNV exit
   call term_sendkeys(buf, "exit\<CR>")
   call WaitForAssert({-> assert_equal("dead", job_status(job))})
 endfunc
@@ -1498,7 +1498,7 @@ endfunc
 func Test_open_term_from_cmd()
   CheckScreendump
   CheckUnix
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   let lines =<< trim END
       call setline(1, ['a', 'b', 'c'])
@@ -1507,7 +1507,7 @@ func Test_open_term_from_cmd()
       cnoremap <F3> <Cmd>call term_start(['/bin/sh', '-c', ':'])<CR>
   END
   call writefile(lines, 'Xopenterm', 'D')
-  let buf = RunVimInTerminal('-S Xopenterm', {})
+  let buf = RunMNVInTerminal('-S Xopenterm', {})
 
   " this opens a window, incsearch should not use the old cursor position
   call term_sendkeys(buf, "/\<F3>")
@@ -1515,26 +1515,26 @@ func Test_open_term_from_cmd()
   call term_sendkeys(buf, "\<Esc>")
   call term_sendkeys(buf, ":q\<CR>")
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_combining_double_width()
   CheckScreendump
   CheckUnix
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   call writefile(["\xe3\x83\x9b\xe3\x82\x9a"], 'Xonedouble', 'D')
   let lines =<< trim END
       call term_start(['/bin/sh', '-c', 'cat Xonedouble'])
   END
   call writefile(lines, 'Xcombining', 'D')
-  let buf = RunVimInTerminal('-S Xcombining', #{rows: 9})
+  let buf = RunMNVInTerminal('-S Xcombining', #{rows: 9})
 
   " this opens a window, incsearch should not use the old cursor position
   call VerifyScreenDump(buf, 'Test_terminal_combining', {})
   call term_sendkeys(buf, ":q\<CR>")
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_terminal_popup_with_cmd()
@@ -1567,7 +1567,7 @@ func Test_terminal_popup_bufload()
 endfunc
 
 func Test_terminal_popup_two_windows()
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
   CheckUnix
 
   " use "sh" instead of "&shell" in the hope it will use a short prompt
@@ -1581,7 +1581,7 @@ func Test_terminal_popup_two_windows()
       call term_sendkeys(termbuf, "echo 'test'")
   END
   call writefile(lines, 'XpopupScript', 'D')
-  let buf = RunVimInTerminal('-S XpopupScript', {})
+  let buf = RunMNVInTerminal('-S XpopupScript', {})
 
   " typed text appears both in normal window and in popup
   call WaitForAssert({-> assert_match("echo 'test'", term_getline(buf, 1))})
@@ -1590,7 +1590,7 @@ func Test_terminal_popup_two_windows()
   call term_sendkeys(buf, "\<CR>\<CR>exit\<CR>")
   call TermWait(buf)
   call term_sendkeys(buf, ":q\<CR>")
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_terminal_popup_insert_cmd()
@@ -1617,7 +1617,7 @@ func Check_dump01(off)
 endfunc
 
 func Test_terminal_dumpwrite_composing()
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   let save_enc = &encoding
   set encoding=utf-8
@@ -1625,22 +1625,22 @@ func Test_terminal_dumpwrite_composing()
 
   let text = " a\u0300 e\u0302 o\u0308"
   call writefile([text], 'Xcomposing', 'D')
-  let buf = RunVimInTerminal('--cmd "set encoding=utf-8" Xcomposing', {})
+  let buf = RunMNVInTerminal('--cmd "set encoding=utf-8" Xcomposing', {})
   call WaitForAssert({-> assert_match(text, term_getline(buf, 1))})
   eval 'Xdump'->term_dumpwrite(buf)
   let dumpline = readfile('Xdump')[0]
   call assert_match('|à| |ê| |ö', dumpline)
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
   call delete('Xdump')
   let &encoding = save_enc
 endfunc
 
 " Tests for failures in the term_dumpwrite() function
 func Test_terminal_dumpwrite_errors()
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
   call assert_fails("call term_dumpwrite({}, 'Xtest.dump')", 'E728:')
-  let buf = RunVimInTerminal('', {})
+  let buf = RunMNVInTerminal('', {})
   call TermWait(buf)
   call assert_fails("call term_dumpwrite(buf, 'Xtest.dump', '')", 'E1206:')
   call assert_fails("call term_dumpwrite(buf, [])", 'E730:')
@@ -1650,7 +1650,7 @@ func Test_terminal_dumpwrite_errors()
   call assert_fails("call term_dumpwrite(buf, '')", 'E482:')
   call assert_fails("call term_dumpwrite(buf, test_null_string())", 'E482:')
   call test_garbagecollect_now()
-  call StopVimInTerminal(buf, 0)
+  call StopMNVInTerminal(buf, 0)
   call TermWait(buf)
   call assert_fails("call term_dumpwrite(buf, 'Xtest.dump')", 'E958:')
   call assert_fails('call term_sendkeys([], ":q\<CR>")', 'E745:')
@@ -1690,16 +1690,16 @@ endfunc
 
 func Test_terminal_dumpload_dump()
   CheckScreendump
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   let lines =<< trim END
      call term_dumpload('dumps/Test_popupwin_22.dump', #{term_rows: 12})
   END
   call writefile(lines, 'XtermDumpload', 'D')
-  let buf = RunVimInTerminal('-S XtermDumpload', #{rows: 15})
+  let buf = RunMNVInTerminal('-S XtermDumpload', #{rows: 15})
   call VerifyScreenDump(buf, 'Test_terminal_dumpload', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_terminal_dumpdiff()
@@ -1813,14 +1813,14 @@ func Test_start_terminal_from_timer()
 
   " Open a terminal window from a timer, typed text goes to the terminal
   call writefile(["call timer_start(100, { -> term_start('sh') })"], 'XtimerTerm', 'D')
-  let buf = RunVimInTerminal('-S XtimerTerm', {})
+  let buf = RunMNVInTerminal('-S XtimerTerm', {})
   call CheckTerminalWindowWorks(buf)
 
   " do the same in Insert mode
   call term_sendkeys(buf, ":call timer_start(200, { -> term_start('sh') })\<CR>a")
   call CheckTerminalWindowWorks(buf)
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_terminal_window_focus()
@@ -1851,7 +1851,7 @@ func Api_drop_common(options)
 	\ 'redraw',
 	\ "set t_ts=",
 	\ ], 'Xscript')
-  let buf = RunVimInTerminal('-S Xscript', {})
+  let buf = RunMNVInTerminal('-S Xscript', {})
   call WaitFor({-> bufnr('Xtextfile') > 0})
   call assert_equal('Xtextfile', expand('%:t'))
   call assert_true(winnr('$') >= 3)
@@ -1859,102 +1859,102 @@ func Api_drop_common(options)
 endfunc
 
 func Test_terminal_api_drop_newwin()
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
   let buf = Api_drop_common('')
   call assert_equal(0, &bin)
   call assert_equal('', &fenc)
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
   call delete('Xscript')
   bwipe Xtextfile
 endfunc
 
 func Test_terminal_api_drop_newwin_bin()
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
   let buf = Api_drop_common(',{"bin":1}')
   call assert_equal(1, &bin)
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
   call delete('Xscript')
   bwipe Xtextfile
 endfunc
 
 func Test_terminal_api_drop_newwin_binary()
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
   let buf = Api_drop_common(',{"binary":1}')
   call assert_equal(1, &bin)
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
   call delete('Xscript')
   bwipe Xtextfile
 endfunc
 
 func Test_terminal_api_drop_newwin_nobin()
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
   set binary
   let buf = Api_drop_common(',{"nobin":1}')
   call assert_equal(0, &bin)
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
   call delete('Xscript')
   bwipe Xtextfile
   set nobinary
 endfunc
 
 func Test_terminal_api_drop_newwin_nobinary()
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
   set binary
   let buf = Api_drop_common(',{"nobinary":1}')
   call assert_equal(0, &bin)
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
   call delete('Xscript')
   bwipe Xtextfile
   set nobinary
 endfunc
 
 func Test_terminal_api_drop_newwin_ff()
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
   let buf = Api_drop_common(',{"ff":"dos"}')
   call assert_equal("dos", &ff)
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
   call delete('Xscript')
   bwipe Xtextfile
 endfunc
 
 func Test_terminal_api_drop_newwin_fileformat()
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
   let buf = Api_drop_common(',{"fileformat":"dos"}')
   call assert_equal("dos", &ff)
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
   call delete('Xscript')
   bwipe Xtextfile
 endfunc
 
 func Test_terminal_api_drop_newwin_enc()
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
   let buf = Api_drop_common(',{"enc":"utf-16"}')
   call assert_equal("utf-16", &fenc)
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
   call delete('Xscript')
   bwipe Xtextfile
 endfunc
 
 func Test_terminal_api_drop_newwin_encoding()
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
   let buf = Api_drop_common(',{"encoding":"utf-16"}')
   call assert_equal("utf-16", &fenc)
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
   call delete('Xscript')
   bwipe Xtextfile
 endfunc
 
 func Test_terminal_api_drop_oldwin()
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
   let firstwinid = win_getid()
   split Xtextfile
   let textfile_winid = win_getid()
@@ -1969,11 +1969,11 @@ func Test_terminal_api_drop_oldwin()
 	\ 'redraw',
 	\ "set t_ts=",
 	\ ], 'Xscript', 'D')
-  let buf = RunVimInTerminal('-S Xscript', {'rows': 10})
+  let buf = RunMNVInTerminal('-S Xscript', {'rows': 10})
   call WaitForAssert({-> assert_equal('Xtextfile', expand('%:t'))})
   call assert_equal(textfile_winid, win_getid())
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
   bwipe Xtextfile
 endfunc
 
@@ -1994,7 +1994,7 @@ func WriteApiCall(funcname)
 endfunc
 
 func Test_terminal_api_call()
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   unlet! g:called_bufnum
   unlet! g:called_arg
@@ -2002,21 +2002,21 @@ func Test_terminal_api_call()
   call WriteApiCall('Tapi_TryThis')
 
   " Default
-  let buf = RunVimInTerminal('-S Xscript', {})
+  let buf = RunMNVInTerminal('-S Xscript', {})
   call WaitFor({-> exists('g:called_bufnum')})
   call assert_equal(buf, g:called_bufnum)
   call assert_equal(['hello', 123], g:called_arg)
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 
   unlet! g:called_bufnum
   unlet! g:called_arg
 
   " Enable explicitly
-  let buf = RunVimInTerminal('-S Xscript', {'term_api': 'Tapi_Try'})
+  let buf = RunMNVInTerminal('-S Xscript', {'term_api': 'Tapi_Try'})
   call WaitFor({-> exists('g:called_bufnum')})
   call assert_equal(buf, g:called_bufnum)
   call assert_equal(['hello', 123], g:called_arg)
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 
   unlet! g:called_bufnum
   unlet! g:called_arg
@@ -2029,11 +2029,11 @@ func Test_terminal_api_call()
   call WriteApiCall('ApiCall_TryThis')
 
   " Use prefix match
-  let buf = RunVimInTerminal('-S Xscript', {'term_api': 'ApiCall_'})
+  let buf = RunMNVInTerminal('-S Xscript', {'term_api': 'ApiCall_'})
   call WaitFor({-> exists('g:called_bufnum2')})
   call assert_equal(buf, g:called_bufnum2)
   call assert_equal(['hello', 123], g:called_arg2)
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 
   call assert_fails("call term_start('ls', {'term_api' : []})", 'E730:')
 
@@ -2047,7 +2047,7 @@ func Test_terminal_api_call()
 endfunc
 
 func Test_terminal_api_call_fails()
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   func! TryThis(bufnum, arg)
     let g:called_bufnum3 = a:bufnum
@@ -2061,19 +2061,19 @@ func Test_terminal_api_call_fails()
 
   " Not permitted
   call ch_logfile('Xlog', 'w')
-  let buf = RunVimInTerminal('-S Xscript', {'term_api': ''})
+  let buf = RunMNVInTerminal('-S Xscript', {'term_api': ''})
   call WaitForAssert({-> assert_match('Unpermitted function: TryThis', string(readfile('Xlog')))})
   call assert_false(exists('g:called_bufnum3'))
   call assert_false(exists('g:called_arg3'))
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 
   " No match
   call ch_logfile('Xlog', 'w')
-  let buf = RunVimInTerminal('-S Xscript', {'term_api': 'TryThat'})
+  let buf = RunMNVInTerminal('-S Xscript', {'term_api': 'TryThat'})
   call WaitFor({-> string(readfile('Xlog')) =~ 'Unpermitted function: TryThis'})
   call assert_false(exists('g:called_bufnum3'))
   call assert_false(exists('g:called_arg3'))
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 
   call delete('Xscript')
   call ch_logfile('')
@@ -2094,19 +2094,19 @@ func Tapi_Delete(bufnum, arg)
 endfunc
 
 func Test_terminal_api_call_fail_delete()
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   call WriteApiCall('Tapi_Delete')
-  let buf = RunVimInTerminal('-S Xscript', {})
+  let buf = RunMNVInTerminal('-S Xscript', {})
   call WaitForAssert({-> assert_equal(1, s:caught_e937)})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
   call delete('Xscript')
   call ch_logfile('', '')
 endfunc
 
 func Test_terminal_setapi_and_call()
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   call WriteApiCall('Tapi_TryThis')
   call ch_logfile('Xlog', 'w')
@@ -2114,7 +2114,7 @@ func Test_terminal_setapi_and_call()
   unlet! g:called_bufnum
   unlet! g:called_arg
 
-  let buf = RunVimInTerminal('-S Xscript', {'term_api': ''})
+  let buf = RunMNVInTerminal('-S Xscript', {'term_api': ''})
   call WaitForAssert({-> assert_match('Unpermitted function: Tapi_TryThis', string(readfile('Xlog')))})
   call assert_false(exists('g:called_bufnum'))
   call assert_false(exists('g:called_arg'))
@@ -2126,7 +2126,7 @@ func Test_terminal_setapi_and_call()
   call assert_equal(buf, g:called_bufnum)
   call assert_equal(['hello', 123], g:called_arg)
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 
   call delete('Xscript')
   call ch_logfile('')
@@ -2136,7 +2136,7 @@ func Test_terminal_setapi_and_call()
 endfunc
 
 func Test_terminal_api_arg()
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   call WriteApiCall('Tapi_TryThis')
   call ch_logfile('Xlog', 'w')
@@ -2144,23 +2144,23 @@ func Test_terminal_api_arg()
   unlet! g:called_bufnum
   unlet! g:called_arg
 
-  execute 'term ++api= ' .. GetVimCommandCleanTerm() .. '-S Xscript'
+  execute 'term ++api= ' .. GetMNVCommandCleanTerm() .. '-S Xscript'
   let buf = bufnr('%')
   call WaitForAssert({-> assert_match('Unpermitted function: Tapi_TryThis', string(readfile('Xlog')))})
   call assert_false(exists('g:called_bufnum'))
   call assert_false(exists('g:called_arg'))
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 
   call ch_logfile('Xlog', 'w')
 
-  execute 'term ++api=Tapi_ ' .. GetVimCommandCleanTerm() .. '-S Xscript'
+  execute 'term ++api=Tapi_ ' .. GetMNVCommandCleanTerm() .. '-S Xscript'
   let buf = bufnr('%')
   call WaitFor({-> exists('g:called_bufnum')})
   call assert_equal(buf, g:called_bufnum)
   call assert_equal(['hello', 123], g:called_arg)
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 
   call delete('Xscript')
   call ch_logfile('')
@@ -2194,10 +2194,10 @@ endfunc
 func Test_terminal_ansicolors_default_reset_tgc()
   CheckScreendump
   CheckFeature termguicolors
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   let $PS1="$ "
-  let buf = RunVimInTerminal('-c "term sh"', {'rows': 12})
+  let buf = RunMNVInTerminal('-c "term sh"', {'rows': 12})
   call TermWait(buf)
   " Wait for the shell to display a prompt
   call WaitForAssert({-> assert_notequal('', term_getline(buf, 1))})
@@ -2212,7 +2212,7 @@ func Test_terminal_ansicolors_default_reset_tgc()
 
   call term_sendkeys(buf, "exit\<CR>")
   call TermWait(buf)
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
   unlet! $PS1
 endfunc
 
@@ -2287,7 +2287,7 @@ endfunc
 
 func Test_terminal_all_ansi_colors()
   CheckScreendump
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   " Use all the ANSI colors.
   call writefile([
@@ -2333,11 +2333,11 @@ func Test_terminal_all_ansi_colors()
 	\ 'call  matchadd("TmagentaBold", "Z")',
 	\ 'redraw',
 	\ ], 'Xcolorscript', 'D')
-  let buf = RunVimInTerminal('-S Xcolorscript', {'rows': 10})
+  let buf = RunMNVInTerminal('-S Xcolorscript', {'rows': 10})
   call VerifyScreenDump(buf, 'Test_terminal_all_ansi_colors', {})
 
   call term_sendkeys(buf, ":q\<CR>")
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 function On_BufFilePost()
@@ -2442,7 +2442,7 @@ func Test_term_TextChangedT_close()
 endfunc
 
 func Test_terminal_disable_kitty_keyboard()
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
   let cmd = ['sh', '-c', 'printf ''\033[>1u\033[?u\033[<u\033[?u''; sleep 1']
   let buf = term_start(cmd)
   let job = term_getjob(buf)
@@ -2451,4 +2451,4 @@ func Test_terminal_disable_kitty_keyboard()
   bwipe!
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_terminal2.vim b/uvim/src/testdir/test_terminal2.mnv
index 41ef3c5f66..a6718a1fab 100644
--- a/uvim/src/testdir/test_terminal2.vim
+++ b/uvim/src/testdir/test_terminal2.mnv
@@ -1,23 +1,23 @@
 " Tests for the terminal window.
 " This is split in two, because it can take a lot of time.
-" See test_terminal.vim and test_terminal3.vim for further tests.
+" See test_terminal.mnv and test_terminal3.mnv for further tests.
 
 CheckFeature terminal
 
-source util/screendump.vim
-source util/mouse.vim
+source util/screendump.mnv
+source util/mouse.mnv
 
 let $PROMPT_COMMAND=''
 
 func Test_terminal_termwinsize_option_fixed()
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
   set termwinsize=6x40
   let text = []
   for n in range(10)
     call add(text, repeat(n, 50))
   endfor
   call writefile(text, 'Xwinsize', 'D')
-  let buf = RunVimInTerminal('Xwinsize', {})
+  let buf = RunMNVInTerminal('Xwinsize', {})
   let win = bufwinid(buf)
   call assert_equal([6, 40], term_getsize(buf))
   call assert_equal(6, winheight(win))
@@ -30,7 +30,7 @@ func Test_terminal_termwinsize_option_fixed()
   call assert_equal(10, winheight(win))
   call assert_equal(60, winwidth(win))
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 
   call assert_fails('set termwinsize=40', 'E474:')
   call assert_fails('set termwinsize=10+40', 'E474:')
@@ -61,7 +61,7 @@ func Test_terminal_termwinsize_option_zero()
   call StopShellInTerminal(buf)
   exe buf . 'bwipe'
 
-  " This used to crash Vim
+  " This used to crash MNV
   set termwinsize=10000*10000
   let buf = Run_shell_in_terminal({})
   let win = bufwinid(buf)
@@ -394,7 +394,7 @@ func Test_terminal_resize2()
   " Wait for the shell to display a prompt
   call WaitForAssert({-> assert_notequal('', term_getline(buf, 1))})
 
-  " This used to crash Vim
+  " This used to crash MNV
   call feedkeys("printf '\033[8;99999;99999t'\<CR>", 'xt')
   redraw
 
@@ -505,15 +505,15 @@ endfunc
 
 func Test_terminal_normal_mode()
   CheckScreendump
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
-  " Run Vim in a terminal and open a terminal window to run Vim in.
+  " Run MNV in a terminal and open a terminal window to run MNV in.
   let lines =<< trim END
     call setline(1, range(11111, 11122))
     3
   END
   call writefile(lines, 'XtermNormal', 'D')
-  let buf = RunVimInTerminal('-S XtermNormal', {'rows': 8})
+  let buf = RunMNVInTerminal('-S XtermNormal', {'rows': 8})
   call TermWait(buf)
 
   call term_sendkeys(buf, "\<C-W>N")
@@ -528,7 +528,7 @@ func Test_terminal_normal_mode()
 
   call assert_fails('call term_sendkeys(buf, [])', 'E730:')
   call term_sendkeys(buf, "a:q!\<CR>:q\<CR>:q\<CR>")
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_terminal_hidden_and_close()
@@ -685,13 +685,13 @@ func Test_term_gettitle()
     throw "Skipped: can't get/set title"
   endif
 
-  let term = term_start([GetVimProg(), '--clean', '-c', 'set noswapfile', '-c', 'set title'])
+  let term = term_start([GetMNVProg(), '--clean', '-c', 'set noswapfile', '-c', 'set title'])
   call TermWait(term)
-  " When Vim is running as a server then the title ends in VIM{number}, thus
-  " optionally match a number after "VIM".
-  let title = s:TermPollAndAssertMatchTitle(term, '', '^\[No Name\] - VIM\d*$')
+  " When MNV is running as a server then the title ends in MNV{number}, thus
+  " optionally match a number after "MNV".
+  let title = s:TermPollAndAssertMatchTitle(term, '', '^\[No Name\] - MNV\d*$')
   call term_sendkeys(term, ":e Xfoo\r")
-  let title = s:TermPollAndAssertMatchTitle(term, title, '^Xfoo (.*[/\\]testdir) - VIM\d*$')
+  let title = s:TermPollAndAssertMatchTitle(term, title, '^Xfoo (.*[/\\]testdir) - MNV\d*$')
   call term_sendkeys(term, ":set titlestring=foo\r")
   let title = s:TermPollAndAssertMatchTitle(term, title, 'foo')
 
@@ -740,4 +740,4 @@ func Test_term_gettty()
   exe buf . 'bwipe'
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_terminal3.vim b/uvim/src/testdir/test_terminal3.mnv
index cdfa189068..dcf09801d5 100644
--- a/uvim/src/testdir/test_terminal3.vim
+++ b/uvim/src/testdir/test_terminal3.mnv
@@ -1,13 +1,13 @@
 " Tests for the terminal window.
 " This is split in two, because it can take a lot of time.
-" See test_terminal.vim and test_terminal2.vim for further tests.
+" See test_terminal.mnv and test_terminal2.mnv for further tests.
 
 CheckFeature terminal
 
-source util/screendump.vim
-source util/mouse.vim
+source util/screendump.mnv
+source util/mouse.mnv
 
-import './util/vim9.vim' as v9
+import './util/mnv9.mnv' as v9
 
 let $PROMPT_COMMAND=''
 
@@ -33,19 +33,19 @@ endfunc
 func Test_terminal_shell_option()
   if has('unix')
     " exec is a shell builtin command, should fail without a shell.
-    term exec ls runtest.vim
+    term exec ls runtest.mnv
     call WaitForAssert({-> assert_match('job failed', term_getline(bufnr(), 1))})
     bwipe!
 
-    term ++shell exec ls runtest.vim
-    call WaitForAssert({-> assert_match('runtest.vim', term_getline(bufnr(), 1))})
+    term ++shell exec ls runtest.mnv
+    call WaitForAssert({-> assert_match('runtest.mnv', term_getline(bufnr(), 1))})
     bwipe!
   elseif has('win32')
     " dir is a shell builtin command, should fail without a shell.
     " However, if dir.exe (which might be provided by Cygwin/MSYS2) exists in
     " the %PATH%, "term dir" succeeds unintentionally.  Use dir.com instead.
     try
-      term dir.com /b runtest.vim
+      term dir.com /b runtest.mnv
       throw 'dir.com without a shell must fail, so you will never get here'
     catch /CreateProcess failed/
       " ignore:
@@ -55,8 +55,8 @@ func Test_terminal_shell_option()
     bwipe!
 
     " This should execute the dir builtin command even with ".com".
-    term ++shell dir.com /b runtest.vim
-    call WaitForAssert({-> assert_match('runtest.vim', term_getline(bufnr(), 1))})
+    term ++shell dir.com /b runtest.mnv
+    call WaitForAssert({-> assert_match('runtest.mnv', term_getline(bufnr(), 1))})
     bwipe!
   else
     throw 'Skipped: does not work on this platform'
@@ -70,7 +70,7 @@ endfunc
 " Check a terminal with different colors
 func Terminal_color(group_name, highlight_cmds, highlight_opt, open_cmds)
   CheckScreendump
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
   CheckUnix
 
   let lines = [
@@ -90,7 +90,7 @@ func Terminal_color(group_name, highlight_cmds, highlight_opt, open_cmds)
     \ 'call NotifyParent()',
     \ ]
   call writefile(lines, 'XtermStart', 'D')
-  let buf = RunVimInTerminal('-S XtermStart', #{rows: 15})
+  let buf = RunMNVInTerminal('-S XtermStart', #{rows: 15})
   call WaitForChildNotification()
   call term_sendkeys(buf, ":call OpenTerm()\<CR>")
   call WaitForChildNotification()
@@ -99,7 +99,7 @@ func Terminal_color(group_name, highlight_cmds, highlight_opt, open_cmds)
 
   call term_sendkeys(buf, "\<C-D>")
   call WaitForChildNotification()
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_terminal_color_Terminal()
@@ -140,7 +140,7 @@ endfunc
 
 func Test_terminal_color_wincolor_split()
   CheckScreendump
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
   CheckUnix
 
   let lines = [
@@ -154,7 +154,7 @@ func Test_terminal_color_wincolor_split()
   \ 'highlight MyWinCol2 ctermfg=black ctermbg=blue',
 	\ ]
   call writefile(lines, 'XtermStart', 'D')
-  let buf = RunVimInTerminal('-S XtermStart', #{rows: 15})
+  let buf = RunMNVInTerminal('-S XtermStart', #{rows: 15})
   call TermWait(buf, 100)
   call term_sendkeys(buf, ":call OpenTerm()\<CR>")
   call TermWait(buf, 50)
@@ -171,7 +171,7 @@ func Test_terminal_color_wincolor_split()
 
   call term_sendkeys(buf, "\<C-D>")
   call TermWait(buf, 50)
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_terminal_color_transp_Terminal()
@@ -248,7 +248,7 @@ endfunc
 
 func Test_terminal_in_popup()
   CheckScreendump
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   let text =<< trim END
     some text
@@ -256,7 +256,7 @@ func Test_terminal_in_popup()
     in a popup window
   END
   call writefile(text, 'Xtext', 'D')
-  let cmd = GetVimCommandCleanTerm()
+  let cmd = GetMNVCommandCleanTerm()
   let lines = [
 	\ 'call setline(1, range(20))',
 	\ 'hi PopTerm ctermbg=grey',
@@ -279,7 +279,7 @@ func Test_terminal_in_popup()
 	\ 'endfunc',
 	\ ]
   call writefile(lines, 'XtermPopup', 'D')
-  let buf = RunVimInTerminal('-S XtermPopup', #{rows: 15})
+  let buf = RunMNVInTerminal('-S XtermPopup', #{rows: 15})
   call TermWait(buf,0)
   call term_sendkeys(buf, ":call OpenTerm(0)\<CR>")
   call TermWait(buf,0)
@@ -321,13 +321,13 @@ func Test_terminal_in_popup()
   call term_sendkeys(buf, ":q\<CR>")
   call WaitForAssert({-> assert_equal(0, match(term_getline(buf, 6), '^5\s*$'))}, 250) " wait for terminal to vanish
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 " Check a terminal in popup window uses the default minimum size.
 func Test_terminal_in_popup_min_size()
   CheckScreendump
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   let text =<< trim END
     another text
@@ -343,7 +343,7 @@ func Test_terminal_in_popup_min_size()
 	\ 'endfunc',
 	\ ]
   call writefile(lines, 'XtermPopup', 'D')
-  let buf = RunVimInTerminal('-S XtermPopup', #{rows: 15})
+  let buf = RunMNVInTerminal('-S XtermPopup', #{rows: 15})
   call TermWait(buf, 100)
   call term_sendkeys(buf, ":set noruler\<CR>")
   call term_sendkeys(buf, ":call OpenTerm()\<CR>")
@@ -354,13 +354,13 @@ func Test_terminal_in_popup_min_size()
   call TermWait(buf, 50)
   call term_sendkeys(buf, ":q\<CR>")
   call TermWait(buf, 50)  " wait for terminal to vanish
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 " Check a terminal in popup window with different colors
 func Terminal_in_popup_color(group_name, highlight_cmds, highlight_opt, popup_cmds, popup_opt)
   CheckScreendump
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
   CheckUnix
 
   let lines = [
@@ -381,7 +381,7 @@ func Terminal_in_popup_color(group_name, highlight_cmds, highlight_opt, popup_cm
     \ 'call NotifyParent()',
     \ ]
   call writefile(lines, 'XtermPopup', 'D')
-  let buf = RunVimInTerminal('-S XtermPopup', #{rows: 15})
+  let buf = RunMNVInTerminal('-S XtermPopup', #{rows: 15})
   call WaitForChildNotification()
   call term_sendkeys(buf, ":set noruler\<CR>")
   call term_sendkeys(buf, ":call OpenTerm()\<CR>")
@@ -391,7 +391,7 @@ func Terminal_in_popup_color(group_name, highlight_cmds, highlight_opt, popup_cm
 
   call term_sendkeys(buf, "\<C-D>")
   call WaitForChildNotification()
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_terminal_in_popup_color_Terminal()
@@ -586,7 +586,7 @@ func Test_term_nasty_callback()
 endfunc
 
 func Test_term_and_startinsert()
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
   CheckUnix
 
   let lines =<< trim EOL
@@ -595,7 +595,7 @@ func Test_term_and_startinsert()
      startinsert
   EOL
   call writefile(lines, 'XTest_startinsert', 'D')
-  let buf = RunVimInTerminal('-S XTest_startinsert', {})
+  let buf = RunMNVInTerminal('-S XTest_startinsert', {})
 
   call term_sendkeys(buf, "exit\r")
   call WaitForAssert({-> assert_equal("some text", term_getline(buf, 1))})
@@ -603,7 +603,7 @@ func Test_term_and_startinsert()
   call term_sendkeys(buf, "A<\<Esc>")
   call WaitForAssert({-> assert_equal("some text<", term_getline(buf, 1))})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 " Test for passing invalid arguments to terminal functions
@@ -633,9 +633,9 @@ endfunc
 
 " Test for sending various special keycodes to a terminal
 func Test_term_keycode_translation()
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
-  let buf = RunVimInTerminal('', {})
+  let buf = RunMNVInTerminal('', {})
   call term_sendkeys(buf, ":set nocompatible\<CR>")
   call term_sendkeys(buf, ":set timeoutlen=20\<CR>")
 
@@ -675,13 +675,13 @@ func Test_term_keycode_translation()
   call feedkeys("\<C-U>\<kEnter>\<BS>one\<C-W>.two", 'xt')
   call WaitForAssert({-> assert_equal('two', term_getline(buf, 1))})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 " Test for using the mouse in a terminal
 func Test_term_mouse()
   CheckNotGui
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   let save_mouse = &mouse
   let save_term = &term
@@ -692,13 +692,13 @@ func Test_term_mouse()
   let lines =<< trim END
     one two three four five
     red green yellow red blue
-    vim emacs sublime nano
+    mnv emacs sublime nano
   END
   call writefile(lines, 'Xtest_mouse', 'D')
 
-  " Create a terminal window running Vim for the test with mouse enabled
+  " Create a terminal window running MNV for the test with mouse enabled
   let prev_win = win_getid()
-  let buf = RunVimInTerminal('Xtest_mouse -n', {})
+  let buf = RunMNVInTerminal('Xtest_mouse -n', {})
   call term_sendkeys(buf, ":set nocompatible\<CR>")
   call term_sendkeys(buf, ":set mouse=a term=xterm ttymouse=sgr\<CR>")
   call term_sendkeys(buf, ":set clipboard=\<CR>")
@@ -759,7 +759,7 @@ func Test_term_mouse()
   call TermWait(buf, 50)
   call term_sendkeys(buf, ":call writefile([@\"], 'Xbuf')\<CR>")
   call WaitFor(XbufNotEmpty)
-  call assert_equal("vim emacs sublime nano\n", readfile('Xbuf')[0])
+  call assert_equal("mnv emacs sublime nano\n", readfile('Xbuf')[0])
   call delete('Xbuf')
 
   " Test for selecting a block using quadruple click
@@ -796,7 +796,7 @@ func Test_term_mouse()
 
   " cleanup
   call TermWait(buf)
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
   let &mouse = save_mouse
   let &term = save_term
   let &ttymouse = save_ttymouse
@@ -808,7 +808,7 @@ endfunc
 " Test for sync buffer cwd with shell's pwd
 func Test_terminal_sync_shell_dir()
   CheckUnix
-  " The test always use sh (see src/testdir/util/unix.vim).
+  " The test always use sh (see src/testdir/util/unix.mnv).
   " BSD's sh doesn't seem to play well with the OSC 7 escape sequence.
   CheckNotBSD
 
@@ -840,7 +840,7 @@ endfunc
 func Test_term_modeless_selection()
   CheckUnix
   CheckNotGui
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
   CheckFeature clipboard_working
 
   let save_mouse = &mouse
@@ -852,13 +852,13 @@ func Test_term_modeless_selection()
   let lines =<< trim END
     one two three four five
     red green yellow red blue
-    vim emacs sublime nano
+    mnv emacs sublime nano
   END
   call writefile(lines, 'Xtest_modeless', 'D')
 
-  " Create a terminal window running Vim for the test with mouse disabled
+  " Create a terminal window running MNV for the test with mouse disabled
   let prev_win = win_getid()
-  let buf = RunVimInTerminal('Xtest_modeless -n', {})
+  let buf = RunMNVInTerminal('Xtest_modeless -n', {})
   call term_sendkeys(buf, ":set nocompatible\<CR>")
   call term_sendkeys(buf, ":set mouse=\<CR>")
   call TermWait(buf)
@@ -882,7 +882,7 @@ func Test_term_modeless_selection()
 
   " cleanup
   call TermWait(buf)
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
   let &mouse = save_mouse
   let &term = save_term
   let &ttymouse = save_ttymouse
@@ -891,14 +891,14 @@ func Test_term_modeless_selection()
 endfunc
 
 func Test_terminal_getwinpos()
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   " split, go to the bottom-right window
   split
   wincmd j
   set splitright
 
-  let buf = RunVimInTerminal('', {'cols': 60})
+  let buf = RunMNVInTerminal('', {'cols': 60})
   call TermWait(buf, 100)
   call term_sendkeys(buf, ":echo getwinpos(500)\<CR>")
 
@@ -909,7 +909,7 @@ func Test_terminal_getwinpos()
   let xpos = str2nr(substitute(line, '\[\(\d\+\), \d\+\]', '\1', ''))
   let ypos = str2nr(substitute(line, '\[\d\+, \(\d\+\)\]', '\1', ''))
 
-  " Position must be bigger than the getwinpos() result of Vim itself.
+  " Position must be bigger than the getwinpos() result of MNV itself.
   " The calculation in the console assumes a 10 x 7 character cell.
   " In the GUI it can be more, let's assume a 20 x 14 cell.
   " And then add 100 / 200 tolerance.
@@ -925,7 +925,7 @@ func Test_terminal_getwinpos()
 
   call TermWait(buf)
   call term_sendkeys(buf, ":q\<CR>")
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
   set splitright&
   only!
 endfunc
@@ -944,14 +944,14 @@ func Test_terminal_term_start_error()
 
   " Must not crash in s:term_start_error, nor the exception thrown.
   let result = s:term_start_error()
-  call assert_match('^Vim(return):E730:', result)
+  call assert_match('^MNV(return):E730:', result)
 
   autocmd! WinEnter
   delfunc s:term_start_error
 endfunc
 
 func Test_terminal_vt420()
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
   " For Termcap
   CheckUnix
   CheckExecutable infocmp
@@ -964,18 +964,18 @@ func Test_terminal_vt420()
   let rows = 15
   call writefile([':set term=vt420'], 'Xterm420', 'D')
 
-  let buf = RunVimInTerminal('-S Xterm420', #{rows: rows})
+  let buf = RunMNVInTerminal('-S Xterm420', #{rows: rows})
   call TermWait(buf, 100)
   call term_sendkeys(buf, ":set t_xo?\<CR>")
   call WaitForAssert({-> assert_match('t_xo=y', term_getline(buf, rows))})
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 
   call writefile([''], 'Xterm420')
-  let buf = RunVimInTerminal('-S Xterm420', #{rows: rows})
+  let buf = RunMNVInTerminal('-S Xterm420', #{rows: rows})
   call TermWait(buf, 100)
   call term_sendkeys(buf, ":set t_xo?\<CR>")
   call WaitForAssert({-> assert_match('t_xo=\s\+', term_getline(buf, rows))})
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 " Test for using 'vertical' with term_start(). If a following term_start(),
@@ -989,7 +989,7 @@ func Test_terminal_vertical()
     call assert_equal('col', layout[1][0][0], string(layout))
     :%bw!
   END
-  call v9.CheckLegacyAndVim9Success(lines)
+  call v9.CheckLegacyAndMNV9Success(lines)
 endfunc
 
 " Needs to come before Test_hidden_terminal(), why?
@@ -1019,7 +1019,7 @@ endfunc
 
 func Test_terminal_visual_empty_listchars()
   CheckScreendump
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
   CheckUnix
 
   let lines = [
@@ -1027,7 +1027,7 @@ func Test_terminal_visual_empty_listchars()
   \ ':term sh -c "printf ''hello\\n\\nhello''"'
   \ ]
   call writefile(lines, 'XtermStart1', 'D')
-  let buf = RunVimInTerminal('-S XtermStart1', #{rows: 15})
+  let buf = RunMNVInTerminal('-S XtermStart1', #{rows: 15})
   call term_wait(buf)
   call term_sendkeys(buf, "V2k")
   call VerifyScreenDump(buf, 'Test_terminal_empty_listchars', {})
@@ -1036,7 +1036,7 @@ func Test_terminal_visual_empty_listchars()
   call term_sendkeys(buf, "ggV2j")
   call VerifyScreenDump(buf, 'Test_terminal_empty_listchars2', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_terminal_ansi_color_windows_cui()
@@ -1073,18 +1073,18 @@ func Test_terminal_ansi_color_windows_cui()
   let len_to_check = 15
   let expected_colors = expected_colors[:len_to_check-1]
 
-  " First, make sure vim can display correct ANSI color text in terminal.
+  " First, make sure mnv can display correct ANSI color text in terminal.
   let buf = term_start("cmd /C type XANSIcolor")
   call WaitForAssert({-> assert_equal(expected_chars, term_scrape(buf, 1)[:15]->map({_, v -> v['chars']})->join(''))})
   call assert_equal(expected_colors, term_scrape(buf, 1)[:len_to_check-1]->map({_, v -> v['bg']}))
   bwipeout!
 
-  " Next, check if vim can do the same thing in the vim terminal in terminal.
+  " Next, check if mnv can do the same thing in the mnv terminal in terminal.
   let lines = [
         \ 'call term_start("cmd /C type XANSIcolor")'
         \ ]
   call writefile(lines, 'XloadANSI', 'D')
-  let cmd = GetVimCommandCleanTerm()
+  let cmd = GetMNVCommandCleanTerm()
   let buf = term_start(cmd .. '-S XloadANSI')
   call WaitForAssert({-> assert_equal(expected_chars, term_scrape(buf, 1)[:15]->map({_, v -> v['chars']})->join(''))})
   call assert_equal(expected_colors, term_scrape(buf, 1)[:len_to_check-1]->map({_, v -> v['bg']}))
@@ -1163,7 +1163,7 @@ func Test_terminal_max_combining_chars()
 endfunc
 
 func Test_term_getpos()
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
   CheckUnix
   CheckExecutable seq
   defer delete('XTest_getpos_result')
@@ -1172,7 +1172,7 @@ func Test_term_getpos()
      term ++curwin sh
   EOL
   call writefile(lines, 'XTest_getpos', 'D')
-  let buf = RunVimInTerminal('-S XTest_getpos', {'rows': 15})
+  let buf = RunMNVInTerminal('-S XTest_getpos', {'rows': 15})
   call term_sendkeys(buf, "for i in `seq 1 30`; do echo line$i; done\<cr>")
 
   call WaitForAssert({-> assert_match("line18", term_getline(buf, 1))})
@@ -1210,7 +1210,7 @@ func Test_term_getpos()
   call WaitForAssert({-> assert_match("for i in", term_getline(buf, 1))})
   call WaitForAssert({-> assert_match("line12", term_getline(buf, 13))})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
   " this crashed
   new
   setl buftype=terminal
@@ -1237,7 +1237,7 @@ func Test_terminal_csi_args_overflow()
 
   " If we get here without a crash, the fix works
   call assert_equal('running', term_getstatus(buf))
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_terminal_fail.vim b/uvim/src/testdir/test_terminal_fail.mnv
index c2bc4bd2ca..68aac087f4 100644
--- a/uvim/src/testdir/test_terminal_fail.vim
+++ b/uvim/src/testdir/test_terminal_fail.mnv
@@ -16,4 +16,4 @@ func Test_terminal_redir_fails()
   bwipe
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_textformat.vim b/uvim/src/testdir/test_textformat.mnv
index b61ccfce29..70ad7ed1e7 100644
--- a/uvim/src/testdir/test_textformat.vim
+++ b/uvim/src/testdir/test_textformat.mnv
@@ -602,25 +602,25 @@ func Test_format_align()
 
   " align text with 'wrapmargin'
   50vnew
-  call setline(1, ['Vim'])
+  call setline(1, ['MNV'])
   setl textwidth=0
   setl wrapmargin=30
   right
-  call assert_equal("\t\t Vim", getline(1))
+  call assert_equal("\t\t MNV", getline(1))
   q!
 
   " align text with 'rightleft'
   if has('rightleft')
     new
-    call setline(1, 'Vim')
+    call setline(1, 'MNV')
     setlocal rightleft
     left 20
     setlocal norightleft
-    call assert_equal("\t\t Vim", getline(1))
+    call assert_equal("\t\t MNV", getline(1))
     setlocal rightleft
     right
     setlocal norightleft
-    call assert_equal("Vim", getline(1))
+    call assert_equal("MNV", getline(1))
     bw!
   endif
 
@@ -696,7 +696,7 @@ endfunc
 func Test_crash_github_issue_5095()
   CheckFeature autocmd
 
-  " This used to segfault, see https://github.com/vim/vim/issues/5095
+  " This used to segfault, see https://github.com/Project-Tick/Project-Tick/issues/5095
   augroup testing
     au BufNew x center
   augroup END
@@ -1327,7 +1327,7 @@ func Test_correct_cursor_position()
   set encoding=utf8
 endfunc
 
-" This was crashing Vim
+" This was crashing MNV
 func Test_textwidth_overflow()
   new
   setl tw=999999999
@@ -1360,4 +1360,4 @@ func Test_breakindent_reformat()
   bw!
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_textobjects.vim b/uvim/src/testdir/test_textobjects.mnv
index 320cd169b6..6b33596c44 100644
--- a/uvim/src/testdir/test_textobjects.vim
+++ b/uvim/src/testdir/test_textobjects.mnv
@@ -72,7 +72,7 @@ func Test_quote_selection_selection_exclusive()
   exe "norm! 0fbhvi'y"
   call assert_equal('bcde', @")
 
-  set selection&vim
+  set selection&mnv
   bw!
 endfunc
 
@@ -97,7 +97,7 @@ func Test_quote_selection_selection_exclusive_abort()
   let exp_visu = [0, 1, 7, 0]
   call assert_equal(exp_curs, getpos('.'))
   call assert_equal(exp_visu, getpos("'>"))
-  set selection&vim
+  set selection&mnv
   bw!
 endfunc
 
@@ -777,4 +777,4 @@ func Test_inner_block_empty_lessthan()
   bwipe!
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_textprop.vim b/uvim/src/testdir/test_textprop.mnv
index 09b6e87f47..60b1d35163 100644
--- a/uvim/src/testdir/test_textprop.vim
+++ b/uvim/src/testdir/test_textprop.mnv
@@ -3,8 +3,8 @@
 
 CheckFeature textprop
 
-source util/screendump.vim
-import './util/vim9.vim' as v9
+source util/screendump.mnv
+import './util/mnv9.mnv' as v9
 
 func Test_proptype_global()
   call prop_type_add('comment', {'highlight': 'Directory', 'priority': 123, 'start_incl': 1, 'end_incl': 1})
@@ -473,7 +473,7 @@ func Test_prop_remove()
   bwipe!
 endfunc
 
-def Test_prop_add_vim9()
+def Test_prop_add_mnv9()
   prop_type_add('comment', {
       highlight: 'Directory',
       priority: 123,
@@ -484,7 +484,7 @@ def Test_prop_add_vim9()
   prop_type_delete('comment')
 enddef
 
-def Test_prop_remove_vim9()
+def Test_prop_remove_mnv9()
   new
   g:AddPropTypes()
   g:SetupPropsInFirstLine()
@@ -1192,7 +1192,7 @@ endfunc
 " screenshot test with textprop highlighting
 func Test_textprop_screenshot_various()
   CheckScreendump
-  " The Vim running in the terminal needs to use utf-8.
+  " The MNV running in the terminal needs to use utf-8.
   if g:orig_encoding != 'utf-8'
     throw 'Skipped: not using utf-8'
   endif
@@ -1246,16 +1246,16 @@ func Test_textprop_screenshot_various()
 	\ "normal 3J",
 	\ "normal 3G",
 	\], 'XtestProp', 'D')
-  let buf = RunVimInTerminal('-S XtestProp', {'rows': 8})
+  let buf = RunMNVInTerminal('-S XtestProp', {'rows': 8})
   call VerifyScreenDump(buf, 'Test_textprop_01', {})
 
   " clean up
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_textprop_hl_override()
   CheckScreendump
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   let lines =<< trim END
       call setline(1, ['One one one one one', 'Two two two two two', 'Three three three three'])
@@ -1274,7 +1274,7 @@ func Test_textprop_hl_override()
       2
   END
   call writefile(lines, 'XtestOverProp', 'D')
-  let buf = RunVimInTerminal('-S XtestOverProp', {'rows': 8})
+  let buf = RunMNVInTerminal('-S XtestOverProp', {'rows': 8})
   call VerifyScreenDump(buf, 'Test_textprop_hl_override_1', {})
 
   call term_sendkeys(buf, "3Gllv$hh")
@@ -1282,7 +1282,7 @@ func Test_textprop_hl_override()
   call term_sendkeys(buf, "\<Esc>")
 
   " clean up
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func RunTestVisualBlock(width, dump)
@@ -1314,11 +1314,11 @@ func RunTestVisualBlock(width, dump)
 	\ "call prop_add(10, 2, {'length': 3, 'type': 'search'})",
 	\ "normal 1G6|\<C-V>" .. repeat('l', a:width - 1) .. "10jx",
 	\], 'XtestPropVis', 'D')
-  let buf = RunVimInTerminal('-S XtestPropVis', {'rows': 12})
+  let buf = RunMNVInTerminal('-S XtestPropVis', {'rows': 12})
   call VerifyScreenDump(buf, 'Test_textprop_vis_' .. a:dump, {})
 
   " clean up
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 " screenshot test with Visual block mode operations
@@ -1346,18 +1346,18 @@ func Test_textprop_after_tab()
        call prop_add(2, 3, {'length': 3, 'type': 'search'})
   END
   call writefile(lines, 'XtextPropTab', 'D')
-  let buf = RunVimInTerminal('-S XtextPropTab', {'rows': 6})
+  let buf = RunMNVInTerminal('-S XtextPropTab', {'rows': 6})
   call VerifyScreenDump(buf, 'Test_textprop_tab', {})
 
   " clean up
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_textprop_nesting()
   CheckScreendump
 
   let lines =<< trim END
-      vim9script
+      mnv9script
       var lines =<< trim LINESEND
 
           const func: func.IFunction = ({
@@ -1371,18 +1371,18 @@ func Test_textprop_nesting()
       prop_add(2, 0, {type: 'prop_add_test', text_wrap: 'truncate', text_align: 'after', text: text})
   END
   call writefile(lines, 'XtextpropNesting', 'D')
-  let buf = RunVimInTerminal('-S XtextpropNesting', {'rows': 8})
+  let buf = RunMNVInTerminal('-S XtextpropNesting', {'rows': 8})
   call VerifyScreenDump(buf, 'Test_textprop_nesting', {})
 
   " clean up
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_textprop_nowrap_scrolled()
   CheckScreendump
 
   let lines =<< trim END
-       vim9script
+       mnv9script
        set nowrap
        setline(1, 'The number 123 is smaller than 4567.' .. repeat('X', &columns))
        prop_type_add('number', {'highlight': 'ErrorMsg'})
@@ -1391,14 +1391,14 @@ func Test_textprop_nowrap_scrolled()
        feedkeys('gg20zl', 'nxt')
   END
   call writefile(lines, 'XtestNowrap', 'D')
-  let buf = RunVimInTerminal('-S XtestNowrap', {'rows': 6})
+  let buf = RunMNVInTerminal('-S XtestNowrap', {'rows': 6})
   call VerifyScreenDump(buf, 'Test_textprop_nowrap_01', {})
 
   call term_sendkeys(buf, "$")
   call VerifyScreenDump(buf, 'Test_textprop_nowrap_02', {})
 
   " clean up
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_textprop_text_priority()
@@ -1420,18 +1420,18 @@ func Test_textprop_text_priority()
       call prop_add(1, 17, #{type: 'arg', length: len('argument')})
   END
   call writefile(lines, 'XtestPropPrio', 'D')
-  let buf = RunVimInTerminal('-S XtestPropPrio', {'rows': 5})
+  let buf = RunMNVInTerminal('-S XtestPropPrio', {'rows': 5})
   call VerifyScreenDump(buf, 'Test_prop_at_same_pos', {})
 
   " clean up
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_textprop_in_empty_popup()
   CheckScreendump
 
   let lines =<< trim END
-    vim9script
+    mnv9script
 
     hi def link FilterMenuMatch Constant
     prop_type_add('FilterMenuMatch', {
@@ -1457,11 +1457,11 @@ func Test_textprop_in_empty_popup()
     redraw
   END
   call writefile(lines, 'XtestPropEmptyPopup', 'D')
-  let buf = RunVimInTerminal('-S XtestPropEmptyPopup', #{rows: 20, cols: 40})
+  let buf = RunMNVInTerminal('-S XtestPropEmptyPopup', #{rows: 20, cols: 40})
   call VerifyScreenDump(buf, 'Test_prop_in_empty_popup', {})
 
   " clean up
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_textprop_with_syntax()
@@ -1478,11 +1478,11 @@ func Test_textprop_with_syntax()
        call prop_add(1, 2, #{type: 'TPTitle', end_col: 5})
   END
   call writefile(lines, 'XtestPropSyn', 'D')
-  let buf = RunVimInTerminal('-S XtestPropSyn', {'rows': 6})
+  let buf = RunMNVInTerminal('-S XtestPropSyn', {'rows': 6})
   call VerifyScreenDump(buf, 'Test_textprop_syn_1', {})
 
   " clean up
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 " Adding a text property to a new buffer should not fail
@@ -1550,7 +1550,7 @@ endfunc
 
 func Test_proptype_substitute2()
   new
-  " text_prop.vim
+  " text_prop.mnv
   call setline(1, [
         \ 'The   num  123 is smaller than 4567.',
         \ '123 The number 123 is smaller than 4567.',
@@ -1665,7 +1665,7 @@ func Test_textprop_noexpandtab()
     call prop_add(1, 6, {'end_col': 7, 'type': 'test'})
     " Has already collapsed here, start_col:6 does not result in an error
     call feedkeys("A\<left>\<tab>", "tx")
-  catch /^Vim\%((\a\+)\)\=:E964/
+  catch /^MNV\%((\a\+)\)\=:E964/
   endtry
   call prop_remove({'type': 'test'})
   call prop_type_delete('test')
@@ -1994,7 +1994,7 @@ enddef
 
 func Test_prop_in_linebreak()
   CheckScreendump
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   let lines =<< trim END
     set breakindent linebreak breakat+=]
@@ -2009,41 +2009,41 @@ func Test_prop_in_linebreak()
     endfunc
   END
   call writefile(lines, 'XscriptPropLinebreak', 'D')
-  let buf = RunVimInTerminal('-S XscriptPropLinebreak', #{rows: 10})
+  let buf = RunMNVInTerminal('-S XscriptPropLinebreak', #{rows: 10})
   call VerifyScreenDump(buf, 'Test_prop_linebreak_1', {})
 
   call term_sendkeys(buf, ":call AddMatch()\<CR>")
   call VerifyScreenDump(buf, 'Test_prop_linebreak_2', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_prop_with_linebreak()
   CheckScreendump
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   let lines =<< trim END
-      vim9script
+      mnv9script
       set linebreak
       setline(1, 'one twoword')
       prop_type_add('test', {highlight: 'Special'})
       prop_add(1, 4, {text: ': virtual text', type: 'test'})
   END
   call writefile(lines, 'XscriptPropWithLinebreak', 'D')
-  let buf = RunVimInTerminal('-S XscriptPropWithLinebreak', #{rows: 6, cols: 50})
+  let buf = RunMNVInTerminal('-S XscriptPropWithLinebreak', #{rows: 6, cols: 50})
   call VerifyScreenDump(buf, 'Test_prop_with_linebreak_1', {})
   call term_sendkeys(buf, "iasdf asdf asdf asdf asdf as\<Esc>")
   call VerifyScreenDump(buf, 'Test_prop_with_linebreak_2', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_prop_with_wrap()
   CheckScreendump
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   let lines =<< trim END
-      vim9script
+      mnv9script
       set linebreak
       setline(1, 'asdf '->repeat(15))
       prop_type_add('test', {highlight: 'Special'})
@@ -2051,15 +2051,15 @@ func Test_prop_with_wrap()
       normal G$
   END
   call writefile(lines, 'XscriptPropWithWrap', 'D')
-  let buf = RunVimInTerminal('-S XscriptPropWithWrap', #{rows: 6, cols: 50})
+  let buf = RunMNVInTerminal('-S XscriptPropWithWrap', #{rows: 6, cols: 50})
   call VerifyScreenDump(buf, 'Test_prop_with_wrap_1', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_prop_after_tab()
   CheckScreendump
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   let lines =<< trim END
     set breakindent linebreak breakat+=]
@@ -2068,15 +2068,15 @@ func Test_prop_after_tab()
     call prop_add(1, 2, #{length: 1, type: 'test'})
   END
   call writefile(lines, 'XscriptPropAfterTab', 'D')
-  let buf = RunVimInTerminal('-S XscriptPropAfterTab', #{rows: 10})
+  let buf = RunMNVInTerminal('-S XscriptPropAfterTab', #{rows: 10})
   call VerifyScreenDump(buf, 'Test_prop_after_tab', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_prop_before_tab()
   CheckScreendump
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   let lines =<< trim END
       call setline(1, ["\tx"]->repeat(6))
@@ -2090,7 +2090,7 @@ func Test_prop_before_tab()
       normal gg0
   END
   call writefile(lines, 'XscriptPropBeforeTab', 'D')
-  let buf = RunVimInTerminal('-S XscriptPropBeforeTab', #{rows: 8})
+  let buf = RunMNVInTerminal('-S XscriptPropBeforeTab', #{rows: 8})
   call VerifyScreenDump(buf, 'Test_prop_before_tab_01', {})
   call term_sendkeys(buf, "$")
   call VerifyScreenDump(buf, 'Test_prop_before_tab_02', {})
@@ -2111,12 +2111,12 @@ func Test_prop_before_tab()
   call term_sendkeys(buf, "j")
   call VerifyScreenDump(buf, 'Test_prop_before_tab_10', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_prop_after_linebreak()
   CheckScreendump
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   let lines =<< trim END
       set linebreak wrap
@@ -2125,10 +2125,10 @@ func Test_prop_after_linebreak()
       call prop_add(1, (&columns / 2) + 2, #{length: 1, type: 'test'})
   END
   call writefile(lines, 'XscriptPropAfterLinebreak', 'D')
-  let buf = RunVimInTerminal('-S XscriptPropAfterLinebreak', #{rows: 10})
+  let buf = RunMNVInTerminal('-S XscriptPropAfterLinebreak', #{rows: 10})
   call VerifyScreenDump(buf, 'Test_prop_after_linebreak', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 " Buffer number of 0 should be ignored, as if the parameter wasn't passed.
@@ -2309,7 +2309,7 @@ func Test_prop_list()
     call g:DeletePropTypes()
     :%bw!
   END
-  call v9.CheckLegacyAndVim9Success(lines)
+  call v9.CheckLegacyAndMNV9Success(lines)
 endfunc
 
 func Test_prop_find_prev_on_same_line()
@@ -2479,7 +2479,7 @@ func Do_test_props_do_not_affect_byte_offsets(ff, increment)
   exec 'setlocal fileformat=' . a:ff
 
   " Fill the buffer with varying length lines. We need a suitably large number
-  " to force Vim code through paths where previous error have occurred. This
+  " to force MNV code through paths where previous error have occurred. This
   " is more 'art' than 'science'.
   let text = 'a'
   call setline(1, text)
@@ -2492,7 +2492,7 @@ func Do_test_props_do_not_affect_byte_offsets(ff, increment)
       call append(line('$'), text)
   endfor
 
-  " Set a property that spans a few lines to cause Vim's internal buffer code
+  " Set a property that spans a few lines to cause MNV's internal buffer code
   " to perform a reasonable amount of rearrangement.
   call prop_type_add('one', {'highlight': 'ErrorMsg'})
   call prop_add(1, 1, {'type': 'one', 'end_lnum': 6, 'end_col': 2})
@@ -2522,7 +2522,7 @@ func Test_props_do_not_affect_byte_offsets_editline()
   setlocal fileformat=unix
 
   " Fill the buffer with varying length lines. We need a suitably large number
-  " to force Vim code through paths where previous error have occurred. This
+  " to force MNV code through paths where previous error have occurred. This
   " is more 'art' than 'science'.
   let text = 'aa'
   call setline(1, text)
@@ -2566,7 +2566,7 @@ endfunc
 
 func Test_prop_inserts_text()
   CheckScreendump
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   " Just a basic check for now
   let lines =<< trim END
@@ -2596,7 +2596,7 @@ func Test_prop_inserts_text()
       call prop_add(5, 6, #{type: 'nohi', text: 'no '})
   END
   call writefile(lines, 'XscriptPropsWithText', 'D')
-  let buf = RunVimInTerminal('-S XscriptPropsWithText', #{rows: 8, cols: 60})
+  let buf = RunMNVInTerminal('-S XscriptPropsWithText', #{rows: 8, cols: 60})
   call VerifyScreenDump(buf, 'Test_prop_inserts_text_1', {})
 
   call term_sendkeys(buf, ":set signcolumn=yes\<CR>")
@@ -2613,12 +2613,12 @@ func Test_prop_inserts_text()
   call term_sendkeys(buf, "4G")
   call VerifyScreenDump(buf, 'Test_prop_inserts_text_6', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_prop_inserts_text_highlight()
   CheckScreendump
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   " Just a basic check for now
   let lines =<< trim END
@@ -2635,7 +2635,7 @@ func Test_prop_inserts_text_highlight()
       endfunc
   END
   call writefile(lines, 'XscriptPropsWithHighlight', 'D')
-  let buf = RunVimInTerminal('-S XscriptPropsWithHighlight', #{rows: 6, cols: 60})
+  let buf = RunMNVInTerminal('-S XscriptPropsWithHighlight', #{rows: 6, cols: 60})
   call VerifyScreenDump(buf, 'Test_prop_inserts_text_hi_1', {})
   call term_sendkeys(buf, "/text (he\<CR>")
   call VerifyScreenDump(buf, 'Test_prop_inserts_text_hi_2', {})
@@ -2649,12 +2649,12 @@ func Test_prop_inserts_text_highlight()
   call term_sendkeys(buf, ":call matchdelete(thematch)\<CR>")
   call VerifyScreenDump(buf, 'Test_prop_inserts_text_hi_6', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_prop_inserts_text_normal_gM()
   CheckScreendump
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   let lines =<< trim END
     call setline(1, '123456789')
@@ -2663,16 +2663,16 @@ func Test_prop_inserts_text_normal_gM()
     call prop_add(1, 8, {'type': 'theprop', 'text': 'bbb'})
   END
   call writefile(lines, 'XscriptPropsNormal_gM', 'D')
-  let buf = RunVimInTerminal('-S XscriptPropsNormal_gM', #{rows: 3, cols: 60})
+  let buf = RunMNVInTerminal('-S XscriptPropsNormal_gM', #{rows: 3, cols: 60})
   call term_sendkeys(buf, "gM")
   call VerifyScreenDump(buf, 'Test_prop_inserts_text_normal_gM', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Run_test_prop_inserts_text_normal_gj_gk(cmd)
   CheckScreendump
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   let lines =<< trim END
     call setline(1, repeat([repeat('a', 55)], 2))
@@ -2682,7 +2682,7 @@ func Run_test_prop_inserts_text_normal_gj_gk(cmd)
   END
   let lines = insert(lines, a:cmd)
   call writefile(lines, 'XscriptPropsNormal_gj_gk', 'D')
-  let buf = RunVimInTerminal('-S XscriptPropsNormal_gj_gk', #{rows: 6, cols: 60})
+  let buf = RunMNVInTerminal('-S XscriptPropsNormal_gj_gk', #{rows: 6, cols: 60})
   call VerifyScreenDump(buf, 'Test_prop_inserts_text_normal_gj_gk_1', {})
   call term_sendkeys(buf, "gj")
   call VerifyScreenDump(buf, 'Test_prop_inserts_text_normal_gj_gk_2', {})
@@ -2697,7 +2697,7 @@ func Run_test_prop_inserts_text_normal_gj_gk(cmd)
   call term_sendkeys(buf, "gk")
   call VerifyScreenDump(buf, 'Test_prop_inserts_text_normal_gj_gk_7', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_prop_inserts_text_normal_gj_gk()
@@ -2707,10 +2707,10 @@ endfunc
 
 func Test_prop_normal_gj_gk_gM_with_outer_virtual_text()
   CheckScreendump
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   let lines =<< trim END
-      vim9script
+      mnv9script
       setlocal number
       setline(1, ['First line fits on screen line.', '', 'Third line fits on screen line.'])
 
@@ -2725,7 +2725,7 @@ func Test_prop_normal_gj_gk_gM_with_outer_virtual_text()
       normal 3l
   END
   call writefile(lines, 'XscriptPropsNormal_gj_gk_gM_with_outer_text', 'D')
-  let buf = RunVimInTerminal('-S XscriptPropsNormal_gj_gk_gM_with_outer_text', #{rows: 16, cols: 40})
+  let buf = RunMNVInTerminal('-S XscriptPropsNormal_gj_gk_gM_with_outer_text', #{rows: 16, cols: 40})
   call VerifyScreenDump(buf, 'Test_prop_normal_gj_gk_gM_with_outer_virtual_text_1', {})
 
   call term_sendkeys(buf, "gj")
@@ -2745,12 +2745,12 @@ func Test_prop_normal_gj_gk_gM_with_outer_virtual_text()
   call term_sendkeys(buf, "gM")
   call VerifyScreenDump(buf, 'Test_prop_normal_gj_gk_gM_with_outer_virtual_text_4', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_prop_inserts_text_visual_block()
   CheckScreendump
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   let lines =<< trim END
     call setline(1, repeat(['123456789'], 4))
@@ -2759,7 +2759,7 @@ func Test_prop_inserts_text_visual_block()
     call prop_add(3, 3, {'type': 'theprop', 'text': '�'})
   END
   call writefile(lines, 'XscriptPropsVisualBlock', 'D')
-  let buf = RunVimInTerminal('-S XscriptPropsVisualBlock', #{rows: 6, cols: 60})
+  let buf = RunMNVInTerminal('-S XscriptPropsVisualBlock', #{rows: 6, cols: 60})
   call VerifyScreenDump(buf, 'Test_prop_inserts_text_visual_block_1', {})
   call term_sendkeys(buf, "\<C-V>3jl")
   call VerifyScreenDump(buf, 'Test_prop_inserts_text_visual_block_2', {})
@@ -2774,12 +2774,12 @@ func Test_prop_inserts_text_visual_block()
   call term_sendkeys(buf, "l")
   call VerifyScreenDump(buf, 'Test_prop_inserts_text_visual_block_7', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Run_test_prop_inserts_text_showbreak(cmd)
   CheckScreendump
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   let lines =<< trim END
     highlight! link LineNr Normal
@@ -2792,7 +2792,7 @@ func Run_test_prop_inserts_text_showbreak(cmd)
   END
   let lines = insert(lines, a:cmd)
   call writefile(lines, 'XscriptPropsShowbreak', 'D')
-  let buf = RunVimInTerminal('-S XscriptPropsShowbreak', #{rows: 6, cols: 30})
+  let buf = RunMNVInTerminal('-S XscriptPropsShowbreak', #{rows: 6, cols: 30})
   call term_sendkeys(buf, ":set noruler\<CR>")
   call VerifyScreenDump(buf, 'Test_prop_inserts_text_showbreak_1', {})
   call term_sendkeys(buf, "\<C-E>")
@@ -2842,7 +2842,7 @@ func Run_test_prop_inserts_text_showbreak(cmd)
   call term_sendkeys(buf, "\<C-\>\<C-O>:setlocal breakindentopt=\<CR>")
   call VerifyScreenDump(buf, 'Test_prop_inserts_text_showbreak_24', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_prop_inserts_text_showbreak()
@@ -2853,7 +2853,7 @@ endfunc
 
 func Test_prop_before_tab_skipcol()
   CheckScreendump
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   let lines =<< trim END
     setlocal list listchars=tab:<-> scrolloff=0 smoothscroll
@@ -2863,7 +2863,7 @@ func Test_prop_before_tab_skipcol()
     normal! $
   END
   call writefile(lines, 'XscriptPropsBeforeTabSkipcol', 'D')
-  let buf = RunVimInTerminal('-S XscriptPropsBeforeTabSkipcol', #{rows: 6, cols: 30})
+  let buf = RunMNVInTerminal('-S XscriptPropsBeforeTabSkipcol', #{rows: 6, cols: 30})
   call VerifyScreenDump(buf, 'Test_prop_before_tab_skipcol_1', {})
   call term_sendkeys(buf, "\<C-E>")
   call VerifyScreenDump(buf, 'Test_prop_before_tab_skipcol_2', {})
@@ -2886,12 +2886,12 @@ func Test_prop_before_tab_skipcol()
   call term_sendkeys(buf, "\<C-E>")
   call VerifyScreenDump(buf, 'Test_prop_before_tab_skipcol_11', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_prop_inserts_text_before_linebreak()
   CheckScreendump
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   let lines =<< trim END
     setlocal linebreak showbreak=+ breakindent breakindentopt=shift:2
@@ -2901,17 +2901,17 @@ func Test_prop_inserts_text_before_linebreak()
     normal! $
   END
   call writefile(lines, 'XscriptPropsBeforeLinebreak', 'D')
-  let buf = RunVimInTerminal('-S XscriptPropsBeforeLinebreak', #{rows: 6, cols: 50})
+  let buf = RunMNVInTerminal('-S XscriptPropsBeforeLinebreak', #{rows: 6, cols: 50})
   call VerifyScreenDump(buf, 'Test_prop_inserts_text_before_linebreak_1', {})
   call term_sendkeys(buf, '05x$')
   call VerifyScreenDump(buf, 'Test_prop_inserts_text_before_linebreak_2', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_prop_inserts_text_before_double_width_wrap()
   CheckScreendump
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   let lines =<< trim END
     call setline(1, repeat('a', 40) .. '�' .. '12345')
@@ -2920,19 +2920,19 @@ func Test_prop_inserts_text_before_double_width_wrap()
     normal! $
   END
   call writefile(lines, 'XscriptPropsBeforeDoubleWidthWrap', 'D')
-  let buf = RunVimInTerminal('-S XscriptPropsBeforeDoubleWidthWrap', #{rows: 3, cols: 50})
+  let buf = RunMNVInTerminal('-S XscriptPropsBeforeDoubleWidthWrap', #{rows: 3, cols: 50})
   call VerifyScreenDump(buf, 'Test_prop_inserts_text_before_double_width_wrap_1', {})
   call term_sendkeys(buf, 'g0')
   call VerifyScreenDump(buf, 'Test_prop_inserts_text_before_double_width_wrap_2', {})
   call term_sendkeys(buf, ":set showbreak=+++\<CR>")
   call VerifyScreenDump(buf, 'Test_prop_inserts_text_before_double_width_wrap_3', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_prop_inserts_text_lcs_extends()
   CheckScreendump
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   let lines =<< trim END
     setlocal nowrap list listchars=extends:!
@@ -2941,7 +2941,7 @@ func Test_prop_inserts_text_lcs_extends()
     call prop_add(1, &columns + 2, #{type: 'theprop', text: 'bbb'})
   END
   call writefile(lines, 'XscriptPropsListExtends', 'D')
-  let buf = RunVimInTerminal('-S XscriptPropsListExtends', #{rows: 3, cols: 50})
+  let buf = RunMNVInTerminal('-S XscriptPropsListExtends', #{rows: 3, cols: 50})
   call term_sendkeys(buf, '20l')
   call VerifyScreenDump(buf, 'Test_prop_inserts_text_lcs_extends_1', {})
   call term_sendkeys(buf, 'zl')
@@ -2953,7 +2953,7 @@ func Test_prop_inserts_text_lcs_extends()
   call term_sendkeys(buf, 'zl')
   call VerifyScreenDump(buf, 'Test_prop_inserts_text_lcs_extends_5', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_prop_add_with_text_fails()
@@ -2967,7 +2967,7 @@ endfunc
 
 func Test_props_with_text_right_align_twice()
   CheckScreendump
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   let lines =<< trim END
       call setline(1, ["some text some text some text some text", 'line two'])
@@ -2979,7 +2979,7 @@ func Test_props_with_text_right_align_twice()
       normal G$
   END
   call writefile(lines, 'XscriptPropsRightAlign', 'D')
-  let buf = RunVimInTerminal('-S XscriptPropsRightAlign', #{rows: 8})
+  let buf = RunMNVInTerminal('-S XscriptPropsRightAlign', #{rows: 8})
   call VerifyScreenDump(buf, 'Test_prop_right_align_twice_1', {})
 
   call term_sendkeys(buf, "ggisome more text\<Esc>G$")
@@ -2988,12 +2988,12 @@ func Test_props_with_text_right_align_twice()
   call term_sendkeys(buf, ":set signcolumn=yes\<CR>")
   call VerifyScreenDump(buf, 'Test_prop_right_align_twice_3', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_props_with_text_after()
   CheckScreendump
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   let lines =<< trim END
       set showbreak=+++
@@ -3015,20 +3015,20 @@ func Test_props_with_text_after()
       call prop_add(3, 0, #{type: 'rightprop', text: 'söme和平téxt', text_align: 'right'})
   END
   call writefile(lines, 'XscriptPropsWithTextAfter', 'D')
-  let buf = RunVimInTerminal('-S XscriptPropsWithTextAfter', #{rows: 8, cols: 60})
+  let buf = RunMNVInTerminal('-S XscriptPropsWithTextAfter', #{rows: 8, cols: 60})
   call VerifyScreenDump(buf, 'Test_prop_with_text_after_1', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 
   call assert_fails('call prop_add(1, 2, #{text: "yes", text_align: "right", type: "some"})', 'E1294:')
 endfunc
 
 func Test_props_with_text_after_and_list()
   CheckScreendump
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   let lines =<< trim END
-      vim9script
+      mnv9script
       setline(1, ['one', 'two'])
       prop_type_add('test', {highlight: 'Special'})
       prop_add(1, 0, {
@@ -3052,21 +3052,21 @@ func Test_props_with_text_after_and_list()
       normal G$
   END
   call writefile(lines, 'XscriptPropsAfter', 'D')
-  let buf = RunVimInTerminal('-S XscriptPropsAfter', #{rows: 8, cols: 60})
+  let buf = RunMNVInTerminal('-S XscriptPropsAfter', #{rows: 8, cols: 60})
   call VerifyScreenDump(buf, 'Test_props_after_1', {})
 
   call term_sendkeys(buf, ":set list\<CR>")
   call VerifyScreenDump(buf, 'Test_props_after_2', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_props_with_text_after_below_trunc()
   CheckScreendump
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   let lines =<< trim END
-      vim9script
+      mnv9script
       edit foobar
       set showbreak=+++
       setline(1, ['onasdf asdf asdf asdf asd fas df', 'two'])
@@ -3086,7 +3086,7 @@ func Test_props_with_text_after_below_trunc()
       normal G$
   END
   call writefile(lines, 'XscriptPropsAfterTrunc', 'D')
-  let buf = RunVimInTerminal('-S XscriptPropsAfterTrunc', #{rows: 8, cols: 60})
+  let buf = RunMNVInTerminal('-S XscriptPropsAfterTrunc', #{rows: 8, cols: 60})
   call VerifyScreenDump(buf, 'Test_prop_with_text_after_below_trunc_1', {})
 
   call term_sendkeys(buf, ":set number\<CR>")
@@ -3095,15 +3095,15 @@ func Test_props_with_text_after_below_trunc()
   call term_sendkeys(buf, ":set cursorline\<CR>gg")
   call VerifyScreenDump(buf, 'Test_prop_with_text_after_below_trunc_3', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_props_with_text_truncated_just_before_after()
   CheckScreendump
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   let lines =<< trim END
-      vim9script
+      mnv9script
       set showbreak=+++
       set list listchars=extends:>
       set nowrap
@@ -3124,7 +3124,7 @@ func Test_props_with_text_truncated_just_before_after()
       normal G$
   END
   call writefile(lines, 'XscriptPropsWithTextTruncatedJustBeforeAfter', 'D')
-  let buf = RunVimInTerminal('-S XscriptPropsWithTextTruncatedJustBeforeAfter', #{rows: 8, cols: 40})
+  let buf = RunMNVInTerminal('-S XscriptPropsWithTextTruncatedJustBeforeAfter', #{rows: 8, cols: 40})
   call VerifyScreenDump(buf, 'Test_props_with_text_truncated_just_before_after_1', {})
 
   call term_sendkeys(buf, ":call AddPropBelow()\<CR>")
@@ -3133,17 +3133,17 @@ func Test_props_with_text_truncated_just_before_after()
   call term_sendkeys(buf, ":call AddPropAfter()\<CR>:\<Esc>")
   call VerifyScreenDump(buf, 'Test_props_with_text_truncated_just_before_after_2', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_prop_with_text_below_after_empty()
   CheckScreendump
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   let lines =<< trim END
-      vim9script
+      mnv9script
 
-      setline(1, ['vim9script', '', 'three', ''])
+      setline(1, ['mnv9script', '', 'three', ''])
 
       # Add text prop below empty line 2 with padding.
       prop_type_add('test', {highlight: 'ErrorMsg'})
@@ -3164,7 +3164,7 @@ func Test_prop_with_text_below_after_empty()
       })
   END
   call writefile(lines, 'XscriptPropBelowAfterEmpty', 'D')
-  let buf = RunVimInTerminal('-S XscriptPropBelowAfterEmpty', #{rows: 8, cols: 60})
+  let buf = RunMNVInTerminal('-S XscriptPropBelowAfterEmpty', #{rows: 8, cols: 60})
   call VerifyScreenDump(buf, 'Test_prop_below_after_empty_1', {})
 
   call term_sendkeys(buf, ":set number\<CR>")
@@ -3173,12 +3173,12 @@ func Test_prop_with_text_below_after_empty()
   call term_sendkeys(buf, ":set nowrap\<CR>")
   call VerifyScreenDump(buf, 'Test_prop_below_after_empty_3', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_prop_with_text_above_below_empty()
   CheckScreendump
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   let lines =<< trim END
       setlocal number
@@ -3200,7 +3200,7 @@ func Test_prop_with_text_above_below_empty()
       endfunc
   END
   call writefile(lines, 'XscriptPropAboveBelowEmpty', 'D')
-  let buf = RunVimInTerminal('-S XscriptPropAboveBelowEmpty', #{rows: 16, cols: 60})
+  let buf = RunMNVInTerminal('-S XscriptPropAboveBelowEmpty', #{rows: 16, cols: 60})
   call VerifyScreenDump(buf, 'Test_prop_above_below_empty_1', {})
 
   call term_sendkeys(buf, ":set list\<CR>")
@@ -3225,12 +3225,12 @@ func Test_prop_with_text_above_below_empty()
   call term_sendkeys(buf, "j")
   call VerifyScreenDump(buf, 'Test_prop_above_below_empty_6', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_prop_multiple_lines_above()
   CheckScreendump
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   let lines =<< trim END
       setlocal number colorcolumn=10
@@ -3245,15 +3245,15 @@ func Test_prop_multiple_lines_above()
       normal G
   END
   call writefile(lines, 'XscriptPropMultipleLinesAbove', 'D')
-  let buf = RunVimInTerminal('-S XscriptPropMultipleLinesAbove', #{rows: 16, cols: 60})
+  let buf = RunMNVInTerminal('-S XscriptPropMultipleLinesAbove', #{rows: 16, cols: 60})
   call VerifyScreenDump(buf, 'Test_prop_multiple_lines_above_1', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_prop_with_multibyte_above()
   CheckScreendump
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   let lines =<< trim END
       setlocal number colorcolumn=10
@@ -3267,15 +3267,15 @@ func Test_prop_with_multibyte_above()
       normal G
   END
   call writefile(lines, 'XscriptPropMultibyteAbove', 'D')
-  let buf = RunVimInTerminal('-S XscriptPropMultibyteAbove', #{rows: 16, cols: 60})
+  let buf = RunMNVInTerminal('-S XscriptPropMultibyteAbove', #{rows: 16, cols: 60})
   call VerifyScreenDump(buf, 'Test_prop_multibyte_above_1', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_prop_with_multibyte_below()
   CheckScreendump
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   let lines =<< trim END
       setlocal number
@@ -3289,15 +3289,15 @@ func Test_prop_with_multibyte_below()
       normal G
   END
   call writefile(lines, 'XscriptPropMultibyteBelow', 'D')
-  let buf = RunVimInTerminal('-S XscriptPropMultibyteBelow', #{rows: 10, cols: 60})
+  let buf = RunMNVInTerminal('-S XscriptPropMultibyteBelow', #{rows: 10, cols: 60})
   call VerifyScreenDump(buf, 'Test_prop_multibyte_below_1', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_prop_with_text_below_rightleft()
   CheckScreendump
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
   CheckFeature rightleft
 
   let lines =<< trim END
@@ -3307,15 +3307,15 @@ func Test_prop_with_text_below_rightleft()
     call prop_add(1, 0, #{type: 'theprop', text: '12345', text_align: 'below'})
   END
   call writefile(lines, 'XscriptPropBelowRightleft', 'D')
-  let buf = RunVimInTerminal('-S XscriptPropBelowRightleft', #{rows: 6, cols: 60})
+  let buf = RunMNVInTerminal('-S XscriptPropBelowRightleft', #{rows: 6, cols: 60})
   call VerifyScreenDump(buf, 'Test_prop_below_rightleft_1', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_prop_with_text_above_empty()
   CheckScreendump
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   " check the cursor is in the correct line
   let lines =<< trim END
@@ -3330,23 +3330,23 @@ func Test_prop_with_text_above_empty()
       normal G
   END
   call writefile(lines, 'XscriptPropAboveEmpty', 'D')
-  let buf = RunVimInTerminal('-S XscriptPropAboveEmpty', #{rows: 16, cols: 60})
+  let buf = RunMNVInTerminal('-S XscriptPropAboveEmpty', #{rows: 16, cols: 60})
   call VerifyScreenDump(buf, 'Test_prop_above_empty_1', {})
 
   call term_sendkeys(buf, ":set list\<CR>")
   call VerifyScreenDump(buf, 'Test_prop_above_empty_2', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_prop_with_text_below_after_match()
   CheckScreendump
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   let lines =<< trim END
-      vim9script
+      mnv9script
 
-      setline(1, ['vim9script', 'some text'])
+      setline(1, ['mnv9script', 'some text'])
       set signcolumn=yes
       matchaddpos('Search', [[1, 10]])
       prop_type_add('test', {highlight: 'Error'})
@@ -3357,15 +3357,15 @@ func Test_prop_with_text_below_after_match()
       })
   END
   call writefile(lines, 'XscriptPropsBelow', 'D')
-  let buf = RunVimInTerminal('-S XscriptPropsBelow', #{rows: 8, cols: 60})
+  let buf = RunMNVInTerminal('-S XscriptPropsBelow', #{rows: 8, cols: 60})
   call VerifyScreenDump(buf, 'Test_prop_with_text_below_after_match_1', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_props_with_text_after_joined()
   CheckScreendump
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   let lines =<< trim END
       call setline(1, ['one', 'two', 'three', 'four'])
@@ -3383,15 +3383,15 @@ func Test_props_with_text_after_joined()
       normal 3G6J
   END
   call writefile(lines, 'XscriptPropsWithTextAfterJoined', 'D')
-  let buf = RunVimInTerminal('-S XscriptPropsWithTextAfterJoined', #{rows: 6, cols: 60})
+  let buf = RunMNVInTerminal('-S XscriptPropsWithTextAfterJoined', #{rows: 6, cols: 60})
   call VerifyScreenDump(buf, 'Test_prop_with_text_after_joined_1', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_props_with_text_after_truncated()
   CheckScreendump
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   let lines =<< trim END
       call setline(1, ['one two three four five six seven'])
@@ -3408,7 +3408,7 @@ func Test_props_with_text_after_truncated()
       normal 4Gfh
   END
   call writefile(lines, 'XscriptPropsWithTextAfterTrunc', 'D')
-  let buf = RunVimInTerminal('-S XscriptPropsWithTextAfterTrunc', #{rows: 9, cols: 60})
+  let buf = RunMNVInTerminal('-S XscriptPropsWithTextAfterTrunc', #{rows: 9, cols: 60})
   call VerifyScreenDump(buf, 'Test_prop_with_text_after_trunc_1', {})
 
   call term_sendkeys(buf, ":37vsp\<CR>gg")
@@ -3425,12 +3425,12 @@ func Test_props_with_text_after_truncated()
   call term_sendkeys(buf, "0fx")
   call VerifyScreenDump(buf, 'Test_prop_with_text_after_trunc_5', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_props_with_text_after_truncated_and_ambiwidth_is_double()
   CheckScreendump
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   let lines =<< trim END
       set ambiwidth=double
@@ -3448,16 +3448,16 @@ func Test_props_with_text_after_truncated_and_ambiwidth_is_double()
       normal 4Gfh
   END
   call writefile(lines, 'XscriptPropsWithTextAfterTrunc-and-ambiwidth-is-double', 'D')
-  let buf = RunVimInTerminal('-S XscriptPropsWithTextAfterTrunc-and-ambiwidth-is-double', #{rows: 9, cols: 60})
+  let buf = RunMNVInTerminal('-S XscriptPropsWithTextAfterTrunc-and-ambiwidth-is-double', #{rows: 9, cols: 60})
   call VerifyScreenDump(buf, 'Test_prop_with_text_after_trunc_ambiw_d_1', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 
 func Test_props_with_text_after_truncated_not_utf8()
   CheckScreendump
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   let lines =<< trim END
       set enc=cp932 tenc=utf-8
@@ -3475,15 +3475,15 @@ func Test_props_with_text_after_truncated_not_utf8()
       normal 4Gfh
   END
   call writefile(lines, 'XscriptPropsWithTextAfterTrunc-enc-is-not-utf8', 'D')
-  let buf = RunVimInTerminal('-S XscriptPropsWithTextAfterTrunc-enc-is-not-utf8', #{rows: 9, cols: 60})
+  let buf = RunMNVInTerminal('-S XscriptPropsWithTextAfterTrunc-enc-is-not-utf8', #{rows: 9, cols: 60})
   call VerifyScreenDump(buf, 'Test_prop_with_text_after_trunc_not_utf8', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_props_with_text_empty_line()
   CheckScreendump
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   let lines =<< trim END
       call setline(1, ['', 'aaa', '', 'bbbbbb'])
@@ -3493,7 +3493,7 @@ func Test_props_with_text_empty_line()
       normal gg0
   END
   call writefile(lines, 'XscriptPropsWithTextEmptyLine', 'D')
-  let buf = RunVimInTerminal('-S XscriptPropsWithTextEmptyLine', #{rows: 8, cols: 60})
+  let buf = RunMNVInTerminal('-S XscriptPropsWithTextEmptyLine', #{rows: 8, cols: 60})
   call VerifyScreenDump(buf, 'Test_prop_with_text_empty_line_1', {})
   call term_sendkeys(buf, "$")
   call VerifyScreenDump(buf, 'Test_prop_with_text_empty_line_2', {})
@@ -3512,12 +3512,12 @@ func Test_props_with_text_empty_line()
   call term_sendkeys(buf, "\<Esc>/aaa\\nc\\%V\<CR>")
   call VerifyScreenDump(buf, 'Test_prop_with_text_empty_line_9', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_props_with_text_after_wraps()
   CheckScreendump
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   let lines =<< trim END
       call setline(1, ['one two three four five six seven'])
@@ -3534,15 +3534,15 @@ func Test_props_with_text_after_wraps()
       normal 4Gfh
   END
   call writefile(lines, 'XscriptPropsWithTextAfterWraps', 'D')
-  let buf = RunVimInTerminal('-S XscriptPropsWithTextAfterWraps', #{rows: 9, cols: 60})
+  let buf = RunMNVInTerminal('-S XscriptPropsWithTextAfterWraps', #{rows: 9, cols: 60})
   call VerifyScreenDump(buf, 'Test_prop_with_text_after_wraps_1', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_props_with_text_after_nowrap()
   CheckScreendump
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   let lines =<< trim END
       set nowrap
@@ -3562,7 +3562,7 @@ func Test_props_with_text_after_nowrap()
       hi CursorLine ctermbg=lightgrey
   END
   call writefile(lines, 'XscriptPropsAfterNowrap', 'D')
-  let buf = RunVimInTerminal('-S XscriptPropsAfterNowrap', #{rows: 12, cols: 60})
+  let buf = RunMNVInTerminal('-S XscriptPropsAfterNowrap', #{rows: 12, cols: 60})
   call VerifyScreenDump(buf, 'Test_prop_with_text_after_nowrap_1', {})
 
   call term_sendkeys(buf, ":set signcolumn=yes foldcolumn=3 cursorline\<CR>")
@@ -3571,15 +3571,15 @@ func Test_props_with_text_after_nowrap()
   call term_sendkeys(buf, "j")
   call VerifyScreenDump(buf, 'Test_prop_with_text_after_nowrap_3', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_prop_with_text_below_cul()
   CheckScreendump
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   let lines =<< trim END
-      vim9script
+      mnv9script
 
       setline(1, ['some text', 'last line'])
       set cursorline nowrap
@@ -3592,18 +3592,18 @@ func Test_prop_with_text_below_cul()
       })
   END
   call writefile(lines, 'XscriptPropsBelowCurline', 'D')
-  let buf = RunVimInTerminal('-S XscriptPropsBelowCurline', #{rows: 6, cols: 60})
+  let buf = RunMNVInTerminal('-S XscriptPropsBelowCurline', #{rows: 6, cols: 60})
   call VerifyScreenDump(buf, 'Test_prop_with_text_below_cul_1', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_props_with_text_below_nowrap()
   CheckScreendump
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   let lines =<< trim END
-      vim9script
+      mnv9script
       edit foobar
       set nowrap
       set showbreak=+++
@@ -3622,18 +3622,18 @@ func Test_props_with_text_below_nowrap()
       normal G$
   END
   call writefile(lines, 'XscriptPropsBelowNowrap', 'D')
-  let buf = RunVimInTerminal('-S XscriptPropsBelowNowrap', #{rows: 8, cols: 60})
+  let buf = RunMNVInTerminal('-S XscriptPropsBelowNowrap', #{rows: 8, cols: 60})
   call VerifyScreenDump(buf, 'Test_prop_with_text_below_nowrap_1', {})
 
   call term_sendkeys(buf, "gg$")
   call VerifyScreenDump(buf, 'Test_prop_with_text_below_nowrap_2', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_props_with_text_above()
   CheckScreendump
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   let lines =<< trim END
       call setline(1, ['one two', 'three four', 'five six'])
@@ -3655,7 +3655,7 @@ func Test_props_with_text_above()
       endfunc
   END
   call writefile(lines, 'XscriptPropsWithTextAbove', 'D')
-  let buf = RunVimInTerminal('-S XscriptPropsWithTextAbove', #{rows: 9, cols: 60})
+  let buf = RunMNVInTerminal('-S XscriptPropsWithTextAbove', #{rows: 9, cols: 60})
   call VerifyScreenDump(buf, 'Test_prop_with_text_above_1', {})
 
   call term_sendkeys(buf, "ggg$")
@@ -3691,15 +3691,15 @@ func Test_props_with_text_above()
   call term_sendkeys(buf, ":call AddLongPropAbove()\<CR>")
   call VerifyScreenDump(buf, 'Test_prop_with_text_above_9', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_prop_with_text_above_padding()
   CheckScreendump
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   let lines =<< trim END
-      vim9script
+      mnv9script
 
       setlocal tabstop=8 noexpandtab
       setline(1, ['', 'sky is blue', 'ocean is blue'])
@@ -3709,10 +3709,10 @@ func Test_prop_with_text_above_padding()
                text_padding_left: 200})
   END
   call writefile(lines, 'XscriptAbovePadding', 'D')
-  let buf = RunVimInTerminal('-S XscriptAbovePadding', #{rows: 8})
+  let buf = RunMNVInTerminal('-S XscriptAbovePadding', #{rows: 8})
   call VerifyScreenDump(buf, 'Test_prop_above_padding_1', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_prop_above_with_indent()
@@ -3733,10 +3733,10 @@ endfunc
 
 func Test_prop_above_with_number()
   CheckScreendump
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   let lines =<< trim END
-      vim9script
+      mnv9script
       setline(1, ['one one one', 'two two two', 'three three three'])
       set number cpo+=n
       prop_type_add('test', {highlight: 'DiffChange'})
@@ -3754,7 +3754,7 @@ func Test_prop_above_with_number()
       enddef
   END
   call writefile(lines, 'XscriptPropAboveNr', 'D')
-  let buf = RunVimInTerminal('-S XscriptPropAboveNr', #{rows: 8})
+  let buf = RunMNVInTerminal('-S XscriptPropAboveNr', #{rows: 8})
   call VerifyScreenDump(buf, 'Test_prop_above_number_1', {})
 
   call term_sendkeys(buf, ":call OneMore()\<CR>")
@@ -3764,12 +3764,12 @@ func Test_prop_above_with_number()
   call term_sendkeys(buf, 'j')
   call VerifyScreenDump(buf, 'Test_prop_above_number_3', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_prop_above_with_linebreak()
   CheckScreendump
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   let lines =<< trim END
     setlocal linebreak breakindent breakindentopt=shift:4
@@ -3779,17 +3779,17 @@ func Test_prop_above_with_linebreak()
     normal! 2gg$
   END
   call writefile(lines, 'XscriptPropAboveLinebreak', 'D')
-  let buf = RunVimInTerminal('-S XscriptPropAboveLinebreak', #{rows: 6})
+  let buf = RunMNVInTerminal('-S XscriptPropAboveLinebreak', #{rows: 6})
   call VerifyScreenDump(buf, 'Test_prop_above_linebreak_1', {})
   call term_sendkeys(buf, 'k')
   call VerifyScreenDump(buf, 'Test_prop_above_linebreak_2', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_prop_above_and_before()
   CheckScreendump
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   let lines =<< trim END
     setlocal linebreak breakindent breakindentopt=shift:2
@@ -3800,7 +3800,7 @@ func Test_prop_above_and_before()
     normal! 2gg$
   END
   call writefile(lines, 'XscriptPropAboveAndBefore', 'D')
-  let buf = RunVimInTerminal('-S XscriptPropAboveAndBefore', #{rows: 6})
+  let buf = RunMNVInTerminal('-S XscriptPropAboveAndBefore', #{rows: 6})
   call VerifyScreenDump(buf, 'Test_prop_above_and_before_1', {})
   call term_sendkeys(buf, 'h')
   call VerifyScreenDump(buf, 'Test_prop_above_and_before_2', {})
@@ -3811,15 +3811,15 @@ func Test_prop_above_and_before()
   call term_sendkeys(buf, 'h')
   call VerifyScreenDump(buf, 'Test_prop_above_and_before_5', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_prop_below_split_line()
   CheckScreendump
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   let lines =<< trim END
-      vim9script
+      mnv9script
       setline(1, ['one one one', 'two two two', 'three three three'])
       prop_type_add('test', {highlight: 'Search'})
       prop_add(2, 0, {
@@ -3830,7 +3830,7 @@ func Test_prop_below_split_line()
       })
   END
   call writefile(lines, 'XscriptPropBelowSpitLine', 'D')
-  let buf = RunVimInTerminal('-S XscriptPropBelowSpitLine', #{rows: 8})
+  let buf = RunMNVInTerminal('-S XscriptPropBelowSpitLine', #{rows: 8})
   call term_sendkeys(buf, "2GA\<CR>xx")
   call VerifyScreenDump(buf, 'Test_prop_below_split_line_1', {})
 
@@ -3840,15 +3840,15 @@ func Test_prop_below_split_line()
   call term_sendkeys(buf, ":set nowrap\<CR>")
   call VerifyScreenDump(buf, 'Test_prop_below_split_line_3', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_prop_above_below_smoothscroll()
   CheckScreendump
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   let lines =<< trim END
-      vim9script
+      mnv9script
       setline(1, range(1, 10)->mapnew((_, v) => '" line ' .. v))
 
       set smoothscroll wrap
@@ -3861,7 +3861,7 @@ func Test_prop_above_below_smoothscroll()
       call prop_add(9, 0, {text: "insert below 2", type: "mytype", text_align: 'below'})
   END
   call writefile(lines, 'XscriptPropsSmoothscroll', 'D')
-  let buf = RunVimInTerminal('-S XscriptPropsSmoothscroll', #{rows: 8, cols: 60})
+  let buf = RunMNVInTerminal('-S XscriptPropsSmoothscroll', #{rows: 8, cols: 60})
   call VerifyScreenDump(buf, 'Test_prop_above_below_smoothscroll_1', {})
 
   for nr in range(2, 16)
@@ -3869,15 +3869,15 @@ func Test_prop_above_below_smoothscroll()
     call VerifyScreenDump(buf, 'Test_prop_above_below_smoothscroll_' .. nr, {})
   endfor
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_props_with_text_override()
   CheckScreendump
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   let lines =<< trim END
-      vim9script
+      mnv9script
       setline(1, 'some text here')
       hi Likethis ctermfg=blue ctermbg=cyan
       prop_type_add('prop', {highlight: 'Likethis', override: true})
@@ -3886,19 +3886,19 @@ func Test_props_with_text_override()
       set cursorline
   END
   call writefile(lines, 'XscriptPropsOverride', 'D')
-  let buf = RunVimInTerminal('-S XscriptPropsOverride', #{rows: 6, cols: 60})
+  let buf = RunMNVInTerminal('-S XscriptPropsOverride', #{rows: 6, cols: 60})
   call VerifyScreenDump(buf, 'Test_prop_with_text_override_1', {})
 
   call term_sendkeys(buf, ":set nocursorline\<CR>")
   call term_sendkeys(buf, "0llvfr")
   call VerifyScreenDump(buf, 'Test_prop_with_text_override_2', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_props_with_text_CursorMoved()
   CheckScreendump
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   let lines =<< trim END
       call setline(1, ['this is line one', 'this is line two', 'three', 'four', 'five'])
@@ -3921,7 +3921,7 @@ func Test_props_with_text_CursorMoved()
       autocmd CursorMoved * call Update()
   END
   call writefile(lines, 'XscriptPropsCursorMovec', 'D')
-  let buf = RunVimInTerminal('-S XscriptPropsCursorMovec', #{rows: 8, cols: 60})
+  let buf = RunMNVInTerminal('-S XscriptPropsCursorMovec', #{rows: 8, cols: 60})
   call term_sendkeys(buf, "gg0w")
   call VerifyScreenDump(buf, 'Test_prop_with_text_cursormoved_1', {})
 
@@ -3932,12 +3932,12 @@ func Test_props_with_text_CursorMoved()
   call term_sendkeys(buf, "k")
   call VerifyScreenDump(buf, 'Test_prop_with_text_cursormoved_1', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_props_with_text_after_split_join()
   CheckScreendump
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   let lines =<< trim END
       call setline(1, ['1122'])
@@ -3952,7 +3952,7 @@ func Test_props_with_text_after_split_join()
       endfunc
   END
   call writefile(lines, 'XscriptPropsAfterSplitJoin', 'D')
-  let buf = RunVimInTerminal('-S XscriptPropsAfterSplitJoin', #{rows: 8, cols: 60})
+  let buf = RunMNVInTerminal('-S XscriptPropsAfterSplitJoin', #{rows: 8, cols: 60})
   call VerifyScreenDump(buf, 'Test_prop_with_text_after_join_split_1', {})
 
   call term_sendkeys(buf, "ggJ")
@@ -3967,7 +3967,7 @@ func Test_props_with_text_after_split_join()
   call term_sendkeys(buf, "ggJ")
   call VerifyScreenDump(buf, 'Test_prop_with_text_after_join_split_5', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_removed_prop_with_text_cleans_up_array()
@@ -4007,10 +4007,10 @@ enddef
 
 func Test_insert_text_start_incl()
   CheckScreendump
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   let lines =<< trim END
-      vim9script
+      mnv9script
       setline(1, ['text one text two', '', 'function(arg)'])
 
       prop_type_add('propincl', {highlight: 'NonText', start_incl: true})
@@ -4024,7 +4024,7 @@ func Test_insert_text_start_incl()
       prop_add(3, 10, {type: 'argname', text: 'arg: '})
   END
   call writefile(lines, 'XscriptPropsStartIncl', 'D')
-  let buf = RunVimInTerminal('-S XscriptPropsStartIncl', #{rows: 8, cols: 60})
+  let buf = RunMNVInTerminal('-S XscriptPropsStartIncl', #{rows: 8, cols: 60})
   call VerifyScreenDump(buf, 'Test_prop_insert_start_incl_1', {})
 
   call term_sendkeys(buf, "i")
@@ -4044,15 +4044,15 @@ func Test_insert_text_start_incl()
   call term_sendkeys(buf, "<<<<")
   call VerifyScreenDump(buf, 'Test_prop_insert_start_incl_8', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_insert_text_list_mode()
   CheckScreendump
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   let lines =<< trim END
-      vim9script
+      mnv9script
       setline(1, ['This is a line with quite a bit of text here.',
                   'second line', 'third line'])
       set list listchars+=extends:»
@@ -4064,7 +4064,7 @@ func Test_insert_text_list_mode()
       })
   END
   call writefile(lines, 'XscriptPropsListMode', 'D')
-  let buf = RunVimInTerminal('-S XscriptPropsListMode', #{rows: 8, cols: 60})
+  let buf = RunMNVInTerminal('-S XscriptPropsListMode', #{rows: 8, cols: 60})
   call term_sendkeys(buf, "ggj")
   call VerifyScreenDump(buf, 'Test_prop_insert_list_mode_1', {})
 
@@ -4074,15 +4074,15 @@ func Test_insert_text_list_mode()
   call term_sendkeys(buf, "ggd32l")
   call VerifyScreenDump(buf, 'Test_prop_insert_list_mode_3', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_insert_text_with_padding()
   CheckScreendump
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   let lines =<< trim END
-      vim9script
+      mnv9script
       setline(1, ['Some text to add virtual text to.',
                   'second line',
                   'Another line with some text to make the wrap.'])
@@ -4114,7 +4114,7 @@ func Test_insert_text_with_padding()
       })
   END
   call writefile(lines, 'XscriptPropsPadded', 'D')
-  let buf = RunVimInTerminal('-S XscriptPropsPadded', #{rows: 8, cols: 60})
+  let buf = RunMNVInTerminal('-S XscriptPropsPadded', #{rows: 8, cols: 60})
   call VerifyScreenDump(buf, 'Test_prop_text_with_padding_1', {})
 
   call term_sendkeys(buf, "ggixxxxxxxxxx\<Esc>")
@@ -4127,15 +4127,15 @@ func Test_insert_text_with_padding()
   call term_sendkeys(buf, ":set list\<CR>")
   call VerifyScreenDump(buf, 'Test_prop_text_with_padding_4', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_long_text_below_with_padding()
   CheckScreendump
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   let lines =<< trim END
-      vim9script
+      mnv9script
       setline(1, ['first line', 'second line'])
       prop_type_add('theprop', {highlight: 'DiffChange'})
       prop_add(1, 0, {
@@ -4153,21 +4153,21 @@ func Test_long_text_below_with_padding()
       normal 2Gw
   END
   call writefile(lines, 'XlongTextBelowWithPadding', 'D')
-  let buf = RunVimInTerminal('-S XlongTextBelowWithPadding', #{rows: 8, cols: 60})
+  let buf = RunMNVInTerminal('-S XlongTextBelowWithPadding', #{rows: 8, cols: 60})
   call VerifyScreenDump(buf, 'Test_long_text_with_padding_1', {})
 
   call term_sendkeys(buf, ":set list\<CR>")
   call VerifyScreenDump(buf, 'Test_long_text_with_padding_2', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_text_after_nowrap()
   CheckScreendump
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   let lines =<< trim END
-      vim9script
+      mnv9script
       setline(1, ['first line', range(80)->join(' '), 'third', 'fourth'])
       set nowrap
       prop_type_add('theprop', {highlight: 'DiffChange'})
@@ -4208,7 +4208,7 @@ func Test_text_after_nowrap()
       enddef
   END
   call writefile(lines, 'XTextAfterNowrap', 'D')
-  let buf = RunVimInTerminal('-S XTextAfterNowrap', #{rows: 8, cols: 60})
+  let buf = RunMNVInTerminal('-S XTextAfterNowrap', #{rows: 8, cols: 60})
   call VerifyScreenDump(buf, 'Test_text_after_nowrap_1', {})
 
   call term_sendkeys(buf, "30w")
@@ -4224,15 +4224,15 @@ func Test_text_after_nowrap()
   call term_sendkeys(buf, ":call ChangeText()\<CR>")
   call VerifyScreenDump(buf, 'Test_text_after_nowrap_5', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_text_after_nowrap_list()
   CheckScreendump
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   let lines =<< trim END
-      vim9script
+      mnv9script
 
       set nowrap
       set listchars+=extends:>
@@ -4258,15 +4258,15 @@ func Test_text_after_nowrap_list()
       normal 3G$
   END
   call writefile(lines, 'XTextAfterNowrapList', 'D')
-  let buf = RunVimInTerminal('-S XTextAfterNowrapList', #{rows: 6, cols: 60})
+  let buf = RunMNVInTerminal('-S XTextAfterNowrapList', #{rows: 6, cols: 60})
   call VerifyScreenDump(buf, 'Test_text_after_nowrap_list_1', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_text_after_wrap_showbreak()
   CheckScreendump
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   let lines =<< trim END
     set cursorline
@@ -4292,7 +4292,7 @@ func Test_text_after_wrap_showbreak()
           \ })
   END
   call writefile(lines, 'XTestAfterWrapShowbreak', 'D')
-  let buf = RunVimInTerminal('-S XTestAfterWrapShowbreak', #{rows: 8, cols: 20})
+  let buf = RunMNVInTerminal('-S XTestAfterWrapShowbreak', #{rows: 8, cols: 20})
   call VerifyScreenDump(buf, 'Test_text_after_wrap_showbreak_01', {})
   call term_sendkeys(buf, 'j')
   call VerifyScreenDump(buf, 'Test_text_after_wrap_showbreak_02', {})
@@ -4336,12 +4336,12 @@ func Test_text_after_wrap_showbreak()
   call term_sendkeys(buf, 'k')
   call VerifyScreenDump(buf, 'Test_text_after_wrap_showbreak_10', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_text_eol_long_wrap_smoothscroll()
   CheckScreendump
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   let lines =<< trim END
     call setline(1, [repeat('0123456789', 5), 'foo', 'bar'])
@@ -4352,7 +4352,7 @@ func Test_text_eol_long_wrap_smoothscroll()
     set cursorline scrolloff=0 showbreak=>\  smoothscroll
   END
   call writefile(lines, 'XTestEolLongWrapSms', 'D')
-  let buf = RunVimInTerminal('-S XTestEolLongWrapSms', #{rows: 8, cols: 50})
+  let buf = RunMNVInTerminal('-S XTestEolLongWrapSms', #{rows: 8, cols: 50})
   call VerifyScreenDump(buf, 'Test_text_eol_long_wrap_sms_01', {})
   call term_sendkeys(buf, "\<C-E>")
   call VerifyScreenDump(buf, 'Test_text_eol_long_wrap_sms_02', {})
@@ -4400,7 +4400,7 @@ func Test_text_eol_long_wrap_smoothscroll()
   call term_sendkeys(buf, "\<C-E>")
   call VerifyScreenDump(buf, 'Test_text_eol_long_wrap_sms_22', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_text_eol_virtcol()
@@ -4421,10 +4421,10 @@ endfunc
 
 func Test_text_below_nowrap()
   CheckScreendump
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   let lines =<< trim END
-      vim9script
+      mnv9script
       setline(1, ['first line', 'second line '->repeat(50), 'third', 'fourth'])
       set nowrap number
       prop_type_add('theprop', {highlight: 'DiffChange'})
@@ -4443,18 +4443,18 @@ func Test_text_below_nowrap()
       normal 2Gw
   END
   call writefile(lines, 'XTextBelowNowrap', 'D')
-  let buf = RunVimInTerminal('-S XTextBelowNowrap', #{rows: 8, cols: 60})
+  let buf = RunMNVInTerminal('-S XTextBelowNowrap', #{rows: 8, cols: 60})
   call VerifyScreenDump(buf, 'Test_text_below_nowrap_1', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_virtual_text_overlap_with_highlight()
   CheckScreendump
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   let lines =<< trim END
-      vim9script
+      mnv9script
       setline(1, ['one', 'two', 'three', 'four', 'five'])
       set number
 
@@ -4484,18 +4484,18 @@ func Test_virtual_text_overlap_with_highlight()
       })
   END
   call writefile(lines, 'XVirtualTextOverlapWithHighlight', 'D')
-  let buf = RunVimInTerminal('-S XVirtualTextOverlapWithHighlight', #{rows: 8, cols: 60})
+  let buf = RunMNVInTerminal('-S XVirtualTextOverlapWithHighlight', #{rows: 8, cols: 60})
   call VerifyScreenDump(buf, 'Test_virtual_text_overlap_with_highlight_1', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_virtual_text_in_popup_highlight()
   CheckScreendump
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   let lines =<< trim END
-      vim9script
+      mnv9script
 
       # foreground highlight only, popup background is used
       prop_type_add('Prop1', {'highlight': 'SpecialKey'})
@@ -4529,18 +4529,18 @@ func Test_virtual_text_in_popup_highlight()
       popup_create(popupText, popupArgs)
   END
   call writefile(lines, 'XscriptVirtualHighlight', 'D')
-  let buf = RunVimInTerminal('-S XscriptVirtualHighlight', #{rows: 8})
+  let buf = RunMNVInTerminal('-S XscriptVirtualHighlight', #{rows: 8})
   call VerifyScreenDump(buf, 'Test_virtual_text_in_popup_highlight_1', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_insert_text_change_arg()
   CheckScreendump
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   let lines =<< trim END
-      vim9script
+      mnv9script
       setline(1, ['SetErrorCode( 10, 20 )', 'second line'])
       prop_type_add('param', {highlight: 'DiffChange', start_incl: 1})
       prop_type_add('padd', {highlight: 'NonText', start_incl: 1})
@@ -4562,13 +4562,13 @@ func Test_insert_text_change_arg()
       })
   END
   call writefile(lines, 'XscriptPropsChange', 'D')
-  let buf = RunVimInTerminal('-S XscriptPropsChange', #{rows: 5, cols: 60})
+  let buf = RunMNVInTerminal('-S XscriptPropsChange', #{rows: 5, cols: 60})
   call VerifyScreenDump(buf, 'Test_prop_text_change_arg_1', {})
 
   call term_sendkeys(buf, "ggf1cw1234\<Esc>")
   call VerifyScreenDump(buf, 'Test_prop_text_change_arg_2', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 def Test_textprop_in_quickfix_window()
@@ -4599,10 +4599,10 @@ enddef
 
 func Test_text_prop_delete_updates()
   CheckScreendump
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   let lines =<< trim END
-      vim9script
+      mnv9script
 
       setline(1, ['some text', 'more text', 'the end'])
       prop_type_add('test', {highlight: 'DiffChange'})
@@ -4622,7 +4622,7 @@ func Test_text_prop_delete_updates()
       normal! G
   END
   call writefile(lines, 'XtextPropDelete', 'D')
-  let buf = RunVimInTerminal('-S XtextPropDelete', #{rows: 10, cols: 60})
+  let buf = RunMNVInTerminal('-S XtextPropDelete', #{rows: 10, cols: 60})
   call VerifyScreenDump(buf, 'Test_prop_delete_updates_1', {})
 
   " Check that after deleting the text prop type the text properties using
@@ -4633,12 +4633,12 @@ func Test_text_prop_delete_updates()
   call term_sendkeys(buf, "ggj")
   call VerifyScreenDump(buf, 'Test_prop_delete_updates_3', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_text_prop_diff_mode()
   CheckScreendump
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   let lines =<< trim END
       call setline(1, ['9000', '0009', '0009', '9000', '0009'])
@@ -4658,13 +4658,13 @@ func Test_text_prop_diff_mode()
       set diff
   END
   call writefile(lines, 'XtextPropDiff', 'D')
-  let buf = RunVimInTerminal('-S XtextPropDiff', #{rows: 10, cols: 60})
+  let buf = RunMNVInTerminal('-S XtextPropDiff', #{rows: 10, cols: 60})
   call VerifyScreenDump(buf, 'Test_prop_diff_mode_1', {})
 
   call term_sendkeys(buf, ":windo set number\<CR>")
   call VerifyScreenDump(buf, 'Test_prop_diff_mode_2', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_error_when_using_negative_id()
@@ -4685,10 +4685,10 @@ endfunc
 
 func Test_modify_text_before_prop()
   CheckScreendump
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   let lines =<< trim END
-      vim9script
+      mnv9script
       setline(1, ['test_words', 'second line', 'third line', 'fourth line'])
       set number
       prop_type_add('text', {highlight: 'DiffChange'})
@@ -4697,21 +4697,21 @@ func Test_modify_text_before_prop()
       prop_add(1, 0, {type: 'below', text: repeat('a', 65), text_align: 'below'})
   END
   call writefile(lines, 'XtextPropModifyBefore', 'D')
-  let buf = RunVimInTerminal('-S XtextPropModifyBefore', #{rows: 5, cols: 60})
+  let buf = RunMNVInTerminal('-S XtextPropModifyBefore', #{rows: 5, cols: 60})
   call VerifyScreenDump(buf, 'Test_modify_text_before_prop_1', {})
 
   call term_sendkeys(buf, "xxia\<Esc>")
   call VerifyScreenDump(buf, 'Test_modify_text_before_prop_2', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_overlong_textprop_above_crash()
   CheckScreendump
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   let lines =<< trim END
-  vim9script
+  mnv9script
   prop_type_add('PropType', {highlight: 'Error'})
   setline(1, ['xxx ', 'yyy'])
   prop_add(1, 0, {
@@ -4722,15 +4722,15 @@ func Test_overlong_textprop_above_crash()
   })
   END
   call writefile(lines, 'XtextPropLongAbove', 'D')
-  let buf = RunVimInTerminal('-S XtextPropLongAbove', #{rows: 8, cols: 60})
+  let buf = RunMNVInTerminal('-S XtextPropLongAbove', #{rows: 8, cols: 60})
   call VerifyScreenDump(buf, 'Test_prop_long_above_1', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_text_prop_list_hl_and_sign_highlight()
   CheckScreendump
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   let lines =<< trim END
     func Test()
@@ -4746,13 +4746,13 @@ func Test_text_prop_list_hl_and_sign_highlight()
     call Test()
   END
   call writefile(lines, 'XtextPropSignTab', 'D')
-  let buf = RunVimInTerminal('-S XtextPropSignTab', #{rows: 8, cols: 60})
+  let buf = RunMNVInTerminal('-S XtextPropSignTab', #{rows: 8, cols: 60})
   call VerifyScreenDump(buf, 'Test_prop_sign_tab_1', {})
 
   call term_sendkeys(buf, ":setl list listchars=eol:¶,tab:>-\<CR>")
   call VerifyScreenDump(buf, 'Test_prop_sign_tab_2', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 " Test for getting the virtual text properties
@@ -4825,7 +4825,7 @@ endfunc
 
 func Test_textprop_with_wincolor()
   CheckScreendump
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   let lines =<< trim END
     call setline(1, 'some text here')
@@ -4840,7 +4840,7 @@ func Test_textprop_with_wincolor()
     set wincolor=DiffChange wrap
   END
   call writefile(lines, 'XtextPropWincolor', 'D')
-  let buf = RunVimInTerminal('-S XtextPropWincolor', #{rows: 8, cols: 60})
+  let buf = RunMNVInTerminal('-S XtextPropWincolor', #{rows: 8, cols: 60})
 
   call term_sendkeys(buf, ":\<CR>")
   call VerifyScreenDump(buf, 'Test_prop_wincolor_1', {})
@@ -4879,7 +4879,7 @@ func Test_textprop_with_wincolor()
     call VerifyScreenDump(buf, 'Test_prop_wincolor_9', {})
   endif
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_textprop_materialize_list()
@@ -4907,4 +4907,4 @@ func Test_textprop_materialize_list()
 	call assert_equal([], prop_list(1, #{ids: 3->range()}))
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_timers.vim b/uvim/src/testdir/test_timers.mnv
index 9ba5d0f84d..269495def9 100644
--- a/uvim/src/testdir/test_timers.vim
+++ b/uvim/src/testdir/test_timers.mnv
@@ -2,7 +2,7 @@
 
 CheckFeature timers
 
-source util/screendump.vim
+source util/screendump.mnv
 
 func SetUp()
   " The tests here use timers, thus are sensitive to timing.
@@ -362,7 +362,7 @@ func Test_timer_ex_mode()
 endfunc
 
 func Test_timer_restore_count()
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
   " Check that v:count is saved and restored, not changed by a timer.
   call writefile([
         \ 'nnoremap <expr><silent> L v:count ? v:count . "l" : "l"',
@@ -376,7 +376,7 @@ func Test_timer_restore_count()
         \ '2-1234',
         \ '3-1234',
 	\ ], 'Xtrctext', 'D')
-  let buf = RunVimInTerminal('-S Xtrcscript Xtrctext', {})
+  let buf = RunMNVInTerminal('-S Xtrcscript Xtrctext', {})
 
   " Wait for the timer to move the cursor to the third line.
   call WaitForAssert({-> assert_equal(3, term_getcursor(buf)[0])})
@@ -385,7 +385,7 @@ func Test_timer_restore_count()
   call term_sendkeys(buf, 'L')
   call WaitForAssert({-> assert_equal(2, term_getcursor(buf)[1])})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 " Test that the garbage collector isn't triggered if a timer callback invokes
@@ -424,7 +424,7 @@ endfunc
 
 func Test_timer_error_in_timer_callback()
   if !has('terminal') || (has('win32') && has('gui_running'))
-    throw 'Skipped: cannot run Vim in a terminal window'
+    throw 'Skipped: cannot run MNV in a terminal window'
   endif
 
   let lines =<< trim [CODE]
@@ -435,13 +435,13 @@ func Test_timer_error_in_timer_callback()
   set updatetime=50
   call timer_start(1, 'Func')
   [CODE]
-  call writefile(lines, 'Xtest.vim', 'D')
+  call writefile(lines, 'Xtest.mnv', 'D')
 
-  let buf = term_start(GetVimCommandCleanTerm() .. ' -S Xtest.vim', {'term_rows': 8})
+  let buf = term_start(GetMNVCommandCleanTerm() .. ' -S Xtest.mnv', {'term_rows': 8})
   let job = term_getjob(buf)
   call WaitForAssert({-> assert_notequal('', term_getline(buf, 8))})
 
-  " GC must not run during timer callback, which can make Vim crash.
+  " GC must not run during timer callback, which can make MNV crash.
   call TermWait(buf, 50)
   call term_sendkeys(buf, "\<CR>")
   call TermWait(buf, 50)
@@ -470,7 +470,7 @@ func Test_timer_invalid_callback()
 endfunc
 
 func Test_timer_changing_function_list()
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   " Create a large number of functions.  Should get the "more" prompt.
   " The typing "G" triggers the timer, which changes the function table.
@@ -482,21 +482,21 @@ func Test_timer_changing_function_list()
     au CmdlineLeave : call timer_start(0, {-> 0})
   END
   call writefile(lines, 'XTest_timerchange', 'D')
-  let buf = RunVimInTerminal('-S XTest_timerchange', #{rows: 10})
+  let buf = RunMNVInTerminal('-S XTest_timerchange', #{rows: 10})
   call term_sendkeys(buf, ":fu\<CR>")
   call WaitForAssert({-> assert_match('-- More --', term_getline(buf, 10))})
   call term_sendkeys(buf, "G")
   call WaitForAssert({-> assert_match('E454:', term_getline(buf, 9))})
   call term_sendkeys(buf, "\<Esc>")
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_timer_outputting_message()
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   let lines =<< trim END
-    vim9script
+    mnv9script
     setline(1, 'some text')
     set showcmd ut=2000 cmdheight=1
     timer_start(0, (_) => {
@@ -504,13 +504,13 @@ func Test_timer_outputting_message()
         })
   END
   call writefile(lines, 'XTest_timermessage', 'D')
-  let buf = RunVimInTerminal('-S XTest_timermessage', #{rows: 6})
+  let buf = RunMNVInTerminal('-S XTest_timermessage', #{rows: 6})
   call term_sendkeys(buf, "l")
   call term_wait(buf)
   " should not get a hit-enter prompt
   call WaitForAssert({-> assert_match('xxxxxxxxxxx', term_getline(buf, 6))})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_timer_using_win_execute_undo_sync()
@@ -540,4 +540,4 @@ func Test_timer_using_win_execute_undo_sync()
 endfunc
 
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_true_false.vim b/uvim/src/testdir/test_true_false.mnv
index 03e02880e5..60487eabf0 100644
--- a/uvim/src/testdir/test_true_false.vim
+++ b/uvim/src/testdir/test_true_false.mnv
@@ -61,25 +61,25 @@ func Test_true_false_arg()
 
   set wildignore=*.swp
   call Try_arg_true_false('expand("foo.swp", %v%)', "", "foo.swp")
-  call Try_arg_true_false('expand("foo.vim", 0, %v%)', "foo.vim", ["foo.vim"])
+  call Try_arg_true_false('expand("foo.mnv", 0, %v%)', "foo.mnv", ["foo.mnv"])
 
   call setreg('a', ['x', 'y'])
   call Try_arg_true_false('getreg("a", 1, %v%)', "x\ny\n", ['x', 'y'])
 
-  set wildignore=*.vim
-  call Try_arg_true_false('glob("runtest.vim", %v%)', "", "runtest.vim")
+  set wildignore=*.mnv
+  call Try_arg_true_false('glob("runtest.mnv", %v%)', "", "runtest.mnv")
   set wildignore=*.swp
-  call Try_arg_true_false('glob("runtest.vim", 0, %v%)', "runtest.vim", ["runtest.vim"])
+  call Try_arg_true_false('glob("runtest.mnv", 0, %v%)', "runtest.mnv", ["runtest.mnv"])
   if has('unix')
     silent !ln -s doesntexit Xlink
     call Try_arg_true_false('glob("Xlink", 0, 0, %v%)', "", "Xlink")
     silent !rm Xlink
   endif
 
-  set wildignore=*.vim
-  call Try_arg_true_false('globpath(".", "runtest.vim", %v%)', "", "./runtest.vim")
+  set wildignore=*.mnv
+  call Try_arg_true_false('globpath(".", "runtest.mnv", %v%)', "", "./runtest.mnv")
   set wildignore=*.swp
-  call Try_arg_true_false('globpath(".", "runtest.vim", 0, %v%)', "./runtest.vim", ["./runtest.vim"])
+  call Try_arg_true_false('globpath(".", "runtest.mnv", 0, %v%)', "./runtest.mnv", ["./runtest.mnv"])
   if has('unix')
     silent !ln -s doesntexit Xlink
     call Try_arg_true_false('globpath(".", "Xlink", 0, 0, %v%)', "", "./Xlink")
@@ -149,4 +149,4 @@ func Test_non_zero_arg()
   endfor
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_trycatch.vim b/uvim/src/testdir/test_trycatch.mnv
index 44c26dbd64..d903dcff25 100644
--- a/uvim/src/testdir/test_trycatch.vim
+++ b/uvim/src/testdir/test_trycatch.mnv
@@ -1,7 +1,7 @@
 " Test try-catch-finally exception handling
 " Most of this was formerly in test49.
 
-import './util/vim9.vim' as v9
+import './util/mnv9.mnv' as v9
 
 "-------------------------------------------------------------------------------
 " Test environment							    {{{1
@@ -638,13 +638,13 @@ func T44_F()
         let caught = 1
         call assert_report('Caught ' . v:exception . ' in ' . v:throwpoint)
       finally
-        if $VIMNOERRTHROW && v:errmsg != ""
+        if $MNVNOERRTHROW && v:errmsg != ""
           call assert_report(v:errmsg)
         endif
-        if caught || $VIMNOERRTHROW && v:errmsg != ""
+        if caught || $MNVNOERRTHROW && v:errmsg != ""
           Xpath 'x'
         endif
-        break		" discard error for $VIMNOERRTHROW
+        break		" discard error for $MNVNOERRTHROW
       endtry
     endwhile
 
@@ -1350,7 +1350,7 @@ func Test_throw_echo()
       Xpath 'n'
     catch /^echoerr-except$/
       Xpath 'o'
-    catch /Vim/
+    catch /MNV/
       Xpath 'p'
     catch /echoerr/
       Xpath 'q'
@@ -1748,10 +1748,10 @@ func Test_throw_builtin_func()
           if v:errmsg != ""
             " If exceptions are not thrown on errors, fake the error
             " exception in order to get the same execution path.
-            throw "faked Vim(substitute)"
+            throw "faked MNV(substitute)"
           endif
         endtry
-      catch /Vim(substitute)/	    " Pattern not found ('e' flag missing)
+      catch /MNV(substitute)/	    " Pattern not found ('e' flag missing)
         Xpath 'n'
         3substitute/subst/\=T74_subst("substitute", 8)/e
         Xpath 'o'
@@ -1848,10 +1848,10 @@ func T75_R()
       Xpath 'f'
     finally
       Xpath 'g'
-      if caught || $VIMNOERRTHROW && v:errmsg =~ 'E21:'
+      if caught || $MNVNOERRTHROW && v:errmsg =~ 'E21:'
         Xpath 'h'
       endif
-      break		" discard error for $VIMNOERRTHROW
+      break		" discard error for $MNVNOERRTHROW
     endtry
   endwhile
   Xpath 'i'
@@ -1875,10 +1875,10 @@ func Test_builtin_func_error()
         Xpath 'k'
       finally
         Xpath 'l'
-        if caught || $VIMNOERRTHROW && v:errmsg =~ 'E21:'
+        if caught || $MNVNOERRTHROW && v:errmsg =~ 'E21:'
           Xpath 'm'
         endif
-        break		" discard error for $VIMNOERRTHROW
+        break		" discard error for $MNVNOERRTHROW
       endtry
     endwhile
 
@@ -1894,10 +1894,10 @@ func Test_builtin_func_error()
         Xpath 'o'
       finally
         Xpath 'p'
-        if caught || $VIMNOERRTHROW && v:errmsg =~ 'E21:'
+        if caught || $MNVNOERRTHROW && v:errmsg =~ 'E21:'
           Xpath 'q'
         endif
-        break		" discard error for $VIMNOERRTHROW
+        break		" discard error for $MNVNOERRTHROW
       endtry
     endwhile
 
@@ -1913,10 +1913,10 @@ func Test_builtin_func_error()
         Xpath 's'
       finally
         Xpath 't'
-        if caught || $VIMNOERRTHROW && v:errmsg =~ 'E21:'
+        if caught || $MNVNOERRTHROW && v:errmsg =~ 'E21:'
           Xpath 'u'
         endif
-        break		" discard error for $VIMNOERRTHROW
+        break		" discard error for $MNVNOERRTHROW
       endtry
     endwhile
 
@@ -1936,10 +1936,10 @@ func Test_builtin_func_error()
         Xpath 'x'
       finally
         Xpath 'y'
-        if caught || $VIMNOERRTHROW && v:errmsg =~ 'E21:'
+        if caught || $MNVNOERRTHROW && v:errmsg =~ 'E21:'
           Xpath 'z'
         endif
-        break		" discard error for $VIMNOERRTHROW
+        break		" discard error for $MNVNOERRTHROW
       endtry
     endwhile
 
@@ -1956,11 +1956,11 @@ func Test_builtin_func_error()
         Xpath 'B'
       finally
         Xpath 'C'
-        if caught || $VIMNOERRTHROW && v:errmsg =~ 'E21:'
+        if caught || $MNVNOERRTHROW && v:errmsg =~ 'E21:'
           Xpath 'D'
         endif
         call assert_equal('a', x)
-        break		" discard error for $VIMNOERRTHROW
+        break		" discard error for $MNVNOERRTHROW
       endtry
     endwhile
   catch /.*/
@@ -2045,9 +2045,9 @@ func Test_try_catch_verbose()
   endtry
   redir END
   let expected = [
-        \ 'Exception thrown: Vim(echo):E121: Undefined variable: i', '',
-        \ 'Exception caught: Vim(echo):E121: Undefined variable: i', '',
-        \ 'Exception finished: Vim(echo):E121: Undefined variable: i']
+        \ 'Exception thrown: MNV(echo):E121: Undefined variable: i', '',
+        \ 'Exception caught: MNV(echo):E121: Undefined variable: i', '',
+        \ 'Exception finished: MNV(echo):E121: Undefined variable: i']
   call assert_equal(expected, split(msg, "\n"))
 
   " Test for verbose messages displayed when an exception is discarded
@@ -2115,7 +2115,7 @@ func Test_try_catch_verbose()
   " Test for messages displayed when :return is resumed after :finally
   func Xtest()
     try
-      return 'vim'
+      return 'mnv'
     finally
     endtry
   endfunc
@@ -2124,9 +2124,9 @@ func Test_try_catch_verbose()
   redir END
   let expected = [
         \ 'calling Xtest()', '',
-        \ ':return vim made pending', '',
-        \ ':return vim resumed', '',
-        \ 'Xtest returning ''vim''', '',
+        \ ':return mnv made pending', '',
+        \ ':return mnv resumed', '',
+        \ 'Xtest returning ''mnv''', '',
         \ 'continuing in Test_try_catch_verbose']
   call assert_equal(expected, split(msg, "\n"))
   delfunc Xtest
@@ -2360,7 +2360,7 @@ endfunc
 " This was causing an illegal memory access
 func Test_leave_block_in_endtry_not_called()
   let lines =<< trim END
-      vim9script
+      mnv9script
       try #
       for x in []
       if
@@ -2378,7 +2378,7 @@ endfunc
 " Ensure | inside_block is correctly executed "{{{1
 func Test_try_endtry_inside_block()
   let lines =<< trim END
-    vim9script
+    mnv9script
 
     augroup testing
       au User myusertest {
@@ -2402,4 +2402,4 @@ func Test_try_endtry_inside_block()
 endfunc
 
 " Modeline								    {{{1
-" vim: ts=8 sw=2 sts=2 expandtab tw=80 fdm=marker
+" mnv: ts=8 sw=2 sts=2 expandtab tw=80 fdm=marker
diff --git a/uvim/src/testdir/test_tuple.vim b/uvim/src/testdir/test_tuple.mnv
index 26609a20fe..17cfd5ef2b 100644
--- a/uvim/src/testdir/test_tuple.vim
+++ b/uvim/src/testdir/test_tuple.mnv
@@ -1,6 +1,6 @@
 " Tests for the Tuple types
 
-import './util/vim9.vim' as v9
+import './util/mnv9.mnv' as v9
 
 func TearDown()
   " Run garbage collection after every test
@@ -44,7 +44,7 @@ func Test_tuple_declaration()
     call assert_equal(('a', 'b'), t1)
     call assert_equal(('c', 'd'), t2)
   END
-  call v9.CheckSourceLegacyAndVim9Success(lines)
+  call v9.CheckSourceLegacyAndMNV9Success(lines)
 
   " Space after and before parens
   let lines =<< trim END
@@ -101,7 +101,7 @@ func Test_tuple_declaration_error()
   let lines =<< trim END
     VAR t = ('a', 'b' 'c')
   END
-  call v9.CheckSourceLegacyAndVim9Failure(lines, [
+  call v9.CheckSourceLegacyAndMNV9Failure(lines, [
         \ "E1527: Missing comma in Tuple: 'c')",
         \ "E1527: Missing comma in Tuple: 'c')",
         \ "E1527: Missing comma in Tuple: 'c')"])
@@ -109,7 +109,7 @@ func Test_tuple_declaration_error()
   let lines =<< trim END
     VAR t = ('a', 'b',
   END
-  call v9.CheckSourceLegacyAndVim9Failure(lines, [
+  call v9.CheckSourceLegacyAndMNV9Failure(lines, [
         \ "E1526: Missing end of Tuple ')'",
         \ "E1526: Missing end of Tuple ')'",
         \ "E1526: Missing end of Tuple ')'"])
@@ -140,7 +140,7 @@ func Test_tuple_declaration_error()
   let lines =<< trim END
     VAR t = ('a', , 'b',)
   END
-  call v9.CheckSourceLegacyAndVim9Failure(lines, [
+  call v9.CheckSourceLegacyAndMNV9Failure(lines, [
         \ 'E15: Invalid expression: ", ''b'',)"',
         \ "E1068: No white space allowed before ',': , 'b',)",
         \ 'E15: Invalid expression: ", ''b'',)"'])
@@ -148,7 +148,7 @@ func Test_tuple_declaration_error()
   let lines =<< trim END
     VAR t = ('a', 'b', ,)
   END
-  call v9.CheckSourceLegacyAndVim9Failure(lines, [
+  call v9.CheckSourceLegacyAndMNV9Failure(lines, [
         \ 'E15: Invalid expression: ",)"',
         \ "E1068: No white space allowed before ',': ,)",
         \ 'E15: Invalid expression: ",)"'])
@@ -156,7 +156,7 @@ func Test_tuple_declaration_error()
   let lines =<< trim END
     VAR t = (, 'a', 'b')
   END
-  call v9.CheckSourceLegacyAndVim9Failure(lines, [
+  call v9.CheckSourceLegacyAndMNV9Failure(lines, [
         \ 'E15: Invalid expression: ", ''a'', ''b'')"',
         \ "E1015: Name expected: , 'a', 'b')",
         \ 'E15: Invalid expression: ", ''a'', ''b'')"'])
@@ -179,11 +179,11 @@ func Test_tuple_indexing()
     call assert_equal(['a', 'b', 'c'], [t[0], t[1], t[2]])
     call assert_equal(['c', 'b', 'a'], [t[-1], t[-2], t[-3]])
   END
-  call v9.CheckSourceLegacyAndVim9Success(lines)
+  call v9.CheckSourceLegacyAndMNV9Success(lines)
 
   " Indexing a tuple passed as a function argument
   let lines =<< trim END
-    vim9script
+    mnv9script
     def Fn(t: any)
       call assert_equal(['a', 'b', 'c'], [t[0], t[1], t[2]])
       call assert_equal(['c', 'b', 'a'], [t[-1], t[-2], t[-3]])
@@ -217,7 +217,7 @@ endfunc
 " Indexing a tuple in a Dict
 func Test_tuple_in_a_dict_index()
   let lines =<< trim END
-    vim9script
+    mnv9script
     def Fn()
       var d = {a: (1, 2)}
       var x = d.a[0]
@@ -232,7 +232,7 @@ func Test_tuple_index_error()
   let lines =<< trim END
     echo ('a', 'b', 'c')[3]
   END
-  call v9.CheckSourceLegacyAndVim9Failure(lines, [
+  call v9.CheckSourceLegacyAndMNV9Failure(lines, [
         \ 'E1519: Tuple index out of range: 3',
         \ 'E1519: Tuple index out of range: 3',
         \ 'E1519: Tuple index out of range: 3'])
@@ -240,13 +240,13 @@ func Test_tuple_index_error()
   let lines =<< trim END
     echo ('a', 'b', 'c')[-4]
   END
-  call v9.CheckSourceLegacyAndVim9Failure(lines, [
+  call v9.CheckSourceLegacyAndMNV9Failure(lines, [
         \ 'E1519: Tuple index out of range: -4',
         \ 'E1519: Tuple index out of range: -4',
         \ 'E1519: Tuple index out of range: -4'])
 
   let lines =<< trim END
-    vim9script
+    mnv9script
     def Fn(t: any)
       echo t[3]
     enddef
@@ -255,7 +255,7 @@ func Test_tuple_index_error()
   call v9.CheckSourceFailure(lines, 'E1519: Tuple index out of range: 3')
 
   let lines =<< trim END
-    vim9script
+    mnv9script
     def Fn(t: any)
       echo t[-4]
     enddef
@@ -264,7 +264,7 @@ func Test_tuple_index_error()
   call v9.CheckSourceFailure(lines, 'E1519: Tuple index out of range: -4')
 
   let lines =<< trim END
-    vim9script
+    mnv9script
     def Fn(t: any)
       var x = t[0]
     enddef
@@ -277,7 +277,7 @@ func Test_tuple_index_error()
     VAR t = test_null_tuple()
     LET t[0][0] = 10
   END
-  call v9.CheckSourceLegacyAndVim9Failure(lines, [
+  call v9.CheckSourceLegacyAndMNV9Failure(lines, [
         \ 'E1519: Tuple index out of range: 0',
         \ 'E1519: Tuple index out of range: 0',
         \ 'E1519: Tuple index out of range: 0'])
@@ -295,7 +295,7 @@ func Test_tuple_index_error()
     VAR t = (1, 2)
     VAR x = t[0.1]
   END
-  call v9.CheckSourceLegacyAndVim9Failure(lines, [
+  call v9.CheckSourceLegacyAndMNV9Failure(lines, [
         \ 'E805: Using a Float as a Number',
         \ 'E1012: Type mismatch; expected number but got float',
         \ 'E805: Using a Float as a Number'])
@@ -313,12 +313,12 @@ func Test_tuple_slice()
     call assert_equal((1, 3, 5, 7, 9), t[:])
     call assert_equal((), test_null_tuple()[:])
   END
-  call v9.CheckSourceLegacyAndVim9Success(lines)
+  call v9.CheckSourceLegacyAndMNV9Success(lines)
 
   let lines =<< trim END
     call assert_equal(('b', 'c'), ('a', 'b', 'c')[1 : 5])
   END
-  call v9.CheckSourceLegacyAndVim9Success(lines)
+  call v9.CheckSourceLegacyAndMNV9Success(lines)
 endfunc
 
 " Test for concatenating tuples
@@ -348,7 +348,7 @@ func Test_tuple_concatenate()
     call assert_equal(('a', 'b', 8, 9), t7)
     call assert_equal('tuple<string, string, number, number>', typename(t7))
   END
-  call v9.CheckSourceLegacyAndVim9Success(lines)
+  call v9.CheckSourceLegacyAndMNV9Success(lines)
 
   let lines =<< trim END
     var t1: tuple<...list<tuple<number, number>>> = ()
@@ -421,7 +421,7 @@ func Test_tuple_concatenate()
 
   " Make sure the correct line number is used in the error message
   let lines =<< trim END
-    vim9script
+    mnv9script
     var t1: tuple<...list<tuple<number, number>>> = ()
     var t2: tuple<...list<tuple<number, string>>> = ()
     var t = t1 + t2
@@ -430,7 +430,7 @@ func Test_tuple_concatenate()
   call v9.CheckSourceFailure(lines, 'E1540: Cannot use a variadic tuple in concatenation', 4)
 
   let lines =<< trim END
-    vim9script
+    mnv9script
 
     def Fn()
       var t1: tuple<...list<tuple<number, number>>> = ()
@@ -481,10 +481,10 @@ func Test_tuple_concatenate()
     VAR t = test_null_tuple() + test_null_tuple()
     call assert_equal(test_null_tuple(), t)
   END
-  call v9.CheckSourceLegacyAndVim9Success(lines)
+  call v9.CheckSourceLegacyAndMNV9Success(lines)
 
   let lines =<< trim END
-    vim9script
+    mnv9script
     def Fn(x: any, y: any): any
       return x + y
     enddef
@@ -519,12 +519,12 @@ func Test_tuple_compare()
     VAR t2 = t1
     call assert_true(t1 == t2)
   END
-  call v9.CheckSourceLegacyAndVim9Success(lines)
+  call v9.CheckSourceLegacyAndMNV9Success(lines)
 
   let lines =<< trim END
     echo (1.0, ) == 1.0
   END
-  call v9.CheckSourceLegacyAndVim9Failure(lines, [
+  call v9.CheckSourceLegacyAndMNV9Failure(lines, [
         \ 'E1517: Can only compare Tuple with Tuple',
         \ 'E1072: Cannot compare tuple with float',
         \ 'E1072: Cannot compare tuple with float'])
@@ -532,7 +532,7 @@ func Test_tuple_compare()
   let lines =<< trim END
     echo 1.0 == (1.0,)
   END
-  call v9.CheckSourceLegacyAndVim9Failure(lines, [
+  call v9.CheckSourceLegacyAndMNV9Failure(lines, [
         \ 'E1517: Can only compare Tuple with Tuple',
         \ 'E1072: Cannot compare float with tuple',
         \ 'E1072: Cannot compare float with tuple'])
@@ -540,7 +540,7 @@ func Test_tuple_compare()
   let lines =<< trim END
     echo (1, 2) =~ []
   END
-  call v9.CheckSourceLegacyAndVim9Failure(lines, [
+  call v9.CheckSourceLegacyAndMNV9Failure(lines, [
         \ 'E691: Can only compare List with List',
         \ 'E1072: Cannot compare tuple with list',
         \ 'E1072: Cannot compare tuple with list'])
@@ -548,7 +548,7 @@ func Test_tuple_compare()
   let lines =<< trim END
     echo (1, 2) =~ (1, 2)
   END
-  call v9.CheckSourceLegacyAndVim9Failure(lines, [
+  call v9.CheckSourceLegacyAndMNV9Failure(lines, [
         \ 'E1518: Invalid operation for Tuple',
         \ 'E1518: Invalid operation for Tuple',
         \ 'E1518: Invalid operation for Tuple'])
@@ -602,7 +602,7 @@ func Test_multi_assign_from_tuple()
     for [v16, v17] in test_null_tuple()
     endfor
   END
-  call v9.CheckSourceLegacyAndVim9Success(lines)
+  call v9.CheckSourceLegacyAndMNV9Success(lines)
 
   let lines =<< trim END
     var t: tuple<...list<number>> = (4, 8)
@@ -613,7 +613,7 @@ func Test_multi_assign_from_tuple()
 
   " Test a mix lists and tuples with "any" type
   let lines =<< trim END
-    vim9script
+    mnv9script
     def Fn(x: any): string
       var str = ''
       for [a, b] in x
@@ -635,7 +635,7 @@ func Test_multi_assign_from_tuple()
   let lines =<< trim END
     VAR [v1, v2] = ('a', 'b', 'c')
   END
-  call v9.CheckSourceLegacyAndVim9Failure(lines, [
+  call v9.CheckSourceLegacyAndMNV9Failure(lines, [
         \ 'E1537: Less targets than Tuple items',
         \ 'E1093: Expected 2 items but got 3',
         \ 'E1537: Less targets than Tuple items'])
@@ -643,7 +643,7 @@ func Test_multi_assign_from_tuple()
   let lines =<< trim END
     VAR [v1, v2, v3] = ('a', 'b')
   END
-  call v9.CheckSourceLegacyAndVim9Failure(lines, [
+  call v9.CheckSourceLegacyAndMNV9Failure(lines, [
         \ 'E1538: More targets than Tuple items',
         \ 'E1093: Expected 3 items but got 2',
         \ 'E1538: More targets than Tuple items'])
@@ -651,7 +651,7 @@ func Test_multi_assign_from_tuple()
   let lines =<< trim END
     VAR [v1; v2] = test_null_tuple()
   END
-  call v9.CheckSourceLegacyAndVim9Failure(lines, [
+  call v9.CheckSourceLegacyAndMNV9Failure(lines, [
         \ 'E1536: Tuple required',
         \ 'E1093: Expected 1 items but got 0',
         \ 'E1536: Tuple required'])
@@ -660,7 +660,7 @@ func Test_multi_assign_from_tuple()
     for [v1, v2] in (('a', 'b', 'c'),)
     endfor
   END
-  call v9.CheckSourceLegacyAndVim9Failure(lines, [
+  call v9.CheckSourceLegacyAndMNV9Failure(lines, [
         \ 'E1537: Less targets than Tuple items',
         \ 'E1537: Less targets than Tuple items',
         \ 'E1537: Less targets than Tuple items'])
@@ -669,7 +669,7 @@ func Test_multi_assign_from_tuple()
     for [v1, v2] in (('a',),)
     endfor
   END
-  call v9.CheckSourceLegacyAndVim9Failure(lines, [
+  call v9.CheckSourceLegacyAndMNV9Failure(lines, [
         \ 'E1538: More targets than Tuple items',
         \ 'E1538: More targets than Tuple items',
         \ 'E1538: More targets than Tuple items'])
@@ -678,7 +678,7 @@ func Test_multi_assign_from_tuple()
     for [v1, v2] in (test_null_tuple(),)
     endfor
   END
-  call v9.CheckSourceLegacyAndVim9Failure(lines, [
+  call v9.CheckSourceLegacyAndMNV9Failure(lines, [
         \ 'E1536: Tuple required',
         \ 'E1538: More targets than Tuple items',
         \ 'E1536: Tuple required'])
@@ -687,14 +687,14 @@ func Test_multi_assign_from_tuple()
     for [v1; v2] in (test_null_tuple(),)
     endfor
   END
-  call v9.CheckSourceLegacyAndVim9Failure(lines, [
+  call v9.CheckSourceLegacyAndMNV9Failure(lines, [
         \ 'E1536: Tuple required',
         \ 'E1538: More targets than Tuple items',
         \ 'E1536: Tuple required'])
 
   " List assignment errors using a function tuple argument
   let lines =<< trim END
-    vim9script
+    mnv9script
     def Fn(x: tuple<...list<number>>)
       var [a, b] = x
     enddef
@@ -703,7 +703,7 @@ func Test_multi_assign_from_tuple()
   call v9.CheckSourceFailure(lines, 'E1093: Expected 2 items but got 3')
 
   let lines =<< trim END
-    vim9script
+    mnv9script
     def Fn(x: tuple<number>)
       var [a, b] = x
     enddef
@@ -712,7 +712,7 @@ func Test_multi_assign_from_tuple()
   call v9.CheckSourceFailure(lines, 'E1093: Expected 2 items but got 1')
 
   let lines =<< trim END
-    vim9script
+    mnv9script
     def Fn(x: tuple<number>)
       var [a, b] = x
     enddef
@@ -738,9 +738,9 @@ func Test_multi_arithmetic_op_from_tuple()
     LET [x, y] %= (3, 5)
     call assert_equal([1, 3], [x, y])
   END
-  call v9.CheckSourceLegacyAndVim9Success(lines)
+  call v9.CheckSourceLegacyAndMNV9Success(lines)
 
-  " The "." operator is supported only in Vim script
+  " The "." operator is supported only in MNV script
   let lines =<< trim END
     let x = 'a'
     let y = 'b'
@@ -755,7 +755,7 @@ func Test_multi_arithmetic_op_from_tuple()
     LET [x, y] ..= ('a', 'b')
     call assert_equal(('aa', 'bb'), (x, y))
   END
-  call v9.CheckSourceLegacyAndVim9Success(lines)
+  call v9.CheckSourceLegacyAndMNV9Success(lines)
 endfunc
 
 " Test for using a tuple in a for statement
@@ -779,11 +779,11 @@ func Test_tuple_for()
     endfor
     call assert_equal(0, sum)
   END
-  call v9.CheckSourceLegacyAndVim9Success(lines)
+  call v9.CheckSourceLegacyAndMNV9Success(lines)
 
   " ignoring the for loop assignment using '_'
   let lines =<< trim END
-    vim9script
+    mnv9script
     var count = 0
     for _ in (1, 2, 3)
       count += 1
@@ -802,7 +802,7 @@ func Test_tuple_for()
   call v9.CheckSourceDefAndScriptSuccess(lines)
 
   let lines =<< trim END
-    vim9script
+    mnv9script
     def Foo()
       for x in ((1, 2), (3, 4))
       endfor
@@ -813,7 +813,7 @@ func Test_tuple_for()
 
   " Test for assigning multiple items from a tuple in a for loop
   let lines =<< trim END
-    vim9script
+    mnv9script
     def Fn()
       for [x, y] in ([1, 2],)
         assert_equal([1, 2], [x, y])
@@ -826,7 +826,7 @@ func Test_tuple_for()
 
   " iterate over tuple<...list<number>
   let lines =<< trim END
-    vim9script
+    mnv9script
     def Fn()
       var t: tuple<...list<number>> = (1, 2)
       var sum = 0
@@ -841,7 +841,7 @@ func Test_tuple_for()
 
   " iterate over tuple<...list<list<number>>>
   let lines =<< trim END
-    vim9script
+    mnv9script
     def Fn()
       var t: tuple<...list<list<number>>> = ([1, 2], [3, 4])
       var sum = 0
@@ -856,7 +856,7 @@ func Test_tuple_for()
 
   " iterate over tuple<...list<tuple<...list<number>>>>
   let lines =<< trim END
-    vim9script
+    mnv9script
     def Fn()
       var t: tuple<...list<tuple<...list<number>>>> = ((1, 2), (3, 4))
       var sum = 0
@@ -871,7 +871,7 @@ func Test_tuple_for()
 
   " iterate over tuple<...list<list<number>>>
   let lines =<< trim END
-    vim9script
+    mnv9script
     def Fn()
       var t: tuple<...list<list<number>>> = ([1, 2], [3, 4])
       var sum = 0
@@ -886,7 +886,7 @@ func Test_tuple_for()
 
   " iterate over a tuple<...list<any>>
   let lines =<< trim END
-    vim9script
+    mnv9script
     def Fn()
       var t: tuple<...list<any>> = (1, 'x', true, [], {}, ())
       var str = ''
@@ -901,7 +901,7 @@ func Test_tuple_for()
 
   " use multiple variable assignment syntax with a tuple<...list<number>>
   let lines =<< trim END
-    vim9script
+    mnv9script
     def Fn()
       var t: tuple<...list<number>> = (1, 2, 3)
       for [i] in t
@@ -953,7 +953,7 @@ func Test_tuple_type_check()
   call v9.CheckSourceDefFailure(lines, 'E1012: Type mismatch; expected list<number> but got tuple<number, number>', 1)
 
   let lines =<< trim END
-    vim9script
+    mnv9script
     def Fn(): tuple<...list<tuple<...list<string>>>>
       return ((1, 2), (3, 4))
     enddef
@@ -967,7 +967,7 @@ func Test_tuple_type_check()
   call v9.CheckSourceDefSuccess(lines)
 
   let lines =<< trim END
-    vim9script
+    mnv9script
     def Fn(): tuple<tuple<string>>
       return ()
     enddef
@@ -976,7 +976,7 @@ func Test_tuple_type_check()
   call v9.CheckSourceSuccess(lines)
 
   let lines =<< trim END
-    vim9script
+    mnv9script
     def Fn(t: tuple<...list<number>>)
     enddef
     Fn(('a', 'b'))
@@ -1004,7 +1004,7 @@ func Test_tuple_type_check()
         \ 'E1013: Argument 2: type mismatch, expected list<number> but got list<string> in extend()'])
 
   let lines =<< trim END
-    vim9script
+    mnv9script
     def Fn(y: tuple<number, ...list<bool>>)
       var x: tuple<number, ...list<string>>
       x = y
@@ -1020,7 +1020,7 @@ endfunc
 func Test_tuple_scriptvar_type()
   " Uninitialized script variable should retain the type
   let lines =<< trim END
-    vim9script
+    mnv9script
     var foobar: tuple<list<string>>
     def Foo()
       var x = foobar
@@ -1032,7 +1032,7 @@ func Test_tuple_scriptvar_type()
 
   " Initialized script variable should retain the type
   let lines =<< trim END
-    vim9script
+    mnv9script
     var foobar: tuple<...list<string>> = ('a', 'b')
     def Foo()
       var x = foobar
@@ -1111,14 +1111,14 @@ func Test_tuple_modify_mutable_item()
     LET t[2].a = 30
     call assert_equal(('a', ['b', 'x'], {'a': 30, 'b': 20}), t)
   END
-  call v9.CheckSourceLegacyAndVim9Success(lines)
+  call v9.CheckSourceLegacyAndMNV9Success(lines)
 
   let lines =<< trim END
     VAR t = ('a', (['b'], 'c'))
     LET t[1][0][0] = 'x'
     call assert_equal(('a', (['x'], 'c')), t)
   END
-  call v9.CheckSourceLegacyAndVim9Success(lines)
+  call v9.CheckSourceLegacyAndMNV9Success(lines)
 
   " Use a negative index
   let lines =<< trim END
@@ -1126,13 +1126,13 @@ func Test_tuple_modify_mutable_item()
     LET t[-2][-2] = 5
     call assert_equal(([5, 2], [3]), t)
   END
-  call v9.CheckSourceLegacyAndVim9Success(lines)
+  call v9.CheckSourceLegacyAndMNV9Success(lines)
 
   let lines =<< trim END
     VAR t = ('a', ('b', 'c'))
     LET t[1][0] = 'x'
   END
-  call v9.CheckSourceLegacyAndVim9Failure(lines, [
+  call v9.CheckSourceLegacyAndMNV9Failure(lines, [
         \ 'E1532: Cannot modify a tuple',
         \ 'E1532: Cannot modify a tuple',
         \ 'E1532: Cannot modify a tuple'])
@@ -1141,7 +1141,7 @@ func Test_tuple_modify_mutable_item()
     VAR t = ['a', ('b', 'c')]
     LET t[1][0] = 'x'
   END
-  call v9.CheckSourceLegacyAndVim9Failure(lines, [
+  call v9.CheckSourceLegacyAndMNV9Failure(lines, [
         \ 'E1532: Cannot modify a tuple',
         \ 'E1532: Cannot modify a tuple',
         \ 'E1532: Cannot modify a tuple'])
@@ -1150,7 +1150,7 @@ func Test_tuple_modify_mutable_item()
     VAR t = {'a': ('b', 'c')}
     LET t['a'][0] = 'x'
   END
-  call v9.CheckSourceLegacyAndVim9Failure(lines, [
+  call v9.CheckSourceLegacyAndMNV9Failure(lines, [
         \ 'E1532: Cannot modify a tuple',
         \ 'E1532: Cannot modify a tuple',
         \ 'E1532: Cannot modify a tuple'])
@@ -1159,7 +1159,7 @@ func Test_tuple_modify_mutable_item()
     VAR t = {'a': ['b', ('c',)]}
     LET t['a'][1][0] = 'x'
   END
-  call v9.CheckSourceLegacyAndVim9Failure(lines, [
+  call v9.CheckSourceLegacyAndMNV9Failure(lines, [
         \ 'E1532: Cannot modify a tuple',
         \ 'E1532: Cannot modify a tuple',
         \ 'E1532: Cannot modify a tuple'])
@@ -1204,7 +1204,7 @@ func Test_tuple_modify_mutable_item()
     VAR t = ('abc',)
     LET t[0][1] = 'x'
   END
-  call v9.CheckSourceLegacyAndVim9Failure(lines, [
+  call v9.CheckSourceLegacyAndMNV9Failure(lines, [
         \ "E689: Index not allowed after a string: t[0][1] = 'x'",
         \ 'E1148: Cannot index a string',
         \ "E689: Index not allowed after a string: t[0][1] = 'x'"])
@@ -1214,7 +1214,7 @@ func Test_tuple_modify_mutable_item()
     VAR t = ([1, 2], [3])
     LET t[2][0] = 5
   END
-  call v9.CheckSourceLegacyAndVim9Failure(lines, [
+  call v9.CheckSourceLegacyAndMNV9Failure(lines, [
         \ 'E1519: Tuple index out of range: 2',
         \ 'E1519: Tuple index out of range: 2',
         \ 'E1519: Tuple index out of range: 2'])
@@ -1223,7 +1223,7 @@ func Test_tuple_modify_mutable_item()
     VAR t = ([1, 2], [3])
     LET t[-3][0] = 5
   END
-  call v9.CheckSourceLegacyAndVim9Failure(lines, [
+  call v9.CheckSourceLegacyAndMNV9Failure(lines, [
         \ 'E1519: Tuple index out of range: -3',
         \ 'E1519: Tuple index out of range: -3',
         \ 'E1519: Tuple index out of range: -3'])
@@ -1233,7 +1233,7 @@ func Test_tuple_modify_mutable_item()
     VAR t = test_null_tuple()
     LET t[0][0] = 5
   END
-  call v9.CheckSourceLegacyAndVim9Failure(lines, [
+  call v9.CheckSourceLegacyAndMNV9Failure(lines, [
         \ 'E1519: Tuple index out of range: 0',
         \ 'E1519: Tuple index out of range: 0',
         \ 'E1519: Tuple index out of range: 0'])
@@ -1247,7 +1247,7 @@ func Test_tuple_lock()
     lockvar 0 g:t
     LET g:t = ()
   END
-  call v9.CheckSourceLegacyAndVim9Failure(lines, [
+  call v9.CheckSourceLegacyAndMNV9Failure(lines, [
         \ 'E1122: Variable is locked: g:t',
         \ 'E1122: Variable is locked: t',
         \ 'E1122: Variable is locked: g:t'])
@@ -1261,7 +1261,7 @@ func Test_tuple_lock()
     lockvar 2 g:t
     call add(g:t[0], 2)
   END
-  call v9.CheckSourceLegacyAndVim9Failure(lines, [
+  call v9.CheckSourceLegacyAndMNV9Failure(lines, [
         \ 'E741: Value is locked: add() argument',
         \ 'E741: Value is locked: add() argument',
         \ 'E741: Value is locked: add() argument'])
@@ -1273,7 +1273,7 @@ func Test_tuple_lock()
     lockvar 3 g:t
     LET g:t[0][0] = 10
   END
-  call v9.CheckSourceLegacyAndVim9Failure(lines, [
+  call v9.CheckSourceLegacyAndMNV9Failure(lines, [
         \ 'E741: Value is locked: g:t[0][0] = 10',
         \ 'E1119: Cannot change locked list item',
         \ 'E741: Value is locked: g:t[0][0] = 10'])
@@ -1284,7 +1284,7 @@ func Test_tuple_lock()
     lockvar 2 t
     call add(t[0], 2)
   END
-  call v9.CheckSourceLegacyAndVim9Failure(lines, [
+  call v9.CheckSourceLegacyAndMNV9Failure(lines, [
         \ 'E741: Value is locked: add() argument',
         \ 'E1178: Cannot lock or unlock a local variable',
         \ 'E741: Value is locked: add() argument'])
@@ -1297,14 +1297,14 @@ func Test_tuple_lock()
     call assert_equal(([0, 1, 3], ), g:t)
     unlet g:t
   END
-  call v9.CheckSourceLegacyAndVim9Success(lines)
+  call v9.CheckSourceLegacyAndMNV9Success(lines)
 
   let lines =<< trim END
     VAR t1 = (1, 2)
     const t2 = t1
     LET t2 = ()
   END
-  call v9.CheckSourceLegacyAndVim9Failure(lines, [
+  call v9.CheckSourceLegacyAndMNV9Failure(lines, [
         \ 'E741: Value is locked: t2',
         \ 'E1018: Cannot assign to a constant: t2',
         \ 'E46: Cannot change read-only variable "t2"'])
@@ -1313,7 +1313,7 @@ endfunc
 " Test for using a class as a tuple item
 func Test_tuple_use_class_item()
   let lines =<< trim END
-    vim9script
+    mnv9script
     class A
     endclass
     var t = (A,)
@@ -1321,7 +1321,7 @@ func Test_tuple_use_class_item()
   call v9.CheckSourceScriptFailure(lines, 'E1405: Class "A" cannot be used as a value', 4)
 
   let lines =<< trim END
-    vim9script
+    mnv9script
     class A
     endclass
     var t = ('a', A)
@@ -1329,7 +1329,7 @@ func Test_tuple_use_class_item()
   call v9.CheckSourceScriptFailure(lines, 'E1405: Class "A" cannot be used as a value', 4)
 
   let lines =<< trim END
-    vim9script
+    mnv9script
     class A
     endclass
     def Fn()
@@ -1340,7 +1340,7 @@ func Test_tuple_use_class_item()
   call v9.CheckSourceScriptFailure(lines, 'E1405: Class "A" cannot be used as a value', 1)
 
   let lines =<< trim END
-    vim9script
+    mnv9script
     class A
     endclass
     def Fn()
@@ -1354,21 +1354,21 @@ endfunc
 " Test for using a user-defined type as a tuple item
 func Test_tuple_user_defined_type_as_item()
   let lines =<< trim END
-    vim9script
+    mnv9script
     type N = number
     var t = (N,)
   END
   call v9.CheckSourceScriptFailure(lines, 'E1403: Type alias "N" cannot be used as a value', 3)
 
   let lines =<< trim END
-    vim9script
+    mnv9script
     type N = number
     var t = ('a', N)
   END
   call v9.CheckSourceScriptFailure(lines, 'E1403: Type alias "N" cannot be used as a value', 3)
 
   let lines =<< trim END
-    vim9script
+    mnv9script
     type N = number
     def Fn()
       var t = (N,)
@@ -1378,7 +1378,7 @@ func Test_tuple_user_defined_type_as_item()
   call v9.CheckSourceScriptFailure(lines, 'E1407: Cannot use a Typealias as a variable or value', 1)
 
   let lines =<< trim END
-    vim9script
+    mnv9script
     type N = number
     def Fn()
       var t = ('a', N)
@@ -1391,7 +1391,7 @@ endfunc
 " Test for using a tuple as a function argument
 func Test_tuple_func_arg()
   let lines =<< trim END
-    vim9script
+    mnv9script
     def Fn(t: tuple<...list<string>>): tuple<...list<string>>
       return t[:]
     enddef
@@ -1432,7 +1432,7 @@ func Test_tuple_identity()
     VAR t3 = (1, 2)
     call assert_false(t3 is t1)
   END
-  call v9.CheckSourceLegacyAndVim9Success(lines)
+  call v9.CheckSourceLegacyAndMNV9Success(lines)
 endfunc
 
 " Test for using a compound op with a tuple
@@ -1441,7 +1441,7 @@ func Test_tuple_compound_op()
     VAR t = (1, 2)
     LET t += (3,)
   END
-  call v9.CheckSourceLegacyAndVim9Failure(lines, [
+  call v9.CheckSourceLegacyAndMNV9Failure(lines, [
         \ 'E734: Wrong variable type for +=',
         \ 'E734: Wrong variable type for +=',
         \ 'E734: Wrong variable type for +='])
@@ -1451,7 +1451,7 @@ func Test_tuple_compound_op()
       VAR t = (1, 2)
       LET t {op}= (3,)
     END
-    call v9.CheckSourceLegacyAndVim9Failure(lines, [
+    call v9.CheckSourceLegacyAndMNV9Failure(lines, [
           \ $'E734: Wrong variable type for {op}=',
           \ $'E734: Wrong variable type for {op}=',
           \ $'E734: Wrong variable type for {op}='])
@@ -1461,7 +1461,7 @@ func Test_tuple_compound_op()
     VAR t = (1, 2)
     LET t ..= (3,)
   END
-  call v9.CheckSourceLegacyAndVim9Failure(lines, [
+  call v9.CheckSourceLegacyAndMNV9Failure(lines, [
         \ 'E734: Wrong variable type for .=',
         \ 'E1019: Can only concatenate to string',
         \ 'E734: Wrong variable type for .='])
@@ -1473,7 +1473,7 @@ func Test_tuple_falsy_op()
     VAR t = test_null_tuple()
     call assert_equal('null tuple', t ?? 'null tuple')
   END
-  call v9.CheckSourceLegacyAndVim9Success(lines)
+  call v9.CheckSourceLegacyAndMNV9Success(lines)
 endfunc
 
 " Test for tuple typecasting
@@ -1498,7 +1498,7 @@ def Test_tuple_string_interop()
     VAR t = ('a', 'b', 'c')
     call assert_equal("x('a', 'b', 'c')x", $'x{t}x')
   END
-  v9.CheckSourceLegacyAndVim9Success(lines)
+  v9.CheckSourceLegacyAndMNV9Success(lines)
 
   lines =<< trim END
     call assert_equal("a()b", $'a{null_tuple}b')
@@ -1513,7 +1513,7 @@ def Test_tuple_string_interop()
     DATA
     call assert_equal(["let x = ('a', 'b', 'c')"], data)
   END
-  v9.CheckSourceLegacyAndVim9Success(lines)
+  v9.CheckSourceLegacyAndMNV9Success(lines)
 
   #" Empty tuple evaluation in heredoc
   lines =<< trim END
@@ -1523,7 +1523,7 @@ def Test_tuple_string_interop()
     DATA
     call assert_equal(["let x = ()"], data)
   END
-  v9.CheckSourceLegacyAndVim9Success(lines)
+  v9.CheckSourceLegacyAndMNV9Success(lines)
 
   #" Null tuple evaluation in heredoc
   lines =<< trim END
@@ -1533,7 +1533,7 @@ def Test_tuple_string_interop()
     DATA
     call assert_equal(["let x = ()"], data)
   END
-  v9.CheckSourceLegacyAndVim9Success(lines)
+  v9.CheckSourceLegacyAndMNV9Success(lines)
 
   lines =<< trim END
     var t1 = null_tuple
@@ -1562,7 +1562,7 @@ func Test_try_finally_with_tuple_return()
   call v9.CheckSourceSuccess(lines)
 
   let lines =<< trim END
-    vim9script
+    mnv9script
     def Fn(): tuple<...list<number>>
       try
         return (1, 2)
@@ -1580,13 +1580,13 @@ func Test_recursive_tuple_eval_fails()
   let lines =<< trim END
     call assert_fails(((((((((((((((('tag xyz', func2(pat, flags, infn)
   END
-  call v9.CheckSourceLegacyAndVim9Failure(lines, [
+  call v9.CheckSourceLegacyAndMNV9Failure(lines, [
         \ 'E121: Undefined variable: pat',
         \ 'E1001: Variable not found: pat',
         \ 'E121: Undefined variable: pat'])
 endfunc
 
-" The following used to crash Vim
+" The following used to crash MNV
 func Test_import_invalid_tuple()
   let lines =<< trim END
     imp(",G0}11*f[+\x","#|
@@ -1603,7 +1603,7 @@ func Test_tuple_add()
     VAR t = (1, 2)
     call add(t, 3)
   END
-  call v9.CheckSourceLegacyAndVim9Failure(lines, [
+  call v9.CheckSourceLegacyAndMNV9Failure(lines, [
         \ 'E897: List or Blob required',
         \ 'E1013: Argument 1: type mismatch, expected list<any> but got tuple<number, number>',
         \ 'E1226: List or Blob required for argument 1'])
@@ -1621,7 +1621,7 @@ func Test_tuple_copy()
     call assert_equal((), copy(()))
     call assert_equal((), copy(test_null_tuple()))
   END
-  call v9.CheckSourceLegacyAndVim9Success(lines)
+  call v9.CheckSourceLegacyAndMNV9Success(lines)
 endfunc
 
 " Test for count()
@@ -1634,7 +1634,7 @@ func Test_tuple_count()
     call assert_equal(0, count(test_null_tuple(), 'xx'))
     call assert_fails("call count((1, 2), 1, v:true, 2)", 'E1519: Tuple index out of range: 2')
   END
-  call v9.CheckSourceLegacyAndVim9Success(lines)
+  call v9.CheckSourceLegacyAndMNV9Success(lines)
 endfunc
 
 " Test for deepcopy()
@@ -1655,7 +1655,7 @@ func Test_tuple_deepcopy()
     call add(l, tuple)
     call assert_equal('([(...)], )', string(deepcopy(tuple)))
   END
-  call v9.CheckSourceLegacyAndVim9Success(lines)
+  call v9.CheckSourceLegacyAndMNV9Success(lines)
 endfunc
 
 " Test for empty()
@@ -1667,7 +1667,7 @@ func Test_tuple_empty()
     VAR t = ('abc', 'def')
     call assert_false(empty(t))
   END
-  call v9.CheckSourceLegacyAndVim9Success(lines)
+  call v9.CheckSourceLegacyAndMNV9Success(lines)
 endfunc
 
 " Test for eval()
@@ -1677,7 +1677,7 @@ func Test_tuple_eval()
     call assert_equal(([],), eval('([],)'))
     call assert_equal((1, 2, 3), eval('(1, 2, 3)'))
   END
-  call v9.CheckSourceLegacyAndVim9Success(lines)
+  call v9.CheckSourceLegacyAndMNV9Success(lines)
 endfunc
 
 " Test for extend() with a tuple
@@ -1687,7 +1687,7 @@ func Test_tuple_extend()
     call extend(t, (4, 5))
     call extendnew(t, (4, 5))
   END
-  call v9.CheckSourceLegacyAndVim9Failure(lines, [
+  call v9.CheckSourceLegacyAndMNV9Failure(lines, [
         \ 'E712: Argument of extend() must be a List or Dictionary',
         \ 'E1013: Argument 1: type mismatch, expected list<any> but got tuple<number, number, number>',
         \ 'E712: Argument of extend() must be a List or Dictionary'])
@@ -1699,7 +1699,7 @@ func Test_tuple_filter()
     VAR t = (1, 2, 3)
     call filter(t, 'v:val == 2')
   END
-  call v9.CheckSourceLegacyAndVim9Failure(lines, [
+  call v9.CheckSourceLegacyAndMNV9Failure(lines, [
         \ 'E1524: Cannot use a tuple with function filter()',
         \ 'E1013: Argument 1: type mismatch, expected list<any> but got tuple<number, number, number>',
         \ 'E1524: Cannot use a tuple with function filter()'])
@@ -1751,7 +1751,7 @@ func Test_tuple_foreach()
     LET g:sum = 0
     call foreach((1, 2, 3), 'LET g:sum += x')
   END
-  call v9.CheckSourceLegacyAndVim9Failure(lines, [
+  call v9.CheckSourceLegacyAndMNV9Failure(lines, [
         \ 'E121: Undefined variable: x',
         \ 'E121: Undefined variable: x',
         \ 'E121: Undefined variable: x'])
@@ -1772,7 +1772,7 @@ func Test_tuple_get()
     call assert_equal('c', get(('a', 'b'), 2, 'c'))
     call assert_equal('x', get(test_null_tuple(), 0, 'x'))
   END
-  call v9.CheckSourceLegacyAndVim9Success(lines)
+  call v9.CheckSourceLegacyAndMNV9Success(lines)
 endfunc
 
 " Test for id()
@@ -1784,7 +1784,7 @@ func Test_tuple_id()
     call assert_true(id(t1) != id(t2))
     call assert_true(id(t1) == id(t3))
   END
-  call v9.CheckSourceLegacyAndVim9Success(lines)
+  call v9.CheckSourceLegacyAndMNV9Success(lines)
 endfunc
 
 " Test for index() function
@@ -1800,13 +1800,13 @@ func Test_tuple_index_func()
     call assert_equal(-1, index((), 8))
     call assert_equal(-1, index(test_null_tuple(), 9))
   END
-  call v9.CheckSourceLegacyAndVim9Success(lines)
+  call v9.CheckSourceLegacyAndMNV9Success(lines)
 
   let lines =<< trim END
     VAR t = (88, 33, 99, 77)
     call assert_equal(-1, index(t, 77, []))
   END
-  call v9.CheckSourceLegacyAndVim9Failure(lines, [
+  call v9.CheckSourceLegacyAndMNV9Failure(lines, [
         \ 'E745: Using a List as a Number',
         \ 'E1013: Argument 3: type mismatch, expected number but got list<any>',
         \ 'E1210: Number required for argument 3'])
@@ -1815,7 +1815,7 @@ func Test_tuple_index_func()
     VAR t = (88,)
     call assert_equal(-1, index(t, 77, 1, ()))
   END
-  call v9.CheckSourceLegacyAndVim9Failure(lines, [
+  call v9.CheckSourceLegacyAndMNV9Failure(lines, [
         \ 'E1520: Using a Tuple as a Number',
         \ 'E1013: Argument 4: type mismatch, expected bool but got tuple<any>',
         \ 'E1212: Bool required for argument 4'])
@@ -1834,7 +1834,7 @@ func Test_tuple_indexof()
     call assert_equal(-1, indexof((), 'v:val == 1'))
     call assert_equal(-1, indexof(test_null_tuple(), 'v:val == 2'))
   END
-  call v9.CheckSourceLegacyAndVim9Success(lines)
+  call v9.CheckSourceLegacyAndMNV9Success(lines)
 
   func g:MyIndexOf(k, v)
     echoerr 'MyIndexOf failed'
@@ -1843,7 +1843,7 @@ func Test_tuple_indexof()
     VAR t = (1, 2, 3)
     echo indexof(t, function('g:MyIndexOf'))
   END
-  call v9.CheckSourceLegacyAndVim9Failure(lines, [
+  call v9.CheckSourceLegacyAndMNV9Failure(lines, [
         \ 'MyIndexOf failed',
         \ 'MyIndexOf failed',
         \ 'MyIndexOf failed'])
@@ -1857,7 +1857,7 @@ func Test_tuple_insert()
     call insert(t, 4)
     call insert(t, 4, 2)
   END
-  call v9.CheckSourceLegacyAndVim9Failure(lines, [
+  call v9.CheckSourceLegacyAndMNV9Failure(lines, [
         \ 'E899: Argument of insert() must be a List or Blob',
         \ 'E1013: Argument 1: type mismatch, expected list<any> but got tuple<number, number, number>',
         \ 'E1226: List or Blob required for argument 1'])
@@ -1891,7 +1891,7 @@ func Test_tuple_items()
     call assert_equal([], items(()))
     call assert_equal([], items(test_null_tuple()))
   END
-  call v9.CheckSourceLegacyAndVim9Success(lines)
+  call v9.CheckSourceLegacyAndMNV9Success(lines)
 endfunc
 
 " Test for join()
@@ -1904,7 +1904,7 @@ func Test_tuple_join()
     call assert_equal('', join(()))
     call assert_equal('', join(test_null_tuple()))
   END
-  call v9.CheckSourceLegacyAndVim9Success(lines)
+  call v9.CheckSourceLegacyAndMNV9Success(lines)
 endfunc
 
 " Test for js_encode()
@@ -1923,7 +1923,7 @@ func Test_tuple_js_encode()
     call add(l, tuple)
     call assert_equal("[[[]]]", js_encode(tuple))
   END
-  call v9.CheckSourceLegacyAndVim9Success(lines)
+  call v9.CheckSourceLegacyAndMNV9Success(lines)
 endfunc
 
 " Test for json_encode()
@@ -1941,13 +1941,13 @@ func Test_tuple_json_encode()
     call add(l, tuple)
     call assert_equal("[[[]]]", json_encode(tuple))
   END
-  call v9.CheckSourceLegacyAndVim9Success(lines)
+  call v9.CheckSourceLegacyAndMNV9Success(lines)
 
   let lines =<< trim END
     VAR t = (function('min'), function('max'))
     VAR s = json_encode(t)
   END
-  call v9.CheckSourceLegacyAndVim9Failure(lines, [
+  call v9.CheckSourceLegacyAndMNV9Failure(lines, [
         \ 'E1161: Cannot json encode a func',
         \ 'E1161: Cannot json encode a func',
         \ 'E1161: Cannot json encode a func'])
@@ -1961,7 +1961,7 @@ func Test_tuple_len()
     call assert_equal(1, len(("abc",)))
     call assert_equal(3, len(("abc", "def", "ghi")))
   END
-  call v9.CheckSourceLegacyAndVim9Success(lines)
+  call v9.CheckSourceLegacyAndMNV9Success(lines)
 endfunc
 
 " Test for map() with a tuple
@@ -1980,16 +1980,16 @@ func Test_tuple_max()
     call assert_equal(0, max(()))
     call assert_equal(0, max(test_null_tuple()))
   END
-  call v9.CheckSourceLegacyAndVim9Success(lines)
+  call v9.CheckSourceLegacyAndMNV9Success(lines)
 
   let lines =<< trim END
-    vim9script
+    mnv9script
     var x = max(('a', 2))
   END
   call v9.CheckSourceFailure(lines, 'E1030: Using a String as a Number: "a"')
 
   let lines =<< trim END
-    vim9script
+    mnv9script
     var x = max((1, 'b'))
   END
   call v9.CheckSourceFailure(lines, 'E1030: Using a String as a Number: "b"')
@@ -1997,7 +1997,7 @@ func Test_tuple_max()
   let lines =<< trim END
     echo max([('a', 'b'), 20])
   END
-  call v9.CheckSourceLegacyAndVim9Failure(lines, [
+  call v9.CheckSourceLegacyAndMNV9Failure(lines, [
         \ 'E1517: Can only compare Tuple with Tuple',
         \ 'E1517: Can only compare Tuple with Tuple',
         \ 'E1517: Can only compare Tuple with Tuple'])
@@ -2013,16 +2013,16 @@ func Test_tuple_min()
     call assert_equal(0, min(()))
     call assert_equal(0, min(test_null_tuple()))
   END
-  call v9.CheckSourceLegacyAndVim9Success(lines)
+  call v9.CheckSourceLegacyAndMNV9Success(lines)
 
   let lines =<< trim END
-    vim9script
+    mnv9script
     var x = min(('a', 2))
   END
   call v9.CheckSourceFailure(lines, 'E1030: Using a String as a Number: "a"')
 
   let lines =<< trim END
-    vim9script
+    mnv9script
     var x = min((1, 'b'))
   END
   call v9.CheckSourceFailure(lines, 'E1030: Using a String as a Number: "b"')
@@ -2043,7 +2043,7 @@ func Test_tuple_reduce()
     call assert_equal('x y z', reduce(('x', 'y', 'z'), LSTART acc, val LMIDDLE acc .. ' ' .. val LEND))
     call assert_equal(5, reduce(test_null_tuple(), LSTART acc, val LMIDDLE acc + val LEND, 5))
   END
-  call v9.CheckSourceLegacyAndVim9Success(lines)
+  call v9.CheckSourceLegacyAndMNV9Success(lines)
 
   call assert_equal({'x': 1, 'y': 1, 'z': 1 }, ('x', 'y', 'z')->reduce({ acc, val -> extend(acc, { val: 1 }) }, {}))
 
@@ -2053,7 +2053,7 @@ func Test_tuple_reduce()
   let lines =<< trim END
     echo reduce((1, 2, 3), LSTART acc, val LMIDDLE acc + foo LEND)
   END
-  call v9.CheckSourceLegacyAndVim9Failure(lines, [
+  call v9.CheckSourceLegacyAndMNV9Failure(lines, [
         \ 'E121: Undefined variable: foo',
         \ 'E1001: Variable not found: foo',
         \ 'E1001: Variable not found: foo'])
@@ -2065,7 +2065,7 @@ func Test_tuple_remove()
     VAR t = (1, 3, 5)
     call remove(t, 1)
   END
-  call v9.CheckSourceLegacyAndVim9Failure(lines, [
+  call v9.CheckSourceLegacyAndMNV9Failure(lines, [
         \ 'E896: Argument of remove() must be a List, Dictionary or Blob',
         \ 'E1013: Argument 1: type mismatch, expected list<any> but got tuple<number, number, number>',
         \ 'E1228: List, Dictionary or Blob required for argument 1'])
@@ -2085,7 +2085,7 @@ func Test_tuple_refcount()
     endfor
     call assert_equal(1, test_refcount(t))
   END
-  call v9.CheckSourceLegacyAndVim9Success(lines)
+  call v9.CheckSourceLegacyAndMNV9Success(lines)
 endfunc
 
 " Test for repeat()
@@ -2099,7 +2099,7 @@ func Test_tuple_repeat()
     call assert_equal((), repeat((), -1))
     call assert_equal((), repeat(test_null_tuple(), 3))
   END
-  call v9.CheckSourceLegacyAndVim9Success(lines)
+  call v9.CheckSourceLegacyAndMNV9Success(lines)
 endfunc
 
 " Test for reverse()
@@ -2111,7 +2111,7 @@ func Test_tuple_reverse()
     call assert_equal((), reverse(()))
     call assert_equal((), reverse(test_null_tuple()))
   END
-  call v9.CheckSourceLegacyAndVim9Success(lines)
+  call v9.CheckSourceLegacyAndMNV9Success(lines)
 endfunc
 
 " Test for slicing a tuple
@@ -2124,7 +2124,7 @@ func Test_tuple_slice_func()
     call assert_equal((), slice((), 1, 2))
     call assert_equal((), slice(test_null_tuple(), 1, 2))
   END
-  call v9.CheckSourceLegacyAndVim9Success(lines)
+  call v9.CheckSourceLegacyAndMNV9Success(lines)
 
   " return value of slice() should be the correct tuple type
   let lines =<< trim END
@@ -2140,7 +2140,7 @@ func Test_tuple_sort()
   let lines =<< trim END
     call sort([1.1, (1.2,)], 'f')
   END
-  call v9.CheckSourceLegacyAndVim9Failure(lines, [
+  call v9.CheckSourceLegacyAndMNV9Failure(lines, [
         \ 'E1521: Using a Tuple as a Float',
         \ 'E1521: Using a Tuple as a Float',
         \ 'E1521: Using a Tuple as a Float'])
@@ -2151,7 +2151,7 @@ func Test_tuple_stridx()
   let lines =<< trim END
     call stridx(('abc', ), 'a')
   END
-  call v9.CheckSourceLegacyAndVim9Failure(lines, [
+  call v9.CheckSourceLegacyAndMNV9Failure(lines, [
         \ 'E1522: Using a Tuple as a String',
         \ 'E1013: Argument 1: type mismatch, expected string but got tuple<string>',
         \ 'E1174: String required for argument 1'])
@@ -2173,7 +2173,7 @@ func Test_tuple_string()
 
     call assert_equal("()", string(test_null_tuple()))
   END
-  call v9.CheckSourceLegacyAndVim9Success(lines)
+  call v9.CheckSourceLegacyAndMNV9Success(lines)
 
   " recursive tuple
   let lines =<< trim END
@@ -2182,7 +2182,7 @@ func Test_tuple_string()
     call add(l, t)
     call assert_equal('([(...)], )', string(t))
   END
-  call v9.CheckSourceLegacyAndVim9Success(lines)
+  call v9.CheckSourceLegacyAndMNV9Success(lines)
 endfunc
 
 " Test for type()
@@ -2194,7 +2194,7 @@ func Test_tuple_type()
     call assert_equal(v:t_tuple, type(()))
     call assert_equal(v:t_tuple, type(test_null_tuple()))
   END
-  call v9.CheckSourceLegacyAndVim9Success(lines)
+  call v9.CheckSourceLegacyAndMNV9Success(lines)
 endfunc
 
 " Test for typename()
@@ -2217,7 +2217,7 @@ func Test_tuple_typename()
     call assert_equal('list<tuple<any>>', typename([()]))
     call assert_equal('tuple<any>', typename(test_null_tuple()))
   END
-  call v9.CheckSourceLegacyAndVim9Success(lines)
+  call v9.CheckSourceLegacyAndMNV9Success(lines)
 
   let lines =<< trim END
     var d: dict<any> = {a: 0}
@@ -2244,11 +2244,11 @@ func Test_tuple_typename()
     call assert_equal('tuple<tuple<number, number>, tuple<number, number>, tuple<number, number>>', ((1, 2),)->repeat(3)->typename())
     call assert_equal('list<tuple<number, number>>', [(1, 2)]->repeat(3)->typename())
   END
-  call v9.CheckSourceLegacyAndVim9Success(lines)
+  call v9.CheckSourceLegacyAndMNV9Success(lines)
 
   " When a tuple item is used in a "for" loop, the type is tuple<any>
   let lines =<< trim END
-    vim9script
+    mnv9script
     var l = [(1, 2)]
     for t in l
       assert_equal('tuple<any>', typename(t))
@@ -2265,27 +2265,27 @@ func Test_tuple_typename()
   call v9.CheckSourceDefAndScriptSuccess(lines)
 endfunc
 
-" Test for saving and restoring tuples from a viminfo file
-func Test_tuple_viminfo()
-  let viminfo_save = &viminfo
-  set viminfo^=!
+" Test for saving and restoring tuples from a mnvinfo file
+func Test_tuple_mnvinfo()
+  let mnvinfo_save = &mnvinfo
+  set mnvinfo^=!
 
   let g:MYTUPLE = ([1, 2], [3, 4], 'a', 'b', 1, 2)
 
   " create a tuple with circular reference
-  " This should not be saved in the viminfo file
+  " This should not be saved in the mnvinfo file
   let l = []
   let g:CIRCTUPLE = (l,)
   call add(l, g:CIRCTUPLE)
 
-  wviminfo! Xviminfo
+  wmnvinfo! Xmnvinfo
   unlet g:MYTUPLE
   unlet g:CIRCTUPLE
-  rviminfo! Xviminfo
+  rmnvinfo! Xmnvinfo
   call assert_equal(([1, 2], [3, 4], 'a', 'b', 1, 2), g:MYTUPLE)
   call assert_false(exists('g:CIRCTUPLE'))
-  let &viminfo = viminfo_save
-  call delete('Xviminfo')
+  let &mnvinfo = mnvinfo_save
+  call delete('Xmnvinfo')
 endfunc
 
 " Test for list2tuple()
@@ -2304,7 +2304,7 @@ func Test_list2tuple()
 
     call assert_equal(((),), [()]->list2tuple())
   END
-  call v9.CheckSourceLegacyAndVim9Success(lines)
+  call v9.CheckSourceLegacyAndMNV9Success(lines)
 
   call assert_fails('call list2tuple(())', 'E1211: List required for argument 1')
 
@@ -2342,7 +2342,7 @@ func Test_tuple2list()
 
     call assert_equal([[]], ([],)->tuple2list())
   END
-  call v9.CheckSourceLegacyAndVim9Success(lines)
+  call v9.CheckSourceLegacyAndMNV9Success(lines)
 
   call assert_fails('call tuple2list([])', 'E1534: Tuple required for argument 1')
 
@@ -2368,18 +2368,18 @@ endfunc
 " function returning a tuple.
 func Test_tuple_multi_assign_from_import()
   let lines =<< trim END
-    vim9script
+    mnv9script
 
     export def Fn(): tuple<string, string>
       return ('aaa', 'bbb')
     enddef
   END
-  call writefile(lines, 'Ximporttuplefunc.vim', 'D')
+  call writefile(lines, 'Ximporttuplefunc.mnv', 'D')
 
   let lines =<< trim END
-    vim9script
+    mnv9script
 
-    import "./Ximporttuplefunc.vim" as Xtuple
+    import "./Ximporttuplefunc.mnv" as Xtuple
 
     def XtestTupleListAssign()
       const [x, y] = Xtuple.Fn()
@@ -2416,18 +2416,18 @@ endfunc
 " function returning a tuple.
 func Test_tuple_multi_assign_in_for_loop_from_import()
   let lines =<< trim END
-    vim9script
+    mnv9script
 
     export def Fn(): tuple<...list<tuple<string, string>>>
       return (('a', 'b'), ('c', 'd'))
     enddef
   END
-  call writefile(lines, 'Ximporttupleinfor.vim', 'D')
+  call writefile(lines, 'Ximporttupleinfor.mnv', 'D')
 
   let lines =<< trim END
-    vim9script
+    mnv9script
 
-    import "./Ximporttupleinfor.vim" as Xtuple
+    import "./Ximporttupleinfor.mnv" as Xtuple
 
     def XtestTupleInFor()
       var s = ''
@@ -2463,4 +2463,4 @@ func Test_tuple_multi_assign_in_for_loop_from_import()
   call v9.CheckSourceScriptSuccess(lines)
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_undo.vim b/uvim/src/testdir/test_undo.mnv
index ad724aa04d..efd428abb2 100644
--- a/uvim/src/testdir/test_undo.vim
+++ b/uvim/src/testdir/test_undo.mnv
@@ -3,7 +3,7 @@
 " undo-able pieces.  Do that by setting 'undolevels'.
 " Also tests :earlier and :later.
 
-source util/screendump.vim
+source util/screendump.mnv
 
 func Test_undotree()
   new
@@ -413,7 +413,7 @@ func Test_undofile_earlier()
   endif
 
   " Issue #1254
-  " create undofile with timestamps older than Vim startup time.
+  " create undofile with timestamps older than MNV startup time.
   let t0 = localtime() - 43200
   call test_settime(t0)
   new XfileEarlier
@@ -495,7 +495,7 @@ endfunc
 func Test_cmd_in_reg_undo()
   enew!
   let @a = "Ox\<Esc>jAy\<Esc>kdd"
-  edit +/^$ test_undo.vim
+  edit +/^$ test_undo.mnv
   normal @au
   call assert_equal(0, &modified)
   return
@@ -850,7 +850,7 @@ endfunc
 func Test_undo_after_write()
   CheckScreendump
   " use a terminal to make undo work like when text is typed
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   let lines =<< trim END
       edit Xtestfile.txt
@@ -859,7 +859,7 @@ func Test_undo_after_write()
       write
   END
   call writefile(lines, 'Xtest_undo_after_write', 'D')
-  let buf = RunVimInTerminal('-S Xtest_undo_after_write', #{rows: 6})
+  let buf = RunMNVInTerminal('-S Xtest_undo_after_write', #{rows: 6})
 
   call term_sendkeys(buf, "Otest.\<CR>boo!!!\<Esc>")
   sleep 100m
@@ -869,7 +869,7 @@ func Test_undo_after_write()
   call term_sendkeys(buf, "u")
   call VerifyScreenDump(buf, 'Test_undo_after_write_2', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
   call delete('Xtestfile.txt')
   call delete('.Xtestfile.txt.un~')
 endfunc
@@ -925,4 +925,4 @@ func Test_restore_cursor_position_after_undo()
 endfunc
 
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_uniq.vim b/uvim/src/testdir/test_uniq.mnv
index 9029ea58f5..d36545460c 100644
--- a/uvim/src/testdir/test_uniq.vim
+++ b/uvim/src/testdir/test_uniq.mnv
@@ -552,7 +552,7 @@ func Test_uniq_cmd_report()
     enew!
     call append(0, repeat([1], 3) + repeat([2], 3) + repeat([3], 3))
     $delete _
-    setl report&vim
+    setl report&mnv
     setlocal nomodified
     let res = execute('1g/^/%uniq')
 
@@ -607,4 +607,4 @@ func Test_uniq_undo()
   bw!
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_unlet.vim b/uvim/src/testdir/test_unlet.mnv
index 88a293ec6b..55dcbff6e7 100644
--- a/uvim/src/testdir/test_unlet.vim
+++ b/uvim/src/testdir/test_unlet.mnv
@@ -76,4 +76,4 @@ func Test_unlet_nonexisting_key()
   unlet g:base
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_user_func.vim b/uvim/src/testdir/test_user_func.mnv
index 56b21a481b..dd3c6e4351 100644
--- a/uvim/src/testdir/test_user_func.vim
+++ b/uvim/src/testdir/test_user_func.mnv
@@ -3,7 +3,7 @@
 " Also test that a builtin function cannot be replaced.
 " Also test for regression when calling arbitrary expression.
 
-import './util/vim9.vim' as v9
+import './util/mnv9.mnv' as v9
 
 func Table(title, ...)
   let ret = a:title
@@ -200,7 +200,7 @@ endfunc
 
 func Test_method_with_linebreaks()
   let lines =<< trim END
-      vim9script
+      mnv9script
 
       export def Scan(ll: list<number>): func(func(number))
         return (Emit: func(number)) => {
@@ -224,12 +224,12 @@ func Test_method_with_linebreaks()
         }
       enddef
   END
-  call writefile(lines, 'Xlib.vim', 'D')
+  call writefile(lines, 'Xlib.mnv', 'D')
 
   let lines =<< trim END
-      vim9script
+      mnv9script
 
-      import "./Xlib.vim" as lib
+      import "./Xlib.mnv" as lib
 
       const x = [1, 2, 3]
 
@@ -376,8 +376,8 @@ func Test_function_defined_line()
   qall!
   [CODE]
 
-  call writefile(lines, 'Xtest.vim', 'D')
-  let res = system(GetVimCommandClean() .. ' -es -X -S Xtest.vim')
+  call writefile(lines, 'Xtest.mnv', 'D')
+  let res = system(GetMNVCommandClean() .. ' -es -X -S Xtest.mnv')
   call assert_equal(0, v:shell_error)
 
   let m = matchstr(res, 'function F1()[^[:print:]]*[[:print:]]*')
@@ -434,7 +434,7 @@ func s:DoNothing()
 endfunc
 
 func Test_script_local_func()
-  set nocp nomore viminfo+=nviminfo
+  set nocp nomore mnvinfo+=nmnvinfo
   new
   nnoremap <buffer> _x	:call <SID>DoNothing()<bar>call <SID>DoLast()<bar>delfunc <SID>DoNothing<bar>delfunc <SID>DoLast<cr>
 
@@ -452,7 +452,7 @@ func Test_script_local_func()
 
   [CODE]
   call writefile(lines, 'Xscript', 'D')
-  if RunVim([], [], '-s Xscript')
+  if RunMNV([], [], '-s Xscript')
     call assert_equal([], readfile('Xresult'))
   endif
   call delete('Xresult')
@@ -630,14 +630,14 @@ func Test_funcdef_alloc_failure()
   call assert_fails('delfunc Xtestfunc', 'E117:')
   %d _
   let lines =<< trim END
-    def g:Xvim9func(): number
+    def g:Xmnv9func(): number
       return 456
     enddef
   END
   call setline(1, lines)
   call test_alloc_fail(GetAllocId('get_func'), 0, 0)
   call assert_fails('source', 'E342:')
-  call assert_false(exists('*Xvim9func'))
+  call assert_false(exists('*Xmnv9func'))
   "call test_alloc_fail(GetAllocId('get_func'), 0, 0)
   "call assert_fails('source', 'E342:')
   "call assert_false(exists('*Xtestfunc'))
@@ -735,7 +735,7 @@ func Test_defer_quitall_func()
       call DeferLevelOne()
   END
   call writefile(lines, 'XdeferQuitallFunc', 'D')
-  call system(GetVimCommand() .. ' -X -S XdeferQuitallFunc')
+  call system(GetMNVCommand() .. ' -X -S XdeferQuitallFunc')
   call assert_equal(0, v:shell_error)
   call assert_false(filereadable('XQuitallFuncOne'))
   call assert_false(filereadable('XQuitallFuncTwo'))
@@ -746,7 +746,7 @@ endfunc
 
 func Test_defer_quitall_def()
   let lines =<< trim END
-      vim9script
+      mnv9script
       def DeferLevelTwo()
         call writefile(['text'], 'XQuitallDefTwo', 'D')
         call writefile(['quit'], 'XQuitallDefThree', 'a')
@@ -761,7 +761,7 @@ func Test_defer_quitall_def()
       DeferLevelOne()
   END
   call writefile(lines, 'XdeferQuitallDef', 'D')
-  call system(GetVimCommand() .. ' -X -S XdeferQuitallDef')
+  call system(GetMNVCommand() .. ' -X -S XdeferQuitallDef')
   call assert_equal(0, v:shell_error)
   call assert_false(filereadable('XQuitallDefOne'))
   call assert_false(filereadable('XQuitallDefTwo'))
@@ -806,7 +806,7 @@ func Test_defer_quitall_autocmd()
       doautocmd User DeferAutocmdOne
   END
   call writefile(lines, 'XdeferQuitallAutocmd', 'D')
-  call system(GetVimCommand() .. ' -X -S XdeferQuitallAutocmd')
+  call system(GetMNVCommand() .. ' -X -S XdeferQuitallAutocmd')
   call assert_equal(0, v:shell_error)
   call assert_equal(['5', '4', '3', '2', '1'], readfile('XQuitallAutocmd'))
 
@@ -829,7 +829,7 @@ func Test_defer_quitall_in_expr_func()
       call Test_defer_in_funcref()
   END
   call writefile(lines, 'XdeferQuitallExpr', 'D')
-  call system(GetVimCommand() .. ' -X -S XdeferQuitallExpr')
+  call system(GetMNVCommand() .. ' -X -S XdeferQuitallExpr')
   call assert_equal(0, v:shell_error)
   call assert_false(filereadable('Xentry0'))
   call assert_false(filereadable('Xentry1'))
@@ -1087,4 +1087,4 @@ func Test_func_return_in_try_verbose()
   delfunc TryReturnOverlongString
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_usercommands.vim b/uvim/src/testdir/test_usercommands.mnv
index 5afd8f1278..3ebeb82149 100644
--- a/uvim/src/testdir/test_usercommands.vim
+++ b/uvim/src/testdir/test_usercommands.mnv
@@ -1,8 +1,8 @@
 " Tests for user defined commands
 
-import './util/vim9.vim' as v9
+import './util/mnv9.mnv' as v9
 
-source util/screendump.vim
+source util/screendump.mnv
 
 " Test for <mods> in user defined commands
 function Test_cmdmods()
@@ -322,13 +322,13 @@ func Test_CmdErrors()
   call assert_match('E1208:', v:warningmsg)
 
   let lines =<< trim END
-      vim9script
+      mnv9script
       com! -complete=file DoCmd :
   END
   call v9.CheckScriptFailure(lines, 'E1208:', 2)
 
   let lines =<< trim END
-      vim9script
+      mnv9script
       com! -nargs=0 -complete=file DoCmd :
   END
   call v9.CheckScriptFailure(lines, 'E1208:', 2)
@@ -687,7 +687,7 @@ func Test_command_list()
   call assert_match("^\n"
         \        .. "    Name              Args Address Complete    Definition\n"
         \        .. "    DoCmd             +            customlist,SomeFunc :ls\n"
-        \        .. "\tLast set from .*/test_usercommands.vim line \\d\\+$",
+        \        .. "\tLast set from .*/test_usercommands.mnv line \\d\\+$",
         \           execute('verbose command DoCmd'))
 
   comclear
@@ -782,7 +782,7 @@ func Test_usercmd_with_block()
   delcommand BadCommand
 
   let lines =<< trim END
-	  vim9script
+	  mnv9script
     command Cmd {
         g:result = [1,
         2]
@@ -795,7 +795,7 @@ func Test_usercmd_with_block()
 	unlet! g:result
 
   let lines =<< trim END
-		vim9script
+		mnv9script
 		command Cmd {
 			g:result = and(0x80,
 			0x80)
@@ -814,7 +814,7 @@ endfunc
 " separation to work; the bug was that only cs_flags[cs_idx] was checked.
 func Test_usercmd_block_normal_in_nested_if()
   let lines =<< trim END
-      vim9script
+      mnv9script
       command TestCmd {
           if true
               normal! Ahello
@@ -917,7 +917,7 @@ endfunc
 func Test_buflocal_usercmd_cmdwin()
   new
   command -buffer TestCmd edit Test
-  " This used to crash Vim
+  " This used to crash MNV
   call assert_fails("norm q::TestCmd\<CR>", 'E11:')
   bw!
 endfunc
@@ -933,7 +933,7 @@ func Test_multibyte_in_usercmd()
   delcommand SubJapanesePeriodToDot
 endfunc
 
-" Declaring a variable in a {} uses Vim9 script rules, even when defined in a
+" Declaring a variable in a {} uses MNV9 script rules, even when defined in a
 " legacy script.
 func Test_block_declaration_legacy_script()
   let lines =<< trim END
@@ -967,7 +967,7 @@ func Test_block_declaration_legacy_script()
 endfunc
 
 func Test_comclear_while_listing()
-  call CheckRunVimInTerminal()
+  call CheckRunMNVInTerminal()
 
   let lines =<< trim END
       set nocompatible
@@ -978,7 +978,7 @@ func Test_comclear_while_listing()
       au CmdlineLeave : call timer_start(0, {-> execute('comclear')})
   END
   call writefile(lines, 'Xcommandclear', 'D')
-  let buf = RunVimInTerminal('-S Xcommandclear', {'rows': 10})
+  let buf = RunMNVInTerminal('-S Xcommandclear', {'rows': 10})
 
   " this was using freed memory
   call term_sendkeys(buf, ":command\<CR>")
@@ -988,7 +988,7 @@ func Test_comclear_while_listing()
   call term_sendkeys(buf, "G")
   call term_sendkeys(buf, "\<CR>")
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 " Test for listing user commands.
@@ -1011,4 +1011,4 @@ func Test_command_list_0()
   delcommand VeryMuchLongerCommand
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_utf8.vim b/uvim/src/testdir/test_utf8.mnv
index a0cd5bd79f..61d7a95f8a 100644
--- a/uvim/src/testdir/test_utf8.vim
+++ b/uvim/src/testdir/test_utf8.mnv
@@ -1,6 +1,6 @@
 " Tests for Unicode manipulations
 
-source util/screendump.vim
+source util/screendump.mnv
 
 " Visual block Insert adjusts for multi-byte char
 func Test_visual_block_insert()
@@ -293,32 +293,32 @@ endfunc
 
 func Test_setcellwidths_dump()
   CheckScreendump
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   let lines =<< trim END
       call setline(1, "\ue5ffDesktop")
   END
   call writefile(lines, 'XCellwidths', 'D')
-  let buf = RunVimInTerminal('-S XCellwidths', {'rows': 6})
+  let buf = RunMNVInTerminal('-S XCellwidths', {'rows': 6})
   call VerifyScreenDump(buf, 'Test_setcellwidths_dump_1', {})
 
   call term_sendkeys(buf, ":call setcellwidths([[0xe5ff, 0xe5ff, 2]])\<CR>")
   call VerifyScreenDump(buf, 'Test_setcellwidths_dump_2', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 " Test setcellwidths() on characters that are not targets of 'ambiwidth'.
 func Test_setcellwidths_with_non_ambiwidth_character_dump()
   CheckScreendump
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   let lines =<< trim END
       call setline(1, [repeat("\u279c", 60), repeat("\u279c", 60)])
       set ambiwidth=single
   END
   call writefile(lines, 'XCellwidthsWithNonAmbiwidthCharacter', 'D')
-  let buf = RunVimInTerminal('-S XCellwidthsWithNonAmbiwidthCharacter', {'rows': 6, 'cols': 50})
+  let buf = RunMNVInTerminal('-S XCellwidthsWithNonAmbiwidthCharacter', {'rows': 6, 'cols': 50})
   call term_sendkeys(buf, ":call setcellwidths([[0x279c, 0x279c, 1]])\<CR>")
   call term_sendkeys(buf, ":echo\<CR>")
   call VerifyScreenDump(buf, 'Test_setcellwidths_with_non_ambiwidth_character_dump_1', {})
@@ -327,21 +327,21 @@ func Test_setcellwidths_with_non_ambiwidth_character_dump()
   call term_sendkeys(buf, ":echo\<CR>")
   call VerifyScreenDump(buf, 'Test_setcellwidths_with_non_ambiwidth_character_dump_2', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 " For some reason this test causes Test_customlist_completion() to fail on CI,
 " so run it as the last test.
 func Test_zz_ambiwidth_hl_dump()
   CheckScreendump
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   let lines =<< trim END
       call setline(1, [repeat("\u2103", 60), repeat("\u2103", 60)])
       set ambiwidth=single cursorline list display=lastline
   END
   call writefile(lines, 'XAmbiwidthHl', 'D')
-  let buf = RunVimInTerminal('-S XAmbiwidthHl', {'rows': 6, 'cols': 50})
+  let buf = RunMNVInTerminal('-S XAmbiwidthHl', {'rows': 6, 'cols': 50})
   call VerifyScreenDump(buf, 'Test_ambiwidth_hl_dump_1', {})
 
   call term_sendkeys(buf, ":set ambiwidth=double\<CR>")
@@ -360,7 +360,7 @@ func Test_zz_ambiwidth_hl_dump()
   call term_sendkeys(buf, ":echo\<CR>")
   call VerifyScreenDump(buf, 'Test_ambiwidth_hl_dump_1', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_print_overlong()
@@ -372,4 +372,4 @@ func Test_print_overlong()
   bwipe!
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_utf8_comparisons.vim b/uvim/src/testdir/test_utf8_comparisons.mnv
index 2c1972b087..f8d1ee58a3 100644
--- a/uvim/src/testdir/test_utf8_comparisons.vim
+++ b/uvim/src/testdir/test_utf8_comparisons.mnv
@@ -128,4 +128,4 @@ func Test_uppercase_sharp_ss()
   bw!
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_vartabs.vim b/uvim/src/testdir/test_vartabs.mnv
index 49600fa539..6c75828fd0 100644
--- a/uvim/src/testdir/test_vartabs.vim
+++ b/uvim/src/testdir/test_vartabs.mnv
@@ -311,7 +311,7 @@ func Test_vartabs_linebreak()
   " cleanup
   bw!
   bw!
-  set nolist listchars&vim
+  set nolist listchars&mnv
 endfunc
 
 func Test_vartabs_shiftwidth()
@@ -511,4 +511,4 @@ func Test_vartabstop_shift_right_left()
 endfunc
 
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_version.vim b/uvim/src/testdir/test_version.mnv
index 40e5192b63..a7340f74dd 100644
--- a/uvim/src/testdir/test_version.vim
+++ b/uvim/src/testdir/test_version.mnv
@@ -6,7 +6,7 @@ func Test_version()
   let v2 = execute('version')
   call assert_equal(v1, v2)
 
-  call assert_match("^\n\nVIM - Vi IMproved .*", v1)
+  call assert_match("^\n\nMNV - MNV is not Vim .*", v1)
 endfunc
 
 func Test_version_redirect()
@@ -14,10 +14,10 @@ func Test_version_redirect()
   CheckCanRunGui
   CheckUnix
 
-  call RunVim([], [], '--clean -g --version >Xversion 2>&1')
+  call RunMNV([], [], '--clean -g --version >Xversion 2>&1')
   call assert_match('Features included', readfile('Xversion')->join())
 
   call delete('Xversion')
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_virtualedit.vim b/uvim/src/testdir/test_virtualedit.mnv
index 7819025f6b..d08de591ac 100644
--- a/uvim/src/testdir/test_virtualedit.vim
+++ b/uvim/src/testdir/test_virtualedit.mnv
@@ -245,7 +245,7 @@ endfunc
 " Repeating CTRL-N fixes it. (Mary Ellen Foster)
 func Test_ve_completion()
   new
-  set completeopt&vim
+  set completeopt&mnv
   set virtualedit=all
   exe "normal ikeyword keyw\<Esc>C\<C-N>"
   call assert_equal('keyword keyword', getline(1))
@@ -260,8 +260,8 @@ func Test_ve_del_to_eol()
   set virtualedit=all
   call append(0, 'all your base are belong to us')
   call search('are', 'w')
-  exe "normal C\<CR>are belong to vim"
-  call assert_equal(['all your base ', 'are belong to vim'], getline(1, 2))
+  exe "normal C\<CR>are belong to mnv"
+  call assert_equal(['all your base ', 'are belong to mnv'], getline(1, 2))
   bwipe!
   set virtualedit=
 endfunc
@@ -753,4 +753,4 @@ func Test_virtualedit_getpos_stable_past_eol_after_visual()
   bwipe!
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_visual.vim b/uvim/src/testdir/test_visual.mnv
index ac27354d48..4315a09d74 100644
--- a/uvim/src/testdir/test_visual.vim
+++ b/uvim/src/testdir/test_visual.mnv
@@ -1,7 +1,7 @@
 " Tests for various Visual modes.
 
-source util/screendump.vim
-import './util/vim9.vim' as v9
+source util/screendump.mnv
+import './util/mnv9.mnv' as v9
 
 func Test_block_shift_multibyte()
   " Uses double-wide character.
@@ -64,7 +64,7 @@ func TriggerTheProblem()
   '<,'>del _
   try
       exe "normal \<Esc>"
-  catch /^Vim\%((\a\+)\)\=:E315/
+  catch /^MNV\%((\a\+)\)\=:E315/
       echom 'Snap! E315 error!'
       let g:msg = 'Snap! E315 error!'
   endtry
@@ -234,7 +234,7 @@ func Test_virtual_replace()
   set softtabstop&
 
   enew!
-  set noai bs&vim
+  set noai bs&mnv
   if exists('save_t_kD')
     let &t_kD = save_t_kD
   endif
@@ -303,7 +303,7 @@ func Test_virtual_replace2()
 
   " clean up
   %d_
-  set bs&vim
+  set bs&mnv
 endfunc
 
 func Test_Visual_word_textobject()
@@ -739,7 +739,7 @@ func Test_gv_with_exclusive_selection()
   exe "normal G0v3l\<Esc>gvcxxx"
   call assert_equal(['', 'xxx '], getline(1, '$'))
 
-  set selection&vim
+  set selection&mnv
   bwipe!
 endfunc
 
@@ -1152,7 +1152,7 @@ func Test_linewise_visual_with_count()
     call writefile(v:errors, 'Xtestout')
     qall!
   [CODE]
-  if RunVim([], after, '')
+  if RunMNV([], after, '')
     call assert_equal([], readfile('Xtestout'))
     call delete('Xtestout')
   endif
@@ -1169,7 +1169,7 @@ func Test_characterwise_visual_with_count()
     call writefile(v:errors, 'Xtestout')
     qall!
   [CODE]
-  if RunVim([], after, '')
+  if RunMNV([], after, '')
     call assert_equal([], readfile('Xtestout'))
     call delete('Xtestout')
   endif
@@ -1298,7 +1298,7 @@ func Test_visual_put_blockedit_zy_and_zp()
   exe "normal! gg0\<c-v>2j$zy"
   norm! 5gg0zP
   call assert_equal(['aa', 'bbbbb', 'ccc', '', 'aaXX', 'bbbbbGGHHJ', 'cccRTZU'], getline(1, 7))
-  set ve&vim
+  set ve&mnv
   bw!
 endfunc
 
@@ -1319,7 +1319,7 @@ func Test_visual_block_with_virtualedit()
   END
   call writefile(lines, 'XTest_block', 'D')
 
-  let buf = RunVimInTerminal('-S XTest_block', {'rows': 8, 'cols': 50})
+  let buf = RunMNVInTerminal('-S XTest_block', {'rows': 8, 'cols': 50})
   call term_sendkeys(buf, "\<C-V>gg$")
   call VerifyScreenDump(buf, 'Test_visual_block_with_virtualedit', {})
 
@@ -1328,7 +1328,7 @@ func Test_visual_block_with_virtualedit()
 
   " clean up
   call term_sendkeys(buf, "\<Esc>")
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_visual_block_ctrl_w_f()
@@ -1601,7 +1601,7 @@ endfunc
 func Test_visual_hl_with_showbreak()
   CheckScreendump
 
-  " Redraw at the end is necessary due to https://github.com/vim/vim/issues/16620
+  " Redraw at the end is necessary due to https://github.com/Project-Tick/Project-Tick/issues/16620
   let lines =<< trim END
     setlocal showbreak=+
     call setline(1, repeat('a', &columns + 10))
@@ -1610,20 +1610,20 @@ func Test_visual_hl_with_showbreak()
   END
   call writefile(lines, 'XTest_visual_sbr', 'D')
 
-  let buf = RunVimInTerminal('-S XTest_visual_sbr', {'rows': 6, 'cols': 50})
+  let buf = RunMNVInTerminal('-S XTest_visual_sbr', {'rows': 6, 'cols': 50})
   call VerifyScreenDump(buf, 'Test_visual_hl_with_showbreak', {})
 
   " clean up
   call term_sendkeys(buf, "\<Esc>")
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
-" Test for https://github.com/vim/vim/issues/19590
+" Test for https://github.com/Project-Tick/Project-Tick/issues/19590
 func Test_visual_block_hl_with_autoselect()
   CheckScreendump
 
   " "autoselect" is included in the default 'clipboard' if available.
-  " Redraw at the end is necessary due to https://github.com/vim/vim/issues/16620
+  " Redraw at the end is necessary due to https://github.com/Project-Tick/Project-Tick/issues/16620
   let lines =<< trim END
     set shortmess+=F
     edit samples/visual_block_hl.txt
@@ -1633,7 +1633,7 @@ func Test_visual_block_hl_with_autoselect()
   END
   call writefile(lines, 'XTest_visual_block_autoselect', 'D')
 
-  let buf = RunVimInTerminal('-S XTest_visual_block_autoselect', {'rows': 10})
+  let buf = RunMNVInTerminal('-S XTest_visual_block_autoselect', {'rows': 10})
   call VerifyScreenDump(buf, 'Test_visual_block_hl_with_autoselect_1', {})
   call term_sendkeys(buf, 'l')
   call VerifyScreenDump(buf, 'Test_visual_block_hl_with_autoselect_2', {})
@@ -1646,7 +1646,7 @@ func Test_visual_block_hl_with_autoselect()
 
   " clean up
   call term_sendkeys(buf, "\<Esc>")
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_visual_highlight_when_using_a_clipboard_provider()
@@ -2143,7 +2143,7 @@ func Test_visual_getregion()
     unlet g:buf
     bwipe!
   END
-  call v9.CheckLegacyAndVim9Success(lines)
+  call v9.CheckLegacyAndMNV9Success(lines)
 
   let lines =<< trim END
     #" Selection in starts or ends in the middle of a multibyte character
@@ -2292,7 +2292,7 @@ func Test_visual_getregion()
     set selection&
     bwipe!
   END
-  call v9.CheckLegacyAndVim9Success(lines)
+  call v9.CheckLegacyAndMNV9Success(lines)
 
   let lines =<< trim END
     #" Exclusive selection
@@ -2625,7 +2625,7 @@ func Test_visual_getregion()
     set virtualedit&
     bwipe!
   END
-  call v9.CheckLegacyAndVim9Success(lines)
+  call v9.CheckLegacyAndMNV9Success(lines)
 
   let lines =<< trim END
     #" 'virtualedit' with TABs at end of line
@@ -2666,7 +2666,7 @@ func Test_visual_getregion()
     set virtualedit&
     bwipe!
   END
-  call v9.CheckLegacyAndVim9Success(lines)
+  call v9.CheckLegacyAndMNV9Success(lines)
 endfunc
 
 func Test_getregion_invalid_buf()
@@ -2833,7 +2833,7 @@ func Test_visual_block_exclusive_selection()
   exe ":norm! 1v~"
   call assert_equal(['asöd asdf', 'asdf asdf', 'as€d asdf', 'asdf asdf'], getline(1, '$'))
   bwipe!
-  set selection&vim
+  set selection&mnv
 endfunc
 
 func Test_visual_block_exclusive_selection_adjusted()
@@ -2852,8 +2852,8 @@ func Test_visual_block_exclusive_selection_adjusted()
   exe ":norm! \<c-v>g_3jy"
   call assert_equal([0, 4, 10, 0], getpos("'>"))
 
-  " Reset selection option to Vim default
-  set selection&vim
+  " Reset selection option to MNV default
+  set selection&mnv
   call cursor(1, 1)
 
   " inclusive motion
@@ -2866,10 +2866,10 @@ func Test_visual_block_exclusive_selection_adjusted()
   exe ":norm! \<c-v>g_3jy"
   call assert_equal([0, 4, 9, 0], getpos("'>"))
   bwipe!
-  set selection&vim
+  set selection&mnv
 endfunc
 
-" the following caused a Heap-Overflow, because Vim was accessing outside of a
+" the following caused a Heap-Overflow, because MNV was accessing outside of a
 " line end
 func Test_visual_pos_buffer_heap_overflow()
   set virtualedit=all
@@ -2980,7 +2980,7 @@ func Test_visual_ended_in_wiped_buffer()
   " Must be the last window.
   call assert_equal(1, winnr('$'))
   call assert_equal(1, tabpagenr('$'))
-  " Was a member access on a NULL curbuf from Vim ending Visual mode.
+  " Was a member access on a NULL curbuf from MNV ending Visual mode.
   buffer #
   call assert_equal(0, bufexists('Xbar'))
   call assert_equal('n', mode())
@@ -3003,7 +3003,7 @@ func Test_visual_ended_in_unloaded_buffer()
           \| execute 'normal! V'
           \| call assert_equal('V', mode())
 
-    " From Vim ending Visual mode.  Used to occur too late, after the buffer was
+    " From MNV ending Visual mode.  Used to occur too late, after the buffer was
     " unloaded, so @* didn't contain the selection.  Window also had a NULL
     " w_buffer here!
     autocmd TextYankPost * ++once let s:fired = 1
@@ -3042,4 +3042,4 @@ func Test_visual_ended_in_unloaded_buffer()
   %bw!
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_wayland.vim b/uvim/src/testdir/test_wayland.mnv
index c690d0cfe9..2d5b8776f2 100644
--- a/uvim/src/testdir/test_wayland.vim
+++ b/uvim/src/testdir/test_wayland.mnv
@@ -1,4 +1,4 @@
-source util/window_manager.vim
+source util/window_manager.mnv
 
 CheckFeature wayland
 CheckFeature wayland_clipboard
@@ -48,12 +48,12 @@ func s:SetupFocusStealing()
     throw "Skipped: seat does not have keyboard"
   endif
 
-  let $VIM_WAYLAND_FORCE_FS=1
+  let $MNV_WAYLAND_FORCE_FS=1
   wlrestore!
 endfunc
 
 func s:UnsetupFocusStealing()
-  unlet $VIM_WAYLAND_FORCE_FS
+  unlet $MNV_WAYLAND_FORCE_FS
 endfunc
 
 func s:CheckClientserver()
@@ -65,18 +65,18 @@ func s:CheckClientserver()
 
   if has('socketserver') && !has('x11')
     if v:servername == ""
-      call remote_startserver('VIMSOCKETSERVER')
+      call remote_startserver('MNVSOCKETSERVER')
     endif
   endif
 endfunc
 
-func s:EndRemoteVim(name, job)
+func s:EndRemoteMNV(name, job)
   eval remote_send(a:name, "\<Esc>:qa!\<CR>")
   try
     call WaitForAssert({-> assert_equal("dead", job_status(a:job))})
   finally
     if job_status(a:job) != 'dead'
-      call assert_report('Vim instance did not exit')
+      call assert_report('MNV instance did not exit')
       call job_stop(a:job, 'kill')
     endif
   endtry
@@ -86,8 +86,8 @@ func Test_wayland_startup()
   call s:PreTest()
   call s:CheckClientserver()
 
-  let l:name = 'WLVIMTEST'
-  let l:cmd = GetVimCommand() .. ' --servername ' .. l:name
+  let l:name = 'WLMNVTEST'
+  let l:cmd = GetMNVCommand() .. ' --servername ' .. l:name
   let l:job = job_start(cmd, {'stoponexit': 'kill', 'out_io': 'null'})
 
   call WaitForAssert({-> assert_equal("run", job_status(l:job))})
@@ -96,7 +96,7 @@ func Test_wayland_startup()
   call WaitForAssert({-> assert_equal($WAYLAND_DISPLAY,
         \ remote_expr(l:name, 'v:wayland_display'))})
 
-  call s:EndRemoteVim(l:name, l:job)
+  call s:EndRemoteMNV(l:name, l:job)
 
   " When $WAYLAND_DISPLAY is invalid
   let l:job = job_start(cmd, { 'stoponexit': 'kill', 'out_io': 'null',
@@ -106,7 +106,7 @@ func Test_wayland_startup()
   call WaitForAssert({-> assert_match(name, serverlist())})
 
   call assert_equal('', remote_expr(l:name, 'v:wayland_display'))
-  call s:EndRemoteVim(l:name, l:job)
+  call s:EndRemoteMNV(l:name, l:job)
 endfunc
 
 func Test_wayland_wlrestore()
@@ -142,15 +142,15 @@ func Test_wayland_wlrestore()
   call assert_equal('2', getreg('+'))
 
   " Check if wlrestore doesn't disconnect the display if not necessary by seeing
-  " if Vim doesn't lose the selection
+  " if MNV doesn't lose the selection
   call setreg('+', 'testing', 'c')
 
   wlrestore
-  call assert_match('_VIM_TEXT', system(l:env_cmd .. 'wl-paste -l'))
+  call assert_match('_MNV_TEXT', system(l:env_cmd .. 'wl-paste -l'))
 
   " Forcibly disconnect and reconnect the display
   wlrestore!
-  call assert_notmatch('_VIM_TEXT', system(l:env_cmd .. 'wl-paste -l'))
+  call assert_notmatch('_MNV_TEXT', system(l:env_cmd .. 'wl-paste -l'))
 
   call EndWaylandCompositor(l:wayland_display)
 endfunc
@@ -254,14 +254,14 @@ func Test_wayland_mime_types_correct()
   call s:PreTest()
 
   let l:mimes = [
-        \ '_VIMENC_TEXT',
-        \ '_VIM_TEXT',
+        \ '_MNVENC_TEXT',
+        \ '_MNV_TEXT',
         \ 'text/plain;charset=utf-8',
         \ 'text/plain',
         \ 'UTF8_STRING',
         \ 'STRING',
         \ 'TEXT',
-        \ 'application/x-vim-instance-' .. getpid()
+        \ 'application/x-mnv-instance-' .. getpid()
         \ ]
 
   call setreg('+', 'text', 'c')
@@ -281,13 +281,13 @@ func Test_wayland_mime_types_correct()
   endfor
 endfunc
 
-" Test if the _VIM_TEXT and _VIMENC_TEXT formats are correct:
-" _VIM_TEXT: preserves motion type (line/char/block wise)
-" _VIMENC_TEXT: same but also indicates the encoding type
-func Test_wayland_paste_vim_format_correct()
+" Test if the _MNV_TEXT and _MNVENC_TEXT formats are correct:
+" _MNV_TEXT: preserves motion type (line/char/block wise)
+" _MNVENC_TEXT: same but also indicates the encoding type
+func Test_wayland_paste_mnv_format_correct()
   call s:PreTest()
 
-  " Vim doesn't support null characters in strings, so we use the -v flag of the
+  " MNV doesn't support null characters in strings, so we use the -v flag of the
   " cat program to show them in a printable way, if it is available.
   call system("cat -v")
   if v:shell_error != 0
@@ -301,35 +301,35 @@ func Test_wayland_paste_vim_format_correct()
 
   " Regular selection
   call setreg('+', 'text', 'c')
-  call assert_equal("^@text", l:GetSel('_VIM_TEXT'))
+  call assert_equal("^@text", l:GetSel('_MNV_TEXT'))
   call setreg('+', 'text', 'c')
-  call assert_equal("^@utf-8^@text", l:GetSel('_VIMENC_TEXT'))
+  call assert_equal("^@utf-8^@text", l:GetSel('_MNVENC_TEXT'))
 
   call setreg('+', 'text', 'l')
-  call assert_equal("^Atext\n", l:GetSel('_VIM_TEXT'))
+  call assert_equal("^Atext\n", l:GetSel('_MNV_TEXT'))
   call setreg('+', 'text', 'l')
-  call assert_equal("^Autf-8^@text\n",l:GetSel('_VIMENC_TEXT'))
+  call assert_equal("^Autf-8^@text\n",l:GetSel('_MNVENC_TEXT'))
 
   call setreg('+', 'text', 'b')
-  call assert_equal("^Btext\n", l:GetSel('_VIM_TEXT'))
+  call assert_equal("^Btext\n", l:GetSel('_MNV_TEXT'))
   call setreg('+', 'text', 'b')
-  call assert_equal("^Butf-8^@text\n", l:GetSel('_VIMENC_TEXT'))
+  call assert_equal("^Butf-8^@text\n", l:GetSel('_MNVENC_TEXT'))
 
   " Primary selection
   call setreg('*', 'text', 'c')
-  call assert_equal("^@text", l:GetSelP('_VIM_TEXT'))
+  call assert_equal("^@text", l:GetSelP('_MNV_TEXT'))
   call setreg('*', 'text', 'c')
-  call assert_equal("^@utf-8^@text", l:GetSelP('_VIMENC_TEXT'))
+  call assert_equal("^@utf-8^@text", l:GetSelP('_MNVENC_TEXT'))
 
   call setreg('*', 'text', 'l')
-  call assert_equal("^Atext\n", l:GetSelP('_VIM_TEXT'))
+  call assert_equal("^Atext\n", l:GetSelP('_MNV_TEXT'))
   call setreg('*', 'text', 'l')
-  call assert_equal("^Autf-8^@text\n",l:GetSelP('_VIMENC_TEXT'))
+  call assert_equal("^Autf-8^@text\n",l:GetSelP('_MNVENC_TEXT'))
 
   call setreg('*', 'text', 'b')
-  call assert_equal("^Btext\n", l:GetSelP('_VIM_TEXT'))
+  call assert_equal("^Btext\n", l:GetSelP('_MNV_TEXT'))
   call setreg('*', 'text', 'b')
-  call assert_equal("^Butf-8^@text\n", l:GetSelP('_VIMENC_TEXT'))
+  call assert_equal("^Butf-8^@text\n", l:GetSelP('_MNVENC_TEXT'))
 
   set encoding&
 endfunc
@@ -372,8 +372,8 @@ func Test_wayland_autoselect_works()
 
   call writefile(l:lines, 'Wltester', 'D')
 
-  let l:name = 'WLVIMTEST'
-  let l:cmd = GetVimCommand() .. ' -S Wltester --servername ' .. l:name
+  let l:name = 'WLMNVTEST'
+  let l:cmd = GetMNVCommand() .. ' -S Wltester --servername ' .. l:name
   let l:job = job_start(cmd, {'stoponexit': 'kill', 'out_io': 'null'})
 
   call WaitForAssert({-> assert_equal("run", job_status(l:job))})
@@ -400,7 +400,7 @@ func Test_wayland_autoselect_works()
 
   eval remote_send(l:name, "\<Esc>:qa!\<CR>")
 
-  call s:EndRemoteVim(l:name, l:job)
+  call s:EndRemoteMNV(l:name, l:job)
 endfunc
 
 " Check if the -Y flag works properly
@@ -408,8 +408,8 @@ func Test_no_wayland_connect_cmd_flag()
   call s:PreTest()
   call s:CheckClientserver()
 
-  let l:name = 'WLFLAGVIMTEST'
-  let l:cmd = GetVimCommand() .. ' -Y --servername ' .. l:name
+  let l:name = 'WLFLAGMNVTEST'
+  let l:cmd = GetMNVCommand() .. ' -Y --servername ' .. l:name
   let l:job = job_start(cmd, {'stoponexit': 'kill', 'out_io': 'null'})
 
   call WaitForAssert({-> assert_equal("run", job_status(l:job))})
@@ -430,16 +430,16 @@ func Test_no_wayland_connect_cmd_flag()
   call WaitForAssert({-> assert_equal('',
         \ remote_expr(l:name, 'v:wayland_display'))})
 
-  call s:EndRemoteVim(l:name, l:job)
+  call s:EndRemoteMNV(l:name, l:job)
 endfunc
 
-" Test behaviour when we do something like suspend Vim
+" Test behaviour when we do something like suspend MNV
 func Test_wayland_become_inactive()
   call s:PreTest()
   call s:CheckClientserver()
 
-  let l:name = 'WLLOSEVIMTEST'
-  let l:cmd = GetVimCommand() .. ' --servername ' .. l:name
+  let l:name = 'WLLOSEMNVTEST'
+  let l:cmd = GetMNVCommand() .. ' --servername ' .. l:name
   let l:job = job_start(cmd, {
         \ 'stoponexit': 'kill',
         \ 'out_io': 'null',
@@ -458,7 +458,7 @@ func Test_wayland_become_inactive()
   call WaitForAssert({-> assert_equal("Nothing is copied\n",
         \ system('wl-paste -n'))})
 
-  call s:EndRemoteVim(l:name, l:job)
+  call s:EndRemoteMNV(l:name, l:job)
 endfunc
 
 " Test wlseat option
@@ -522,8 +522,8 @@ func Test_wayland_bad_environment()
   let l:old = $XDG_RUNTIME_DIR
   unlet $XDG_RUNTIME_DIR
 
-  let l:name = 'WLVIMTEST'
-  let l:cmd = GetVimCommand() .. ' --servername ' .. l:name
+  let l:name = 'WLMNVTEST'
+  let l:cmd = GetMNVCommand() .. ' --servername ' .. l:name
   let l:job = job_start(cmd, {
         \ 'stoponexit': 'kill',
         \ 'out_io': 'null',
@@ -535,12 +535,12 @@ func Test_wayland_bad_environment()
   call WaitForAssert({-> assert_equal('',
         \ remote_expr(l:name, 'v:wayland_display'))})
 
-  call s:EndRemoteVim(l:name, l:job)
+  call s:EndRemoteMNV(l:name, l:job)
 
   let $XDG_RUNTIME_DIR = l:old
 endfunc
 
-" Test if Vim still works properly after losing the selection
+" Test if MNV still works properly after losing the selection
 func Test_wayland_lost_selection()
   call s:PreTest()
 
@@ -623,8 +623,8 @@ endfunc
 func Test_wayland_protocol_error_overflow()
   try
     exe "wlrestore " .. repeat('X', 4096)
-  catch /^Vim(wlrestore):/
+  catch /^MNV(wlrestore):/
   endtry
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_winbar.vim b/uvim/src/testdir/test_winbar.mnv
index 59241746b9..9c56ef165c 100644
--- a/uvim/src/testdir/test_winbar.vim
+++ b/uvim/src/testdir/test_winbar.mnv
@@ -2,7 +2,7 @@
 
 CheckFeature menu
 
-source util/screendump.vim
+source util/screendump.mnv
 
 func Test_add_remove_menu()
   new
@@ -131,11 +131,11 @@ func Test_winbar_not_visible()
       wincmd _
   END
   call writefile(lines, 'XtestWinbarNotVisible', 'D')
-  let buf = RunVimInTerminal('-S XtestWinbarNotVisible', #{rows: 10})
+  let buf = RunMNVInTerminal('-S XtestWinbarNotVisible', #{rows: 10})
   call VerifyScreenDump(buf, 'Test_winbar_not_visible', {})
 
   " clean up
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunction
 
 func Test_winbar_not_visible_custom_statusline()
@@ -150,11 +150,11 @@ func Test_winbar_not_visible_custom_statusline()
       wincmd _
   END
   call writefile(lines, 'XtestWinbarNotVisible', 'D')
-  let buf = RunVimInTerminal('-S XtestWinbarNotVisible', #{rows: 10})
+  let buf = RunMNVInTerminal('-S XtestWinbarNotVisible', #{rows: 10})
   call VerifyScreenDump(buf, 'Test_winbar_not_visible_custom_statusline', {})
 
   " clean up
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunction
 
 func Test_drag_statusline_with_winbar()
@@ -185,4 +185,4 @@ func Test_drag_statusline_with_winbar()
   set laststatus&
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_winbuf_close.vim b/uvim/src/testdir/test_winbuf_close.mnv
index 5175c2c94d..b15e5a2868 100644
--- a/uvim/src/testdir/test_winbuf_close.vim
+++ b/uvim/src/testdir/test_winbuf_close.mnv
@@ -225,4 +225,4 @@ func Test_window_close_splitright_noequalalways()
   call assert_equal(w, win_getid(), "Did not return to original window after opening and closing a window")
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_window_cmd.vim b/uvim/src/testdir/test_window_cmd.mnv
index aa631b2905..5f45f4c5bb 100644
--- a/uvim/src/testdir/test_window_cmd.vim
+++ b/uvim/src/testdir/test_window_cmd.mnv
@@ -1,6 +1,6 @@
 " Tests for window cmd (:wincmd, :split, :vsplit, :resize and etc...)
 
-source util/screendump.vim
+source util/screendump.mnv
 
 func Test_window_cmd_ls0_with_split()
   set ls=0
@@ -10,16 +10,16 @@ func Test_window_cmd_ls0_with_split()
   call assert_equal(0, &lines - &cmdheight - winheight(0))
   new | only!
   "
-  set splitbelow&vim
+  set splitbelow&mnv
   botright split
   quit
   call assert_equal(0, &lines - &cmdheight - winheight(0))
   new | only!
-  set ls&vim
+  set ls&mnv
 endfunc
 
 func Test_window_cmd_ls0_split_scrolling()
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   let lines =<< trim END
     set laststatus=0
@@ -27,13 +27,13 @@ func Test_window_cmd_ls0_split_scrolling()
     normal! G
   END
   call writefile(lines, 'XTestLs0SplitScrolling', 'D')
-  let buf = RunVimInTerminal('-S XTestLs0SplitScrolling', #{rows: 10})
+  let buf = RunMNVInTerminal('-S XTestLs0SplitScrolling', #{rows: 10})
 
   call term_sendkeys(buf, ":botright split\<CR>")
   call WaitForAssert({-> assert_match('Bot$', term_getline(buf, 5))})
   call assert_equal('100', term_getline(buf, 4))
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_window_cmd_cmdwin_with_vsp()
@@ -51,7 +51,7 @@ func Test_window_cmd_cmdwin_with_vsp()
     call assert_equal(0, ac, emsg)
     new | only!
   endfor
-  set ls&vim
+  set ls&mnv
 endfunc
 
 func Test_cmdheight_not_changed()
@@ -91,7 +91,7 @@ func Test_window_cmd_wincmd_gf()
   function s:swap_exists()
     let v:swapchoice = s:swap_choice
   endfunc
-  " Remove the catch-all that runtest.vim adds
+  " Remove the catch-all that runtest.mnv adds
   au! SwapExists
   augroup test_window_cmd_wincmd_gf
     autocmd!
@@ -822,7 +822,7 @@ func Test_window_prevwin()
   wincmd p
   " reset
   q
-  set hidden&vim autoread&vim
+  set hidden&mnv autoread&mnv
   delfunc Fun_RenewFile
   bw!
 endfunc
@@ -1042,11 +1042,11 @@ func Test_winnr()
 endfunc
 
 func Test_winrestview()
-  split runtest.vim
+  split runtest.mnv
   normal 50%
   let view = winsaveview()
   close
-  split runtest.vim
+  split runtest.mnv
   eval view->winrestview()
   call assert_equal(view, winsaveview())
 
@@ -1236,7 +1236,7 @@ func Run_noroom_for_newwindow_test(dir_arg)
 
   " Window related commands
   for cmd in ['split', 'split Xnorfile2', 'new', 'new Xnorfile3', 'sview Xnorfile1',
-		\ 'sfind runtest.vim']
+		\ 'sfind runtest.mnv']
     call assert_fails(dir .. cmd, 'E36:')
   endfor
 
@@ -1751,14 +1751,14 @@ func Test_window_alloc_failure()
   call assert_equal('Xwaffile2', @%)
   %bw!
 
-  " FIXME: The following test crashes Vim
+  " FIXME: The following test crashes MNV
   " test for new tabpage creation failure
   " call test_alloc_fail(GetAllocId('newwin_wvars'), 0, 0)
   " call assert_fails('tabnew', 'E342:')
   " call assert_equal(1, tabpagenr('$'))
   " call assert_equal(1, winnr('$'))
 
-  " This test messes up the internal Vim window/frame information. So the
+  " This test messes up the internal MNV window/frame information. So the
   " Test_window_cmd_cmdwin_with_vsp() test fails after running this test.
   " Open a new tab and close everything else to fix this issue.
   tabnew
@@ -2006,7 +2006,7 @@ func Test_splitkeep_cursor()
     call CursorEqualize()
   END
   call writefile(lines, 'XTestSplitkeepCallback', 'D')
-  let buf = RunVimInTerminal('-S XTestSplitkeepCallback', #{rows: 8})
+  let buf = RunMNVInTerminal('-S XTestSplitkeepCallback', #{rows: 8})
 
   call VerifyScreenDump(buf, 'Test_splitkeep_cursor_1', {})
 
@@ -2016,7 +2016,7 @@ func Test_splitkeep_cursor()
   call term_sendkeys(buf, ":set scrolloff=0\<CR>G")
   call VerifyScreenDump(buf, 'Test_splitkeep_cursor_3', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_splitkeep_callback()
@@ -2035,7 +2035,7 @@ func Test_splitkeep_callback()
           \ { 'hidden': 1, 'exit_cb': 'C2' }), {})<CR>
   END
   call writefile(lines, 'XTestSplitkeepCallback', 'D')
-  let buf = RunVimInTerminal('-S XTestSplitkeepCallback', #{rows: 8})
+  let buf = RunMNVInTerminal('-S XTestSplitkeepCallback', #{rows: 8})
 
   call term_sendkeys(buf, "j")
   call VerifyScreenDump(buf, 'Test_splitkeep_callback_1', {})
@@ -2049,7 +2049,7 @@ func Test_splitkeep_callback()
   call term_sendkeys(buf, ":quit\<CR>Gt")
   call VerifyScreenDump(buf, 'Test_splitkeep_callback_4', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_splitkeep_fold()
@@ -2067,7 +2067,7 @@ func Test_splitkeep_fold()
     endfor
   END
   call writefile(lines, 'XTestSplitkeepFold', 'D')
-  let buf = RunVimInTerminal('-S XTestSplitkeepFold', #{rows: 10})
+  let buf = RunMNVInTerminal('-S XTestSplitkeepFold', #{rows: 10})
 
   call term_sendkeys(buf, "L:wincmd s\<CR>")
   call VerifyScreenDump(buf, 'Test_splitkeep_fold_1', {})
@@ -2081,7 +2081,7 @@ func Test_splitkeep_fold()
   call term_sendkeys(buf, ":wincmd k\<CR>:quit\<CR>")
   call VerifyScreenDump(buf, 'Test_splitkeep_fold_4', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_splitkeep_status()
@@ -2096,12 +2096,12 @@ func Test_splitkeep_status()
     wincmd j
   END
   call writefile(lines, 'XTestSplitkeepStatus', 'D')
-  let buf = RunVimInTerminal('-S XTestSplitkeepStatus', #{rows: 10})
+  let buf = RunMNVInTerminal('-S XTestSplitkeepStatus', #{rows: 10})
 
   call term_sendkeys(buf, ":call win_move_statusline(win, 1)\<CR>")
   call VerifyScreenDump(buf, 'Test_splitkeep_status_1', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 " skipcol is not reset unnecessarily and is copied to new window
@@ -2116,10 +2116,10 @@ func Test_splitkeep_skipcol()
   END
 
   call writefile(lines, 'XTestSplitkeepSkipcol', 'D')
-  let buf = RunVimInTerminal('-S XTestSplitkeepSkipcol', #{rows: 12, cols: 40})
+  let buf = RunMNVInTerminal('-S XTestSplitkeepSkipcol', #{rows: 12, cols: 40})
 
   call VerifyScreenDump(buf, 'Test_splitkeep_skipcol_1', {})
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_splitkeep_line()
@@ -2132,13 +2132,13 @@ func Test_splitkeep_line()
   END
 
   call writefile(lines, 'XTestSplitkeepSkipcol', 'D')
-  let buf = RunVimInTerminal('-S XTestSplitkeepSkipcol', #{rows: 6, cols: 40})
+  let buf = RunMNVInTerminal('-S XTestSplitkeepSkipcol', #{rows: 6, cols: 40})
 
   call VerifyScreenDump(buf, 'Test_splitkeep_line_1', {})
 
   call term_sendkeys(buf, ":wincmd s\<CR>")
   call VerifyScreenDump(buf, 'Test_splitkeep_line_2', {})
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_new_help_window_on_error()
@@ -2326,7 +2326,7 @@ func Test_winfixsize_vsep_statusline()
     endfunc
   END
   call writefile(lines, 'XTestWinfixsizeVsepStatusline', 'D')
-  let buf = RunVimInTerminal('-S XTestWinfixsizeVsepStatusline', #{rows: 8})
+  let buf = RunMNVInTerminal('-S XTestWinfixsizeVsepStatusline', #{rows: 8})
 
   call term_sendkeys(buf, ":echo winwidth(1) winwidth(2) winwidth(3)\n")
   call WaitForAssert({-> assert_match('^16 37 20\>', term_getline(buf, 8))})
@@ -2353,7 +2353,7 @@ func Test_winfixsize_vsep_statusline()
   " (Likewise, may be better if 'wfh' window remains at 3 rows)
   call WaitForAssert({-> assert_match('^2 4\>', term_getline(buf, 8))})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_resize_from_another_tabpage()
@@ -2368,10 +2368,10 @@ func Test_resize_from_another_tabpage()
     tabprev
   END
   call writefile(lines, 'XTestResizeFromAnotherTabpage', 'D')
-  let buf = RunVimInTerminal('-S XTestResizeFromAnotherTabpage', #{rows: 8})
+  let buf = RunMNVInTerminal('-S XTestResizeFromAnotherTabpage', #{rows: 8})
   call VerifyScreenDump(buf, 'Test_resize_from_another_tabpage_1', {})
 
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 " When shrinking a window and the only other window has 'winfixheight'
@@ -2452,9 +2452,9 @@ func Test_laststatus_vsplit_row_height()
     set ls=2
   END
   call writefile(lines, 'XTestLaststatusVsplitRowHeight', 'D')
-  let buf = RunVimInTerminal('-S XTestLaststatusVsplitRowHeight', #{rows: 8})
+  let buf = RunMNVInTerminal('-S XTestLaststatusVsplitRowHeight', #{rows: 8})
   call VerifyScreenDump(buf, 'Test_laststatus_vsplit_row_height_1', {})
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 " Test that when FR_ROW windows have different status line heights (due to
@@ -2472,9 +2472,9 @@ func Test_laststatus_vsplit_row_height_mixed_stlo()
     set ls=2
   END
   call writefile(lines, 'XTestLaststatusVsplitRowHeight2', 'D')
-  let buf = RunVimInTerminal('-S XTestLaststatusVsplitRowHeight2', #{rows: 8})
+  let buf = RunMNVInTerminal('-S XTestLaststatusVsplitRowHeight2', #{rows: 8})
   call VerifyScreenDump(buf, 'Test_laststatus_vsplit_row_height2_1', {})
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 " Same as above but with the stlo window on the right (second leaf in FR_ROW).
@@ -2491,9 +2491,9 @@ func Test_laststatus_vsplit_row_height_mixed_stlo_reversed()
     set ls=2
   END
   call writefile(lines, 'XTestLaststatusVsplitRowHeight3', 'D')
-  let buf = RunVimInTerminal('-S XTestLaststatusVsplitRowHeight3', #{rows: 8})
+  let buf = RunMNVInTerminal('-S XTestLaststatusVsplitRowHeight3', #{rows: 8})
   call VerifyScreenDump(buf, 'Test_laststatus_vsplit_row_height3_1', {})
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 func Test_window_w_locked_bypass()
@@ -2521,4 +2521,4 @@ func Test_window_w_locked_bypass()
   %bw!
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_window_id.vim b/uvim/src/testdir/test_window_id.mnv
index 5401b5f37c..a9f6f5eacc 100644
--- a/uvim/src/testdir/test_window_id.vim
+++ b/uvim/src/testdir/test_window_id.mnv
@@ -137,4 +137,4 @@ func Test_winlayout()
   call assert_equal([], winlayout(-1))
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_windows_home.vim b/uvim/src/testdir/test_windows_home.mnv
index 4bacd3aab8..b60d10b08d 100644
--- a/uvim/src/testdir/test_windows_home.vim
+++ b/uvim/src/testdir/test_windows_home.mnv
@@ -118,4 +118,4 @@ func Test_WindowsHome()
   endtry
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_winfixbuf.vim b/uvim/src/testdir/test_winfixbuf.mnv
index 898443d9b5..8e933e0153 100644
--- a/uvim/src/testdir/test_winfixbuf.vim
+++ b/uvim/src/testdir/test_winfixbuf.mnv
@@ -488,9 +488,9 @@ func Test_browse_edit_fail()
   try
     browse edit! other
     call assert_equal(l:other, bufnr())
-  catch /^Vim\%((\a\+)\)\=:E338:/
-    " Ignore E338, which occurs if console Vim is built with +browse.
-    " Console Vim without +browse will treat this as a regular :edit.
+  catch /^MNV\%((\a\+)\)\=:E338:/
+    " Ignore E338, which occurs if console MNV is built with +browse.
+    " Console MNV without +browse will treat this as a regular :edit.
   endtry
 endfunc
 
@@ -506,9 +506,9 @@ func Test_browse_edit_pass()
 
   try
     browse write other
-  catch /^Vim\%((\a\+)\)\=:E338:/
-    " Ignore E338, which occurs if console Vim is built with +browse.
-    " Console Vim without +browse will treat this as a regular :write.
+  catch /^MNV\%((\a\+)\)\=:E338:/
+    " Ignore E338, which occurs if console MNV is built with +browse.
+    " Console MNV without +browse will treat this as a regular :write.
   endtry
 
   call delete("other")
@@ -1747,7 +1747,7 @@ func Test_ltag()
   set tags&
 endfunc
 
-" Fail vim.command if we try to change buffers while 'winfixbuf' is set
+" Fail mnv.command if we try to change buffers while 'winfixbuf' is set
 func Test_lua_command()
   CheckFeature lua
   call s:reset_all_buffers()
@@ -1762,15 +1762,15 @@ func Test_lua_command()
 
   set winfixbuf
 
-  call assert_fails($'lua vim.command("buffer " .. {l:previous})')
+  call assert_fails($'lua mnv.command("buffer " .. {l:previous})')
   call assert_equal(l:current, bufnr())
 
-  exe $'lua vim.command("buffer! " .. {l:previous})'
+  exe $'lua mnv.command("buffer! " .. {l:previous})'
   call assert_equal(l:previous, bufnr())
 endfunc
 
-" Fail :lvimgrep but :lvimgrep! is allowed
-func Test_lvimgrep()
+" Fail :lmnvgrep but :lmnvgrep! is allowed
+func Test_lmnvgrep()
   CheckFeature quickfix
   call s:reset_all_buffers()
 
@@ -1792,10 +1792,10 @@ func Test_lvimgrep()
 
   buffer! winfix.unittest
 
-  call assert_fails("lvimgrep /some-search-term/ *.unittest", "E1513:")
+  call assert_fails("lmnvgrep /some-search-term/ *.unittest", "E1513:")
   call assert_equal(l:current, bufnr())
 
-  lvimgrep! /some-search-term/ *.unittest
+  lmnvgrep! /some-search-term/ *.unittest
   call assert_notequal(l:current, bufnr())
 
   call delete("first.unittest")
@@ -1803,8 +1803,8 @@ func Test_lvimgrep()
   call delete("last.unittest")
 endfunc
 
-" Fail :lvimgrepadd but :lvimgrepadd! is allowed
-func Test_lvimgrepadd()
+" Fail :lmnvgrepadd but :lmnvgrepadd! is allowed
+func Test_lmnvgrepadd()
   CheckFeature quickfix
   call s:reset_all_buffers()
 
@@ -1826,10 +1826,10 @@ func Test_lvimgrepadd()
 
   buffer! winfix.unittest
 
-  call assert_fails("lvimgrepadd /some-search-term/ *.unittest", "E1513: Cannot switch buffer. 'winfixbuf' is enabled")
+  call assert_fails("lmnvgrepadd /some-search-term/ *.unittest", "E1513: Cannot switch buffer. 'winfixbuf' is enabled")
   call assert_equal(l:current, bufnr())
 
-  lvimgrepadd! /some-search-term/ *.unittest
+  lmnvgrepadd! /some-search-term/ *.unittest
   call assert_notequal(l:current, bufnr())
 
   call delete("first.unittest")
@@ -1898,19 +1898,19 @@ func Test_mksession()
   set sessionoptions+=options
   set winfixbuf
 
-  mksession test_winfixbuf_Test_mksession.vim
+  mksession test_winfixbuf_Test_mksession.mnv
 
   call s:reset_all_buffers()
   let l:winfixbuf = &winfixbuf
   call assert_equal(0, l:winfixbuf)
 
-  source test_winfixbuf_Test_mksession.vim
+  source test_winfixbuf_Test_mksession.mnv
 
   let l:winfixbuf = &winfixbuf
   call assert_equal(1, l:winfixbuf)
 
   set sessionoptions&
-  call delete("test_winfixbuf_Test_mksession.vim")
+  call delete("test_winfixbuf_Test_mksession.mnv")
 endfunc
 
 " Allow :next if the next index is the same as the current buffer
@@ -2261,7 +2261,7 @@ func Test_normal_gF()
   call writefile([], l:file, 'D')
   " Place the cursor onto the line that has `l:file`
   normal gg
-  " Prevent Vim from erroring with "No write since last change @ command
+  " Prevent MNV from erroring with "No write since last change @ command
   " line" when we try to call gF, later.
   set hidden
 
@@ -2289,7 +2289,7 @@ func Test_normal_gf()
   call writefile([], l:file, 'D')
   " Place the cursor onto the line that has `l:file`
   normal gg
-  " Prevent Vim from erroring with "No write since last change @ command
+  " Prevent MNV from erroring with "No write since last change @ command
   " line" when we try to call gf, later.
   set hidden
 
@@ -2317,7 +2317,7 @@ func Test_normal_square_bracket_left_f()
   call writefile([], l:file, 'D')
   " Place the cursor onto the line that has `l:file`
   normal gg
-  " Prevent Vim from erroring with "No write since last change @ command
+  " Prevent MNV from erroring with "No write since last change @ command
   " line" when we try to call gf, later.
   set hidden
 
@@ -2463,7 +2463,7 @@ func Test_normal_square_bracket_right_f()
   call writefile([], l:file, 'D')
   " Place the cursor onto the line that has `l:file`
   normal gg
-  " Prevent Vim from erroring with "No write since last change @ command
+  " Prevent MNV from erroring with "No write since last change @ command
   " line" when we try to call gf, later.
   set hidden
 
@@ -2613,16 +2613,16 @@ func Test_pythonx_pyxdo()
   set winfixbuf
 
   pythonx << EOF
-import vim
+import mnv
 
 def test_winfixbuf_Test_pythonx_pyxdo_set_buffer():
-    buffer = vim.vars['_previous_buffer']
-    vim.current.buffer = vim.buffers[buffer]
+    buffer = mnv.vars['_previous_buffer']
+    mnv.current.buffer = mnv.buffers[buffer]
 EOF
 
   try
     pyxdo test_winfixbuf_Test_pythonx_pyxdo_set_buffer()
-  catch /Vim\%((\a\+)\)\=:E1513:/
+  catch /MNV\%((\a\+)\)\=:E1513:/
     let l:caught = 1
   endtry
 
@@ -2645,15 +2645,15 @@ func Test_pythonx_pyxfile()
 
   set winfixbuf
 
-  call writefile(["import vim",
-        \ "buffer = vim.vars['_previous_buffer']",
-        \ "vim.current.buffer = vim.buffers[buffer]",
+  call writefile(["import mnv",
+        \ "buffer = mnv.vars['_previous_buffer']",
+        \ "mnv.current.buffer = mnv.buffers[buffer]",
         \ ],
         \ "file.py", 'D')
 
   try
     pyxfile file.py
-  catch /Vim\%((\a\+)\)\=:E1513:/
+  catch /MNV\%((\a\+)\)\=:E1513:/
     let l:caught = 1
   endtry
 
@@ -2662,8 +2662,8 @@ func Test_pythonx_pyxfile()
   unlet g:_previous_buffer
 endfunc
 
-" Fail vim.current.buffer if 'winfixbuf' is set
-func Test_pythonx_vim_current_buffer()
+" Fail mnv.current.buffer if 'winfixbuf' is set
+func Test_pythonx_mnv_current_buffer()
   CheckFeature pythonx
   call s:reset_all_buffers()
 
@@ -2680,12 +2680,12 @@ func Test_pythonx_vim_current_buffer()
 
   try
     pythonx << EOF
-import vim
+import mnv
 
-buffer = vim.vars["_previous_buffer"]
-vim.current.buffer = vim.buffers[buffer]
+buffer = mnv.vars["_previous_buffer"]
+mnv.current.buffer = mnv.buffers[buffer]
 EOF
-  catch /Vim\%((\a\+)\)\=:E1513:/
+  catch /MNV\%((\a\+)\)\=:E1513:/
     let l:caught = 1
   endtry
 
@@ -3104,8 +3104,8 @@ func Test_visual()
   call assert_equal(l:other, bufnr())
 endfunc
 
-" Fail :vimgrep but :vimgrep! is allowed
-func Test_vimgrep()
+" Fail :mnvgrep but :mnvgrep! is allowed
+func Test_mnvgrep()
   CheckFeature quickfix
   call s:reset_all_buffers()
 
@@ -3127,11 +3127,11 @@ func Test_vimgrep()
 
   buffer! winfix.unittest
 
-  call assert_fails("vimgrep /some-search-term/ *.unittest", "E1513: Cannot switch buffer. 'winfixbuf' is enabled")
+  call assert_fails("mnvgrep /some-search-term/ *.unittest", "E1513: Cannot switch buffer. 'winfixbuf' is enabled")
   call assert_equal(l:current, bufnr())
 
   " Don't error and also do swap to the first match because ! was included
-  vimgrep! /some-search-term/ *.unittest
+  mnvgrep! /some-search-term/ *.unittest
   call assert_notequal(l:current, bufnr())
 
   call delete("first.unittest")
@@ -3139,8 +3139,8 @@ func Test_vimgrep()
   call delete("last.unittest")
 endfunc
 
-" Fail :vimgrepadd but ::vimgrepadd! is allowed
-func Test_vimgrepadd()
+" Fail :mnvgrepadd but ::mnvgrepadd! is allowed
+func Test_mnvgrepadd()
   CheckFeature quickfix
   call s:reset_all_buffers()
 
@@ -3162,10 +3162,10 @@ func Test_vimgrepadd()
 
   buffer! winfix.unittest
 
-  call assert_fails("vimgrepadd /some-search-term/ *.unittest", "E1513: Cannot switch buffer. 'winfixbuf' is enabled")
+  call assert_fails("mnvgrepadd /some-search-term/ *.unittest", "E1513: Cannot switch buffer. 'winfixbuf' is enabled")
   call assert_equal(l:current, bufnr())
 
-  vimgrepadd! /some-search-term/ *.unittest
+  mnvgrepadd! /some-search-term/ *.unittest
   call assert_notequal(l:current, bufnr())
   call delete("first.unittest")
   call delete("winfix.unittest")
@@ -3350,7 +3350,7 @@ func Test_bufdo_cnext_splitwin_fails()
   call assert_fails(':cnext', ['E36:', 'E1513:'])
   " Ensure the entry didn't change.
   call assert_equal(1, getqflist(#{idx: 0}).idx)
-  set winminheight&vim winheight&vim
+  set winminheight&mnv winheight&mnv
 endfunc
 
 " Test that exiting with 'winfixbuf' and EXITFREE doesn't cause an error.
@@ -3361,7 +3361,7 @@ func Test_exitfree_no_error()
   END
   call writefile(lines, 'Xwfb_exitfree', 'D')
   call assert_notmatch('E1513:',
-        \ system(GetVimCommandClean() .. ' --not-a-term -X -S Xwfb_exitfree'))
+        \ system(GetMNVCommandClean() .. ' --not-a-term -X -S Xwfb_exitfree'))
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_wnext.vim b/uvim/src/testdir/test_wnext.mnv
index ad782e45ed..0da1c409da 100644
--- a/uvim/src/testdir/test_wnext.vim
+++ b/uvim/src/testdir/test_wnext.mnv
@@ -100,4 +100,4 @@ func Test_wprevious()
   call delete('X4')
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_wordcount.vim b/uvim/src/testdir/test_wordcount.mnv
index 9d47743b6e..a229877e53 100644
--- a/uvim/src/testdir/test_wordcount.vim
+++ b/uvim/src/testdir/test_wordcount.mnv
@@ -103,4 +103,4 @@ func Test_wordcount()
   close
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_writefile.vim b/uvim/src/testdir/test_writefile.mnv
index cd427ad990..1f636bc89b 100644
--- a/uvim/src/testdir/test_writefile.vim
+++ b/uvim/src/testdir/test_writefile.mnv
@@ -6,13 +6,13 @@ func Test_writefile()
   call writefile(["hello", "world"], f, "b")
   call writefile(["!", "good"], f, "a")
   call writefile(["morning"], f, "ab")
-  call writefile(["", "vimmers"], f, "ab")
+  call writefile(["", "mnvmers"], f, "ab")
   let l = readfile(f)
   call assert_equal("hello", l[0])
   call assert_equal("world!", l[1])
   call assert_equal("good", l[2])
   call assert_equal("morning", l[3])
-  call assert_equal("vimmers", l[4])
+  call assert_equal("mnvmers", l[4])
 
   call assert_fails('call writefile("text", "Xwffile")', 'E475: Invalid argument: writefile() first argument must be a List or a Blob')
 endfunc
@@ -77,7 +77,7 @@ func Test_writefile_fails_conversion()
 
   call delete('Xwfcfile' .. &backupext)
   bwipe!
-  set backup& writebackup& backupdir&vim backupskip&vim
+  set backup& writebackup& backupdir&mnv backupskip&mnv
 endfunc
 
 func Test_writefile_fails_conversion2()
@@ -99,7 +99,7 @@ func Test_writefile_fails_conversion2()
 
   call delete('Xwf2file_conversion_err~')
   bwipe!
-  set backup& writebackup& backupdir&vim backupskip&vim
+  set backup& writebackup& backupdir&mnv backupskip&mnv
 endfunc
 
 func SetFlag(timer)
@@ -298,15 +298,15 @@ func Test_write_errors()
   endif
 endfunc
 
-" Test for writing to a file which is modified after Vim read it
+" Test for writing to a file which is modified after MNV read it
 func Test_write_file_mtime()
   CheckEnglish
-  CheckRunVimInTerminal
+  CheckRunMNVInTerminal
 
   " First read the file into a buffer
   call writefile(["Line1", "Line2"], 'Xwfmfile', 'D')
   let old_ftime = getftime('Xwfmfile')
-  let buf = RunVimInTerminal('Xwfmfile', #{rows : 10})
+  let buf = RunMNVInTerminal('Xwfmfile', #{rows : 10})
   call TermWait(buf)
   call term_sendkeys(buf, ":set noswapfile\<CR>")
   call TermWait(buf)
@@ -339,7 +339,7 @@ func Test_write_file_mtime()
   call WaitForAssert({-> assert_equal('Line2', readfile('Xwfmfile')[1])})
 
   " clean up
-  call StopVimInTerminal(buf)
+  call StopMNVInTerminal(buf)
 endfunc
 
 " Test for an autocmd unloading a buffer during a write command
@@ -506,9 +506,9 @@ func Test_write_file_encoding()
   let save_fileencodings = &fileencodings
   set encoding=latin1 fileencodings&
   let text =<< trim END
-    1 utf-8 text: Дл� Vim version 6.2.  По�леднее изменение: 1970 Jan 01
-    2 cp1251 text: Äëÿ Vim version 6.2.  Ïîñëåäíåå èçìåíåíèå: 1970 Jan 01
-    3 cp866 text: „«ï Vim version 6.2.  �®á«¥¤­¥¥ ¨§¬¥­¥­¨¥: 1970 Jan 01
+    1 utf-8 text: Дл� MNV version 6.2.  По�леднее изменение: 1970 Jan 01
+    2 cp1251 text: ��MNMNV version 6.2.  ��������� ���������: 1970 Jan 01
+    3 cp866 text: ��MNMNV version 6.2.  ��᫥���� ���������: 1970 Jan 01
   END
   call writefile(text, 'Xwfefile', 'D')
   edit Xwfefile
@@ -523,9 +523,9 @@ func Test_write_file_encoding()
   .w ++enc=cp866 >> Xwfetest
   .w! ++enc=utf-8 Xutf8
   let expected =<< trim END
-    1 utf-8 text: Дл� Vim version 6.2.  По�леднее изменение: 1970 Jan 01
-    1 utf-8 text: Äëÿ Vim version 6.2.  Ïîñëåäíåå èçìåíåíèå: 1970 Jan 01
-    1 utf-8 text: „«ï Vim version 6.2.  �®á«¥¤­¥¥ ¨§¬¥­¥­¨¥: 1970 Jan 01
+    1 utf-8 text: Дл� MNV version 6.2.  По�леднее изменение: 1970 Jan 01
+    1 utf-8 text: ��MNMNV version 6.2.  ��������� ���������: 1970 Jan 01
+    1 utf-8 text: ��MNMNV version 6.2.  ��᫥���� ���������: 1970 Jan 01
   END
   call assert_equal(expected, readfile('Xwfetest'))
 
@@ -536,9 +536,9 @@ func Test_write_file_encoding()
   .w ++enc=cp866 >> Xwfetest
   .w! ++enc=cp1251 Xcp1251
   let expected =<< trim END
-    2 cp1251 text: Дл� Vim version 6.2.  По�леднее изменение: 1970 Jan 01
-    2 cp1251 text: Äëÿ Vim version 6.2.  Ïîñëåäíåå èçìåíåíèå: 1970 Jan 01
-    2 cp1251 text: „«ï Vim version 6.2.  �®á«¥¤­¥¥ ¨§¬¥­¥­¨¥: 1970 Jan 01
+    2 cp1251 text: Дл� MNV version 6.2.  По�леднее изменение: 1970 Jan 01
+    2 cp1251 text: ��MNMNV version 6.2.  ��������� ���������: 1970 Jan 01
+    2 cp1251 text: ��MNMNV version 6.2.  ��᫥���� ���������: 1970 Jan 01
   END
   call assert_equal(expected, readfile('Xwfetest'))
 
@@ -549,9 +549,9 @@ func Test_write_file_encoding()
   .w ++enc=cp866 >> Xwfetest
   .w! ++enc=cp866 Xcp866
   let expected =<< trim END
-    3 cp866 text: Дл� Vim version 6.2.  По�леднее изменение: 1970 Jan 01
-    3 cp866 text: Äëÿ Vim version 6.2.  Ïîñëåäíåå èçìåíåíèå: 1970 Jan 01
-    3 cp866 text: „«ï Vim version 6.2.  �®á«¥¤­¥¥ ¨§¬¥­¥­¨¥: 1970 Jan 01
+    3 cp866 text: Дл� MNV version 6.2.  По�леднее изменение: 1970 Jan 01
+    3 cp866 text: ��MNMNV version 6.2.  ��������� ���������: 1970 Jan 01
+    3 cp866 text: ��MNMNV version 6.2.  ��᫥���� ���������: 1970 Jan 01
   END
   call assert_equal(expected, readfile('Xwfetest'))
 
@@ -565,9 +565,9 @@ func Test_write_file_encoding()
   e Xcp866
   .w ++enc=utf-8 >> Xwfetest
   let expected =<< trim END
-    1 utf-8 text: Дл� Vim version 6.2.  По�леднее изменение: 1970 Jan 01
-    2 cp1251 text: Дл� Vim version 6.2.  По�леднее изменение: 1970 Jan 01
-    3 cp866 text: Дл� Vim version 6.2.  По�леднее изменение: 1970 Jan 01
+    1 utf-8 text: Дл� MNV version 6.2.  По�леднее изменение: 1970 Jan 01
+    2 cp1251 text: Дл� MNV version 6.2.  По�леднее изменение: 1970 Jan 01
+    3 cp866 text: Дл� MNV version 6.2.  По�леднее изменение: 1970 Jan 01
   END
   call assert_equal(expected, readfile('Xwfetest'))
 
@@ -581,9 +581,9 @@ func Test_write_file_encoding()
   e Xcp866
   .w ++enc=cp1251 >> Xwfetest
   let expected =<< trim END
-    1 utf-8 text: Äëÿ Vim version 6.2.  Ïîñëåäíåå èçìåíåíèå: 1970 Jan 01
-    2 cp1251 text: Äëÿ Vim version 6.2.  Ïîñëåäíåå èçìåíåíèå: 1970 Jan 01
-    3 cp866 text: Äëÿ Vim version 6.2.  Ïîñëåäíåå èçìåíåíèå: 1970 Jan 01
+    1 utf-8 text: ��MNMNV version 6.2.  ��������� ���������: 1970 Jan 01
+    2 cp1251 text: ��MNMNV version 6.2.  ��������� ���������: 1970 Jan 01
+    3 cp866 text: ��MNMNV version 6.2.  ��������� ���������: 1970 Jan 01
   END
   call assert_equal(expected, readfile('Xwfetest'))
 
@@ -597,9 +597,9 @@ func Test_write_file_encoding()
   e Xcp866
   .w ++enc=cp866 >> Xwfetest
   let expected =<< trim END
-    1 utf-8 text: „«ï Vim version 6.2.  �®á«¥¤­¥¥ ¨§¬¥­¥­¨¥: 1970 Jan 01
-    2 cp1251 text: „«ï Vim version 6.2.  �®á«¥¤­¥¥ ¨§¬¥­¥­¨¥: 1970 Jan 01
-    3 cp866 text: „«ï Vim version 6.2.  �®á«¥¤­¥¥ ¨§¬¥­¥­¨¥: 1970 Jan 01
+    1 utf-8 text: ��MNMNV version 6.2.  ��᫥���� ���������: 1970 Jan 01
+    2 cp1251 text: ��MNMNV version 6.2.  ��᫥���� ���������: 1970 Jan 01
+    3 cp866 text: ��MNMNV version 6.2.  ��᫥���� ���������: 1970 Jan 01
   END
   call assert_equal(expected, readfile('Xwfetest'))
 
@@ -997,4 +997,4 @@ func Test_write_with_xattr_support()
   bw!
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_xdg.vim b/uvim/src/testdir/test_xdg.mnv
index abded47551..f17661f166 100644
--- a/uvim/src/testdir/test_xdg.vim
+++ b/uvim/src/testdir/test_xdg.mnv
@@ -2,10 +2,10 @@
 
 func s:get_rcs()
   let rcs = {
-        \ 'file1': { 'path': '~/.vimrc', 'dir': expand('~/.vim/') },
-        \ 'file2': { 'path': '~/.vim/vimrc', 'dir': expand('~/.vim/') },
+        \ 'file1': { 'path': '~/.mnvrc', 'dir': expand('~/.mnv/') },
+        \ 'file2': { 'path': '~/.mnv/mnvrc', 'dir': expand('~/.mnv/') },
         \ 'xdg': { 'path': exists('$XDG_CONFIG_HOME') ? '$XDG_CONFIG_HOME' : "~/.config",
-                  \ 'dir': exists('$XDG_CONFIG_HOME') ? expand("$XDG_CONFIG_HOME/vim") : '~/.config/vim/'},
+                  \ 'dir': exists('$XDG_CONFIG_HOME') ? expand("$XDG_CONFIG_HOME/mnv") : '~/.config/mnv/'},
         \}
   for v in values(rcs)
     let v.exists = filereadable(expand(v.path))
@@ -17,13 +17,13 @@ func Test_xdg_rc_detection()
   CheckUnix
   let rc = s:get_rcs()
   let before =<< trim CODE
-    call writefile([expand('$MYVIMRC')], "XMY_VIMRC")
-    call writefile([expand('$MYVIMDIR')], "XMY_VIMDIR")
+    call writefile([expand('$MYMNVRC')], "XMY_MNVRC")
+    call writefile([expand('$MYMNVDIR')], "XMY_MNVDIR")
     quit!
   CODE
-  call RunVim(before, [], "")
-  let my_rc = readfile("XMY_VIMRC")
-  let my_rcdir = readfile("XMY_VIMDIR")
+  call RunMNV(before, [], "")
+  let my_rc = readfile("XMY_MNVRC")
+  let my_rcdir = readfile("XMY_MNVDIR")
   if rc.file1.exists
     call assert_equal(rc.file1.path, my_rc)
     call assert_equal(rc.file1.dir, my_rcdir)
@@ -34,88 +34,88 @@ func Test_xdg_rc_detection()
     call assert_equal(rc.xdg.path, my_rc)
     call assert_equal(rc.xdg.dir, my_rcdir)
   endif
-  call delete("XMY_VIMRC")
-  call delete("XMY_VIMDIR")
+  call delete("XMY_MNVRC")
+  call delete("XMY_MNVDIR")
 endfunc
 
 func Test_xdg_runtime_files()
   " This tests, that the initialization file from
-  " ~/.vimrc, ~/.vim/vimrc and ~/.config/vim/vimrc (or
-  " $XDG_CONFIG_HOME/vim/vimrc) are sourced in that order
+  " ~/.mnvrc, ~/.mnv/mnvrc and ~/.config/mnv/mnvrc (or
+  " $XDG_CONFIG_HOME/mnv/mnvrc) are sourced in that order
   CheckUnix
-  call mkdir(expand('~/.vim/'), 'pD')
-  call mkdir(expand('~/.config/vim/'), 'pD')
-  call mkdir(expand('~/xdg/vim/'), 'pD')
+  call mkdir(expand('~/.mnv/'), 'pD')
+  call mkdir(expand('~/.config/mnv/'), 'pD')
+  call mkdir(expand('~/xdg/mnv/'), 'pD')
 
-  let rc1=expand('~/.vimrc')
-  let rc2=expand('~/.vim/vimrc')
-  let rc3=expand('~/.config/vim/vimrc')
-  let rc4=expand('~/xdg/vim/vimrc')
+  let rc1=expand('~/.mnvrc')
+  let rc2=expand('~/.mnv/mnvrc')
+  let rc3=expand('~/.config/mnv/mnvrc')
+  let rc4=expand('~/xdg/mnv/mnvrc')
 
   " g:rc_one|two|three|four is to verify, that the other
   " init files are not sourced
   " g:rc is to verify which rc file has been loaded.
-  " g:rc_vimdir is to verify $MYVIMDIR is set and valid
+  " g:rc_mnvdir is to verify $MYMNVDIR is set and valid
   let file1 =<< trim CODE
     let g:rc_one = 'one'
-    let g:rc = '.vimrc'
-    let g:rc_vimdir = expand('~/.vim/')
-    call assert_equal(g:rc_vimdir, $MYVIMDIR)
+    let g:rc = '.mnvrc'
+    let g:rc_mnvdir = expand('~/.mnv/')
+    call assert_equal(g:rc_mnvdir, $MYMNVDIR)
   CODE
   let file2 =<< trim CODE
     let g:rc_two = 'two'
-    let g:rc = '.vim/vimrc'
-    let g:rc_vimdir = expand('~/.vim/')
-    call assert_equal(g:rc_vimdir, $MYVIMDIR)
+    let g:rc = '.mnv/mnvrc'
+    let g:rc_mnvdir = expand('~/.mnv/')
+    call assert_equal(g:rc_mnvdir, $MYMNVDIR)
   CODE
   let file3 =<< trim CODE
     let g:rc_three = 'three'
-    let g:rc = '.config/vim/vimrc'
-    let g:rc_vimdir = expand('~/.config/vim/')
-    call assert_equal(g:rc_vimdir, $MYVIMDIR)
+    let g:rc = '.config/mnv/mnvrc'
+    let g:rc_mnvdir = expand('~/.config/mnv/')
+    call assert_equal(g:rc_mnvdir, $MYMNVDIR)
   CODE
   let file4 =<< trim CODE
     let g:rc_four = 'four'
-    let g:rc = 'xdg/vim/vimrc'
-    let g:rc_vimdir = expand('~/xdg/vim/')
-    call assert_equal(g:rc_vimdir, $MYVIMDIR)
+    let g:rc = 'xdg/mnv/mnvrc'
+    let g:rc_mnvdir = expand('~/xdg/mnv/')
+    call assert_equal(g:rc_mnvdir, $MYMNVDIR)
   CODE
   call writefile(file1, rc1)
   call writefile(file2, rc2)
   call writefile(file3, rc3)
   call writefile(file4, rc4)
 
-  " Get the Vim command to run without the '-u NONE' argument
-  let vimcmd = substitute(GetVimCommand(), '-u NONE', '', '')
+  " Get the MNV command to run without the '-u NONE' argument
+  let mnvcmd = substitute(GetMNVCommand(), '-u NONE', '', '')
 
-  " Test for ~/.vimrc
+  " Test for ~/.mnvrc
   let lines =<< trim END
-    call assert_match('XfakeHOME/\.vimrc', $MYVIMRC)
-    call assert_match('XfakeHOME/.vim/', $MYVIMDIR)
+    call assert_match('XfakeHOME/\.mnvrc', $MYMNVRC)
+    call assert_match('XfakeHOME/.mnv/', $MYMNVDIR)
     call filter(g:, {idx, _ -> idx =~ '^rc'})
-    call assert_equal(#{rc_one: 'one', rc: '.vimrc', rc_vimdir: $MYVIMDIR}, g:)
-    call assert_match('XfakeHOME/\.vim/view', &viewdir)
+    call assert_equal(#{rc_one: 'one', rc: '.mnvrc', rc_mnvdir: $MYMNVDIR}, g:)
+    call assert_match('XfakeHOME/\.mnv/view', &viewdir)
     call writefile(v:errors, 'Xresult')
     quit
   END
   call writefile(lines, 'Xscript', 'D')
-  call system($'{vimcmd} -S Xscript')
+  call system($'{mnvcmd} -S Xscript')
   call assert_equal([], readfile('Xresult'))
 
   call delete(rc1)
 
-  " Test for ~/.vim/vimrc
+  " Test for ~/.mnv/mnvrc
   let lines =<< trim END
-    call assert_match('XfakeHOME/\.vim/vimrc', $MYVIMRC)
-    call assert_match('XfakeHOME/\.vim/', $MYVIMDIR)
+    call assert_match('XfakeHOME/\.mnv/mnvrc', $MYMNVRC)
+    call assert_match('XfakeHOME/\.mnv/', $MYMNVDIR)
     call filter(g:, {idx, _ -> idx =~ '^rc'})
-    call assert_equal(#{rc_two: 'two', rc: '.vim/vimrc', rc_vimdir: $MYVIMDIR}, g:)
-    call assert_match('XfakeHOME/\.vim/view', &viewdir)
+    call assert_equal(#{rc_two: 'two', rc: '.mnv/mnvrc', rc_mnvdir: $MYMNVDIR}, g:)
+    call assert_match('XfakeHOME/\.mnv/view', &viewdir)
     call writefile(v:errors, 'Xresult')
     quit
   END
   call writefile(lines, 'Xscript', 'D')
-  call system($'{vimcmd} -S Xscript')
+  call system($'{mnvcmd} -S Xscript')
   call assert_equal([], readfile('Xresult'))
 
   call delete(rc2)
@@ -123,50 +123,50 @@ func Test_xdg_runtime_files()
   " XDG_CONFIG_HOME is set in Github CI runners
   unlet $XDG_CONFIG_HOME
 
-  " Test for ~/.config/vim/vimrc
+  " Test for ~/.config/mnv/mnvrc
   let lines =<< trim END
     let msg = $'HOME="{$HOME}", ~="{expand("~")}"'
-    call assert_match('XfakeHOME/\.config/vim/vimrc', $MYVIMRC, msg)
-    call assert_match('XfakeHOME/\.config/vim/', $MYVIMDIR, msg)
+    call assert_match('XfakeHOME/\.config/mnv/mnvrc', $MYMNVRC, msg)
+    call assert_match('XfakeHOME/\.config/mnv/', $MYMNVDIR, msg)
     call filter(g:, {idx, _ -> idx =~ '^rc'})
-    call assert_equal(#{rc_three: 'three', rc: '.config/vim/vimrc', rc_vimdir: $MYVIMDIR}, g:)
-    call assert_match('XfakeHOME/\.config/vim/view', &viewdir)
+    call assert_equal(#{rc_three: 'three', rc: '.config/mnv/mnvrc', rc_mnvdir: $MYMNVDIR}, g:)
+    call assert_match('XfakeHOME/\.config/mnv/view', &viewdir)
     call writefile(v:errors, 'Xresult')
     quit
   END
   call writefile(lines, 'Xscript', 'D')
-  call system($'{vimcmd} -S Xscript')
+  call system($'{mnvcmd} -S Xscript')
   call assert_equal([], readfile('Xresult'))
 
   call delete(rc3)
 
-  " Test for ~/xdg/vim/vimrc
+  " Test for ~/xdg/mnv/mnvrc
   let $XDG_CONFIG_HOME=expand('~/xdg/')
   let lines =<< trim END
     let msg = $'HOME="{$HOME}", XDG_CONFIG_HOME="{$XDG_CONFIG_HOME}"'
-    call assert_match('XfakeHOME/xdg/vim/vimrc', $MYVIMRC, msg)
-    call assert_match('XfakeHOME/xdg/vim/', $MYVIMDIR, msg)
+    call assert_match('XfakeHOME/xdg/mnv/mnvrc', $MYMNVRC, msg)
+    call assert_match('XfakeHOME/xdg/mnv/', $MYMNVDIR, msg)
     call filter(g:, {idx, _ -> idx =~ '^rc'})
-    call assert_equal(#{rc_four: 'four', rc: 'xdg/vim/vimrc', rc_vimdir: $MYVIMDIR}, g:)
-    call assert_match('XfakeHOME/xdg/vim/view, &viewdir)
+    call assert_equal(#{rc_four: 'four', rc: 'xdg/mnv/mnvrc', rc_mnvdir: $MYMNVDIR}, g:)
+    call assert_match('XfakeHOME/xdg/mnv/view, &viewdir)
     call writefile(v:errors, 'Xresult')
     quit
   END
   call writefile(lines, 'Xscript', 'D')
-  call system($'{vimcmd} -S Xscript')
+  call system($'{mnvcmd} -S Xscript')
   call assert_equal([], readfile('Xresult'))
 
-  " Test for $MYVIMDIR changes when updating runtimepath
+  " Test for $MYMNVDIR changes when updating runtimepath
   let lines =<< trim END
     let msg = $'HOME="{$HOME}", XDG_CONFIG_HOME="{$XDG_CONFIG_HOME}" rtp-prepend'
     set rtp^=/non-existing
-    call assert_match('XfakeHOME/xdg/vim/vimrc', $MYVIMRC, msg)
-    call assert_match('/non-existing', $MYVIMDIR, msg)
+    call assert_match('XfakeHOME/xdg/mnv/mnvrc', $MYMNVRC, msg)
+    call assert_match('/non-existing', $MYMNVDIR, msg)
     call writefile(v:errors, 'Xresult')
     quit
   END
   call writefile(lines, 'Xscript', 'D')
-  call system($'{vimcmd} -S Xscript')
+  call system($'{mnvcmd} -S Xscript')
   call assert_equal([], readfile('Xresult'))
 
   call delete(rc4)
@@ -179,26 +179,26 @@ func Test_xdg_version()
   unlet $XDG_CONFIG_HOME
   let a = execute(':version')->split('\n')
   let a = filter(a, { _, val -> val =~ '\.config\|XDG_CONFIG_HOME' })
-  " There should be 1 entry for gvimrc and 1 entry for vimrc,
-  " but only if Vim was compiled with gui support
+  " There should be 1 entry for gmnvrc and 1 entry for mnvrc,
+  " but only if MNV was compiled with gui support
   call assert_equal(1 + has("gui"), len(a))
-  call assert_match('\~/\.config/vim/vimrc', a[0])
+  call assert_match('\~/\.config/mnv/mnvrc', a[0])
   if has("gui")
-    call assert_match('\~/\.config/vim/gvimrc', a[1])
+    call assert_match('\~/\.config/mnv/gmnvrc', a[1])
   endif
 
   let $XDG_CONFIG_HOME = expand('~/.xdg')
   let a = execute(':version')->split('\n')
   let a = filter(a, { _, val -> val =~ '\.config\|XDG_CONFIG_HOME' })
   call assert_equal(1 + has("gui"), len(a))
-  call assert_match('XDG_CONFIG_HOME/vim/vimrc', a[0])
+  call assert_match('XDG_CONFIG_HOME/mnv/mnvrc', a[0])
   if has("gui")
-    call assert_match('XDG_CONFIG_HOME/vim/gvimrc', a[1])
+    call assert_match('XDG_CONFIG_HOME/mnv/gmnvrc', a[1])
   endif
   unlet $XDG_CONFIG_HOME
 endfunc
 
-" Test for gvimrc, must be last, since it starts the GUI
+" Test for gmnvrc, must be last, since it starts the GUI
 " and sources a few extra test files
 func Test_zzz_xdg_runtime_files()
   CheckCanRunGui
@@ -206,122 +206,122 @@ func Test_zzz_xdg_runtime_files()
 
   " Is setup in Github Runner
   unlet $XDG_CONFIG_HOME
-  source util/setup_gui.vim
+  source util/setup_gui.mnv
   call GUISetUpCommon()
 
   " This tests, that the GUI initialization file from
-  " ~/.gvimrc, ~/.vim/gvimrc, ~/.config/vim/gvimrc
-  " and ~/XDG_CONFIG_HOME/vim/gvimrc is sourced
+  " ~/.gmnvrc, ~/.mnv/gmnvrc, ~/.config/mnv/gmnvrc
+  " and ~/XDG_CONFIG_HOME/mnv/gmnvrc is sourced
   " when starting GUI mode
-  call mkdir(expand('~/.vim/'), 'pD')
-  call mkdir(expand('~/.config/vim/'), 'pD')
-  call mkdir(expand('~/xdg/vim/'), 'pD')
+  call mkdir(expand('~/.mnv/'), 'pD')
+  call mkdir(expand('~/.config/mnv/'), 'pD')
+  call mkdir(expand('~/xdg/mnv/'), 'pD')
 
-  let rc1=expand('~/.gvimrc')
-  let rc2=expand('~/.vim/gvimrc')
-  let rc3=expand('~/.config/vim/gvimrc')
-  let rc4=expand('~/xdg/vim/gvimrc')
+  let rc1=expand('~/.gmnvrc')
+  let rc2=expand('~/.mnv/gmnvrc')
+  let rc3=expand('~/.config/mnv/gmnvrc')
+  let rc4=expand('~/xdg/mnv/gmnvrc')
 
   " g:rc_one|two|three|four is to verify, that the other
   " init files are not sourced
   " g:rc is to verify which rc file has been loaded.
   let file1 =<< trim CODE
     let g:rc_one = 'one'
-    let g:rc = '.gvimrc'
+    let g:rc = '.gmnvrc'
   CODE
   let file2 =<< trim CODE
     let g:rc_two = 'two'
-    let g:rc = '.vim/gvimrc'
+    let g:rc = '.mnv/gmnvrc'
   CODE
   let file3 =<< trim CODE
     let g:rc_three = 'three'
-    let g:rc = '.config/vim/gvimrc'
+    let g:rc = '.config/mnv/gmnvrc'
   CODE
   let file4 =<< trim CODE
     let g:rc_four = 'four'
-    let g:rc = 'xdg/vim/gvimrc'
+    let g:rc = 'xdg/mnv/gmnvrc'
   CODE
   call writefile(file1, rc1)
   call writefile(file2, rc2)
   call writefile(file3, rc3)
   call writefile(file4, rc4)
 
-  " Get the Vim command to run without the '-u NONE' argument
-  let vimcmd = substitute(GetVimCommand(), '-u NONE', '', '')
+  " Get the MNV command to run without the '-u NONE' argument
+  let mnvcmd = substitute(GetMNVCommand(), '-u NONE', '', '')
 
-  " Test for ~/.gvimrc
+  " Test for ~/.gmnvrc
   let lines =<< trim END
     " Ignore the "failed to create input context" error.
     call test_ignore_error('E285')
     gui -f
-    call assert_match('Xhome/\.gvimrc', $MYGVIMRC)
-    call assert_match('Xhome/\.vim/', $MYVIMDIR)
+    call assert_match('Xhome/\.gmnvrc', $MYGMNVRC)
+    call assert_match('Xhome/\.mnv/', $MYMNVDIR)
     call filter(g:, {idx, _ -> idx =~ '^rc'})
-    call assert_equal(#{rc_one: 'one', rc: '.gvimrc'}, g:)
+    call assert_equal(#{rc_one: 'one', rc: '.gmnvrc'}, g:)
     call writefile(v:errors, 'Xresult')
     quit
   END
   call writefile(lines, 'Xscript', 'D')
-  call system($'{vimcmd} -S Xscript')
+  call system($'{mnvcmd} -S Xscript')
   call assert_equal([], readfile('Xresult'))
 
   call delete(rc1)
 
-  " Test for ~/.vim/gvimrc
+  " Test for ~/.mnv/gmnvrc
   let lines =<< trim END
     " Ignore the "failed to create input context" error.
     call test_ignore_error('E285')
     gui -f
-    call assert_match('Xhome/\.vim/gvimrc', $MYGVIMRC)
-    call assert_match('Xhome/\.vim/', $MYVIMDIR)
+    call assert_match('Xhome/\.mnv/gmnvrc', $MYGMNVRC)
+    call assert_match('Xhome/\.mnv/', $MYMNVDIR)
     call filter(g:, {idx, _ -> idx =~ '^rc'})
-    call assert_equal(#{rc_two: 'two', rc: '.vim/gvimrc'}, g:)
+    call assert_equal(#{rc_two: 'two', rc: '.mnv/gmnvrc'}, g:)
     call writefile(v:errors, 'Xresult')
     quit
   END
   call writefile(lines, 'Xscript', 'D')
-  call system($'{vimcmd} -S Xscript')
+  call system($'{mnvcmd} -S Xscript')
   call assert_equal([], readfile('Xresult'))
 
   call delete(rc2)
 
-  " Test for ~/.config/vim/gvimrc
-  " MYVIMDIR is only set to ~/config/.vim if ~/.config/vim/vimrc exists!
+  " Test for ~/.config/mnv/gmnvrc
+  " MYMNVDIR is only set to ~/config/.mnv if ~/.config/mnv/mnvrc exists!
   let lines =<< trim END
     " Ignore the "failed to create input context" error.
     call test_ignore_error('E285')
     gui -f
     let msg = $'HOME="{$HOME}", ~="{expand("~")}"'
-    call assert_match('Xhome/\.config/vim/gvimrc', $MYGVIMRC, msg)
-    call assert_match('Xhome/\.vim/', $MYVIMDIR, msg)
+    call assert_match('Xhome/\.config/mnv/gmnvrc', $MYGMNVRC, msg)
+    call assert_match('Xhome/\.mnv/', $MYMNVDIR, msg)
     call filter(g:, {idx, _ -> idx =~ '^rc'})
-    call assert_equal(#{rc_three: 'three', rc: '.config/vim/gvimrc'}, g:)
+    call assert_equal(#{rc_three: 'three', rc: '.config/mnv/gmnvrc'}, g:)
     call writefile(v:errors, 'Xresult')
     quit
   END
   call writefile(lines, 'Xscript', 'D')
-  call system($'{vimcmd} -S Xscript')
+  call system($'{mnvcmd} -S Xscript')
   call assert_equal([], readfile('Xresult'))
 
   call delete(rc3)
 
-  " Test for ~/xdg/vim/gvimrc
-  " MYVIMDIR is only set to ~/xdg/vim if ~/xdg/vim/vimrc exists!
+  " Test for ~/xdg/mnv/gmnvrc
+  " MYMNVDIR is only set to ~/xdg/mnv if ~/xdg/mnv/mnvrc exists!
   let $XDG_CONFIG_HOME=expand('~/xdg/')
   let lines =<< trim END
     " Ignore the "failed to create input context" error.
     call test_ignore_error('E285')
     gui -f
     let msg = $'HOME="{$HOME}", XDG_CONFIG_HOME="{$XDG_CONFIG_HOME}"'
-    call assert_match('Xhome/xdg/vim/gvimrc', $MYGVIMRC, msg)
-    call assert_match('Xhome/\.vim/', $MYVIMDIR, msg)
+    call assert_match('Xhome/xdg/mnv/gmnvrc', $MYGMNVRC, msg)
+    call assert_match('Xhome/\.mnv/', $MYMNVDIR, msg)
     call filter(g:, {idx, _ -> idx =~ '^rc'})
-    call assert_equal(#{rc_four: 'four', rc: 'xdg/vim/gvimrc'}, g:)
+    call assert_equal(#{rc_four: 'four', rc: 'xdg/mnv/gmnvrc'}, g:)
     call writefile(v:errors, 'Xresult')
     quit
   END
   call writefile(lines, 'Xscript', 'D')
-  call system($'{vimcmd} -S Xscript')
+  call system($'{mnvcmd} -S Xscript')
   call assert_equal([], readfile('Xresult'))
 
   call delete(rc4)
@@ -332,4 +332,4 @@ func Test_zzz_xdg_runtime_files()
   call delete('Xhome', 'rf')
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/test_xxd.vim b/uvim/src/testdir/test_xxd.mnv
index 472dfd4ee9..f88dc8a66b 100644
--- a/uvim/src/testdir/test_xxd.vim
+++ b/uvim/src/testdir/test_xxd.mnv
@@ -1,6 +1,6 @@
 " Test for the xxd command
 
-source util/screendump.vim
+source util/screendump.mnv
 
 if empty($XXD) && executable('..\xxd\xxd.exe')
   let s:xxd_cmd = '..\xxd\xxd.exe'
@@ -696,7 +696,7 @@ func Test_xxd_color2()
 
   let $PS1='$ '
   " This needs dash, plain bashs sh does not seem to work :(
-  let buf = RunVimInTerminal('', #{rows: 20, cmd: 'sh'})
+  let buf = RunMNVInTerminal('', #{rows: 20, cmd: 'sh'})
   call term_sendkeys(buf,  s:xxd_cmd .. " -R never  < XXDfile_colors\<cr>")
   call TermWait(buf)
   redraw
@@ -822,4 +822,4 @@ func Test_xxd_color_term_unset()
   call delete(outfile)
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/util/amiga.vim b/uvim/src/testdir/util/amiga.mnv
index 2837fe564d..61b0318972 100644
--- a/uvim/src/testdir/util/amiga.vim
+++ b/uvim/src/testdir/util/amiga.mnv
@@ -3,4 +3,4 @@ set shell=csh
 map! /tmp t:
 cmap !rm !Delete all
 
-source util/setup.vim
+source util/setup.mnv
diff --git a/uvim/src/testdir/util/check.vim b/uvim/src/testdir/util/check.mnv
index 8df985091c..731455ca11 100644
--- a/uvim/src/testdir/util/check.vim
+++ b/uvim/src/testdir/util/check.mnv
@@ -1,9 +1,9 @@
-source util/shared.vim
-source util/term_util.vim
+source util/shared.mnv
+source util/term_util.mnv
 
 " uses line-continuation
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 command -nargs=1 MissingFeature throw 'Skipped: ' .. <args> .. ' feature missing'
 
@@ -152,7 +152,7 @@ endfunc
 
 func SetupWindowSizeToForVisualDumps()
   " The dumps used as reference in these tests were created with a terminal
-  " width of 75 columns. The vim window that uses the remainder of the GUI
+  " width of 75 columns. The mnv window that uses the remainder of the GUI
   " window width must be at least 3 columns. In theory this means we need the
   " GUI shell to provide 78+ columns. However the GTK3 resize logic is flaky,
   " sometimes resulting in X11 Configure events that are narrower than
@@ -173,11 +173,11 @@ func SetupWindowSizeToForVisualDumps()
 endfunc
 
 " Command to check that making screendumps is supported.
-" Caller must source util/screendump.vim
+" Caller must source util/screendump.mnv
 command CheckScreendump call CheckScreendump()
 func CheckScreendump()
   let g:check_screendump_called = v:true
-  if !CanRunVimInTerminal()
+  if !CanRunMNVInTerminal()
     throw 'Skipped: cannot make screendumps'
   endif
   if has('gui_running')
@@ -185,11 +185,11 @@ func CheckScreendump()
   endif
 endfunc
 
-" Command to check that we can Run Vim in a terminal window
-command CheckRunVimInTerminal call CheckRunVimInTerminal()
-func CheckRunVimInTerminal()
-  if !CanRunVimInTerminal()
-    throw 'Skipped: cannot run Vim in a terminal window'
+" Command to check that we can Run MNV in a terminal window
+command CheckRunMNVInTerminal call CheckRunMNVInTerminal()
+func CheckRunMNVInTerminal()
+  if !CanRunMNVInTerminal()
+    throw 'Skipped: cannot run MNV in a terminal window'
   endif
 endfunc
 
@@ -352,7 +352,7 @@ command RunSocketServer call RunSocketServer()
 func RunSocketServer()
   if has("socketserver") && v:servername == ""
     try
-      call remote_startserver('VIMSOCKETSERVERTEST')
+      call remote_startserver('MNVSOCKETSERVERTEST')
     catch " not possible to start a remote server
       throw 'Skipped: Cannot start remote server'
     endtry
@@ -361,4 +361,4 @@ endfunc
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/util/color_ramp.vim b/uvim/src/testdir/util/color_ramp.mnv
index 8eed8f9863..8eed8f9863 100644
--- a/uvim/src/testdir/util/color_ramp.vim
+++ b/uvim/src/testdir/util/color_ramp.mnv
diff --git a/uvim/src/testdir/util/dos.vim b/uvim/src/testdir/util/dos.mnv
index 3134d341a3..a61add81f1 100644
--- a/uvim/src/testdir/util/dos.vim
+++ b/uvim/src/testdir/util/dos.mnv
@@ -6,4 +6,4 @@ if executable("cmd.exe")
    set shell=cmd.exe shellcmdflag=/D\ /c
 endif
 
-source util/setup.vim
+source util/setup.mnv
diff --git a/uvim/src/testdir/util/gen_opt_test.vim b/uvim/src/testdir/util/gen_opt_test.mnv
index 72ff49b62e..2ecda2e103 100644
--- a/uvim/src/testdir/util/gen_opt_test.vim
+++ b/uvim/src/testdir/util/gen_opt_test.mnv
@@ -1,7 +1,7 @@
-" Script to generate src/testdir/opt_test.vim from src/optiondefs.h and
+" Script to generate src/testdir/opt_test.mnv from src/optiondefs.h and
 " runtime/doc/options.txt
 
-set cpo&vim
+set cpo&mnv
 
 " Only do this when build with the +eval feature.
 if 1
@@ -50,8 +50,8 @@ let skip_setglobal_reasons = #{
 " Script header.
 " The test values contains multibyte characters.
 let script = [
-      \ '" DO NOT EDIT: Generated with util/gen_opt_test.vim',
-      \ '" Used by test_options_all.vim.',
+      \ '" DO NOT EDIT: Generated with util/gen_opt_test.mnv',
+      \ '" Used by test_options_all.mnv.',
       \ '',
       \ 'scriptencoding utf-8',
       \ ]
@@ -147,7 +147,7 @@ let test_values = {
       \ 'cedit': [['', '^Y', '^@', '<Esc>', '<t_xx>'],
       \		['xxx', 'f', '<xxx>', '<t_xxx>', '<Esc', '<t_xx']],
       \ 'clipboard': [['', 'unnamed', 'unnamedplus', 'autoselect',
-      \		'autoselectplus', 'autoselectml', 'html', 'exclude:vimdisplay',
+      \		'autoselectplus', 'autoselectml', 'html', 'exclude:mnvdisplay',
       \		'autoselect,unnamed', 'unnamed,exclude:.*'],
       \		['xxx', 'exclude:\\ze*', 'exclude:\\%(']],
       \ 'clipmethod': [['wayland', 'x11', 'wayland,x11', ''],['xxx', '--', 'wayland,,', ',x11']],
@@ -347,7 +347,7 @@ let test_values = {
       \ 'verbosefile': [['', './Xfile'], []],
       \ 'viewoptions': [['', 'cursor', 'folds', 'options', 'localoptions',
       \		'slash', 'unix', 'curdir', 'unix,slash'], ['xxx']],
-      \ 'viminfo': [['', '''50', '"30', "'100,<50,s10,h"], ['xxx', 'h']],
+      \ 'mnvinfo': [['', '''50', '"30', "'100,<50,s10,h"], ['xxx', 'h']],
       \ 'virtualedit': [['', 'block', 'insert', 'all', 'onemore', 'none',
       \		'NONE', 'all,block'],
       \		['xxx']],
@@ -434,7 +434,7 @@ if !empty(invalid_options)
 endif
 
 1
-call search('struct vimoption options')
+call search('struct mnvoption options')
 while 1
   if search('{"', 'W') > end
     break
@@ -535,7 +535,7 @@ while 1
   call add(script, 'endfunc')
 endwhile
 
-call writefile(script, 'opt_test.vim')
+call writefile(script, 'opt_test.mnv')
 
 " Write error messages if error occurs.
 catch
@@ -551,4 +551,4 @@ endif
 
 qa!
 
-" vim:sw=2:ts=8:noet:nosta:
+" mnv:sw=2:ts=8:noet:nosta:
diff --git a/uvim/src/testdir/util/gui_init.vim b/uvim/src/testdir/util/gui_init.mnv
index 4fa6cbc77a..600941d91b 100644
--- a/uvim/src/testdir/util/gui_init.vim
+++ b/uvim/src/testdir/util/gui_init.mnv
@@ -1,4 +1,4 @@
-" gvimrc for test_gui_init.vim
+" gmnvrc for test_gui_init.mnv
 
 if has('gui_motif') || has('gui_gtk2') || has('gui_gtk3')
   set guiheadroom=0
diff --git a/uvim/src/testdir/util/gui_preinit.mnv b/uvim/src/testdir/util/gui_preinit.mnv
new file mode 100644
index 0000000000..b93e1114f4
--- /dev/null
+++ b/uvim/src/testdir/util/gui_preinit.mnv
@@ -0,0 +1,7 @@
+" mnvrc for test_gui_init.mnv
+
+" Note that this flag must be added in the .mnvrc file, before switching on
+" syntax or filetype recognition (when the |gmnvrc| file is sourced the system
+" menu has already been loaded; the ":syntax on" and ":filetype on" commands
+" load the menu too).
+set guioptions+=M
diff --git a/uvim/src/testdir/util/gui_preinit.vim b/uvim/src/testdir/util/gui_preinit.vim
deleted file mode 100644
index c351b72461..0000000000
--- a/uvim/src/testdir/util/gui_preinit.vim
+++ /dev/null
@@ -1,7 +0,0 @@
-" vimrc for test_gui_init.vim
-
-" Note that this flag must be added in the .vimrc file, before switching on
-" syntax or filetype recognition (when the |gvimrc| file is sourced the system
-" menu has already been loaded; the ":syntax on" and ":filetype on" commands
-" load the menu too).
-set guioptions+=M
diff --git a/uvim/src/testdir/util/vim9.vim b/uvim/src/testdir/util/mnv9.mnv
index b994855b8c..4dad00938d 100644
--- a/uvim/src/testdir/util/vim9.vim
+++ b/uvim/src/testdir/util/mnv9.mnv
@@ -1,6 +1,6 @@
-vim9script
+mnv9script
 
-# Utility functions for testing Vim9 script
+# Utility functions for testing MNV9 script
 
 # Use a different file name for each run.
 var sequence = 1
@@ -112,11 +112,11 @@ enddef
 
 export def CheckDefAndScriptSuccess(lines: list<string>)
   CheckDefSuccess(lines)
-  CheckScriptSuccess(['vim9script'] + lines)
+  CheckScriptSuccess(['mnv9script'] + lines)
 enddef
 
 # Check that a command fails when used in a :def function and when used in
-# Vim9 script.
+# MNV9 script.
 # When "error" is a string, both with the same error.
 # When "error" is a list, the :def function fails with "error[0]" , the script
 # fails with "error[1]".
@@ -134,11 +134,11 @@ export def CheckDefAndScriptFailure(lines: list<string>, error: any, lnum = -3)
     return
   endif
   CheckDefFailure(lines, errorDef, lnum)
-  CheckScriptFailure(['vim9script'] + lines, errorScript, lnum + 1)
+  CheckScriptFailure(['mnv9script'] + lines, errorScript, lnum + 1)
 enddef
 
 # Check that a command fails when executed in a :def function and when used in
-# Vim9 script.
+# MNV9 script.
 # When "error" is a string, both with the same error.
 # When "error" is a list, the :def function fails with "error[0]" , the script
 # fails with "error[1]".
@@ -156,7 +156,7 @@ export def CheckDefExecAndScriptFailure(lines: list<string>, error: any, lnum =
     return
   endif
   CheckDefExecFailure(lines, errorDef, lnum)
-  CheckScriptFailure(['vim9script'] + lines, errorScript, lnum + 1)
+  CheckScriptFailure(['mnv9script'] + lines, errorScript, lnum + 1)
 enddef
 
 
@@ -191,7 +191,7 @@ export func CheckLegacyFailure(lines, error)
   endtry
 endfunc
 
-# Translate "lines" to legacy Vim script
+# Translate "lines" to legacy MNV script
 def LegacyTrans(lines: list<string>): list<string>
   return lines->mapnew((_, v) =>
 		v->substitute('\<VAR\>', 'let', 'g')
@@ -205,12 +205,12 @@ def LegacyTrans(lines: list<string>): list<string>
 enddef
 
 # Execute "lines" in a legacy function, translated as in
-# CheckLegacyAndVim9Success()
+# CheckLegacyAndMNV9Success()
 export def CheckTransLegacySuccess(lines: list<string>)
   CheckLegacySuccess(LegacyTrans(lines))
 enddef
 
-export def Vim9Trans(lines: list<string>): list<string>
+export def MNV9Trans(lines: list<string>): list<string>
   return lines->mapnew((_, v) =>
 	    v->substitute('\<VAR\>', 'var', 'g')
 	    ->substitute('\<LET ', '', 'g')
@@ -222,35 +222,35 @@ export def Vim9Trans(lines: list<string>): list<string>
 enddef
 
 # Execute "lines" in a :def function, translated as in
-# CheckLegacyAndVim9Success()
+# CheckLegacyAndMNV9Success()
 export def CheckTransDefSuccess(lines: list<string>)
-  CheckDefSuccess(Vim9Trans(lines))
+  CheckDefSuccess(MNV9Trans(lines))
 enddef
 
-# Execute "lines" in a Vim9 script, translated as in
-# CheckLegacyAndVim9Success()
-export def CheckTransVim9Success(lines: list<string>)
-  CheckScriptSuccess(['vim9script'] + Vim9Trans(lines))
+# Execute "lines" in a MNV9 script, translated as in
+# CheckLegacyAndMNV9Success()
+export def CheckTransMNV9Success(lines: list<string>)
+  CheckScriptSuccess(['mnv9script'] + MNV9Trans(lines))
 enddef
 
-# Execute "lines" in a legacy function, :def function and Vim9 script.
+# Execute "lines" in a legacy function, :def function and MNV9 script.
 # Use 'VAR' for a declaration.
 # Use 'LET' for an assignment
 # Use ' #"' for a comment
 # Use LSTART arg LMIDDLE expr LEND for lambda
-# Use 'TRUE' for 1 in legacy, true in Vim9
-# Use 'FALSE' for 0 in legacy, false in Vim9
-export def CheckLegacyAndVim9Success(lines: list<string>)
+# Use 'TRUE' for 1 in legacy, true in MNV9
+# Use 'FALSE' for 0 in legacy, false in MNV9
+export def CheckLegacyAndMNV9Success(lines: list<string>)
   CheckTransLegacySuccess(lines)
   CheckTransDefSuccess(lines)
-  CheckTransVim9Success(lines)
+  CheckTransMNV9Success(lines)
 enddef
 
-# Execute "lines" in a legacy function, :def function and Vim9 script.
+# Execute "lines" in a legacy function, :def function and MNV9 script.
 # Use 'VAR' for a declaration.
 # Use 'LET' for an assignment
 # Use ' #"' for a comment
-export def CheckLegacyAndVim9Failure(lines: list<string>, error: any)
+export def CheckLegacyAndMNV9Failure(lines: list<string>, error: any)
   var legacyError: string
   var defError: string
   var scriptError: string
@@ -276,7 +276,7 @@ export def CheckLegacyAndVim9Failure(lines: list<string>, error: any)
 				 ->substitute('#"', ' "', 'g'))
   CheckLegacyFailure(legacylines, legacyError)
 
-  var vim9lines = lines->mapnew((_, v) =>
+  var mnv9lines = lines->mapnew((_, v) =>
 				v->substitute('\<VAR\>', 'var', 'g')
 				 ->substitute('\<LET ', '', 'g')
 				 ->substitute('\<LSTART\>', '(', 'g')
@@ -284,8 +284,8 @@ export def CheckLegacyAndVim9Failure(lines: list<string>, error: any)
 				 ->substitute(' *\<LEND\> *', '', 'g')
 				 ->substitute('\<TRUE\>', 'true', 'g')
 				 ->substitute('\<FALSE\>', 'false', 'g'))
-  CheckDefExecFailure(vim9lines, defError)
-  CheckScriptFailure(['vim9script'] + vim9lines, scriptError)
+  CheckDefExecFailure(mnv9lines, defError)
+  CheckScriptFailure(['mnv9script'] + mnv9lines, scriptError)
 enddef
 
 # Check that "lines" inside a legacy function has no error.
@@ -319,34 +319,34 @@ export func CheckSourceLegacyFailure(lines, error)
 endfunc
 
 # Execute "lines" in a legacy function, translated as in
-# CheckSourceLegacyAndVim9Success()
+# CheckSourceLegacyAndMNV9Success()
 export def CheckSourceTransLegacySuccess(lines: list<string>)
   CheckSourceLegacySuccess(LegacyTrans(lines))
 enddef
 
 # Execute "lines" in a :def function, translated as in
-# CheckLegacyAndVim9Success()
+# CheckLegacyAndMNV9Success()
 export def CheckSourceTransDefSuccess(lines: list<string>)
-  CheckSourceDefSuccess(Vim9Trans(lines))
+  CheckSourceDefSuccess(MNV9Trans(lines))
 enddef
 
-# Execute "lines" in a Vim9 script, translated as in
-# CheckLegacyAndVim9Success()
-export def CheckSourceTransVim9Success(lines: list<string>)
-  CheckSourceScriptSuccess(['vim9script'] + Vim9Trans(lines))
+# Execute "lines" in a MNV9 script, translated as in
+# CheckLegacyAndMNV9Success()
+export def CheckSourceTransMNV9Success(lines: list<string>)
+  CheckSourceScriptSuccess(['mnv9script'] + MNV9Trans(lines))
 enddef
 
-# Execute "lines" in a legacy function, :def function and Vim9 script.
+# Execute "lines" in a legacy function, :def function and MNV9 script.
 # Use 'VAR' for a declaration.
 # Use 'LET' for an assignment
 # Use ' #"' for a comment
 # Use LSTART arg LMIDDLE expr LEND for lambda
-# Use 'TRUE' for 1 in legacy, true in Vim9
-# Use 'FALSE' for 0 in legacy, false in Vim9
-export def CheckSourceLegacyAndVim9Success(lines: list<string>)
+# Use 'TRUE' for 1 in legacy, true in MNV9
+# Use 'FALSE' for 0 in legacy, false in MNV9
+export def CheckSourceLegacyAndMNV9Success(lines: list<string>)
   CheckSourceTransLegacySuccess(lines)
   CheckSourceTransDefSuccess(lines)
-  CheckSourceTransVim9Success(lines)
+  CheckSourceTransMNV9Success(lines)
 enddef
 
 # :source a list of "lines" and check whether it fails with "error"
@@ -462,7 +462,7 @@ export func CheckSourceDefExecFailure(lines, error, lnum = -3)
 endfunc
 
 # Check that a command fails when used in a :def function and when used in
-# Vim9 script.
+# MNV9 script.
 # When "error" is a string, both with the same error.
 # When "error" is a list, the :def function fails with "error[0]" , the script
 # fails with "error[1]".
@@ -480,11 +480,11 @@ export def CheckSourceDefAndScriptFailure(lines: list<string>, error: any, lnum
     return
   endif
   CheckSourceDefFailure(lines, errorDef, lnum)
-  CheckSourceScriptFailure(['vim9script'] + lines, errorScript, lnum + 1)
+  CheckSourceScriptFailure(['mnv9script'] + lines, errorScript, lnum + 1)
 enddef
 
 # Check that a command fails when executed in a :def function and when used in
-# Vim9 script.
+# MNV9 script.
 # When "error" is a string, both with the same error.
 # When "error" is a list, the :def function fails with "error[0]" , the script
 # fails with "error[1]".
@@ -502,7 +502,7 @@ export def CheckSourceDefExecAndScriptFailure(lines: list<string>, error: any, l
     return
   endif
   CheckSourceDefExecFailure(lines, errorDef, lnum)
-  CheckSourceScriptFailure(['vim9script'] + lines, errorScript, lnum + 1)
+  CheckSourceScriptFailure(['mnv9script'] + lines, errorScript, lnum + 1)
 enddef
 
 export def CheckSourceSuccess(lines: list<string>)
@@ -519,14 +519,14 @@ enddef
 
 export def CheckSourceDefAndScriptSuccess(lines: list<string>)
   CheckSourceDefSuccess(lines)
-  CheckSourceScriptSuccess(['vim9script'] + lines)
+  CheckSourceScriptSuccess(['mnv9script'] + lines)
 enddef
 
-# Execute "lines" in a legacy function, :def function and Vim9 script.
+# Execute "lines" in a legacy function, :def function and MNV9 script.
 # Use 'VAR' for a declaration.
 # Use 'LET' for an assignment
 # Use ' #"' for a comment
-export def CheckSourceLegacyAndVim9Failure(lines: list<string>, error: any)
+export def CheckSourceLegacyAndMNV9Failure(lines: list<string>, error: any)
   var legacyError: string
   var defError: string
   var scriptError: string
@@ -542,8 +542,8 @@ export def CheckSourceLegacyAndVim9Failure(lines: list<string>, error: any)
   endif
 
   CheckSourceLegacyFailure(LegacyTrans(lines), legacyError)
-  var vim9lines = Vim9Trans(lines)
-  CheckSourceDefExecFailure(vim9lines, defError)
-  CheckSourceScriptFailure(['vim9script'] + vim9lines, scriptError)
+  var mnv9lines = MNV9Trans(lines)
+  CheckSourceDefExecFailure(mnv9lines, defError)
+  CheckSourceScriptFailure(['mnv9script'] + mnv9lines, scriptError)
 enddef
 
diff --git a/uvim/src/testdir/util/mouse.vim b/uvim/src/testdir/util/mouse.mnv
index e2979b771c..454a9a6713 100644
--- a/uvim/src/testdir/util/mouse.vim
+++ b/uvim/src/testdir/util/mouse.mnv
@@ -20,9 +20,9 @@ else
   let g:Ttymouse_netterm = []
 endif
 
-" Vim Mouse Codes.
+" MNV Mouse Codes.
 " Used by the GUI and by MS-Windows Consoles.
-" Keep these in sync with vim.h
+" Keep these in sync with mnv.h
 let s:MOUSE_CODE = {
   \ 'BTN_LEFT'    :  0x00,
   \ 'BTN_MIDDLE'  :  0x01,
@@ -369,4 +369,4 @@ func MouseShiftWheelRight(row, col)
   endif
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/util/popupbounce.vim b/uvim/src/testdir/util/popupbounce.mnv
index 5e63aca347..83cdf21571 100644
--- a/uvim/src/testdir/util/popupbounce.vim
+++ b/uvim/src/testdir/util/popupbounce.mnv
@@ -3,8 +3,8 @@
 "    cd src
 "    # Edit Makefile to uncomment PROFILE_CFLAGS and PROFILE_LIBS
 "    make reconfig
-"    ./vim --clean -S testdir/util/popupbounce.vim main.c
-"    gprof vim gmon.out | vim -
+"    ./mnv --clean -S testdir/util/popupbounce.mnv main.c
+"    gprof mnv gmon.out | mnv -
 
 " using line continuation
 set nocp
diff --git a/uvim/src/testdir/util/screendump.vim b/uvim/src/testdir/util/screendump.mnv
index c881eb9636..2f28c759a8 100644
--- a/uvim/src/testdir/util/screendump.vim
+++ b/uvim/src/testdir/util/screendump.mnv
@@ -87,7 +87,7 @@ def g:ScreenDumpLookForFFFDChars(
   endif
 enddef
 
-" Verify that Vim running in terminal buffer "buf" matches the screen dump.
+" Verify that MNV running in terminal buffer "buf" matches the screen dump.
 "
 " A copy of "options" is passed to "term_dumpwrite()".  For convenience, this
 " dictionary supports other optional entries:
@@ -108,8 +108,8 @@ enddef
 "
 " The file name used is "dumps/{filename}.dump".
 "
-" To ignore part of the dump, provide a "dumps/{filename}.vim" file with
-" Vim commands to be applied to both the reference and the current dump, so
+" To ignore part of the dump, provide a "dumps/{filename}.mnv" file with
+" MNV commands to be applied to both the reference and the current dump, so
 " that parts that are irrelevant are not used for the comparison.  The result
 " is NOT written, thus "term_dumpdiff()" shows the difference anyway.
 "
@@ -122,7 +122,7 @@ func VerifyScreenDump(buf, filename, options, ...)
     return 1
   endif
   let reference = 'dumps/' . a:filename . '.dump'
-  let filter = 'dumps/' . a:filename . '.vim'
+  let filter = 'dumps/' . a:filename . '.mnv'
   let testfile = 'failed/' . a:filename . '.dump'
 
   let options_copy = copy(a:options)
@@ -214,7 +214,7 @@ func VerifyScreenDump(buf, filename, options, ...)
     endfor
 
     " Always add the last error so that it is displayed on timeout.
-    " See TestTimeout() in runtest.vim.
+    " See TestTimeout() in runtest.mnv.
     if i > 0
       call remove(v:errors, -1)
     endif
@@ -228,4 +228,4 @@ func VerifyScreenDump(buf, filename, options, ...)
   return 0
 endfunc
 
-" vim:sw=2:ts=8:noet:
+" mnv:sw=2:ts=8:noet:
diff --git a/uvim/src/testdir/util/script_util.vim b/uvim/src/testdir/util/script_util.mnv
index a300b670c7..b385e76907 100644
--- a/uvim/src/testdir/util/script_util.vim
+++ b/uvim/src/testdir/util/script_util.mnv
@@ -1,4 +1,4 @@
-" Functions shared by the tests for Vim script
+" Functions shared by the tests for MNV script
 
 " Commands to track the execution path of a script
 com!		   XpathINIT  let g:Xpath = ''
diff --git a/uvim/src/testdir/util/setup.vim b/uvim/src/testdir/util/setup.mnv
index 485675aa33..08bc24bb6f 100644
--- a/uvim/src/testdir/util/setup.vim
+++ b/uvim/src/testdir/util/setup.mnv
@@ -15,7 +15,7 @@ if 1
 endif
 
 " Make sure 'runtimepath' and 'packpath' does not include $HOME.
-set rtp=$VIM/vimfiles,$VIMRUNTIME,$VIM/vimfiles/after
+set rtp=$MNV/mnvfiles,$MNVRUNTIME,$MNV/mnvfiles/after
 if has('packages')
   let &packpath = &rtp
 endif
diff --git a/uvim/src/testdir/util/setup_gui.vim b/uvim/src/testdir/util/setup_gui.mnv
index 2e5e77771d..2e5e77771d 100644
--- a/uvim/src/testdir/util/setup_gui.vim
+++ b/uvim/src/testdir/util/setup_gui.mnv
diff --git a/uvim/src/testdir/util/shared.vim b/uvim/src/testdir/util/shared.mnv
index c49f305deb..1ea367392b 100644
--- a/uvim/src/testdir/util/shared.vim
+++ b/uvim/src/testdir/util/shared.mnv
@@ -5,7 +5,7 @@ if exists('*PythonProg')
   finish
 endif
 
-source util/view_util.vim
+source util/view_util.mnv
 
 " When 'term' is changed some status requests may be sent.  The responses may
 " interfere with what is being tested.  A short sleep is used to process any of
@@ -292,43 +292,43 @@ func s:feedkeys(timer)
   call feedkeys('x', 'nt')
 endfunc
 
-" Get the name of the Vim executable that we expect has been build in the src
+" Get the name of the MNV executable that we expect has been build in the src
 " directory.
-func s:GetJustBuildVimExe()
+func s:GetJustBuildMNVExe()
   if has("win32")
-    if !filereadable('..\vim.exe') && filereadable('..\vimd.exe')
+    if !filereadable('..\mnv.exe') && filereadable('..\mnvd.exe')
       " looks like the debug executable was intentionally build, so use it
-      return '..\vimd.exe'
+      return '..\mnvd.exe'
     endif
-    return '..\vim.exe'
+    return '..\mnv.exe'
   endif
-  return '../vim'
+  return '../mnv'
 endfunc
 
-" Get $VIMPROG to run the Vim executable.
-" The Makefile writes it as the first line in the "vimcmd" file.
-" Falls back to the Vim executable in the src directory.
-func GetVimProg()
-  if filereadable('vimcmd')
-    return readfile('vimcmd')[0]
+" Get $MNVPROG to run the MNV executable.
+" The Makefile writes it as the first line in the "mnvcmd" file.
+" Falls back to the MNV executable in the src directory.
+func GetMNVProg()
+  if filereadable('mnvcmd')
+    return readfile('mnvcmd')[0]
   endif
-  echo 'Cannot read the "vimcmd" file, falling back to ../vim.'
+  echo 'Cannot read the "mnvcmd" file, falling back to ../mnv.'
 
   " Probably the script was sourced instead of running "make".
-  " We assume Vim was just build in the src directory then.
-  return s:GetJustBuildVimExe()
+  " We assume MNV was just build in the src directory then.
+  return s:GetJustBuildMNVExe()
 endfunc
 
 let g:valgrind_cnt = 1
 
-" Get the command to run Vim, with -u NONE and --not-a-term arguments.
+" Get the command to run MNV, with -u NONE and --not-a-term arguments.
 " If there is an argument use it instead of "NONE".
-func GetVimCommand(...)
-  if filereadable('vimcmd')
-    let lines = readfile('vimcmd')
+func GetMNVCommand(...)
+  if filereadable('mnvcmd')
+    let lines = readfile('mnvcmd')
   else
-    echo 'Cannot read the "vimcmd" file, falling back to ../vim.'
-    let lines = [s:GetJustBuildVimExe()]
+    echo 'Cannot read the "mnvcmd" file, falling back to ../mnv.'
+    let lines = [s:GetJustBuildMNVExe()]
   endif
 
   if a:0 == 0
@@ -337,7 +337,7 @@ func GetVimCommand(...)
     let name = a:1
   endif
   " For Unix Makefile writes the command to use in the second line of the
-  " "vimcmd" file, including environment options.
+  " "mnvcmd" file, including environment options.
   " Other Makefiles just write the executable in the first line, so fall back
   " to that if there is no second line or it is empty.
   if len(lines) > 1 && lines[1] != ''
@@ -367,7 +367,7 @@ endfunc
 " Return one when it looks like the tests are run with valgrind, which means
 " that everything is much slower.
 func RunningWithValgrind()
-  return GetVimCommand() =~ '\<valgrind\>'
+  return GetMNVCommand() =~ '\<valgrind\>'
 endfunc
 
 func RunningAsan()
@@ -380,59 +380,59 @@ endfun
 
 const g:test_timeout = (ValgrindOrAsan()) ? 5000 * 4 : 5000
 
-" Get the command to run Vim, with --clean instead of "-u NONE".
-func GetVimCommandClean()
-  let cmd = GetVimCommand()
+" Get the command to run MNV, with --clean instead of "-u NONE".
+func GetMNVCommandClean()
+  let cmd = GetMNVCommand()
   let cmd = substitute(cmd, '-u NONE', '--clean', '')
   let cmd = substitute(cmd, '--not-a-term', '', '')
 
-  " Force using utf-8, Vim may pick up something else from the environment.
+  " Force using utf-8, MNV may pick up something else from the environment.
   let cmd ..= ' --cmd "set enc=utf8" '
 
-  " Optionally run Vim under valgrind
+  " Optionally run MNV under valgrind
   " let cmd = 'valgrind --tool=memcheck --leak-check=yes --num-callers=25 --log-file=valgrind ' . cmd
 
   return cmd
 endfunc
 
-" Get the command to run Vim, with --clean, and force to run in terminal so it
+" Get the command to run MNV, with --clean, and force to run in terminal so it
 " won't start a new GUI.
-func GetVimCommandCleanTerm()
-  " Add -v to have gvim run in the terminal (if possible)
-  return GetVimCommandClean() .. ' -v '
+func GetMNVCommandCleanTerm()
+  " Add -v to have gmnv run in the terminal (if possible)
+  return GetMNVCommandClean() .. ' -v '
 endfunc
 
-" Run Vim, using the "vimcmd" file and "-u NORC".
-" "before" is a list of Vim commands to be executed before loading plugins.
-" "after" is a list of Vim commands to be executed after loading plugins.
+" Run MNV, using the "mnvcmd" file and "-u NORC".
+" "before" is a list of MNV commands to be executed before loading plugins.
+" "after" is a list of MNV commands to be executed after loading plugins.
 " Plugins are not loaded, unless 'loadplugins' is set in "before".
-" Return 1 if Vim could be executed.
-func RunVim(before, after, arguments)
-  return RunVimPiped(a:before, a:after, a:arguments, '')
+" Return 1 if MNV could be executed.
+func RunMNV(before, after, arguments)
+  return RunMNVPiped(a:before, a:after, a:arguments, '')
 endfunc
 
-func RunVimPiped(before, after, arguments, pipecmd)
-  let cmd = GetVimCommand()
+func RunMNVPiped(before, after, arguments, pipecmd)
+  let cmd = GetMNVCommand()
   let args = ''
   if len(a:before) > 0
-    call writefile(a:before, 'Xbefore.vim')
-    let args .= ' --cmd "so Xbefore.vim"'
+    call writefile(a:before, 'Xbefore.mnv')
+    let args .= ' --cmd "so Xbefore.mnv"'
   endif
   if len(a:after) > 0
-    call writefile(a:after, 'Xafter.vim')
-    let args .= ' -S Xafter.vim'
+    call writefile(a:after, 'Xafter.mnv')
+    let args .= ' -S Xafter.mnv'
   endif
 
-  " Optionally run Vim under valgrind
+  " Optionally run MNV under valgrind
   " let cmd = 'valgrind --tool=memcheck --leak-check=yes --num-callers=25 --log-file=valgrind ' . cmd
 
   exe "silent !" .. a:pipecmd .. ' ' ..  cmd .. args .. ' ' .. a:arguments
 
   if len(a:before) > 0
-    call delete('Xbefore.vim')
+    call delete('Xbefore.mnv')
   endif
   if len(a:after) > 0
-    call delete('Xafter.vim')
+    call delete('Xafter.mnv')
   endif
   return 1
 endfunc
@@ -473,4 +473,4 @@ func AssertException(cmds, errstr)
   call assert_match(a:errstr, save_exception)
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/util/socketserver.vim b/uvim/src/testdir/util/socketserver.mnv
index 5492db626d..19ff56406a 100644
--- a/uvim/src/testdir/util/socketserver.vim
+++ b/uvim/src/testdir/util/socketserver.mnv
@@ -7,11 +7,11 @@ func TrySocketServer()
     let g:socketserver_only = v:true
 
     if v:servername == ""
-      call remote_startserver('VIMSOCKETSERVERTEST')
+      call remote_startserver('MNVSOCKETSERVERTEST')
     endif
   else
       let g:socketserver_only = v:false
     endif
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/util/summarize.vim b/uvim/src/testdir/util/summarize.mnv
index d0d4e00b2c..220846a30d 100644
--- a/uvim/src/testdir/util/summarize.vim
+++ b/uvim/src/testdir/util/summarize.mnv
@@ -1,8 +1,8 @@
-set cpo&vim
+set cpo&mnv
 if 1
   " This is executed only with the eval feature
   set nocompatible
-  set viminfo=
+  set mnvinfo=
   func Count(match, type)
     if a:type ==# 'executed'
       let g:executed += (a:match+0)
diff --git a/uvim/src/testdir/util/term_util.vim b/uvim/src/testdir/util/term_util.mnv
index 61ff9ce1b8..4150355ce5 100644
--- a/uvim/src/testdir/util/term_util.vim
+++ b/uvim/src/testdir/util/term_util.mnv
@@ -1,16 +1,16 @@
 " Functions about terminal shared by several tests
 
 " Only load this script once.
-if exists('*CanRunVimInTerminal')
+if exists('*CanRunMNVInTerminal')
   finish
 endif
 
-source util/shared.vim
+source util/shared.mnv
 
-" For most tests we need to be able to run terminal Vim with 256 colors.  On
+" For most tests we need to be able to run terminal MNV with 256 colors.  On
 " MS-Windows the console only has 16 colors and the GUI can't run in a
 " terminal.
-func CanRunVimInTerminal()
+func CanRunMNVInTerminal()
   return has('terminal') && !has('win32')
 endfunc
 
@@ -44,7 +44,7 @@ func TermWait(buf, ...)
   let g:test_is_flaky = 1
 endfunc
 
-" Run Vim with "arguments" in a new terminal window.
+" Run MNV with "arguments" in a new terminal window.
 " By default uses a size of 20 lines and 75 columns.
 " Returns the buffer number of the terminal.
 "
@@ -58,8 +58,8 @@ endfunc
 " "no_clean" - if non-zero then remove "--clean" from the command
 " "cmd"  - run any other command, e.g. "xxd" (used in xxd test)
 " "env"  - additional environment variables, e.g. $TERM variable
-func RunVimInTerminal(arguments, options)
-  " If Vim doesn't exit a swap file remains, causing other tests to fail.
+func RunMNVInTerminal(arguments, options)
+  " If MNV doesn't exit a swap file remains, causing other tests to fail.
   " Remove it here.
   call delete(".swp")
 
@@ -93,7 +93,7 @@ func RunVimInTerminal(arguments, options)
   endif
 
   if empty(get(a:options, 'cmd', ''))
-    let cmd = GetVimCommandCleanTerm() .. reset_u7 .. a:arguments
+    let cmd = GetMNVCommandCleanTerm() .. reset_u7 .. a:arguments
   else
     let cmd = get(a:options, 'cmd')
   endif
@@ -139,19 +139,19 @@ func RunVimInTerminal(arguments, options)
       call WaitFor({-> len(term_getline(buf, rows)) >= cols - 1 || len(term_getline(buf, rows - statusoff)) >= cols - 1})
     catch /timed out after/
       let lines = map(range(1, rows), {key, val -> term_getline(buf, val)})
-      call assert_report('RunVimInTerminal() failed, screen contents: ' . join(lines, "<NL>"))
+      call assert_report('RunMNVInTerminal() failed, screen contents: ' . join(lines, "<NL>"))
     endtry
   endif
 
-  " Starting a terminal to run Vim is always considered flaky.
+  " Starting a terminal to run MNV is always considered flaky.
   let g:test_is_flaky = 1
 
   return buf
 endfunc
 
-" Stop a Vim running in terminal buffer "buf".
-func StopVimInTerminal(buf, kill = 1)
-  " Using a terminal to run Vim is always considered flaky.
+" Stop a MNV running in terminal buffer "buf".
+func StopMNVInTerminal(buf, kill = 1)
+  " Using a terminal to run MNV is always considered flaky.
   let g:test_is_flaky = 1
 
   call assert_equal("running", term_getstatus(a:buf))
@@ -208,4 +208,4 @@ func Term_getlines(buf, lines)
 endfunc
 
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/util/unix.vim b/uvim/src/testdir/util/unix.mnv
index 8a97129475..9ac6f7d5bf 100644
--- a/uvim/src/testdir/util/unix.vim
+++ b/uvim/src/testdir/util/unix.mnv
@@ -10,4 +10,4 @@ if 1
   let g:tester_HOME = $HOME
 endif
 
-source util/setup.vim
+source util/setup.mnv
diff --git a/uvim/src/testdir/util/view_util.vim b/uvim/src/testdir/util/view_util.mnv
index 5c5bfa81de..b355a81a54 100644
--- a/uvim/src/testdir/util/view_util.vim
+++ b/uvim/src/testdir/util/view_util.mnv
@@ -65,7 +65,7 @@ func CloseWindow() abort
 endfunc
 
 
-" When using RunVimInTerminal() we expect modifyOtherKeys level 2 to be enabled
+" When using RunMNVInTerminal() we expect modifyOtherKeys level 2 to be enabled
 " automatically.  The key + modifier Escape codes must then use the
 " modifyOtherKeys encoding.  They are recognized anyway, thus it's safer to use
 " than the raw code.
diff --git a/uvim/src/testdir/util/vms.vim b/uvim/src/testdir/util/vms.mnv
index 0a264e9560..b3833ee615 100644
--- a/uvim/src/testdir/util/vms.vim
+++ b/uvim/src/testdir/util/vms.mnv
@@ -3,4 +3,4 @@
 " Do not use any swap files
 set noswapfile
 
-source util/setup.vim
+source util/setup.mnv
diff --git a/uvim/src/testdir/util/window_manager.vim b/uvim/src/testdir/util/window_manager.mnv
index 7a3c0c0d08..7a8771f8bf 100644
--- a/uvim/src/testdir/util/window_manager.vim
+++ b/uvim/src/testdir/util/window_manager.mnv
@@ -104,4 +104,4 @@ func EndXServer(display)
   unlet s:x11_displays[a:display]
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/viewdumps.mnv b/uvim/src/testdir/viewdumps.mnv
new file mode 100644
index 0000000000..b9298deaa1
--- /dev/null
+++ b/uvim/src/testdir/viewdumps.mnv
@@ -0,0 +1,11 @@
+mnv9script
+
+exec 'source ' .. (((cwdpath: string) => cwdpath
+  ->strpart(0, cwdpath->strridx('/mnv')))(getcwd()))
+  .. '/mnv/src/testdir/commondumps.mnv'
+g:Init('\<src\>', 0)
+
+# Match ":language" of runtest.mnv.
+language messages C
+
+# mnv:fdm=syntax:sw=2:ts=8:noet:nosta:
diff --git a/uvim/src/testdir/viewdumps.vim b/uvim/src/testdir/viewdumps.vim
deleted file mode 100644
index ffb7314e14..0000000000
--- a/uvim/src/testdir/viewdumps.vim
+++ /dev/null
@@ -1,11 +0,0 @@
-vim9script
-
-exec 'source ' .. (((cwdpath: string) => cwdpath
-  ->strpart(0, cwdpath->strridx('/vim')))(getcwd()))
-  .. '/vim/src/testdir/commondumps.vim'
-g:Init('\<src\>', 0)
-
-# Match ":language" of runtest.vim.
-language messages C
-
-# vim:fdm=syntax:sw=2:ts=8:noet:nosta: