NOISSUE rebrand vim to MNV's not Vim

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

70 files changed, 913 insertions, 913 deletions

diff --git a/uvim/runtime/autoload/README.txt b/uvim/runtime/autoload/README.txt
index 3b18d3dde5..3fa53fdba9 100644
--- a/uvim/runtime/autoload/README.txt
+++ b/uvim/runtime/autoload/README.txt
@@ -1,22 +1,22 @@
-The autoload directory is for standard Vim autoload scripts.
+The autoload directory is for standard MNV autoload scripts.
 
 These are functions used by plugins and for general use.  They will be loaded
 automatically when the function is invoked.  See ":help autoload".
 
-gzip.vim	for editing compressed files
-netrw*.vim	browsing (remote) directories and editing remote files
-tar.vim		browsing tar files
-zip.vim		browsing zip files
-paste.vim	common code for mswin.vim, menu.vim and macmap.vim
-spellfile.vim	downloading of a missing spell file
+gzip.mnv	for editing compressed files
+netrw*.mnv	browsing (remote) directories and editing remote files
+tar.mnv		browsing tar files
+zip.mnv		browsing zip files
+paste.mnv	common code for mswin.mnv, menu.mnv and macmap.mnv
+spellfile.mnv	downloading of a missing spell file
 
 Omni completion files:
-ccomplete.vim		C
-csscomplete.vim		HTML / CSS
-htmlcomplete.vim	HTML
-javascriptcomplete.vim  Javascript
-phpcomplete.vim		PHP
-pythoncomplete.vim	Python
-rubycomplete.vim	Ruby
-syntaxcomplete.vim	from syntax highlighting
-xmlcomplete.vim		XML (uses files in the xml directory)
+ccomplete.mnv		C
+csscomplete.mnv		HTML / CSS
+htmlcomplete.mnv	HTML
+javascriptcomplete.mnv  Javascript
+phpcomplete.mnv		PHP
+pythoncomplete.mnv	Python
+rubycomplete.mnv	Ruby
+syntaxcomplete.mnv	from syntax highlighting
+xmlcomplete.mnv		XML (uses files in the xml directory)
diff --git a/uvim/runtime/autoload/RstFold.vim b/uvim/runtime/autoload/RstFold.mnv
index 238b1e3537..238b1e3537 100644
--- a/uvim/runtime/autoload/RstFold.vim
+++ b/uvim/runtime/autoload/RstFold.mnv
diff --git a/uvim/runtime/autoload/ada.vim b/uvim/runtime/autoload/ada.mnv
index 3f1b40398f..79a7349437 100644
--- a/uvim/runtime/autoload/ada.vim
+++ b/uvim/runtime/autoload/ada.mnv
@@ -1,7 +1,7 @@
 "------------------------------------------------------------------------------
 "  Description: Perform Ada specific completion & tagging.
 "     Language: Ada (2005)
-"	   $Id: ada.vim 887 2008-07-08 14:29:01Z krischik $
+"	   $Id: ada.mnv 887 2008-07-08 14:29:01Z krischik $
 "   Maintainer: Mathias Brousset <mathiasb17@gmail.com>
 "		Martin Krischik <krischik@users.sourceforge.net>
 "		Taylor Venable <taylor@metasyntax.net>
@@ -11,10 +11,10 @@
 "	 $Date: 2017-01-31 20:20:05 +0200 (Mon, 01 Jan 2017) $
 "      Version: 4.6
 "    $Revision: 887 $
-"     $HeadURL: https://gnuada.svn.sourceforge.net/svnroot/gnuada/trunk/tools/vim/autoload/ada.vim $
+"     $HeadURL: https://gnuada.svn.sourceforge.net/svnroot/gnuada/trunk/tools/mnv/autoload/ada.mnv $
 "      History: 24.05.2006 MK Unified Headers
 "		26.05.2006 MK ' should not be in iskeyword.
-"		16.07.2006 MK Ada-Mode as vim-ball
+"		16.07.2006 MK Ada-Mode as mnv-ball
 "		02.10.2006 MK Better folding.
 "		15.10.2006 MK Bram's suggestion for runtime integration
 "		05.11.2006 MK Bram suggested not to use include protection for
@@ -32,7 +32,7 @@ if version < 700
    finish
 endif 
 let s:keepcpo= &cpo
-set cpo&vim
+set cpo&mnv
 
 " Section: Constants {{{1
 "
@@ -224,7 +224,7 @@ function ada#Word (...)
    " match will toggle matching/not matching as we traverse characters
    " backwards. Thus, we have to find the previous unrelated match, exclude
    " it, then use the next full match (ours).
-   " Remember to convert vim column 'l:Column_Nr' [1..n] to string offset [0..(n-1)]
+   " Remember to convert mnv column 'l:Column_Nr' [1..n] to string offset [0..(n-1)]
    " ... but start, here, one after the required char.
    let l:New_Column = l:Column_Nr + 1
    while 1
@@ -464,7 +464,7 @@ function ada#Switch_Session (New_Session)
 
 	 augroup ada_session
 	    autocmd!
-	    autocmd VimLeavePre * execute 'mksession! ' . v:this_session
+	    autocmd MNVLeavePre * execute 'mksession! ' . v:this_session
 	 augroup END
 	 
 	 "if exists ("g:Tlist_Auto_Open") && g:Tlist_Auto_Open
@@ -631,7 +631,7 @@ finish " 1}}}
 "------------------------------------------------------------------------------
 "   Copyright (C) 2006	Martin Krischik
 "
-"   Vim is Charityware - see ":help license" or uganda.txt for licence details.
+"   MNV is Charityware - see ":help license" or uganda.txt for licence details.
 "------------------------------------------------------------------------------
-" vim: textwidth=78 wrap tabstop=8 shiftwidth=3 softtabstop=3 noexpandtab
-" vim: foldmethod=marker
+" mnv: textwidth=78 wrap tabstop=8 shiftwidth=3 softtabstop=3 noexpandtab
+" mnv: foldmethod=marker
diff --git a/uvim/runtime/autoload/adacomplete.vim b/uvim/runtime/autoload/adacomplete.mnv
index d7bba93d12..96ff323669 100644
--- a/uvim/runtime/autoload/adacomplete.vim
+++ b/uvim/runtime/autoload/adacomplete.mnv
@@ -1,16 +1,16 @@
 "------------------------------------------------------------------------------
-"  Description: Vim Ada omnicompletion file
+"  Description: MNV Ada omnicompletion file
 "     Language:	Ada (2005)
-"	   $Id: adacomplete.vim 887 2008-07-08 14:29:01Z krischik $
+"	   $Id: adacomplete.mnv 887 2008-07-08 14:29:01Z krischik $
 "   Maintainer:	Martin Krischik
 "      $Author: krischik $
 "	 $Date: 2008-07-08 16:29:01 +0200 (Di, 08 Jul 2008) $
 "      Version: 4.6
 "    $Revision: 887 $
-"     $HeadURL: https://gnuada.svn.sourceforge.net/svnroot/gnuada/trunk/tools/vim/autoload/adacomplete.vim $
+"     $HeadURL: https://gnuada.svn.sourceforge.net/svnroot/gnuada/trunk/tools/mnv/autoload/adacomplete.mnv $
 "      History: 24.05.2006 MK Unified Headers
 "		26.05.2006 MK improved search for begin of word.
-"		16.07.2006 MK Ada-Mode as vim-ball
+"		16.07.2006 MK Ada-Mode as mnv-ball
 "		15.10.2006 MK Bram's suggestion for runtime integration
 "		05.11.2006 MK Bram suggested not to use include protection for
 "			      autoload
@@ -103,7 +103,7 @@ finish " 1}}}
 "------------------------------------------------------------------------------
 "   Copyright (C) 2006	Martin Krischik
 "
-"   Vim is Charityware - see ":help license" or uganda.txt for licence details.
+"   MNV is Charityware - see ":help license" or uganda.txt for licence details.
 "------------------------------------------------------------------------------
-" vim: textwidth=78 wrap tabstop=8 shiftwidth=3 softtabstop=3 noexpandtab
-" vim: foldmethod=marker
+" mnv: textwidth=78 wrap tabstop=8 shiftwidth=3 softtabstop=3 noexpandtab
+" mnv: foldmethod=marker
diff --git a/uvim/runtime/autoload/bitbake.vim b/uvim/runtime/autoload/bitbake.mnv
index bb3fc5c0e2..6e93b73b45 100644
--- a/uvim/runtime/autoload/bitbake.vim
+++ b/uvim/runtime/autoload/bitbake.mnv
@@ -1,4 +1,4 @@
-" Support for bitbake indenting, see runtime/indent/bitbake.vim
+" Support for bitbake indenting, see runtime/indent/bitbake.mnv
 
 function s:is_bb_python_func_def(lnum)
     let stack = synstack(a:lnum, 1)
@@ -79,7 +79,7 @@ function bitbake#Indent(lnum)
     endif
 
     " TODO: GetShIndent doesn't detect tasks prepended with 'fakeroot'
-    " Need to submit a patch upstream to Vim to provide an extension point.
+    " Need to submit a patch upstream to MNV to provide an extension point.
     " Unlike the Python indenter, the Sh indenter is way too large to copy and
     " modify here.
     if name == "bbShFuncRegion"
diff --git a/uvim/runtime/autoload/cargo.vim b/uvim/runtime/autoload/cargo.mnv
index 6696b3105f..1713ee9605 100644
--- a/uvim/runtime/autoload/cargo.vim
+++ b/uvim/runtime/autoload/cargo.mnv
@@ -12,7 +12,7 @@ function! cargo#cmd(args) abort
         let cmd = g:cargo_shell_command_runner
     elseif has('terminal')
         let cmd = 'terminal'
-    elseif has('nvim')
+    elseif has('nmnv')
         let cmd = 'noautocmd new | terminal'
     else
         let cmd = '!'
@@ -146,4 +146,4 @@ function! cargo#runtarget(args)
     endif
 endfunction
 
-" vim: set et sw=4 sts=4 ts=8:
+" mnv: set et sw=4 sts=4 ts=8:
diff --git a/uvim/runtime/autoload/cargo/quickfix.vim b/uvim/runtime/autoload/cargo/quickfix.mnv
index f2a006f6c5..019a16a4ed 100644
--- a/uvim/runtime/autoload/cargo/quickfix.vim
+++ b/uvim/runtime/autoload/cargo/quickfix.mnv
@@ -26,4 +26,4 @@ function! cargo#quickfix#CmdPost() abort
     endif
 endfunction
 
-" vim: set et sw=4 sts=4 ts=8:
+" mnv: set et sw=4 sts=4 ts=8:
diff --git a/uvim/runtime/autoload/ccomplete.vim b/uvim/runtime/autoload/ccomplete.mnv
index 51237be98b..898dc9653b 100644
--- a/uvim/runtime/autoload/ccomplete.vim
+++ b/uvim/runtime/autoload/ccomplete.mnv
@@ -1,11 +1,11 @@
-vim9script noclear
+mnv9script noclear
 
-# Vim completion script
+# MNV completion script
 # Language:	C
-# Maintainer:	The Vim Project <https://github.com/vim/vim>
+# Maintainer:	The MNV Project <https://github.com/Project-Tick/Project-Tick>
 # Last Change:	2026 Feb 18
-#		Rewritten in Vim9 script by github user lacygoill
-# Former Maintainer:   Bram Moolenaar <Bram@vim.org>
+#		Rewritten in MNV9 script by github user lacygoill
+# Former Maintainer:   Bram Moolenaar <Bram@mnv.org>
 
 var prepended: string
 var grepCache: dict<list<dict<any>>>
@@ -71,7 +71,7 @@ export def Complete(findstart: bool, abase: string): any # {{{1
     return []
   endif
 
-  # init cache for vimgrep to empty
+  # init cache for mnvgrep to empty
   grepCache = {}
 
   # Split item in words, keep empty word after "." or "->".
@@ -600,7 +600,7 @@ def StructMembers( # {{{1
         return []
       endif
       execute 'silent! keepjumps noautocmd '
-        .. n .. 'vimgrep ' .. '/\t' .. typename .. '\(\t\|$\)/j '
+        .. n .. 'mnvgrep ' .. '/\t' .. typename .. '\(\t\|$\)/j '
         .. fnames
 
       qflist = getqflist()
@@ -740,4 +740,4 @@ def SearchMembers( # {{{1
 enddef
 #}}}1
 
-# vim: et sw=2 sts=2
+# mnv: et sw=2 sts=2
diff --git a/uvim/runtime/autoload/clojurecomplete.vim b/uvim/runtime/autoload/clojurecomplete.mnv
index 02262a6f91..df77c9a9fb 100644
--- a/uvim/runtime/autoload/clojurecomplete.vim
+++ b/uvim/runtime/autoload/clojurecomplete.mnv
@@ -1,13 +1,13 @@
-" Vim completion script
+" MNV completion script
 " Language:           Clojure
 " Maintainer:         Alex Vear <alex@vear.uk>
 " Former Maintainers: Sung Pae <self@sungpae.com>
-" URL:                https://github.com/clojure-vim/clojure.vim
-" License:            Vim (see :h license)
+" URL:                https://github.com/clojure-mnv/clojure.mnv
+" License:            MNV (see :h license)
 " Last Change:        2022-03-24
 
 " -*- COMPLETION WORDS -*-
-" Generated from https://github.com/clojure-vim/clojure.vim/blob/fd280e33e84c88e97860930557dba3ff80b1a82d/clj/src/vim_clojure_static/generate.clj
+" Generated from https://github.com/clojure-mnv/clojure.mnv/blob/fd280e33e84c88e97860930557dba3ff80b1a82d/clj/src/mnv_clojure_static/generate.clj
 " Clojure version 1.11.0
 let s:words = ["&","*","*'","*1","*2","*3","*agent*","*allow-unresolved-vars*","*assert*","*clojure-version*","*command-line-args*","*compile-files*","*compile-path*","*compiler-options*","*data-readers*","*default-data-reader-fn*","*e","*err*","*file*","*flush-on-newline*","*fn-loader*","*in*","*math-context*","*ns*","*out*","*print-dup*","*print-length*","*print-level*","*print-meta*","*print-namespace-maps*","*print-readably*","*read-eval*","*reader-resolver*","*source-path*","*suppress-read*","*unchecked-math*","*use-context-classloader*","*verbose-defrecords*","*warn-on-reflection*","+","+'","-","-'","->","->>","->ArrayChunk","->Eduction","->Vec","->VecNode","->VecSeq","-cache-protocol-fn","-reset-methods",".","..","/","<","<=","=","==",">",">=","EMPTY-NODE","Inst","NaN?","PrintWriter-on","StackTraceElement->vec","Throwable->map","abs","accessor","aclone","add-classpath","add-tap","add-watch","agent","agent-error","agent-errors","aget","alength","alias","all-ns","alter","alter-meta!","alter-var-root","amap","ancestors","and","any?","apply","areduce","array-map","as->","aset","aset-boolean","aset-byte","aset-char","aset-double","aset-float","aset-int","aset-long","aset-short","assert","assoc","assoc!","assoc-in","associative?","atom","await","await-for","await1","bases","bean","bigdec","bigint","biginteger","binding","bit-and","bit-and-not","bit-clear","bit-flip","bit-not","bit-or","bit-set","bit-shift-left","bit-shift-right","bit-test","bit-xor","boolean","boolean-array","boolean?","booleans","bound-fn","bound-fn*","bound?","bounded-count","butlast","byte","byte-array","bytes","bytes?","case","case*","cast","cat","catch","char","char-array","char-escape-string","char-name-string","char?","chars","chunk","chunk-append","chunk-buffer","chunk-cons","chunk-first","chunk-next","chunk-rest","chunked-seq?","class","class?","clear-agent-errors","clojure-version","coll?","comment","commute","comp","comparator","compare","compare-and-set!","compile","complement","completing","concat","cond","cond->","cond->>","condp","conj","conj!","cons","constantly","construct-proxy","contains?","count","counted?","create-ns","create-struct","cycle","dec","dec'","decimal?","declare","dedupe","def","default-data-readers","definline","definterface","defmacro","defmethod","defmulti","defn","defn-","defonce","defprotocol","defrecord","defstruct","deftype","deftype*","delay","delay?","deliver","denominator","deref","derive","descendants","destructure","disj","disj!","dissoc","dissoc!","distinct","distinct?","do","doall","dorun","doseq","dosync","dotimes","doto","double","double-array","double?","doubles","drop","drop-last","drop-while","eduction","empty","empty?","ensure","ensure-reduced","enumeration-seq","error-handler","error-mode","eval","even?","every-pred","every?","ex-cause","ex-data","ex-info","ex-message","extend","extend-protocol","extend-type","extenders","extends?","false","false?","ffirst","file-seq","filter","filterv","finally","find","find-keyword","find-ns","find-protocol-impl","find-protocol-method","find-var","first","flatten","float","float-array","float?","floats","flush","fn","fn*","fn?","fnext","fnil","for","force","format","frequencies","future","future-call","future-cancel","future-cancelled?","future-done?","future?","gen-class","gen-interface","gensym","get","get-in","get-method","get-proxy-class","get-thread-bindings","get-validator","group-by","halt-when","hash","hash-combine","hash-map","hash-ordered-coll","hash-set","hash-unordered-coll","ident?","identical?","identity","if","if-let","if-not","if-some","ifn?","import","in-ns","inc","inc'","indexed?","infinite?","init-proxy","inst-ms","inst-ms*","inst?","instance?","int","int-array","int?","integer?","interleave","intern","interpose","into","into-array","ints","io!","isa?","iterate","iteration","iterator-seq","juxt","keep","keep-indexed","key","keys","keyword","keyword?","last","lazy-cat","lazy-seq","let","let*","letfn","letfn*","line-seq","list","list*","list?","load","load-file","load-reader","load-string","loaded-libs","locking","long","long-array","longs","loop","loop*","macroexpand","macroexpand-1","make-array","make-hierarchy","map","map-entry?","map-indexed","map?","mapcat","mapv","max","max-key","memfn","memoize","merge","merge-with","meta","method-sig","methods","min","min-key","mix-collection-hash","mod","monitor-enter","monitor-exit","munge","name","namespace","namespace-munge","nat-int?","neg-int?","neg?","new","newline","next","nfirst","nil","nil?","nnext","not","not-any?","not-empty","not-every?","not=","ns","ns-aliases","ns-imports","ns-interns","ns-map","ns-name","ns-publics","ns-refers","ns-resolve","ns-unalias","ns-unmap","nth","nthnext","nthrest","num","number?","numerator","object-array","odd?","or","parents","parse-boolean","parse-double","parse-long","parse-uuid","partial","partition","partition-all","partition-by","pcalls","peek","persistent!","pmap","pop","pop!","pop-thread-bindings","pos-int?","pos?","pr","pr-str","prefer-method","prefers","primitives-classnames","print","print-ctor","print-dup","print-method","print-simple","print-str","printf","println","println-str","prn","prn-str","promise","proxy","proxy-call-with-super","proxy-mappings","proxy-name","proxy-super","push-thread-bindings","pvalues","qualified-ident?","qualified-keyword?","qualified-symbol?","quot","quote","rand","rand-int","rand-nth","random-sample","random-uuid","range","ratio?","rational?","rationalize","re-find","re-groups","re-matcher","re-matches","re-pattern","re-seq","read","read+string","read-line","read-string","reader-conditional","reader-conditional?","realized?","record?","recur","reduce","reduce-kv","reduced","reduced?","reductions","ref","ref-history-count","ref-max-history","ref-min-history","ref-set","refer","refer-clojure","reify","reify*","release-pending-sends","rem","remove","remove-all-methods","remove-method","remove-ns","remove-tap","remove-watch","repeat","repeatedly","replace","replicate","require","requiring-resolve","reset!","reset-meta!","reset-vals!","resolve","rest","restart-agent","resultset-seq","reverse","reversible?","rseq","rsubseq","run!","satisfies?","second","select-keys","send","send-off","send-via","seq","seq-to-map-for-destructuring","seq?","seqable?","seque","sequence","sequential?","set","set!","set-agent-send-executor!","set-agent-send-off-executor!","set-error-handler!","set-error-mode!","set-validator!","set?","short","short-array","shorts","shuffle","shutdown-agents","simple-ident?","simple-keyword?","simple-symbol?","slurp","some","some->","some->>","some-fn","some?","sort","sort-by","sorted-map","sorted-map-by","sorted-set","sorted-set-by","sorted?","special-symbol?","spit","split-at","split-with","str","string?","struct","struct-map","subs","subseq","subvec","supers","swap!","swap-vals!","symbol","symbol?","sync","tagged-literal","tagged-literal?","take","take-last","take-nth","take-while","tap>","test","the-ns","thread-bound?","throw","time","to-array","to-array-2d","trampoline","transduce","transient","tree-seq","true","true?","try","type","unchecked-add","unchecked-add-int","unchecked-byte","unchecked-char","unchecked-dec","unchecked-dec-int","unchecked-divide-int","unchecked-double","unchecked-float","unchecked-inc","unchecked-inc-int","unchecked-int","unchecked-long","unchecked-multiply","unchecked-multiply-int","unchecked-negate","unchecked-negate-int","unchecked-remainder-int","unchecked-short","unchecked-subtract","unchecked-subtract-int","underive","unquote","unquote-splicing","unreduced","unsigned-bit-shift-right","update","update-in","update-keys","update-proxy","update-vals","uri?","use","uuid?","val","vals","var","var-get","var-set","var?","vary-meta","vec","vector","vector-of","vector?","volatile!","volatile?","vreset!","vswap!","when","when-first","when-let","when-not","when-some","while","with-bindings","with-bindings*","with-in-str","with-loading-context","with-local-vars","with-meta","with-open","with-out-str","with-precision","with-redefs","with-redefs-fn","xml-seq","zero?","zipmap"]
 
@@ -20,4 +20,4 @@ function! clojurecomplete#Complete(findstart, base)
 	endif
 endfunction
 
-" vim:sts=8:sw=8:ts=8:noet
+" mnv:sts=8:sw=8:ts=8:noet
diff --git a/uvim/runtime/autoload/context.vim b/uvim/runtime/autoload/context.mnv
index 6b013f2a7b..9d98325d1b 100644
--- a/uvim/runtime/autoload/context.vim
+++ b/uvim/runtime/autoload/context.mnv
@@ -1,14 +1,14 @@
-vim9script
+mnv9script
 
 # Language:           ConTeXt typesetting engine
 # Maintainer:         Nicola Vitacolonna <nvitacolonna@gmail.com>
 # Former Maintainers: Nikolai Weibull <now@bitwi.se>
 # Latest Revision:    2026 Feb 03
 # Last Change:
-# 2026 Mar 30 by Vim project: Use fnameescape for the Log command
+# 2026 Mar 30 by MNV project: Use fnameescape for the Log command
 
 # Typesetting {{{
-import autoload './typeset.vim'
+import autoload './typeset.mnv'
 
 export def ConTeXtCmd(path: string): list<string>
   var cmd = ['mtxrun', '--script', 'context', '--paranoid', '--autogenerate']
@@ -106,4 +106,4 @@ export def Complete(findstart: number, base: string): any
 enddef
 # }}}
 
-# vim: sw=2 fdm=marker
+# mnv: sw=2 fdm=marker
diff --git a/uvim/runtime/autoload/contextcomplete.vim b/uvim/runtime/autoload/contextcomplete.mnv
index 5b93bb0986..3e3d3e80e0 100644
--- a/uvim/runtime/autoload/contextcomplete.vim
+++ b/uvim/runtime/autoload/contextcomplete.mnv
@@ -3,7 +3,7 @@
 " Latest Revision:    2016 Oct 15
 
 let s:keepcpo= &cpo
-set cpo&vim
+set cpo&mnv
 
 " Complete keywords in MetaPost blocks
 function! contextcomplete#Complete(findstart, base)
@@ -22,4 +22,4 @@ endfunction
 let &cpo = s:keepcpo
 unlet s:keepcpo
 
-" vim: sw=2 fdm=marker
+" mnv: sw=2 fdm=marker
diff --git a/uvim/runtime/autoload/csscomplete.vim b/uvim/runtime/autoload/csscomplete.mnv
index 4b673ac9b8..a892c9463d 100644
--- a/uvim/runtime/autoload/csscomplete.vim
+++ b/uvim/runtime/autoload/csscomplete.mnv
@@ -1,4 +1,4 @@
-" Vim completion script
+" MNV completion script
 " Language: CSS
 "           Based on MDN CSS Reference at 2016 Jan <https://developer.mozilla.org/en-US/docs/Web/CSS/Reference>
 "           plus CSS Speech Module <http://www.w3.org/TR/css3-speech/>
diff --git a/uvim/runtime/autoload/decada.vim b/uvim/runtime/autoload/decada.mnv
index fda2b76dac..abcee79648 100644
--- a/uvim/runtime/autoload/decada.vim
+++ b/uvim/runtime/autoload/decada.mnv
@@ -1,14 +1,14 @@
 "------------------------------------------------------------------------------
-"  Description: Vim Ada/Dec Ada compiler file
+"  Description: MNV Ada/Dec Ada compiler file
 "     Language: Ada (Dec Ada)
-"          $Id: decada.vim 887 2008-07-08 14:29:01Z krischik $
+"          $Id: decada.mnv 887 2008-07-08 14:29:01Z krischik $
 "    Copyright: Copyright (C) 2006 Martin Krischik
 "   Maintainer:	Martin Krischik <krischik@users.sourceforge.net>
 "      $Author: krischik $
 "        $Date: 2008-07-08 16:29:01 +0200 (Di, 08 Jul 2008) $
 "      Version: 4.6      
 "    $Revision: 887 $
-"     $HeadURL: https://gnuada.svn.sourceforge.net/svnroot/gnuada/trunk/tools/vim/autoload/decada.vim $
+"     $HeadURL: https://gnuada.svn.sourceforge.net/svnroot/gnuada/trunk/tools/mnv/autoload/decada.mnv $
 "      History: 21.07.2006 MK New Dec Ada
 "               15.10.2006 MK Bram's suggestion for runtime integration
 "               05.11.2006 MK Bram suggested not to use include protection for
@@ -45,8 +45,8 @@ function decada#Set_Session (...) dict				     " {{{1
       call ada#Switch_Session (a:1)
    elseif argc() == 0 && strlen (v:servername) > 0
       call ada#Switch_Session (
-	 \ expand('~')[0:-2] . ".vimfiles.session]decada_" .
-	 \ v:servername . ".vim")
+	 \ expand('~')[0:-2] . ".mnvfiles.session]decada_" .
+	 \ v:servername . ".mnv")
    endif
    return
 endfunction decada#Set_Session					     " }}}1
@@ -69,7 +69,7 @@ finish " 1}}}
 "------------------------------------------------------------------------------
 "   Copyright (C) 2006  Martin Krischik
 "
-"   Vim is Charityware - see ":help license" or uganda.txt for licence details.
+"   MNV is Charityware - see ":help license" or uganda.txt for licence details.
 "------------------------------------------------------------------------------
-" vim: textwidth=78 wrap tabstop=8 shiftwidth=3 softtabstop=3 noexpandtab
-" vim: foldmethod=marker
+" mnv: textwidth=78 wrap tabstop=8 shiftwidth=3 softtabstop=3 noexpandtab
+" mnv: foldmethod=marker
diff --git a/uvim/runtime/autoload/dist/ft.vim b/uvim/runtime/autoload/dist/ft.mnv
index 20495866b3..5c91e591f1 100644
--- a/uvim/runtime/autoload/dist/ft.vim
+++ b/uvim/runtime/autoload/dist/ft.mnv
@@ -1,12 +1,12 @@
-vim9script
+mnv9script
 
-# Vim functions for file type detection
+# MNV functions for file type detection
 #
-# Maintainer:		The Vim Project <https://github.com/vim/vim>
+# Maintainer:		The MNV Project <https://github.com/Project-Tick/Project-Tick>
 # Last Change:		2026 Mar 24
-# Former Maintainer:	Bram Moolenaar <Bram@vim.org>
+# Former Maintainer:	Bram Moolenaar <Bram@mnv.org>
 
-# These functions are moved here from runtime/filetype.vim to make startup
+# These functions are moved here from runtime/filetype.mnv to make startup
 # faster.
 
 var prolog_pattern = '^\s*\(:-\|%\+\(\s\|$\)\|\/\*\)\|\.\s*$'
@@ -1073,7 +1073,7 @@ export def McSetf()
   setf m4  # Default: Sendmail .mc file
 enddef
 
-# Called from filetype.vim and scripts.vim.
+# Called from filetype.mnv and scripts.mnv.
 # When "setft" is passed and false then the 'filetype' option is not set.
 export def SetFileTypeSH(name: string, setft = true): string
   if setft && did_filetype()
@@ -1126,7 +1126,7 @@ enddef
 # For shell-like file types, check for an "exec" command hidden in a comment,
 # as used for Tcl.
 # When "setft" is passed and false then the 'filetype' option is not set.
-# Also called from scripts.vim, thus can't be local to this script.
+# Also called from scripts.mnv, thus can't be local to this script.
 export def SetFileTypeShell(name: string, setft = true): string
   if setft && did_filetype()
     # Filetype was already detected
@@ -1190,7 +1190,7 @@ export def FTRules()
   var config_lines: list<string>
   try
     config_lines = readfile('/etc/udev/udev.conf')
-  catch /^Vim\%((\a\+)\)\=:E484/
+  catch /^MNV\%((\a\+)\)\=:E484/
     setf hog
     return
   endtry
@@ -1326,7 +1326,7 @@ enddef
 # Choose context, plaintex, or tex (LaTeX) based on these rules:
 # 1. Check the first line of the file for "%&<format>".
 # 2. Check the first 1000 non-comment lines for LaTeX or ConTeXt keywords.
-# 3. Default to "plain" or to g:tex_flavor, can be set in user's vimrc.
+# 3. Default to "plain" or to g:tex_flavor, can be set in user's mnvrc.
 export def FTtex()
   var firstline = getline(1)
   var format: string
@@ -1650,8 +1650,8 @@ export def FTv()
 enddef
 
 export def FTvba()
-  if getline(1) =~ '^["#] Vimball Archiver'
-    setf vim
+  if getline(1) =~ '^["#] MNVball Archiver'
+    setf mnv
   else
     setf vb
   endif
@@ -2988,7 +2988,7 @@ const ft_from_ext = {
   "sba": "vb",
   # VRML V1.0c
   "wrl": "vrml",
-  # Vroom (vim testing and executable documentation)
+  # Vroom (mnv testing and executable documentation)
   "vroom": "vroom",
   # Vue.js Single File Component
   "vue": "vue",
@@ -3402,9 +3402,9 @@ const ft_from_name = {
   "trustees.conf": "trustees",
   # Vagrant (uses Ruby syntax)
   "Vagrantfile": "ruby",
-  # Viminfo file
-  ".viminfo": "viminfo",
-  "_viminfo": "viminfo",
+  # MNVinfo file
+  ".mnvinfo": "mnvinfo",
+  "_mnvinfo": "mnvinfo",
   # Vgrindefs file
   "vgrindefs": "vgrindefs",
   # Wget config
diff --git a/uvim/runtime/autoload/dist/json.vim b/uvim/runtime/autoload/dist/json.mnv
index 9faa88ace3..4c24e26881 100644
--- a/uvim/runtime/autoload/dist/json.vim
+++ b/uvim/runtime/autoload/dist/json.mnv
@@ -1,17 +1,17 @@
-vim9script
+mnv9script
 
 # Maintainer: Maxim Kim <habamax@gmail.com>
 # Last update: 2023-12-10
 #
 # Set of functions to format/beautify JSON data structures.
 #
-# Could be used to reformat a minified json in a buffer (put it into ~/.vim/ftplugin/json.vim):
-#    import autoload 'dist/json.vim'
+# Could be used to reformat a minified json in a buffer (put it into ~/.mnv/ftplugin/json.mnv):
+#    import autoload 'dist/json.mnv'
 #    setl formatexpr=json.FormatExpr()
 #
-# Or to get a formatted string out of vim's dict/list/string:
-#    vim9script
-#    import autoload 'dist/json.vim'
+# Or to get a formatted string out of mnv's dict/list/string:
+#    mnv9script
+#    import autoload 'dist/json.mnv'
 #    echo json.Format({
 #      "widget": { "debug": "on", "window": { "title": "Sample \"Konfabulator\" Widget",
 #          "name": "main_window", "width": 500, "height": 500
@@ -55,7 +55,7 @@ vim9script
 #
 # NOTE: order of `key: value` pairs is not kept.
 #
-# You can also use a JSON string instead of vim's dict/list to maintain order:
+# You can also use a JSON string instead of mnv's dict/list to maintain order:
 #    echo json.Format('{"hello": 1, "world": 2}')
 #    {
 #      "hello": 1,
@@ -63,8 +63,8 @@ vim9script
 #    }
 
 
-# To be able to reformat with `gq` add following to `~/.vim/ftplugin/json.vim`:
-#    import autoload 'dist/json.vim'
+# To be able to reformat with `gq` add following to `~/.mnv/ftplugin/json.mnv`:
+#    import autoload 'dist/json.mnv'
 #    setl formatexpr=json.FormatExpr()
 export def FormatExpr(): number
     FormatRange(v:lnum, v:lnum + v:count - 1)
@@ -72,7 +72,7 @@ export def FormatExpr(): number
 enddef
 
 
-# import autoload 'dist/json.vim'
+# import autoload 'dist/json.mnv'
 # command -range=% JSONFormat json.FormatRange(<line1>, <line2>)
 export def FormatRange(line1: number, line2: number)
     var indent_base = matchstr(getline(line1), '^\s*')
@@ -95,7 +95,7 @@ enddef
 
 
 # Format JSON string or dict/list as JSON
-# import autoload 'dist/json.vim'
+# import autoload 'dist/json.mnv'
 # echo json.Format('{"hello": "world"}', {use_tabs: false, indent: 2, indent_base: 0})
 
 # {
diff --git a/uvim/runtime/autoload/dist/man.vim b/uvim/runtime/autoload/dist/man.mnv
index 32bf80c765..e84bb7a0b2 100644
--- a/uvim/runtime/autoload/dist/man.vim
+++ b/uvim/runtime/autoload/dist/man.mnv
@@ -1,4 +1,4 @@
-" Vim filetype plugin autoload file
+" MNV filetype plugin autoload file
 " Language:	man
 " Maintainer:	Jason Franklin <jason@oneway.dev>
 " Maintainer:	SungHyun Nam <goweol@gmail.com>
@@ -46,7 +46,7 @@ func! s:ManDbPagesBySection() abort
   let unparsed_lines = []
   for line in systemlist(list_command)
     " Typical lines:
-    " vim (1)              - Vi IMproved, a programmer's text editor
+    " mnv (1)              - MNV is not Vim, a programmer's text editor
     "
     " Unusual lines:
     " pgm_read_ T _ (3avr) - (unknown subject)
@@ -219,7 +219,7 @@ func dist#man#GetPage(cmdmods, ...)
     endif
   endif
   if s:FindPage(sect, page) == 0
-    let msg = 'man.vim: no manual entry for "' . page . '"'
+    let msg = 'man.mnv: no manual entry for "' . page . '"'
     if !empty(sect)
       let msg .= ' in section ' . sect
     endif
@@ -279,7 +279,7 @@ func dist#man#GetPage(cmdmods, ...)
     let unsetwidth = 1
   endif
 
-  " Ensure Vim is not recursively invoked (man-db does this) when doing ctrl-[
+  " Ensure MNV is not recursively invoked (man-db does this) when doing ctrl-[
   " on a man page reference by unsetting MANPAGER.
   " Some versions of env(1) do not support the '-u' option, and in such case
   " we set MANPAGER=cat.
@@ -294,7 +294,7 @@ func dist#man#GetPage(cmdmods, ...)
   silent exec "r !" . man_cmd
 
   " Emulate piping the buffer through the "col -b" command.
-  " Ref: https://github.com/vim/vim/issues/12301
+  " Ref: https://github.com/Project-Tick/Project-Tick/issues/12301
   exe 'silent! keepjumps keeppatterns %s/\v(.)\b\ze\1?//e' .. (&gdefault ? '' : 'g')
 
   if unsetwidth
@@ -334,4 +334,4 @@ endfunc
 let &cpo = s:cpo_save
 unlet s:cpo_save
 
-" vim: set sw=2 ts=8 noet:
+" mnv: set sw=2 ts=8 noet:
diff --git a/uvim/runtime/autoload/dist/vim.vim b/uvim/runtime/autoload/dist/mnv.mnv
index 5a0f350537..6e14895d28 100644
--- a/uvim/runtime/autoload/dist/vim.vim
+++ b/uvim/runtime/autoload/dist/mnv.mnv
@@ -1,8 +1,8 @@
-" Vim runtime support library,
-" runs the Vim9 script version or legacy script version
-" on demand (mostly for Neovim compatibility)
+" MNV runtime support library,
+" runs the MNV9 script version or legacy script version
+" on demand (mostly for Neomnv compatibility)
 "
-" Maintainer:	The Vim Project <https://github.com/vim/vim>
+" Maintainer:	The MNV Project <https://github.com/Project-Tick/Project-Tick>
 " Last Change:	2026 Jan 11
 
 
@@ -15,8 +15,8 @@ if !exists('g:gzip_exec')
   let g:gzip_exec = 1
 endif
 
-if !has('vim9script')
-  function dist#vim#IsSafeExecutable(filetype, executable)
+if !has('mnv9script')
+  function dist#mnv#IsSafeExecutable(filetype, executable)
     let cwd = getcwd()
     if empty(exepath(a:executable))
       return v:false
@@ -30,6 +30,6 @@ if !has('vim9script')
   finish
 endif
 
-def dist#vim#IsSafeExecutable(filetype: string, executable: string): bool
-  return dist#vim9#IsSafeExecutable(filetype, executable)
+def dist#mnv#IsSafeExecutable(filetype: string, executable: string): bool
+  return dist#mnv9#IsSafeExecutable(filetype, executable)
 enddef
diff --git a/uvim/runtime/autoload/dist/vim9.vim b/uvim/runtime/autoload/dist/mnv9.mnv
index 87b3dbb872..010a46418c 100644
--- a/uvim/runtime/autoload/dist/vim9.vim
+++ b/uvim/runtime/autoload/dist/mnv9.mnv
@@ -1,8 +1,8 @@
-vim9script
+mnv9script
 
-# Vim runtime support library
+# MNV runtime support library
 #
-# Maintainer:   The Vim Project <https://github.com/vim/vim>
+# Maintainer:   The MNV Project <https://github.com/Project-Tick/Project-Tick>
 # Last Change:  2026 Mar 10
 
 export def IsSafeExecutable(filetype: string, executable: string): bool
@@ -69,9 +69,9 @@ elseif has('win32')
   export def Launch(args: string)
     try
       execute ':silent !start' args | redraw!
-    catch /^Vim(!):E371:/
+    catch /^MNV(!):E371:/
       echohl ErrorMsg
-      echom "dist#vim9#Launch(): can not start" args
+      echom "dist#mnv9#Launch(): can not start" args
       echohl None
     endtry
   enddef
@@ -151,4 +151,4 @@ enddef
 # Uncomment this line to check for compilation errors early
 # defcompile
 
-# vim: ts=8 sts=2 sw=2 et
+# mnv: ts=8 sts=2 sw=2 et
diff --git a/uvim/runtime/autoload/dist/vimindent.vim b/uvim/runtime/autoload/dist/mnvindent.mnv
index ec14823558..fd1f6177d4 100644
--- a/uvim/runtime/autoload/dist/vimindent.vim
+++ b/uvim/runtime/autoload/dist/mnvindent.mnv
@@ -1,23 +1,23 @@
-vim9script
+mnv9script
 
-# Language:     Vim script
+# Language:     MNV script
 # Maintainer:   github user lacygoill
 # Last Change:  2025 Oct 09
 #
-# Includes changes from The Vim Project:
+# Includes changes from The MNV Project:
 
 # NOTE: Whenever you change the code, make sure the tests are still passing:
 #
 #     $ cd runtime/indent/
-#     $ make clean; make test || vimdiff testdir/vim.{ok,fail}
+#     $ make clean; make test || mnvdiff testdir/mnv.{ok,fail}
 
 # Config {{{1
 
-const TIMEOUT: number = get(g:, 'vim_indent', {})
+const TIMEOUT: number = get(g:, 'mnv_indent', {})
     ->get('searchpair_timeout', 100)
 
 def IndentMoreInBracketBlock(): number # {{{2
-    if get(g:, 'vim_indent', {})
+    if get(g:, 'mnv_indent', {})
             ->get('more_in_bracket_block', false)
         return shiftwidth()
     endif
@@ -25,9 +25,9 @@ def IndentMoreInBracketBlock(): number # {{{2
 enddef
 
 def IndentMoreLineContinuation(): number # {{{2
-    var n: any = get(g:, 'vim_indent', {})
-        # We inspect `g:vim_indent_cont` to stay backward compatible.
-        ->get('line_continuation', get(g:, 'vim_indent_cont', shiftwidth() * 3))
+    var n: any = get(g:, 'mnv_indent', {})
+        # We inspect `g:mnv_indent_cont` to stay backward compatible.
+        ->get('line_continuation', get(g:, 'mnv_indent_cont', shiftwidth() * 3))
 
     if n->typename() == 'string'
         return n->eval()
@@ -76,16 +76,16 @@ const CHARACTER_UNDER_CURSOR: string = '\%.c.'
 # `synstack()`).
 const INLINE_COMMENT: string = '\s[#"]\%(\s\|[{}]\{3}\)'
 
-# INLINE_VIM9_COMMENT {{{3
+# INLINE_MNV9_COMMENT {{{3
 
-const INLINE_VIM9_COMMENT: string = '\s#'
+const INLINE_MNV9_COMMENT: string = '\s#'
 
 # COMMENT {{{3
 
 # TODO: Technically, `"\s` is wrong.
 #
 # First, whitespace is not required.
-# Second, in Vim9, a string might appear at the start of the line.
+# Second, in MNV9, a string might appear at the start of the line.
 # To be sure, we should also inspect the syntax.
 # We can't use `INLINE_COMMENT` here. {{{
 #
@@ -120,9 +120,9 @@ const END_OF_COMMAND: string = $'\s*\%($\|||\@!\|{INLINE_COMMENT}\)'
 
 const END_OF_LINE: string = $'\s*\%($\|{INLINE_COMMENT}\)'
 
-# END_OF_VIM9_LINE {{{3
+# END_OF_MNV9_LINE {{{3
 
-const END_OF_VIM9_LINE: string = $'\s*\%($\|{INLINE_VIM9_COMMENT}\)'
+const END_OF_MNV9_LINE: string = $'\s*\%($\|{INLINE_MNV9_COMMENT}\)'
 
 # OPERATOR {{{3
 
@@ -353,23 +353,23 @@ const TRICKY_COMMANDS: string = patterns->join('\|')
 # EOL {{{2
 # OPENING_BRACKET_AT_EOL {{{3
 
-const OPENING_BRACKET_AT_EOL: string = OPENING_BRACKET .. END_OF_VIM9_LINE
+const OPENING_BRACKET_AT_EOL: string = OPENING_BRACKET .. END_OF_MNV9_LINE
 
 # CLOSING_BRACKET_AT_EOL {{{3
 
-const CLOSING_BRACKET_AT_EOL: string = CLOSING_BRACKET .. END_OF_VIM9_LINE
+const CLOSING_BRACKET_AT_EOL: string = CLOSING_BRACKET .. END_OF_MNV9_LINE
 
 # COMMA_AT_EOL {{{3
 
-const COMMA_AT_EOL: string = $',{END_OF_VIM9_LINE}'
+const COMMA_AT_EOL: string = $',{END_OF_MNV9_LINE}'
 
 # COMMA_OR_DICT_KEY_AT_EOL {{{3
 
-const COMMA_OR_DICT_KEY_AT_EOL: string = $'\%(,\|{DICT_KEY}\){END_OF_VIM9_LINE}'
+const COMMA_OR_DICT_KEY_AT_EOL: string = $'\%(,\|{DICT_KEY}\){END_OF_MNV9_LINE}'
 
 # LAMBDA_ARROW_AT_EOL {{{3
 
-const LAMBDA_ARROW_AT_EOL: string = $'\s=>{END_OF_VIM9_LINE}'
+const LAMBDA_ARROW_AT_EOL: string = $'\s=>{END_OF_MNV9_LINE}'
 
 # LINE_CONTINUATION_AT_EOL {{{3
 
@@ -425,8 +425,8 @@ export def Expr(lnum = v:lnum): number # {{{2
     elseif line_A.lnum->IsInside('HereDoc')
         return line_A.text->HereDocIndent()
     elseif line_A.lnum->IsRightBelow('HereDoc')
-        var ind: number = b:vimindent.startindent
-        unlet! b:vimindent
+        var ind: number = b:mnvindent.startindent
+        unlet! b:mnvindent
         if line_A.text =~ ENDS_BLOCK_OR_CLAUSE
             return ind - shiftwidth()
         endif
@@ -452,10 +452,10 @@ export def Expr(lnum = v:lnum): number # {{{2
             && !IsInInterface()
         line_A.lnum->CacheFuncHeader()
     elseif line_A.lnum->IsInside('FuncHeader')
-        return b:vimindent.startindent + 2 * shiftwidth()
+        return b:mnvindent.startindent + 2 * shiftwidth()
     elseif line_A.lnum->IsRightBelow('FuncHeader')
-        var startindent: number = b:vimindent.startindent
-        unlet! b:vimindent
+        var startindent: number = b:mnvindent.startindent
+        unlet! b:mnvindent
         if line_A.text =~ ENDS_FUNCTION
             return startindent
         endif
@@ -463,8 +463,8 @@ export def Expr(lnum = v:lnum): number # {{{2
     endif
 
     var past_bracket_block: dict<any>
-    if exists('b:vimindent')
-            && b:vimindent->has_key('is_BracketBlock')
+    if exists('b:mnvindent')
+            && b:mnvindent->has_key('is_BracketBlock')
         past_bracket_block = RemovePastBracketBlock(line_A)
     endif
     if line_A->AtStartOf('BracketBlock')
@@ -472,7 +472,7 @@ export def Expr(lnum = v:lnum): number # {{{2
     endif
     if line_A.lnum->IsInside('BracketBlock')
         var is_in_curly_block: bool = IsInCurlyBlock()
-        for block: dict<any> in b:vimindent.block_stack
+        for block: dict<any> in b:mnvindent.block_stack
             if line_A.lnum <= block.startlnum
                 continue
             endif
@@ -517,9 +517,9 @@ export def Expr(lnum = v:lnum): number # {{{2
     # Don't move it before the function header and bracket block ones either.{{{
     #
     # You could, because these blocks of code deal with construct which can only
-    # appear  in a  Vim9  script.  And  in  a  Vim9 script,  the  first line  is
-    # `vim9script`.  Or  maybe some legacy code/comment  (see `:help vim9-mix`).
-    # But you  can't find a  Vim9 function header or  Vim9 bracket block  on the
+    # appear  in a  MNV9  script.  And  in  a  MNV9 script,  the  first line  is
+    # `mnv9script`.  Or  maybe some legacy code/comment  (see `:help mnv9-mix`).
+    # But you  can't find a  MNV9 function header or  MNV9 bracket block  on the
     # first line.
     #
     # Anyway, even if you could, don't.  First, it would be inconsistent.
@@ -592,7 +592,7 @@ export def Expr(lnum = v:lnum): number # {{{2
     return base_ind + Offset(line_A, line_B)
 enddef
 
-def g:GetVimIndent(): number # {{{2
+def g:GetMNVIndent(): number # {{{2
     # for backward compatibility
     return Expr()
 enddef
@@ -644,27 +644,27 @@ enddef
 
 def HereDocIndent(line_A: string): number # {{{2
     # at the end of a heredoc
-    if line_A =~ $'^\s*{b:vimindent.endmarker}$'
+    if line_A =~ $'^\s*{b:mnvindent.endmarker}$'
         # `END` must be at the very start of the line if the heredoc is not trimmed
-        if !b:vimindent.is_trimmed
+        if !b:mnvindent.is_trimmed
             # We can't invalidate the cache just yet.
             # The indent of `END` is meaningless;  it's always 0.  The next line
             # will need to be indented relative to the start of the heredoc.  It
             # must know where it starts; it needs the cache.
             return 0
         endif
-        var ind: number = b:vimindent.startindent
+        var ind: number = b:mnvindent.startindent
         # invalidate the cache so that it's not used for the next heredoc
-        unlet! b:vimindent
+        unlet! b:mnvindent
         return ind
     endif
 
     # In a non-trimmed heredoc, all of leading whitespace is semantic.
     # Leave it alone.
-    if !b:vimindent.is_trimmed
+    if !b:mnvindent.is_trimmed
         # But do save the indent of the assignment line.
-        if !b:vimindent->has_key('startindent')
-            b:vimindent.startindent = b:vimindent.startlnum->Indent()
+        if !b:mnvindent->has_key('startindent')
+            b:mnvindent.startindent = b:mnvindent.startlnum->Indent()
         endif
         return -1
     endif
@@ -676,9 +676,9 @@ def HereDocIndent(line_A: string): number # {{{2
     # was increased  or decreased.   Then, we  need to apply  that same  change to
     # every line inside the body.
     var offset: number
-    if !b:vimindent->has_key('offset')
-        var old_startindent: number = b:vimindent.startindent
-        var new_startindent: number = b:vimindent.startlnum->Indent()
+    if !b:mnvindent->has_key('offset')
+        var old_startindent: number = b:mnvindent.startindent
+        var new_startindent: number = b:mnvindent.startlnum->Indent()
         offset = new_startindent - old_startindent
 
         # If all the non-empty lines in  the body have a higher indentation relative
@@ -687,18 +687,18 @@ def HereDocIndent(line_A: string): number # {{{2
         # lower one), then we want to indent it further (and the whole block with it).
         # This way,  we can clearly distinguish  the heredoc block from  the rest of
         # the code.
-        var end: number = search($'^\s*{b:vimindent.endmarker}$', 'nW')
+        var end: number = search($'^\s*{b:mnvindent.endmarker}$', 'nW')
         var should_indent_more: bool = range(v:lnum, end - 1)
             ->indexof((_, lnum: number): bool => Indent(lnum) <= old_startindent && getline(lnum) != '') >= 0
         if should_indent_more
             offset += shiftwidth()
         endif
 
-        b:vimindent.offset = offset
-        b:vimindent.startindent = new_startindent
+        b:mnvindent.offset = offset
+        b:mnvindent.startindent = new_startindent
     endif
 
-    return Indent(v:lnum) + b:vimindent.offset
+    return Indent(v:lnum) + b:mnvindent.offset
 enddef
 
 def CommentIndent(): number # {{{2
@@ -713,15 +713,15 @@ def CommentIndent(): number # {{{2
     if next == 0
         return 0
     endif
-    var vimindent_save: dict<any> = get(b:, 'vimindent', {})->deepcopy()
+    var mnvindent_save: dict<any> = get(b:, 'mnvindent', {})->deepcopy()
     var ind: number = next->Expr()
-    # The previous `Expr()` might have set or deleted `b:vimindent`.
+    # The previous `Expr()` might have set or deleted `b:mnvindent`.
     # This could  cause issues (e.g.  when indenting  2 commented lines  above a
     # heredoc).  Let's make sure the state of the variable is not altered.
-    if vimindent_save->empty()
-        unlet! b:vimindent
+    if mnvindent_save->empty()
+        unlet! b:mnvindent
     else
-        b:vimindent = vimindent_save
+        b:mnvindent = mnvindent_save
     endif
     if getline(next) =~ ENDS_BLOCK
         return ind + shiftwidth()
@@ -733,7 +733,7 @@ def BracketBlockIndent(line_A: dict<any>, block: dict<any>): number # {{{2
     var ind: number = block.startindent
 
     if line_A.text =~ CLOSING_BRACKET_AT_SOL
-        if b:vimindent.is_on_named_block_line
+        if b:mnvindent.is_on_named_block_line
             ind += 2 * shiftwidth()
         endif
         return ind + IndentMoreInBracketBlock()
@@ -752,7 +752,7 @@ def BracketBlockIndent(line_A: dict<any>, block: dict<any>): number # {{{2
         ind += shiftwidth() + IndentMoreInBracketBlock()
     endif
 
-    if b:vimindent.is_on_named_block_line
+    if b:mnvindent.is_on_named_block_line
         ind += shiftwidth()
     endif
 
@@ -768,7 +768,7 @@ def CacheHeredoc(line_A: dict<any>) # {{{2
     var endmarker: string = line_A.text->matchstr(ASSIGNS_HEREDOC)
     var endlnum: number = search($'^\s*{endmarker}$', 'nW')
     var is_trimmed: bool = line_A.text =~ $'.*\s\%(trim\%(\s\+eval\)\=\)\s\+[A-Z]\+{END_OF_LINE}'
-    b:vimindent = {
+    b:mnvindent = {
         is_HereDoc: true,
         startlnum: line_A.lnum,
         endlnum: endlnum,
@@ -776,7 +776,7 @@ def CacheHeredoc(line_A: dict<any>) # {{{2
         is_trimmed: is_trimmed,
     }
     if is_trimmed
-        b:vimindent.startindent = Indent(line_A.lnum)
+        b:mnvindent.startindent = Indent(line_A.lnum)
     endif
     RegisterCacheInvalidation()
 enddef
@@ -793,7 +793,7 @@ def CacheFuncHeader(startlnum: number) # {{{2
         return
     endif
 
-    b:vimindent = {
+    b:mnvindent = {
         is_FuncHeader: true,
         startindent: startlnum->Indent(),
         endlnum: endlnum,
@@ -811,8 +811,8 @@ def CacheBracketBlock(line_A: dict<any>) # {{{2
         return
     endif
 
-    if !exists('b:vimindent')
-        b:vimindent = {
+    if !exists('b:mnvindent')
+        b:mnvindent = {
             is_BracketBlock: true,
             is_on_named_block_line: line_A.text =~ STARTS_NAMED_BLOCK,
             block_stack: [],
@@ -828,7 +828,7 @@ def CacheBracketBlock(line_A: dict<any>) # {{{2
             [is_dict, is_curly_block] = [true, false]
         endif
     endif
-    b:vimindent.block_stack->insert({
+    b:mnvindent.block_stack->insert({
         is_dict: is_dict,
         is_curly_block: is_curly_block,
         startline: line_A.text,
@@ -842,9 +842,9 @@ enddef
 def RegisterCacheInvalidation() # {{{2
     # invalidate the cache so that it's not used for the next `=` normal command
     autocmd_add([{
-        cmd: 'unlet! b:vimindent',
+        cmd: 'unlet! b:mnvindent',
         event: 'ModeChanged',
-        group: '__VimIndent__',
+        group: '__MNVIndent__',
         once: true,
         pattern: '*:n',
         replace: true,
@@ -852,7 +852,7 @@ def RegisterCacheInvalidation() # {{{2
 enddef
 
 def RemovePastBracketBlock(line_A: dict<any>): dict<any> # {{{2
-    var stack: list<dict<any>> = b:vimindent.block_stack
+    var stack: list<dict<any>> = b:mnvindent.block_stack
 
     var removed: dict<any>
     if line_A.lnum > stack[0].endlnum
@@ -861,7 +861,7 @@ def RemovePastBracketBlock(line_A: dict<any>): dict<any> # {{{2
 
     stack->filter((_, block: dict<any>): bool => line_A.lnum <= block.endlnum)
     if stack->empty()
-        unlet! b:vimindent
+        unlet! b:mnvindent
     endif
     return removed
 enddef
@@ -978,10 +978,10 @@ def SearchPair( # {{{3
     if end == '[' || end == ']'
         e = e->escape('[]')
     endif
-    # VIM_INDENT_TEST_TRACE_START
+    # MNV_INDENT_TEST_TRACE_START
     return searchpair('\C' .. s, (middle == '' ? '' : '\C' .. middle), '\C' .. e,
         flags, (): bool => InCommentOrString(), stopline, TIMEOUT)
-    # VIM_INDENT_TEST_TRACE_END dist#vimindent#SearchPair
+    # MNV_INDENT_TEST_TRACE_END dist#mnvindent#SearchPair
 enddef
 
 def SearchPairStart( # {{{3
@@ -1012,7 +1012,7 @@ def AtStartOf(line_A: dict<any>, syntax: string): bool # {{{3
         FuncHeader: STARTS_FUNCTION
     }[syntax]
     return line_A.text =~ pat
-        && (!exists('b:vimindent') || !b:vimindent->has_key('is_HereDoc'))
+        && (!exists('b:mnvindent') || !b:mnvindent->has_key('is_HereDoc'))
 enddef
 
 def AtStartOfBracketBlock(line_A: dict<any>): bool # {{{3
@@ -1021,8 +1021,8 @@ def AtStartOfBracketBlock(line_A: dict<any>): bool # {{{3
     # indent correctly a  multiline bracket block inside  a function header,
     # but that's  a corner case for  which it doesn't seem  worth making the
     # code more complex.
-    if exists('b:vimindent')
-            && !b:vimindent->has_key('is_BracketBlock')
+    if exists('b:mnvindent')
+            && !b:mnvindent->has_key('is_BracketBlock')
         return false
     endif
 
@@ -1069,30 +1069,30 @@ def IsInside(lnum: number, syntax: string): bool # {{{3
         return false
     endif
 
-    if !exists('b:vimindent')
-            || !b:vimindent->has_key($'is_{syntax}')
+    if !exists('b:mnvindent')
+            || !b:mnvindent->has_key($'is_{syntax}')
         return false
     endif
 
     if syntax == 'BracketBlock'
-        if !b:vimindent->has_key('block_stack')
-                || b:vimindent.block_stack->empty()
+        if !b:mnvindent->has_key('block_stack')
+                || b:mnvindent.block_stack->empty()
             return false
         endif
-        return lnum <= b:vimindent.block_stack[0].endlnum
+        return lnum <= b:mnvindent.block_stack[0].endlnum
     endif
 
-    return lnum <= b:vimindent.endlnum
+    return lnum <= b:mnvindent.endlnum
 enddef
 
 def IsRightBelow(lnum: number, syntax: string): bool # {{{3
-    return exists('b:vimindent')
-        && b:vimindent->has_key($'is_{syntax}')
-        && lnum > b:vimindent.endlnum
+    return exists('b:mnvindent')
+        && b:mnvindent->has_key($'is_{syntax}')
+        && lnum > b:mnvindent.endlnum
 enddef
 
 def IsInCurlyBlock(): bool # {{{3
-    return b:vimindent.block_stack
+    return b:mnvindent.block_stack
         ->indexof((_, block: dict<any>): bool => block.is_curly_block) >= 0
 enddef
 
@@ -1267,11 +1267,11 @@ def NonCommentedMatch(line: dict<any>, pat: string): bool # {{{3
 
     var pos: list<number> = getcurpos()
     cursor(line.lnum, 1)
-    # VIM_INDENT_TEST_TRACE_START
+    # MNV_INDENT_TEST_TRACE_START
     var match_lnum: number = search(pat, 'cnW', line.lnum, TIMEOUT, (): bool => InCommentOrString())
-    # VIM_INDENT_TEST_TRACE_END dist#vimindent#NonCommentedMatch
+    # MNV_INDENT_TEST_TRACE_END dist#mnvindent#NonCommentedMatch
     setpos('.', pos)
     return match_lnum > 0
 enddef
 # }}}1
-# vim:sw=4
+# mnv:sw=4
diff --git a/uvim/runtime/autoload/dist/script.vim b/uvim/runtime/autoload/dist/script.mnv
index de168f0c09..faa6d8e2fd 100644
--- a/uvim/runtime/autoload/dist/script.vim
+++ b/uvim/runtime/autoload/dist/script.mnv
@@ -1,11 +1,11 @@
-vim9script
+mnv9script
 
-# Vim function for detecting a filetype from the file contents.
-# Invoked from "scripts.vim" in 'runtimepath'
+# MNV function for detecting a filetype from the file contents.
+# Invoked from "scripts.mnv" in 'runtimepath'
 #
-# Maintainer:	The Vim Project <https://github.com/vim/vim>
+# Maintainer:	The MNV Project <https://github.com/Project-Tick/Project-Tick>
 # Last Change:	2025 Dec 22
-# Former Maintainer:	Bram Moolenaar <Bram@vim.org>
+# Former Maintainer:	Bram Moolenaar <Bram@mnv.org>
 
 export def DetectFiletype()
   var line1 = getline(1)
@@ -237,9 +237,9 @@ export def Exe2filetype(name: string, line1: string): string
   elseif name =~ '^bpftrace\>'
     return 'bpftrace'
 
-    # Vim
-  elseif name =~ '^vim\>'
-    return 'vim'
+    # MNV
+  elseif name =~ '^mnv\>'
+    return 'mnv'
 
   endif
 
@@ -275,9 +275,9 @@ def DetectFromText(line1: string)
   elseif line1 =~ '^<[%&].*>'
     setl ft=mason
 
-  # Vim scripts (must have '" vim' as the first line to trigger this)
+  # MNV scripts (must have '" mnv' as the first line to trigger this)
   elseif line1 =~ '^" *[vV]im$'
-    setl ft=vim
+    setl ft=mnv
 
   # libcxx and libstdc++ standard library headers like "iostream" do not have
   # an extension, recognize the Emacs file mode.
diff --git a/uvim/runtime/autoload/freebasic.vim b/uvim/runtime/autoload/freebasic.mnv
index 6c94cd34ea..8aded425db 100644
--- a/uvim/runtime/autoload/freebasic.vim
+++ b/uvim/runtime/autoload/freebasic.mnv
@@ -1,4 +1,4 @@
-" Vim filetype plugin file
+" MNV filetype plugin file
 " Language:	FreeBASIC
 " Maintainer:	Doug Kearns <dougkearns@gmail.com>
 " Last Change:	2022 June 24
@@ -37,4 +37,4 @@ function! freebasic#GetDialect() abort
   return dialect
 endfunction
 
-" vim: nowrap sw=2 sts=2 ts=8 noet fdm=marker:
+" mnv: nowrap sw=2 sts=2 ts=8 noet fdm=marker:
diff --git a/uvim/runtime/autoload/getscript.vim b/uvim/runtime/autoload/getscript.mnv
index 27a5a49535..06ea00b090 100644
--- a/uvim/runtime/autoload/getscript.vim
+++ b/uvim/runtime/autoload/getscript.mnv
@@ -1,5 +1,5 @@
 " ---------------------------------------------------------------------
-" getscript.vim
+" getscript.mnv
 "  Maintainer: This runtime file is looking for a new maintainer.
 "  Original Author: Charles E. Campbell
 "  Date:	Jan 21, 2014
@@ -7,38 +7,38 @@
 "  Installing:	:help glvs-install
 "  Usage:	:help glvs
 "  Last Change:	{{{1
-"   2024 Sep 08 by Vim Project: several small fixes (#15640)
-"   2024 Sep 23 by Vim Project: runtime dir selection fix (#15722)
+"   2024 Sep 08 by MNV Project: several small fixes (#15640)
+"   2024 Sep 23 by MNV Project: runtime dir selection fix (#15722)
 "                               autoloading search path fix
 "                               substitution of hardcoded commands with global variables
-"   2024 Nov 12 by Vim Project: fix problems on Windows (#16036)
-"   2025 Feb 28 by Vim Project: add support for bzip3 (#16755)
-"   2025 May 11 by Vim Project: check network connectivity (#17249)
-"   2025 Dec 21 by Vim Project: make the wget check more robust (#18987)
+"   2024 Nov 12 by MNV Project: fix problems on Windows (#16036)
+"   2025 Feb 28 by MNV Project: add support for bzip3 (#16755)
+"   2025 May 11 by MNV Project: check network connectivity (#17249)
+"   2025 Dec 21 by MNV Project: make the wget check more robust (#18987)
 "  }}}
 "
-" GetLatestVimScripts: 642 1 :AutoInstall: getscript.vim
+" GetLatestMNVScripts: 642 1 :AutoInstall: getscript.mnv
 "redraw!|call inputsave()|call input("Press <cr> to continue")|call inputrestore()
 " ---------------------------------------------------------------------
 " Initialization:	{{{1
 " if you're sourcing this file, surely you can't be
-" expecting vim to be in its vi-compatible mode!
+" expecting mnv to be in its vi-compatible mode!
 if exists("g:loaded_getscript")
  finish
 endif
 let g:loaded_getscript= "v37"
 if &cp
- echoerr "GetLatestVimScripts is not vi-compatible; not loaded (you need to set nocp)"
+ echoerr "GetLatestMNVScripts is not vi-compatible; not loaded (you need to set nocp)"
  finish
 endif
 if v:version < 901
  echohl WarningMsg
- echo "***warning*** this version of GetLatestVimScripts needs vim 9.1"
+ echo "***warning*** this version of GetLatestMNVScripts needs mnv 9.1"
  echohl Normal
  finish
 endif
 let s:keepcpo = &cpo
-set cpo&vim
+set cpo&mnv
 "DechoTabOn
 
 " ---------------------------
@@ -58,116 +58,116 @@ if !exists("g:getscript_cygwin")
 endif
 
 " wget vs curl {{{2
-if !exists("g:GetLatestVimScripts_wget")
+if !exists("g:GetLatestMNVScripts_wget")
  if executable("wget.exe")
   " enforce extension: windows powershell desktop version has a wget alias that hides wget.exe
-  let g:GetLatestVimScripts_wget= "wget.exe"
+  let g:GetLatestMNVScripts_wget= "wget.exe"
  elseif executable("wget")
-  let g:GetLatestVimScripts_wget= "wget"
+  let g:GetLatestMNVScripts_wget= "wget"
  elseif executable("curl.exe")
   " enforce extension: windows powershell desktop version has a curl alias that hides curl.exe
-  let g:GetLatestVimScripts_wget= "curl.exe"
+  let g:GetLatestMNVScripts_wget= "curl.exe"
  elseif executable("curl")
-  let g:GetLatestVimScripts_wget= "curl"
+  let g:GetLatestMNVScripts_wget= "curl"
  else
-  let g:GetLatestVimScripts_wget    = 'echo "GetLatestVimScripts needs wget or curl"'
-  let g:GetLatestVimScripts_options = ""
+  let g:GetLatestMNVScripts_wget    = 'echo "GetLatestMNVScripts needs wget or curl"'
+  let g:GetLatestMNVScripts_options = ""
  endif
 endif
 
 " options that wget and curl require:
-if !exists("g:GetLatestVimScripts_options")
- if g:GetLatestVimScripts_wget =~ "wget"
-  let g:GetLatestVimScripts_options= "-q -O"
- elseif g:GetLatestVimScripts_wget =~ "curl"
-  let g:GetLatestVimScripts_options= "-s -o"
+if !exists("g:GetLatestMNVScripts_options")
+ if g:GetLatestMNVScripts_wget =~ "wget"
+  let g:GetLatestMNVScripts_options= "-q -O"
+ elseif g:GetLatestMNVScripts_wget =~ "curl"
+  let g:GetLatestMNVScripts_options= "-s -o"
  else
-  let g:GetLatestVimScripts_options= ""
+  let g:GetLatestMNVScripts_options= ""
  endif
 endif
 
 " by default, allow autoinstall lines to work
-if !exists("g:GetLatestVimScripts_allowautoinstall")
- let g:GetLatestVimScripts_allowautoinstall= 1
+if !exists("g:GetLatestMNVScripts_allowautoinstall")
+ let g:GetLatestMNVScripts_allowautoinstall= 1
 endif
 
 " set up default scriptaddr address
-if !exists("g:GetLatestVimScripts_scriptaddr")
- let g:GetLatestVimScripts_scriptaddr = 'https://www.vim.org/scripts/script.php?script_id='
+if !exists("g:GetLatestMNVScripts_scriptaddr")
+ let g:GetLatestMNVScripts_scriptaddr = 'https://www.mnv.org/scripts/script.php?script_id='
 endif
 
-if !exists("g:GetLatestVimScripts_downloadaddr")
-  let g:GetLatestVimScripts_downloadaddr = 'https://www.vim.org/scripts/download_script.php?src_id='
+if !exists("g:GetLatestMNVScripts_downloadaddr")
+  let g:GetLatestMNVScripts_downloadaddr = 'https://www.mnv.org/scripts/download_script.php?src_id='
 endif
 
 " define decompression tools (on windows this allows redirection to wsl or git tools).
 " Note tar is available as builtin since Windows 11.
-if !exists("g:GetLatestVimScripts_bunzip2")
- let g:GetLatestVimScripts_bunzip2= "bunzip2"
+if !exists("g:GetLatestMNVScripts_bunzip2")
+ let g:GetLatestMNVScripts_bunzip2= "bunzip2"
 endif
 
-if !exists("g:GetLatestVimScripts_bunzip3")
- let g:GetLatestVimScripts_bunzip3= "bunzip3"
+if !exists("g:GetLatestMNVScripts_bunzip3")
+ let g:GetLatestMNVScripts_bunzip3= "bunzip3"
 endif
 
-if !exists("g:GetLatestVimScripts_gunzip")
- let g:GetLatestVimScripts_gunzip= "gunzip"
+if !exists("g:GetLatestMNVScripts_gunzip")
+ let g:GetLatestMNVScripts_gunzip= "gunzip"
 endif
 
-if !exists("g:GetLatestVimScripts_unxz")
- let g:GetLatestVimScripts_unxz= "unxz"
+if !exists("g:GetLatestMNVScripts_unxz")
+ let g:GetLatestMNVScripts_unxz= "unxz"
 endif
 
-if !exists("g:GetLatestVimScripts_unzip")
- let g:GetLatestVimScripts_unzip= "unzip"
+if !exists("g:GetLatestMNVScripts_unzip")
+ let g:GetLatestMNVScripts_unzip= "unzip"
 endif
 
 "" For debugging:
-"let g:GetLatestVimScripts_wget    = "echo"
-"let g:GetLatestVimScripts_options = "options"
+"let g:GetLatestMNVScripts_wget    = "echo"
+"let g:GetLatestMNVScripts_options = "options"
 
 " ---------------------------------------------------------------------
 " Check If AutoInstall Capable: {{{1
 let s:autoinstall= ""
-if g:GetLatestVimScripts_allowautoinstall
+if g:GetLatestMNVScripts_allowautoinstall
 
  let s:is_windows = has("win32") || has("gui_win32") || has("gui_win32s") || has("win16") || has("win64") || has("win32unix") || has("win95")
- let s:dotvim= s:is_windows ? "vimfiles" : ".vim"
+ let s:dotmnv= s:is_windows ? "mnvfiles" : ".mnv"
 
- if !exists("g:GetLatestVimScripts_mv")
+ if !exists("g:GetLatestMNVScripts_mv")
   if &shell =~? '\<pwsh\>\|\<powershell\>'
-   let g:GetLatestVimScripts_mv= "move -Force"
+   let g:GetLatestMNVScripts_mv= "move -Force"
   elseif s:is_windows && &shell =~? '\<cmd\>'
    " windows (but not cygwin/bash)
-   let g:GetLatestVimScripts_mv= "move /Y"
+   let g:GetLatestMNVScripts_mv= "move /Y"
   else
    " unix or cygwin bash/zsh
    " 'mv' overrides existing files without asking
-    let g:GetLatestVimScripts_mv= "mv"
+    let g:GetLatestMNVScripts_mv= "mv"
   endif
  endif
 
- if exists("g:GetLatestVimScripts_autoinstalldir") && isdirectory(g:GetLatestVimScripts_autoinstalldir)
-  let s:autoinstall= g:GetLatestVimScripts_autoinstalldir"
- elseif exists('$HOME') && isdirectory(expand("$HOME")."/".s:dotvim)
-  let s:autoinstall= $HOME."/".s:dotvim
+ if exists("g:GetLatestMNVScripts_autoinstalldir") && isdirectory(g:GetLatestMNVScripts_autoinstalldir)
+  let s:autoinstall= g:GetLatestMNVScripts_autoinstalldir"
+ elseif exists('$HOME') && isdirectory(expand("$HOME")."/".s:dotmnv)
+  let s:autoinstall= $HOME."/".s:dotmnv
  endif
 endif
 
 " ---------------------------------------------------------------------
 "  Public Interface: {{{1
-com!        -nargs=0 GetLatestVimScripts call getscript#GetLatestVimScripts()
-com!        -nargs=0 GetScript           call getscript#GetLatestVimScripts()
-silent! com -nargs=0 GLVS                call getscript#GetLatestVimScripts()
+com!        -nargs=0 GetLatestMNVScripts call getscript#GetLatestMNVScripts()
+com!        -nargs=0 GetScript           call getscript#GetLatestMNVScripts()
+silent! com -nargs=0 GLVS                call getscript#GetLatestMNVScripts()
 
 " ---------------------------------------------------------------------
-" GetLatestVimScripts: this function gets the latest versions of {{{1
+" GetLatestMNVScripts: this function gets the latest versions of {{{1
 "                      scripts based on the list in
-"   (first dir in runtimepath)/GetLatest/GetLatestVimScripts.dat
-fun! getscript#GetLatestVimScripts()
+"   (first dir in runtimepath)/GetLatest/GetLatestMNVScripts.dat
+fun! getscript#GetLatestMNVScripts()
 
-  if executable(g:GetLatestVimScripts_wget) != 1
-   echoerr "GetLatestVimScripts needs ".g:GetLatestVimScripts_wget." which apparently is not available on your system"
+  if executable(g:GetLatestMNVScripts_wget) != 1
+   echoerr "GetLatestMNVScripts needs ".g:GetLatestMNVScripts_wget." which apparently is not available on your system"
    return
   endif
 
@@ -177,7 +177,7 @@ fun! getscript#GetLatestVimScripts()
     let datadir= datadir . "/GetLatest"
     break
    endif
-   if filereadable(datadir."GetLatestVimScripts.dat")
+   if filereadable(datadir."GetLatestMNVScripts.dat")
     break
    endif
   endfor
@@ -188,10 +188,10 @@ fun! getscript#GetLatestVimScripts()
    return
   endif
   if filewritable(datadir) != 2
-   echoerr "(getLatestVimScripts) Your ".datadir." isn't writable"
+   echoerr "(getLatestMNVScripts) Your ".datadir." isn't writable"
    return
   endif
-  let datafile= datadir."/GetLatestVimScripts.dat"
+  let datafile= datadir."/GetLatestMNVScripts.dat"
   if !filereadable(datafile)
    echoerr "Your data file<".datafile."> isn't readable"
    return
@@ -208,9 +208,9 @@ fun! getscript#GetLatestVimScripts()
   let eikeep  = &ei
   let hlskeep = &hls
   let acdkeep = &acd
-  set ei=all hls&vim noacd
+  set ei=all hls&mnv noacd
 
-  " Edit the datafile (ie. GetLatestVimScripts.dat):
+  " Edit the datafile (ie. GetLatestMNVScripts.dat):
   " 1. record current directory (origdir),
   " 2. change directory to datadir,
   " 3. split window
@@ -227,19 +227,19 @@ fun! getscript#GetLatestVimScripts()
   " Check on dependencies mentioned in plugins
   let lastline    = line("$")
   let firstdir    = substitute(&rtp,',.*$','','')
-  let plugins     = split(globpath(firstdir,"plugin/**/*.vim"),'\n')
-  let plugins     += split(globpath(firstdir,"ftplugin/**/*.vim"),'\n')
-  let plugins     += split(globpath(firstdir,"AsNeeded/**/*.vim"),'\n')
-  let plugins     += split(globpath(firstdir,"pack/*/start/*/plugin/**/*.vim"),'\n')
-  let plugins     += split(globpath(firstdir,"pack/*/opt/*/plugin/**/*.vim"),'\n')
-  let plugins     += split(globpath(firstdir,"pack/*/start/*/ftplugin/**/*.vim"),'\n')
-  let plugins     += split(globpath(firstdir,"pack/*/opt/*/ftplugin/**/*.vim"),'\n')
+  let plugins     = split(globpath(firstdir,"plugin/**/*.mnv"),'\n')
+  let plugins     += split(globpath(firstdir,"ftplugin/**/*.mnv"),'\n')
+  let plugins     += split(globpath(firstdir,"AsNeeded/**/*.mnv"),'\n')
+  let plugins     += split(globpath(firstdir,"pack/*/start/*/plugin/**/*.mnv"),'\n')
+  let plugins     += split(globpath(firstdir,"pack/*/opt/*/plugin/**/*.mnv"),'\n')
+  let plugins     += split(globpath(firstdir,"pack/*/start/*/ftplugin/**/*.mnv"),'\n')
+  let plugins     += split(globpath(firstdir,"pack/*/opt/*/ftplugin/**/*.mnv"),'\n')
   let foundscript = 0
 
-  " this loop updates the GetLatestVimScripts.dat file
+  " this loop updates the GetLatestMNVScripts.dat file
   " with dependencies explicitly mentioned in the plugins
-  " via   GetLatestVimScripts: ... lines
-  " It reads the plugin script at the end of the GetLatestVimScripts.dat
+  " via   GetLatestMNVScripts: ... lines
+  " It reads the plugin script at the end of the GetLatestMNVScripts.dat
   " file, examines it, and then removes it.
   for plugin in plugins
 
@@ -249,14 +249,14 @@ fun! getscript#GetLatestVimScripts()
    exe "silent r ".fnameescape(plugin)
    exe "silent bwipe ".bufnr("#")
 
-   while search('^"\s\+GetLatestVimScripts:\s\+\d\+\s\+\d\+','W') != 0
-    let depscript   = substitute(getline("."),'^"\s\+GetLatestVimScripts:\s\+\d\+\s\+\d\+\s\+\(.*\)$','\1','e')
-    let depscriptid = substitute(getline("."),'^"\s\+GetLatestVimScripts:\s\+\(\d\+\)\s\+.*$','\1','')
+   while search('^"\s\+GetLatestMNVScripts:\s\+\d\+\s\+\d\+','W') != 0
+    let depscript   = substitute(getline("."),'^"\s\+GetLatestMNVScripts:\s\+\d\+\s\+\d\+\s\+\(.*\)$','\1','e')
+    let depscriptid = substitute(getline("."),'^"\s\+GetLatestMNVScripts:\s\+\(\d\+\)\s\+.*$','\1','')
     let llp1        = lastline+1
 
-    " found a "GetLatestVimScripts: # #" line in the script;
+    " found a "GetLatestMNVScripts: # #" line in the script;
     " check if it's already in the datafile by searching backwards from llp1,
-    " the (prior to reading in the plugin script) last line plus one of the GetLatestVimScripts.dat file,
+    " the (prior to reading in the plugin script) last line plus one of the GetLatestMNVScripts.dat file,
     " for the script-id with no wrapping allowed.
     let curline     = line(".")
     let noai_script = substitute(depscript,'\s*:AutoInstall:\s*','','e')
@@ -270,7 +270,7 @@ fun! getscript#GetLatestVimScripts()
     if srchline == 0
      " found a new script to permanently include in the datafile
      let keep_rega   = @a
-     let @a          = substitute(getline(curline),'^"\s\+GetLatestVimScripts:\s\+','','')
+     let @a          = substitute(getline(curline),'^"\s\+GetLatestMNVScripts:\s\+','','')
      echomsg "Appending <".@a."> to ".datafile." for ".depscript
      exe lastline."put a"
      let @a          = keep_rega
@@ -293,7 +293,7 @@ fun! getscript#GetLatestVimScripts()
   endif
 
   " --------------------------------------------------------------------
-  " Check on out-of-date scripts using GetLatest/GetLatestVimScripts.dat
+  " Check on out-of-date scripts using GetLatest/GetLatestMNVScripts.dat
   " --------------------------------------------------------------------
   setlocal lz
   1
@@ -302,7 +302,7 @@ fun! getscript#GetLatestVimScripts()
   " Final report (an echomsg)
   try
    silent! ?^-------?
-  catch /^Vim\%((\a\+)\)\=:E114/
+  catch /^MNV\%((\a\+)\)\=:E114/
    return
   endtry
   exe "norm! kz\<CR>"
@@ -341,10 +341,10 @@ fun! getscript#GetLatestVimScripts()
 endfun
 
 " ---------------------------------------------------------------------
-"  GetOneScript: (Get Latest Vim script) this function operates {{{1
+"  GetOneScript: (Get Latest MNV script) this function operates {{{1
 "    on the current line, interpreting two numbers and text as
 "    ScriptID, SourceID, and Filename.
-"    It downloads any scripts that have newer versions from vim.sourceforge.net.
+"    It downloads any scripts that have newer versions from mnv.sourceforge.net.
 fun! s:GetOneScript(...)
  " set options to allow progress to be shown on screen
   let rega= @a
@@ -379,22 +379,22 @@ fun! s:GetOneScript(...)
    let parsepat = '^\s*\(\d\+\)\s\+\(\d\+\)\s\+\(.\{-}\)\(\s*#.*\)\=$'
    try
     let scriptid = substitute(curline,parsepat,'\1','e')
-   catch /^Vim\%((\a\+)\)\=:E486/
+   catch /^MNV\%((\a\+)\)\=:E486/
     let scriptid= 0
    endtry
    try
     let srcid    = substitute(curline,parsepat,'\2','e')
-   catch /^Vim\%((\a\+)\)\=:E486/
+   catch /^MNV\%((\a\+)\)\=:E486/
     let srcid= 0
    endtry
    try
     let fname= substitute(curline,parsepat,'\3','e')
-   catch /^Vim\%((\a\+)\)\=:E486/
+   catch /^MNV\%((\a\+)\)\=:E486/
     let fname= ""
    endtry
    try
     let cmmnt= substitute(curline,parsepat,'\4','e')
-   catch /^Vim\%((\a\+)\)\=:E486/
+   catch /^MNV\%((\a\+)\)\=:E486/
     let cmmnt= ""
    endtry
   endif
@@ -409,7 +409,7 @@ fun! s:GetOneScript(...)
   if fname =~ ":AutoInstall:"
    let aicmmnt= substitute(fname,'\s\+:AutoInstall:\s\+',' ','')
    if s:autoinstall != ""
-    let doautoinstall = g:GetLatestVimScripts_allowautoinstall
+    let doautoinstall = g:GetLatestMNVScripts_allowautoinstall
    endif
   else
    let aicmmnt= fname
@@ -419,13 +419,13 @@ fun! s:GetOneScript(...)
   redraw!
   echo 'considering <'.aicmmnt.'> scriptid='.scriptid.' srcid='.srcid
 
-  " grab a copy of the plugin's vim.sourceforge.net webpage
-  let scriptaddr = g:GetLatestVimScripts_scriptaddr.scriptid
+  " grab a copy of the plugin's mnv.sourceforge.net webpage
+  let scriptaddr = g:GetLatestMNVScripts_scriptaddr.scriptid
   let tmpfile    = tempname()
   let v:errmsg   = ""
 
   " Check if URLs are reachable
-  if !CheckVimScriptURL(scriptid, srcid)
+  if !CheckMNVScriptURL(scriptid, srcid)
    return
   endif
 
@@ -433,9 +433,9 @@ fun! s:GetOneScript(...)
   let itry= 1
   while itry <= 3
    if has("win32") || has("win16") || has("win95")
-    new|exe "silent r!".g:GetLatestVimScripts_wget." ".g:GetLatestVimScripts_options." ".shellescape(tmpfile).' '.shellescape(scriptaddr)|bw!
+    new|exe "silent r!".g:GetLatestMNVScripts_wget." ".g:GetLatestMNVScripts_options." ".shellescape(tmpfile).' '.shellescape(scriptaddr)|bw!
    else
-    exe "silent !".g:GetLatestVimScripts_wget." ".g:GetLatestVimScripts_options." ".shellescape(tmpfile)." ".shellescape(scriptaddr)
+    exe "silent !".g:GetLatestMNVScripts_wget." ".g:GetLatestMNVScripts_options." ".shellescape(tmpfile)." ".shellescape(scriptaddr)
    endif
    if itry == 1
     exe "silent vsplit ".fnameescape(tmpfile)
@@ -494,7 +494,7 @@ fun! s:GetOneScript(...)
 
    let s:downloads= s:downloads + 1
    if sname == bufname("%")
-    " GetLatestVimScript has to be careful about downloading itself
+    " GetLatestMNVScript has to be careful about downloading itself
     let sname= "NEW_".sname
    endif
 
@@ -503,9 +503,9 @@ fun! s:GetOneScript(...)
    " -----------------------------------------------------------------------------
    echomsg ".downloading new <".sname.">"
    if has("win32") || has("win16") || has("win95")
-    new|exe "silent r!".g:GetLatestVimScripts_wget." ".g:GetLatestVimScripts_options." ".shellescape(sname)." ".shellescape(g:GetLatestVimScripts_downloadaddr.latestsrcid)|bw!
+    new|exe "silent r!".g:GetLatestMNVScripts_wget." ".g:GetLatestMNVScripts_options." ".shellescape(sname)." ".shellescape(g:GetLatestMNVScripts_downloadaddr.latestsrcid)|bw!
    else
-    exe "silent !".g:GetLatestVimScripts_wget." ".g:GetLatestVimScripts_options." ".shellescape(sname)." ".shellescape(g:GetLatestVimScripts_downloadaddr.latestsrcid)
+    exe "silent !".g:GetLatestMNVScripts_wget." ".g:GetLatestMNVScripts_options." ".shellescape(sname)." ".shellescape(g:GetLatestMNVScripts_downloadaddr.latestsrcid)
    endif
 
    " --------------------------------------------------------------------------
@@ -513,7 +513,7 @@ fun! s:GetOneScript(...)
    " --------------------------------------------------------------------------
    if doautoinstall
     if filereadable(sname)
-     exe "silent !".g:GetLatestVimScripts_mv." ".shellescape(sname)." ".shellescape(s:autoinstall)
+     exe "silent !".g:GetLatestMNVScripts_mv." ".shellescape(sname)." ".shellescape(s:autoinstall)
      let curdir    = fnameescape(substitute(getcwd(),'\','/','ge'))
      let installdir= curdir."/Installed"
      if !isdirectory(installdir)
@@ -523,7 +523,7 @@ fun! s:GetOneScript(...)
 
      " determine target directory for moves
      let firstdir= substitute(&rtp,',.*$','','')
-     let pname   = substitute(sname,'\..*','.vim','')
+     let pname   = substitute(sname,'\..*','.mnv','')
      if filereadable(firstdir.'/AsNeeded/'.pname)
       let tgtdir= "AsNeeded"
      else
@@ -532,23 +532,23 @@ fun! s:GetOneScript(...)
 
      " decompress
      if sname =~ '\.bz2$'
-      exe "sil !".g:GetLatestVimScripts_bunzip2." ".shellescape(sname)
+      exe "sil !".g:GetLatestMNVScripts_bunzip2." ".shellescape(sname)
       let sname= substitute(sname,'\.bz2$','','')
      elseif sname =~ '\.bz3$'
-      exe "sil !".g:GetLatestVimScripts_bunzip3." ".shellescape(sname)
+      exe "sil !".g:GetLatestMNVScripts_bunzip3." ".shellescape(sname)
       let sname= substitute(sname,'\.bz3$','','')
      elseif sname =~ '\.gz$'
-      exe "sil !".g:GetLatestVimScripts_gunzip." ".shellescape(sname)
+      exe "sil !".g:GetLatestMNVScripts_gunzip." ".shellescape(sname)
       let sname= substitute(sname,'\.gz$','','')
      elseif sname =~ '\.xz$'
-      exe "sil !".g:GetLatestVimScripts_unxz." ".shellescape(sname)
+      exe "sil !".g:GetLatestMNVScripts_unxz." ".shellescape(sname)
       let sname= substitute(sname,'\.xz$','','')
      else
      endif
 
      " distribute archive(.zip, .tar, .vba, .vmb, ...) contents
      if sname =~ '\.zip$'
-      exe "silent !".g:GetLatestVimScripts_unzip." -o ".shellescape(sname)
+      exe "silent !".g:GetLatestMNVScripts_unzip." -o ".shellescape(sname)
      elseif sname =~ '\.tar$'
       exe "silent !tar -xvf ".shellescape(sname)
      elseif sname =~ '\.tgz$'
@@ -561,30 +561,30 @@ fun! s:GetOneScript(...)
       exe "silent !tar -Jxvf ".shellescape(sname)
      elseif sname =~ '\.vba$\|\.vmb$'
       silent 1split
-      if exists("g:vimball_home")
-       let oldvimballhome= g:vimball_home
+      if exists("g:mnvball_home")
+       let oldmnvballhome= g:mnvball_home
       endif
-      let g:vimball_home= s:autoinstall
+      let g:mnvball_home= s:autoinstall
       exe "silent e ".fnameescape(sname)
       silent so %
       silent q
-      if exists("oldvimballhome")
-       let g:vimball_home= oldvimballhome
+      if exists("oldmnvballhome")
+       let g:mnvball_home= oldmnvballhome
       else
-       unlet g:vimball_home
+       unlet g:mnvball_home
       endif
      endif
 
      " ---------------------------------------------
      " move plugin to plugin/ or AsNeeded/ directory
      " ---------------------------------------------
-     if sname =~ '.vim$'
-      exe "silent !".g:GetLatestVimScripts_mv." ".shellescape(sname)." ".tgtdir
+     if sname =~ '.mnv$'
+      exe "silent !".g:GetLatestMNVScripts_mv." ".shellescape(sname)." ".tgtdir
      else
-      exe "silent !".g:GetLatestVimScripts_mv." ".shellescape(sname)." ".installdir
+      exe "silent !".g:GetLatestMNVScripts_mv." ".shellescape(sname)." ".installdir
      endif
      if tgtdir != "plugin"
-      exe "silent !".g:GetLatestVimScripts_mv." ".shellescape("plugin/".pname)." ".tgtdir
+      exe "silent !".g:GetLatestMNVScripts_mv." ".shellescape("plugin/".pname)." ".tgtdir
      endif
 
      " helptags step
@@ -601,15 +601,15 @@ fun! s:GetOneScript(...)
     let modline=scriptid." ".latestsrcid." ".fname.cmmnt
    endif
 
-   " update the data in the <GetLatestVimScripts.dat> file
+   " update the data in the <GetLatestMNVScripts.dat> file
    call setline(line("."),modline)
   endif
 endfun
 
-" CheckVimScriptURL: Check Network Connection {{{1
+" CheckMNVScriptURL: Check Network Connection {{{1
 " Check status code of scriptaddr and downloadaddr
 " return v:true if the script is downloadable or v:false in case of errors
-fun CheckVimScriptURL(script_id, src_id)
+fun CheckMNVScriptURL(script_id, src_id)
   " doesn't work with powershell
   if !executable('curl') || &shell =~? 'pwsh\|powershell'
     return v:true
@@ -618,8 +618,8 @@ fun CheckVimScriptURL(script_id, src_id)
 
   let temp = tempname()
   defer delete(temp)
-  let script_url = g:GetLatestVimScripts_scriptaddr . a:script_id
-  let download_url = g:GetLatestVimScripts_downloadaddr . a:src_id
+  let script_url = g:GetLatestMNVScripts_scriptaddr . a:script_id
+  let download_url = g:GetLatestMNVScripts_downloadaddr . a:src_id
 
   let script_cmd = 'curl -s -I -w "%{http_code}"' . output . shellescape(script_url) . ' >' . shellescape(temp)
   call system(script_cmd)
@@ -648,4 +648,4 @@ unlet s:keepcpo
 
 " ---------------------------------------------------------------------
 "  Modelines: {{{1
-" vim: ts=8 sts=2 fdm=marker nowrap
+" mnv: ts=8 sts=2 fdm=marker nowrap
diff --git a/uvim/runtime/autoload/gnat.vim b/uvim/runtime/autoload/gnat.mnv
index 585be2e1e0..99c46f6e44 100644
--- a/uvim/runtime/autoload/gnat.vim
+++ b/uvim/runtime/autoload/gnat.mnv
@@ -1,7 +1,7 @@
 "------------------------------------------------------------------------------
-"  Description: Vim Ada/GNAT compiler file
+"  Description: MNV Ada/GNAT compiler file
 "     Language: Ada (GNAT)
-"          $Id: gnat.vim 887 2008-07-08 14:29:01Z krischik $
+"          $Id: gnat.mnv 887 2008-07-08 14:29:01Z krischik $
 "    Copyright: Copyright (C) 2006 Martin Krischik
 "   Maintainer:	Martin Krischi <krischik@users.sourceforge.net>
 "		Ned Okie <nokie@radford.edu>
@@ -9,9 +9,9 @@
 "        $Date: 2008-07-08 16:29:01 +0200 (Di, 08 Jul 2008) $
 "      Version: 4.6
 "    $Revision: 887 $
-"     $HeadURL: https://gnuada.svn.sourceforge.net/svnroot/gnuada/trunk/tools/vim/autoload/gnat.vim $
+"     $HeadURL: https://gnuada.svn.sourceforge.net/svnroot/gnuada/trunk/tools/mnv/autoload/gnat.mnv $
 "      History: 24.05.2006 MK Unified Headers
-"		16.07.2006 MK Ada-Mode as vim-ball
+"		16.07.2006 MK Ada-Mode as mnv-ball
 "		05.08.2006 MK Add session support
 "               15.10.2006 MK Bram's suggestion for runtime integration
 "               05.11.2006 MK Bram suggested not to use include protection for
@@ -76,12 +76,12 @@ function gnat#Set_Project_File (...) dict			     " {{{1
    "if strlen (self.Project_File) > 0
       "if has("vms")
 	 "call ada#Switch_Session (
-	    "\ expand('~')[0:-2] . ".vimfiles.session]gnat_" .
-	    "\ fnamemodify (self.Project_File, ":t:r") . ".vim")
+	    "\ expand('~')[0:-2] . ".mnvfiles.session]gnat_" .
+	    "\ fnamemodify (self.Project_File, ":t:r") . ".mnv")
       "else
 	 "call ada#Switch_Session (
-	    "\ expand('~') . "/vimfiles/session/gnat_" .
-	    "\ fnamemodify (self.Project_File, ":t:r") . ".vim")
+	    "\ expand('~') . "/mnvfiles/session/gnat_" .
+	    "\ fnamemodify (self.Project_File, ":t:r") . ".mnv")
       "endif
    "else
       "call ada#Switch_Session ('')
@@ -141,7 +141,7 @@ finish " 1}}}
 "------------------------------------------------------------------------------
 "   Copyright (C) 2006  Martin Krischik
 "
-"   Vim is Charityware - see ":help license" or uganda.txt for licence details.
+"   MNV is Charityware - see ":help license" or uganda.txt for licence details.
 "------------------------------------------------------------------------------
-" vim: textwidth=0 wrap tabstop=8 shiftwidth=3 softtabstop=3 noexpandtab
-" vim: foldmethod=marker
+" mnv: textwidth=0 wrap tabstop=8 shiftwidth=3 softtabstop=3 noexpandtab
+" mnv: foldmethod=marker
diff --git a/uvim/runtime/autoload/gzip.vim b/uvim/runtime/autoload/gzip.mnv
index a6fbe2c336..23e18c8253 100644
--- a/uvim/runtime/autoload/gzip.vim
+++ b/uvim/runtime/autoload/gzip.mnv
@@ -1,7 +1,7 @@
-" Vim autoload file for editing compressed files.
-" Maintainer:	The Vim Project <https://github.com/vim/vim>
+" MNV autoload file for editing compressed files.
+" Maintainer:	The MNV Project <https://github.com/Project-Tick/Project-Tick>
 " Last Change:	2024 Nov 25
-" Former Maintainer: Bram Moolenaar <Bram@vim.org>
+" Former Maintainer: Bram Moolenaar <Bram@mnv.org>
 
 " These functions are used by the gzip plugin.
 
@@ -11,7 +11,7 @@ fun s:check(cmd)
   let name = substitute(a:cmd, '\(\S*\).*', '\1', '')
   if !exists("s:have_" . name)
     " safety check, don't execute anything from the current directory
-    let f = dist#vim#IsSafeExecutable('gzip', name)
+    let f = dist#mnv#IsSafeExecutable('gzip', name)
     if !f
       echoerr "Warning: NOT executing " .. name .. " from current directory!"
     endif
@@ -226,4 +226,4 @@ fun s:escape(name)
   return "'" . a:name . "'"
 endfun
 
-" vim: set sw=2 :
+" mnv: set sw=2 :
diff --git a/uvim/runtime/autoload/hare.vim b/uvim/runtime/autoload/hare.mnv
index d85a05b38c..08828680b0 100644
--- a/uvim/runtime/autoload/hare.vim
+++ b/uvim/runtime/autoload/hare.mnv
@@ -1,10 +1,10 @@
-vim9script
+mnv9script
 
 # Helper functions for Hare.
 # Language:    Hare
 # Maintainer:  Amelia Clarke <selene@perilune.dev>
 # Last Change: 2026 Jan 24
-# Upstream:    https://git.sr.ht/~sircmpwn/hare.vim
+# Upstream:    https://git.sr.ht/~sircmpwn/hare.mnv
 
 # Returns the value of $HAREPATH, if it exists. Otherwise, returns a safe
 # default value.
@@ -62,4 +62,4 @@ def ParsePath(): list<string>
     ->map((_, n) => matchstr(n, '^\s*\zs.*'))
 enddef
 
-# vim: et sts=2 sw=2 ts=8 tw=80
+# mnv: et sts=2 sw=2 ts=8 tw=80
diff --git a/uvim/runtime/autoload/haskellcomplete.vim b/uvim/runtime/autoload/haskellcomplete.mnv
index 2b28209079..afc39c3361 100644
--- a/uvim/runtime/autoload/haskellcomplete.vim
+++ b/uvim/runtime/autoload/haskellcomplete.mnv
@@ -1,9 +1,9 @@
-" Vim completion script
+" MNV completion script
 " Language:        Haskell
 " Maintainer:      Daniel Campoverde <alx@sillybytes.net>
-" URL:             https://github.com/alx741/haskellcomplete.vim
+" URL:             https://github.com/alx741/haskellcomplete.mnv
 " Last Change:     2019 May 14
-" 2026 Feb 04 by Vim project: fix undefined buffer variable: #19259
+" 2026 Feb 04 by MNV project: fix undefined buffer variable: #19259
 " Usage:           setlocal omnifunc=haskellcomplete#Complete
 
 " Language extensions from:
diff --git a/uvim/runtime/autoload/hcl.vim b/uvim/runtime/autoload/hcl.mnv
index e45a4e31ba..85b150ab96 100644
--- a/uvim/runtime/autoload/hcl.vim
+++ b/uvim/runtime/autoload/hcl.mnv
@@ -1,7 +1,7 @@
 " Language:    HCL
 " Maintainer:  Gregory Anders
 " Last Change: 2024-09-03
-" Based on:    https://github.com/hashivim/vim-terraform
+" Based on:    https://github.com/hashimnv/mnv-terraform
 " License:     ISC
 "
 " Copyright (c) 2014-2016 Mark Cornick <mark@markcornick.com>
diff --git a/uvim/runtime/autoload/htmlcomplete.vim b/uvim/runtime/autoload/htmlcomplete.mnv
index 267889d97f..901d9edd00 100644
--- a/uvim/runtime/autoload/htmlcomplete.vim
+++ b/uvim/runtime/autoload/htmlcomplete.mnv
@@ -1,4 +1,4 @@
-" Vim completion script
+" MNV completion script
 " Language:	HTML and XHTML
 " Maintainer:	Mikolaj Machowski ( mikmach AT wp DOT pl )
 " Last Change:	2019 Sep 27
@@ -199,11 +199,11 @@ function! htmlcomplete#CompleteTags(findstart, base)
 			call htmlcomplete#CheckDoctype()
 		endif
 		if !exists("b:html_omni")
-			"runtime! autoload/xml/xhtml10s.vim
+			"runtime! autoload/xml/xhtml10s.mnv
 			call htmlcomplete#LoadData()
 		endif
 
-	    let entities =  b:html_omni['vimxmlentities']
+	    let entities =  b:html_omni['mnvxmlentities']
 
 		if len(a:base) == 1
 			for m in entities
@@ -497,7 +497,7 @@ function! htmlcomplete#CompleteTags(findstart, base)
 				call htmlcomplete#CheckDoctype()
 			endif
 			if !exists("b:html_omni")
-				"runtime! autoload/xml/xhtml10s.vim
+				"runtime! autoload/xml/xhtml10s.mnv
 				call htmlcomplete#LoadData()
 			endif
 			" }}}
@@ -576,13 +576,13 @@ function! htmlcomplete#CompleteTags(findstart, base)
 			endif
 		endfor
 		let menu = res + res2
-		if has_key(b:html_omni, 'vimxmlattrinfo')
+		if has_key(b:html_omni, 'mnvxmlattrinfo')
 			let final_menu = []
 			for i in range(len(menu))
 				let item = menu[i]
-				if has_key(b:html_omni['vimxmlattrinfo'], item)
-					let m_menu = b:html_omni['vimxmlattrinfo'][item][0]
-					let m_info = b:html_omni['vimxmlattrinfo'][item][1]
+				if has_key(b:html_omni['mnvxmlattrinfo'], item)
+					let m_menu = b:html_omni['mnvxmlattrinfo'][item][0]
+					let m_info = b:html_omni['mnvxmlattrinfo'][item][1]
 				else
 					let m_menu = ''
 					let m_info = ''
@@ -629,7 +629,7 @@ function! htmlcomplete#CompleteTags(findstart, base)
 		call htmlcomplete#CheckDoctype()
 	endif
 	if !exists("b:html_omni")
-		"runtime! autoload/xml/xhtml10s.vim
+		"runtime! autoload/xml/xhtml10s.mnv
 		call htmlcomplete#LoadData()
 	endif
 	" }}}
@@ -644,7 +644,7 @@ function! htmlcomplete#CompleteTags(findstart, base)
 		" of invalid document - not properly closed tags and other mish-mash.
 		" Also when document is empty. Return list of *all* tags.
 	    let tags = keys(b:html_omni)
-		call filter(tags, 'v:val !~ "^vimxml"')
+		call filter(tags, 'v:val !~ "^mnvxml"')
 	else
 		if has_key(b:html_omni, opentag)
 			let tags = b:html_omni[opentag][0]
@@ -682,13 +682,13 @@ function! htmlcomplete#CompleteTags(findstart, base)
 		endif
 	endfor
 	let menu = res + res2
-	if has_key(b:html_omni, 'vimxmltaginfo')
+	if has_key(b:html_omni, 'mnvxmltaginfo')
 		let final_menu = []
 		for i in range(len(menu))
 			let item = menu[i]
-			if has_key(b:html_omni['vimxmltaginfo'], item)
-				let m_menu = b:html_omni['vimxmltaginfo'][item][0]
-				let m_info = b:html_omni['vimxmltaginfo'][item][1]
+			if has_key(b:html_omni['mnvxmltaginfo'], item)
+				let m_menu = b:html_omni['mnvxmltaginfo'][item][0]
+				let m_info = b:html_omni['mnvxmltaginfo'][item][1]
 			else
 				let m_menu = ''
 				let m_info = ''
@@ -726,7 +726,7 @@ function! htmlcomplete#LoadData() " {{{
 	if exists('g:xmldata_'.b:html_omni_flavor)
 		exe 'let b:html_omni = g:xmldata_'.b:html_omni_flavor
 	else
-		exe 'runtime! autoload/xml/'.b:html_omni_flavor.'.vim'
+		exe 'runtime! autoload/xml/'.b:html_omni_flavor.'.mnv'
 		exe 'let b:html_omni = g:xmldata_'.b:html_omni_flavor
 	endif
 endfunction
@@ -798,7 +798,7 @@ function! htmlcomplete#CheckDoctype() " {{{
 			if exists('g:xmldata_'.b:html_omni_flavor)
 				exe 'let b:html_omni = g:xmldata_'.b:html_omni_flavor
 			else
-				exe 'runtime! autoload/xml/'.b:html_omni_flavor.'.vim'
+				exe 'runtime! autoload/xml/'.b:html_omni_flavor.'.mnv'
 				exe 'let b:html_omni = g:xmldata_'.b:html_omni_flavor
 			endif
 			return
@@ -806,4 +806,4 @@ function! htmlcomplete#CheckDoctype() " {{{
 	endif
 endfunction
 " }}}
-" vim:set foldmethod=marker:
+" mnv:set foldmethod=marker:
diff --git a/uvim/runtime/autoload/htmlfold.vim b/uvim/runtime/autoload/htmlfold.mnv
index 76ccaefaf4..631d42cd79 100644
--- a/uvim/runtime/autoload/htmlfold.vim
+++ b/uvim/runtime/autoload/htmlfold.mnv
@@ -93,8 +93,8 @@ function! htmlfold#MapBalancedTags() abort
   return folds
 endfunction
 
-" See ":help vim9-mix".
-if !has("vim9script")
+" See ":help mnv9-mix".
+if !has("mnv9script")
   finish
 endif
 
@@ -189,4 +189,4 @@ def! g:htmlfold#MapBalancedTags(): dict<string>
   return folds
 enddef
 
-" vim: fdm=syntax sw=2 ts=8 noet
+" mnv: fdm=syntax sw=2 ts=8 noet
diff --git a/uvim/runtime/autoload/javaformat.vim b/uvim/runtime/autoload/javaformat.mnv
index 4d7d32cf19..4bd0ac37b2 100644
--- a/uvim/runtime/autoload/javaformat.vim
+++ b/uvim/runtime/autoload/javaformat.mnv
@@ -1,7 +1,7 @@
-" Vim formatting plugin file
+" MNV formatting plugin file
 " Language:		Java
 " Maintainer:		Aliaksei Budavei <0x000c70 AT gmail DOT com>
-" Repository:		https://github.com/zzzyxwvut/java-vim.git
+" Repository:		https://github.com/zzzyxwvut/java-mnv.git
 " Last Change:		2024 Sep 26
 
 " Documented in ":help ft-java-plugin".
@@ -11,7 +11,7 @@ endif
 
 let g:loaded_javaformat = 1
 
-"""" STRIVE TO REMAIN COMPATIBLE FOR AT LEAST VIM 7.0.
+"""" STRIVE TO REMAIN COMPATIBLE FOR AT LEAST MNV 7.0.
 
 function! javaformat#RemoveCommonMarkdownWhitespace() abort
     if mode() != 'n'
@@ -50,8 +50,8 @@ function! javaformat#RemoveCommonMarkdownWhitespace() abort
     return 0
 endfunction
 
-" See ":help vim9-mix".
-if !has("vim9script")
+" See ":help mnv9-mix".
+if !has("mnv9script")
     finish
 endif
 
@@ -89,4 +89,4 @@ def! g:javaformat#RemoveCommonMarkdownWhitespace(): number
     return 0
 enddef
 
-" vim: fdm=syntax sw=4 ts=8 noet sta
+" mnv: fdm=syntax sw=4 ts=8 noet sta
diff --git a/uvim/runtime/autoload/javascriptcomplete.vim b/uvim/runtime/autoload/javascriptcomplete.mnv
index 3ec3b50490..4e39e18fd7 100644
--- a/uvim/runtime/autoload/javascriptcomplete.vim
+++ b/uvim/runtime/autoload/javascriptcomplete.mnv
@@ -1,7 +1,7 @@
-" Vim completion script
+" MNV completion script
 " Language:	Java Script
 " Maintainer:	Jay Sitter (jay@jaysitter.com)
-" URL: https://github.com/jsit/javascriptcomplete.vim/
+" URL: https://github.com/jsit/javascriptcomplete.mnv/
 " Previous Maintainer:	Mikolaj Machowski ( mikmach AT wp DOT pl )
 " Last Change:	2020 Jul 30
 
@@ -294,9 +294,9 @@ function! javascriptcomplete#CompleteJS(findstart, base)
 		" Navigator - navigator.
 		let naviprop = ['plugins', 'appCodeName', 'appName', 'appVersion', 'cookieEnabled',
 					\ 'platform', 'userAgent']
-		let navimeth = ['javaEnabled', 'taintEnabled']
-		call map(navimeth, 'v:val."("')
-		let navis = naviprop + navimeth
+		let namnveth = ['javaEnabled', 'taintEnabled']
+		call map(namnveth, 'v:val."("')
+		let navis = naviprop + namnveth
 		" Object - object.
 		let objeprop = ['align', 'archive', 'border', 'code', 'codeBase', 'codeType', 'data',
 					\ 'declare', 'form', 'height', 'hspace', 'id', 'name', 'standby', 'tabIndex',
@@ -644,4 +644,4 @@ function! javascriptcomplete#CompleteJS(findstart, base)
 
 endfunction
 
-" vim:set foldmethod=marker:
+" mnv:set foldmethod=marker:
diff --git a/uvim/runtime/autoload/vimball.vim b/uvim/runtime/autoload/mnvball.mnv
index 6456984411..0863bcda6f 100644
--- a/uvim/runtime/autoload/vimball.vim
+++ b/uvim/runtime/autoload/mnvball.mnv
@@ -1,31 +1,31 @@
-" vimball.vim : construct a file containing both paths and files
+" mnvball.mnv : construct a file containing both paths and files
 " Maintainer: This runtime file is looking for a new maintainer.
 " Original Author:	Charles E. Campbell
 " Date:			Apr 11, 2016
-" Version:	37 (with modifications from the Vim Project)
-" GetLatestVimScripts: 1502 1 :AutoInstall: vimball.vim
+" Version:	37 (with modifications from the MNV Project)
+" GetLatestMNVScripts: 1502 1 :AutoInstall: mnvball.mnv
 "  Last Change:
-"   2025 Feb 28 by Vim Project: add support for bzip3 (#16755)
+"   2025 Feb 28 by MNV Project: add support for bzip3 (#16755)
 " Copyright: (c) 2004-2011 by Charles E. Campbell
-"            The VIM LICENSE applies to Vimball.vim, and Vimball.txt
-"            (see |copyright|) except use "Vimball" instead of "Vim".
+"            The MNV LICENSE applies to MNVball.mnv, and MNVball.txt
+"            (see |copyright|) except use "MNVball" instead of "MNV".
 "            No warranty, express or implied.
 "  *** ***   Use At-Your-Own-Risk!   *** ***
 
 " ---------------------------------------------------------------------
 "  Load Once: {{{1
-if &cp || exists("g:loaded_vimball")
+if &cp || exists("g:loaded_mnvball")
  finish
 endif
-let g:loaded_vimball = "v37"
+let g:loaded_mnvball = "v37"
 if v:version < 702
  echohl WarningMsg
- echo "***warning*** this version of vimball needs vim 7.2"
+ echo "***warning*** this version of mnvball needs mnv 7.2"
  echohl Normal
  finish
 endif
 let s:keepcpo= &cpo
-set cpo&vim
+set cpo&mnv
 "DechoTabOn
 
 " =====================================================================
@@ -48,17 +48,17 @@ if !exists("s:USAGE")
   endif
  endif
 
- " set up g:vimball_mkdir if the mkdir() call isn't defined
+ " set up g:mnvball_mkdir if the mkdir() call isn't defined
  if !exists("*mkdir")
   if exists("g:netrw_local_mkdir")
-   let g:vimball_mkdir= g:netrw_local_mkdir
+   let g:mnvball_mkdir= g:netrw_local_mkdir
   elseif executable("mkdir")
-   let g:vimball_mkdir= "mkdir"
+   let g:mnvball_mkdir= "mkdir"
   elseif executable("makedir")
-   let g:vimball_mkdir= "makedir"
+   let g:mnvball_mkdir= "makedir"
   endif
-  if !exists(g:vimball_mkdir)
-   call vimball#ShowMesg(s:WARNING,"(vimball) g:vimball_mkdir undefined")
+  if !exists(g:mnvball_mkdir)
+   call mnvball#ShowMesg(s:WARNING,"(mnvball) g:mnvball_mkdir undefined")
   endif
  endif
 endif
@@ -67,22 +67,22 @@ endif
 "  Functions: {{{1
 
 " ---------------------------------------------------------------------
-" vimball#MkVimball: creates a vimball given a list of paths to files {{{2
+" mnvball#MkMNVball: creates a mnvball given a list of paths to files {{{2
 " Input:
-"     line1,line2: a range of lines containing paths to files to be included in the vimball
+"     line1,line2: a range of lines containing paths to files to be included in the mnvball
 "     writelevel : if true, force a write to filename.vmb, even if it exists
-"                  (usually accomplished with :MkVimball! ...
+"                  (usually accomplished with :MkMNVball! ...
 "     filename   : base name of file to be created (ie. filename.vmb)
-" Output: a filename.vmb using vimball format:
+" Output: a filename.vmb using mnvball format:
 "     path
 "     filesize
 "     [file]
 "     path
 "     filesize
 "     [file]
-fun! vimball#MkVimball(line1,line2,writelevel,...) range
-"  call Dfunc("MkVimball(line1=".a:line1." line2=".a:line2." writelevel=".a:writelevel." vimballname<".a:1.">) a:0=".a:0)
-  if a:1 =~ '\.vim$' || a:1 =~ '\.txt$'
+fun! mnvball#MkMNVball(line1,line2,writelevel,...) range
+"  call Dfunc("MkMNVball(line1=".a:line1." line2=".a:line2." writelevel=".a:writelevel." mnvballname<".a:1.">) a:0=".a:0)
+  if a:1 =~ '\.mnv$' || a:1 =~ '\.txt$'
    let vbname= substitute(a:1,'\.\a\{3}$','.vmb','')
   else
    let vbname= a:1
@@ -92,25 +92,25 @@ fun! vimball#MkVimball(line1,line2,writelevel,...) range
   endif
 "  call Decho("vbname<".vbname.">")
   if !a:writelevel && a:1 =~ '[\/]'
-   call vimball#ShowMesg(s:ERROR,"(MkVimball) vimball name<".a:1."> should not include slashes; use ! to insist")
-"   call Dret("MkVimball : vimball name<".a:1."> should not include slashes")
+   call mnvball#ShowMesg(s:ERROR,"(MkMNVball) mnvball name<".a:1."> should not include slashes; use ! to insist")
+"   call Dret("MkMNVball : mnvball name<".a:1."> should not include slashes")
    return
   endif
   if !a:writelevel && filereadable(vbname)
-   call vimball#ShowMesg(s:ERROR,"(MkVimball) file<".vbname."> exists; use ! to insist")
-"   call Dret("MkVimball : file<".vbname."> already exists; use ! to insist")
+   call mnvball#ShowMesg(s:ERROR,"(MkMNVball) file<".vbname."> exists; use ! to insist")
+"   call Dret("MkMNVball : file<".vbname."> already exists; use ! to insist")
    return
   endif
 
   " user option bypass
-  call vimball#SaveSettings()
+  call mnvball#SaveSettings()
 
   if a:0 >= 2
    " allow user to specify where to get the files
    let home= expand(a:2)
   else
    " use first existing directory from rtp
-   let home= vimball#VimballHome()
+   let home= mnvball#MNVballHome()
   endif
 
   " save current directory
@@ -127,17 +127,17 @@ fun! vimball#MkVimball(line1,line2,writelevel,...) range
 "   call Decho("svfile<".svfile.">")
  
    if !filereadable(svfile)
-    call vimball#ShowMesg(s:ERROR,"unable to read file<".svfile.">")
+    call mnvball#ShowMesg(s:ERROR,"unable to read file<".svfile.">")
 	call s:ChgDir(curdir)
-	call vimball#RestoreSettings()
-"    call Dret("MkVimball")
+	call mnvball#RestoreSettings()
+"    call Dret("MkMNVball")
     return
    endif
  
-   " create/switch to mkvimball tab
+   " create/switch to mkmnvball tab
    if !exists("vbtabnr")
     tabnew
-    sil! file Vimball
+    sil! file MNVball
     let vbtabnr= tabpagenr()
    else
     exe "tabn ".vbtabnr
@@ -145,8 +145,8 @@ fun! vimball#MkVimball(line1,line2,writelevel,...) range
  
    let lastline= line("$") + 1
    if lastline == 2 && getline("$") == ""
-	call setline(1,'" Vimball Archiver by Charles E. Campbell')
-	call setline(2,'UseVimball')
+	call setline(1,'" MNVball Archiver by Charles E. Campbell')
+	call setline(2,'UseMNVball')
 	call setline(3,'finish')
 	let lastline= line("$") + 1
    endif
@@ -165,7 +165,7 @@ fun! vimball#MkVimball(line1,line2,writelevel,...) range
    let linenr= linenr + 1
   endwhile
 
-  " write the vimball
+  " write the mnvball
   exe "tabn ".vbtabnr
   call s:ChgDir(curdir)
   setlocal ff=unix
@@ -176,8 +176,8 @@ fun! vimball#MkVimball(line1,line2,writelevel,...) range
 "   call Decho("exe w ".fnameescape(vbname))
    exe "w ".fnameescape(vbname)
   endif
-"  call Decho("Vimball<".vbname."> created")
-  echo "Vimball<".vbname."> created"
+"  call Decho("MNVball<".vbname."> created")
+  echo "MNVball<".vbname."> created"
 
   " remove the evidence
   setlocal nomod bh=wipe
@@ -185,45 +185,45 @@ fun! vimball#MkVimball(line1,line2,writelevel,...) range
   exe "tabc! ".vbtabnr
 
   " restore options
-  call vimball#RestoreSettings()
+  call mnvball#RestoreSettings()
 
-"  call Dret("MkVimball")
+"  call Dret("MkMNVball")
 endfun
 
 " ---------------------------------------------------------------------
-" vimball#Vimball: extract and distribute contents from a vimball {{{2
-"                  (invoked the the UseVimball command embedded in 
-"                  vimballs' prologue)
-fun! vimball#Vimball(really,...)
-"  call Dfunc("vimball#Vimball(really=".a:really.") a:0=".a:0)
+" mnvball#MNVball: extract and distribute contents from a mnvball {{{2
+"                  (invoked the the UseMNVball command embedded in 
+"                  mnvballs' prologue)
+fun! mnvball#MNVball(really,...)
+"  call Dfunc("mnvball#MNVball(really=".a:really.") a:0=".a:0)
 
   if v:version < 701 || (v:version == 701 && !exists('*fnameescape'))
-   echoerr "your vim is missing the fnameescape() function (pls upgrade to vim 7.2 or later)"
-"   call Dret("vimball#Vimball : needs 7.1 with patch 299 or later")
+   echoerr "your mnv is missing the fnameescape() function (pls upgrade to mnv 7.2 or later)"
+"   call Dret("mnvball#MNVball : needs 7.1 with patch 299 or later")
    return
   endif
 
-  if getline(1) !~ '^" Vimball Archiver'
-   echoerr "(Vimball) The current file does not appear to be a Vimball!"
-"   call Dret("vimball#Vimball")
+  if getline(1) !~ '^" MNVball Archiver'
+   echoerr "(MNVball) The current file does not appear to be a MNVball!"
+"   call Dret("mnvball#MNVball")
    return
   endif
 
   " set up standard settings
-  call vimball#SaveSettings()
+  call mnvball#SaveSettings()
   let curtabnr    = tabpagenr()
-  let vimballfile = expand("%:tr")
+  let mnvballfile = expand("%:tr")
 
-  " set up vimball tab
-"  call Decho("setting up vimball tab")
+  " set up mnvball tab
+"  call Decho("setting up mnvball tab")
   tabnew
-  sil! file Vimball
+  sil! file MNVball
   let vbtabnr= tabpagenr()
   let didhelp= ""
 
-  " go to vim plugin home
+  " go to mnv plugin home
   if a:0 > 0
-   " let user specify the directory where the vimball is to be unpacked.
+   " let user specify the directory where the mnvball is to be unpacked.
    " If, however, the user did not specify a full path, set the home to be below the current directory
    let home= expand(a:1)
    if has("win32") || has("win95") || has("win64") || has("win16")
@@ -234,32 +234,32 @@ fun! vimball#Vimball(really,...)
 	let home= getcwd().'/'.a:1
    endif
   else
-   let home= vimball#VimballHome()
+   let home= mnvball#MNVballHome()
   endif
 "  call Decho("home<".home.">")
 
-  " save current directory and remove older same-named vimball, if any
+  " save current directory and remove older same-named mnvball, if any
   let curdir = getcwd()
 "  call Decho("home<".home.">")
 "  call Decho("curdir<".curdir.">")
 
   call s:ChgDir(home)
   let s:ok_unablefind= 1
-  call vimball#RmVimball(vimballfile)
+  call mnvball#RmMNVball(mnvballfile)
   unlet s:ok_unablefind
 
   let linenr  = 4
   let filecnt = 0
 
-  " give title to listing of (extracted) files from Vimball Archive
+  " give title to listing of (extracted) files from MNVball Archive
   if a:really
-   echohl Title     | echomsg "Vimball Archive"         | echohl None
+   echohl Title     | echomsg "MNVball Archive"         | echohl None
   else             
-   echohl Title     | echomsg "Vimball Archive Listing" | echohl None
+   echohl Title     | echomsg "MNVball Archive Listing" | echohl None
    echohl Statement | echomsg "files would be placed under: ".home | echohl None
   endif
 
-  " apportion vimball contents to various files
+  " apportion mnvball contents to various files
 "  call Decho("exe tabn ".curtabnr)
   exe "tabn ".curtabnr
 "  call Decho("linenr=".linenr." line$=".line("$"))
@@ -280,7 +280,7 @@ fun! vimball#Vimball(really,...)
 "   call Decho("using L#".(linenr+1).": fsize=".fsize)
 
    " Allow AsNeeded/ directory to take place of plugin/ directory
-   " when AsNeeded/filename is filereadable or was present in VimballRecord
+   " when AsNeeded/filename is filereadable or was present in MNVballRecord
    if fname =~ '\<plugin/'
    	let anfname= substitute(fname,'\<plugin/','AsNeeded/','')
 	if filereadable(anfname) || (exists("s:VBRstring") && s:VBRstring =~# anfname)
@@ -304,8 +304,8 @@ fun! vimball#Vimball(really,...)
 "	 call Decho("dirpath<".dirpath.">")
      if !isdirectory(dirname)
 "      call Decho("making <".dirname.">")
-      if exists("g:vimball_mkdir")
-	   call system(g:vimball_mkdir." ".shellescape(dirname))
+      if exists("g:mnvball_mkdir")
+	   call system(g:mnvball_mkdir." ".shellescape(dirname))
       else
        call mkdir(dirname)
       endif
@@ -346,7 +346,7 @@ fun! vimball#Vimball(really,...)
 	call s:RecordInVar(home,"call delete('".fnamepath."')")
     endif
 
-    " return to tab with vimball
+    " return to tab with mnvball
 "   call Decho("exe tabn ".curtabnr)
     exe "tabn ".curtabnr
 
@@ -378,7 +378,7 @@ fun! vimball#Vimball(really,...)
    let filecnt= filecnt + 1
   endwhile
 
-  " record actions in <.VimballRecord>
+  " record actions in <.MNVballRecord>
   call s:RecordInFile(home)
 
   " restore events, delete tab and buffer
@@ -386,22 +386,22 @@ fun! vimball#Vimball(really,...)
   setlocal nomod bh=wipe
   exe "sil! tabn ".curtabnr
   exe "sil! tabc! ".vbtabnr
-  call vimball#RestoreSettings()
+  call mnvball#RestoreSettings()
   call s:ChgDir(curdir)
 
-"  call Dret("vimball#Vimball")
+"  call Dret("mnvball#MNVball")
 endfun
 
 " ---------------------------------------------------------------------
-" vimball#RmVimball: remove any files, remove any directories made by any {{{2
-"               previous vimball extraction based on a file of the current
+" mnvball#RmMNVball: remove any files, remove any directories made by any {{{2
+"               previous mnvball extraction based on a file of the current
 "               name.
-"  Usage:  RmVimball  (assume current file is a vimball; remove)
-"          RmVimball vimballname
-fun! vimball#RmVimball(...)
-"  call Dfunc("vimball#RmVimball() a:0=".a:0)
-  if exists("g:vimball_norecord")
-"   call Dret("vimball#RmVimball : (g:vimball_norecord)")
+"  Usage:  RmMNVball  (assume current file is a mnvball; remove)
+"          RmMNVball mnvballname
+fun! mnvball#RmMNVball(...)
+"  call Dfunc("mnvball#RmMNVball() a:0=".a:0)
+  if exists("g:mnvball_norecord")
+"   call Dret("mnvball#RmMNVball : (g:mnvball_norecord)")
    return
   endif
 
@@ -410,8 +410,8 @@ fun! vimball#RmVimball(...)
 "   call Decho("case a:0=0: curfile<".curfile."> (used expand(%:tr))")
   else
    if a:1 =~ '[\/]'
-    call vimball#ShowMesg(s:USAGE,"RmVimball vimballname [path]")
-"    call Dret("vimball#RmVimball : suspect a:1<".a:1.">")
+    call mnvball#ShowMesg(s:USAGE,"RmMNVball mnvballname [path]")
+"    call Dret("mnvball#RmMNVball : suspect a:1<".a:1.">")
     return
    endif
    let curfile= a:1
@@ -425,7 +425,7 @@ fun! vimball#RmVimball(...)
   if a:0 >= 2
    let home= expand(a:2)
   else
-   let home= vimball#VimballHome()
+   let home= mnvball#MNVballHome()
   endif
   let curdir = getcwd()
 "  call Decho("home   <".home.">")
@@ -433,11 +433,11 @@ fun! vimball#RmVimball(...)
 "  call Decho("curdir <".curdir.">")
 
   call s:ChgDir(home)
-  if filereadable(".VimballRecord")
-"   call Decho(".VimballRecord is readable")
+  if filereadable(".MNVballRecord")
+"   call Decho(".MNVballRecord is readable")
 "   call Decho("curfile<".curfile.">")
    keepalt keepjumps 1split 
-   sil! keepalt keepjumps e .VimballRecord
+   sil! keepalt keepjumps e .MNVballRecord
    let keepsrch= @/
 "   call Decho('search for ^\M'.curfile.'.\m: ')
 "   call Decho('search for ^\M'.curfile.'.\m{vba|vmb}: ')
@@ -472,9 +472,9 @@ fun! vimball#RmVimball(...)
    else
     let s:VBRstring= ''
 	let curfile    = substitute(curfile,'\.vmb','','')
-"    call Decho("unable to find <".curfile."> in .VimballRecord")
+"    call Decho("unable to find <".curfile."> in .MNVballRecord")
 	if !exists("s:ok_unablefind")
-     call vimball#ShowMesg(s:WARNING,"(RmVimball) unable to find <".curfile."> in .VimballRecord")
+     call mnvball#ShowMesg(s:WARNING,"(RmMNVball) unable to find <".curfile."> in .MNVballRecord")
 	endif
    endif
    sil! keepalt keepjumps g/^\s*$/d
@@ -483,12 +483,12 @@ fun! vimball#RmVimball(...)
   endif
   call s:ChgDir(curdir)
 
-"  call Dret("vimball#RmVimball")
+"  call Dret("mnvball#RmMNVball")
 endfun
 
 " ---------------------------------------------------------------------
-" vimball#Decompress: attempts to automatically decompress vimballs {{{2
-fun! vimball#Decompress(fname,...)
+" mnvball#Decompress: attempts to automatically decompress mnvballs {{{2
+fun! mnvball#Decompress(fname,...)
 "  call Dfunc("Decompress(fname<".a:fname.">) a:0=".a:0)
 
   " decompression:
@@ -496,71 +496,71 @@ fun! vimball#Decompress(fname,...)
    " handle *.gz with gunzip
    silent exe "!gunzip ".shellescape(a:fname)
    if v:shell_error != 0
-	call vimball#ShowMesg(s:WARNING,"(vimball#Decompress) gunzip may have failed with <".a:fname.">")
+	call mnvball#ShowMesg(s:WARNING,"(mnvball#Decompress) gunzip may have failed with <".a:fname.">")
    endif
    let fname= substitute(a:fname,'\.gz$','','')
    exe "e ".escape(fname,' \')
-   if a:0 == 0| call vimball#ShowMesg(s:USAGE,"Source this file to extract it! (:so %)") | endif
+   if a:0 == 0| call mnvball#ShowMesg(s:USAGE,"Source this file to extract it! (:so %)") | endif
 
   elseif expand("%") =~ '.*\.gz' && executable("gzip")
    " handle *.gz with gzip -d
    silent exe "!gzip -d ".shellescape(a:fname)
    if v:shell_error != 0
-	call vimball#ShowMesg(s:WARNING,'(vimball#Decompress) "gzip -d" may have failed with <'.a:fname.">")
+	call mnvball#ShowMesg(s:WARNING,'(mnvball#Decompress) "gzip -d" may have failed with <'.a:fname.">")
    endif
    let fname= substitute(a:fname,'\.gz$','','')
    exe "e ".escape(fname,' \')
-   if a:0 == 0| call vimball#ShowMesg(s:USAGE,"Source this file to extract it! (:so %)") | endif
+   if a:0 == 0| call mnvball#ShowMesg(s:USAGE,"Source this file to extract it! (:so %)") | endif
 
   elseif expand("%") =~ '.*\.bz2' && executable("bunzip2")
    " handle *.bz2 with bunzip2
    silent exe "!bunzip2 ".shellescape(a:fname)
    if v:shell_error != 0
-	call vimball#ShowMesg(s:WARNING,"(vimball#Decompress) bunzip2 may have failed with <".a:fname.">")
+	call mnvball#ShowMesg(s:WARNING,"(mnvball#Decompress) bunzip2 may have failed with <".a:fname.">")
    endif
    let fname= substitute(a:fname,'\.bz2$','','')
    exe "e ".escape(fname,' \')
-   if a:0 == 0| call vimball#ShowMesg(s:USAGE,"Source this file to extract it! (:so %)") | endif
+   if a:0 == 0| call mnvball#ShowMesg(s:USAGE,"Source this file to extract it! (:so %)") | endif
 
   elseif expand("%") =~ '.*\.bz2' && executable("bzip2")
    " handle *.bz2 with bzip2 -d
    silent exe "!bzip2 -d ".shellescape(a:fname)
    if v:shell_error != 0
-	call vimball#ShowMesg(s:WARNING,'(vimball#Decompress) "bzip2 -d" may have failed with <'.a:fname.">")
+	call mnvball#ShowMesg(s:WARNING,'(mnvball#Decompress) "bzip2 -d" may have failed with <'.a:fname.">")
    endif
    let fname= substitute(a:fname,'\.bz2$','','')
    exe "e ".escape(fname,' \')
-   if a:0 == 0| call vimball#ShowMesg(s:USAGE,"Source this file to extract it! (:so %)") | endif
+   if a:0 == 0| call mnvball#ShowMesg(s:USAGE,"Source this file to extract it! (:so %)") | endif
 
   elseif expand("%") =~ '.*\.bz3' && executable("bunzip3")
    " handle *.bz3 with bunzip3
    silent exe "!bunzip3 ".shellescape(a:fname)
    if v:shell_error != 0
-	call vimball#ShowMesg(s:WARNING,"(vimball#Decompress) bunzip3 may have failed with <".a:fname.">")
+	call mnvball#ShowMesg(s:WARNING,"(mnvball#Decompress) bunzip3 may have failed with <".a:fname.">")
    endif
    let fname= substitute(a:fname,'\.bz3$','','')
    exe "e ".escape(fname,' \')
-   if a:0 == 0| call vimball#ShowMesg(s:USAGE,"Source this file to extract it! (:so %)") | endif
+   if a:0 == 0| call mnvball#ShowMesg(s:USAGE,"Source this file to extract it! (:so %)") | endif
 
   elseif expand("%") =~ '.*\.bz3' && executable("bzip3")
    " handle *.bz3 with bzip3 -d
    silent exe "!bzip3 -d ".shellescape(a:fname)
    if v:shell_error != 0
-	call vimball#ShowMesg(s:WARNING,'(vimball#Decompress) "bzip3 -d" may have failed with <'.a:fname.">")
+	call mnvball#ShowMesg(s:WARNING,'(mnvball#Decompress) "bzip3 -d" may have failed with <'.a:fname.">")
    endif
    let fname= substitute(a:fname,'\.bz3$','','')
    exe "e ".escape(fname,' \')
-   if a:0 == 0| call vimball#ShowMesg(s:USAGE,"Source this file to extract it! (:so %)") | endif
+   if a:0 == 0| call mnvball#ShowMesg(s:USAGE,"Source this file to extract it! (:so %)") | endif
 
   elseif expand("%") =~ '.*\.zip' && executable("unzip")
    " handle *.zip with unzip
    silent exe "!unzip ".shellescape(a:fname)
    if v:shell_error != 0
-	call vimball#ShowMesg(s:WARNING,"(vimball#Decompress) unzip may have failed with <".a:fname.">")
+	call mnvball#ShowMesg(s:WARNING,"(mnvball#Decompress) unzip may have failed with <".a:fname.">")
    endif
    let fname= substitute(a:fname,'\.zip$','','')
    exe "e ".escape(fname,' \')
-   if a:0 == 0| call vimball#ShowMesg(s:USAGE,"Source this file to extract it! (:so %)") | endif
+   if a:0 == 0| call mnvball#ShowMesg(s:USAGE,"Source this file to extract it! (:so %)") | endif
   endif
 
   if a:0 == 0| setlocal noma bt=nofile fmr=[[[,]]] fdm=marker | endif
@@ -569,9 +569,9 @@ fun! vimball#Decompress(fname,...)
 endfun
 
 " ---------------------------------------------------------------------
-" vimball#ShowMesg: {{{2
-fun! vimball#ShowMesg(level,msg)
-"  call Dfunc("vimball#ShowMesg(level=".a:level." msg<".a:msg.">)")
+" mnvball#ShowMesg: {{{2
+fun! mnvball#ShowMesg(level,msg)
+"  call Dfunc("mnvball#ShowMesg(level=".a:level." msg<".a:msg.">)")
 
   let rulerkeep   = &ruler
   let showcmdkeep = &showcmd
@@ -579,14 +579,14 @@ fun! vimball#ShowMesg(level,msg)
   redraw!
 
   if &fo =~# '[ta]'
-   echomsg "***vimball*** ".a:msg
+   echomsg "***mnvball*** ".a:msg
   else
    if a:level == s:WARNING || a:level == s:USAGE
     echohl WarningMsg
    elseif a:level == s:ERROR
     echohl Error
    endif
-   echomsg "***vimball*** ".a:msg
+   echomsg "***mnvball*** ".a:msg
    echohl None
   endif
 
@@ -597,7 +597,7 @@ fun! vimball#ShowMesg(level,msg)
   let &ruler   = rulerkeep
   let &showcmd = showcmdkeep
 
-"  call Dret("vimball#ShowMesg")
+"  call Dret("mnvball#ShowMesg")
 endfun
 " =====================================================================
 " s:ChgDir: change directory (in spite of Windoze) {{{2
@@ -606,14 +606,14 @@ fun! s:ChgDir(newdir)
   if (has("win32") || has("win95") || has("win64") || has("win16"))
    try
     exe 'silent cd '.fnameescape(substitute(a:newdir,'/','\\','g'))
-   catch  /^Vim\%((\a\+)\)\=:E/
+   catch  /^MNV\%((\a\+)\)\=:E/
     call mkdir(fnameescape(substitute(a:newdir,'/','\\','g')))
     exe 'silent cd '.fnameescape(substitute(a:newdir,'/','\\','g'))
    endtry
   else
    try
     exe 'silent cd '.fnameescape(a:newdir)
-   catch  /^Vim\%((\a\+)\)\=:E/
+   catch  /^MNV\%((\a\+)\)\=:E/
     call mkdir(fnameescape(a:newdir))
     exe 'silent cd '.fnameescape(a:newdir)
    endtry
@@ -622,7 +622,7 @@ fun! s:ChgDir(newdir)
 endfun
 
 " ---------------------------------------------------------------------
-" s:RecordInVar: record a un-vimball command in the .VimballRecord file {{{2
+" s:RecordInVar: record a un-mnvball command in the .MNVballRecord file {{{2
 fun! s:RecordInVar(home,cmd)
 "  call Dfunc("RecordInVar(home<".a:home."> cmd<".a:cmd.">)")
   if a:cmd =~ '^rmdir'
@@ -643,8 +643,8 @@ endfun
 " s:RecordInFile: {{{2
 fun! s:RecordInFile(home)
 "  call Dfunc("s:RecordInFile()")
-  if exists("g:vimball_norecord")
-"   call Dret("s:RecordInFile : g:vimball_norecord")
+  if exists("g:mnvball_norecord")
+"   call Dret("s:RecordInFile : g:mnvball_norecord")
    return
   endif
 
@@ -656,7 +656,7 @@ fun! s:RecordInFile(home)
    let cmd= expand("%:tr").": "
 "   call Decho("cmd<".cmd.">")
 
-   sil! keepalt keepjumps e .VimballRecord
+   sil! keepalt keepjumps e .MNVballRecord
    setlocal ma
    $
    if exists("s:recordfile") && exists("s:recorddir")
@@ -671,7 +671,7 @@ fun! s:RecordInFile(home)
    endif
 "   call Decho("cmd<".cmd.">")
 
-   " put command into buffer, write .VimballRecord `file
+   " put command into buffer, write .MNVballRecord `file
    keepalt keepjumps put=cmd
    sil! keepalt keepjumps g/^\s*$/d
    sil! keepalt keepjumps wq!
@@ -693,18 +693,18 @@ fun! s:RecordInFile(home)
 endfun
 
 " ---------------------------------------------------------------------
-" vimball#VimballHome: determine/get home directory path (usually from rtp) {{{2
-fun! vimball#VimballHome()
-"  call Dfunc("vimball#VimballHome()")
-  if exists("g:vimball_home")
-   let home= g:vimball_home
+" mnvball#MNVballHome: determine/get home directory path (usually from rtp) {{{2
+fun! mnvball#MNVballHome()
+"  call Dfunc("mnvball#MNVballHome()")
+  if exists("g:mnvball_home")
+   let home= g:mnvball_home
   else
-   " go to vim plugin home
+   " go to mnv plugin home
    for home in split(&rtp,',') + ['']
     if isdirectory(home) && filewritable(home) | break | endif
-	let basehome= substitute(home,'[/\\]\.vim$','','')
+	let basehome= substitute(home,'[/\\]\.mnv$','','')
     if isdirectory(basehome) && filewritable(basehome)
-	 let home= basehome."/.vim"
+	 let home= basehome."/.mnv"
 	 break
 	endif
    endfor
@@ -719,22 +719,22 @@ fun! vimball#VimballHome()
   " insure that the home directory exists
 "  call Decho("picked home<".home.">")
   if !isdirectory(home)
-   if exists("g:vimball_mkdir")
-"	call Decho("home<".home."> isn't a directory -- making it now with g:vimball_mkdir<".g:vimball_mkdir.">")
-"    call Decho("system(".g:vimball_mkdir." ".shellescape(home).")")
-    call system(g:vimball_mkdir." ".shellescape(home))
+   if exists("g:mnvball_mkdir")
+"	call Decho("home<".home."> isn't a directory -- making it now with g:mnvball_mkdir<".g:mnvball_mkdir.">")
+"    call Decho("system(".g:mnvball_mkdir." ".shellescape(home).")")
+    call system(g:mnvball_mkdir." ".shellescape(home))
    else
 "	call Decho("home<".home."> isn't a directory -- making it now with mkdir()")
     call mkdir(home)
    endif
   endif
-"  call Dret("vimball#VimballHome <".home.">")
+"  call Dret("mnvball#MNVballHome <".home.">")
   return home
 endfun
 
 " ---------------------------------------------------------------------
-" vimball#SaveSettings: {{{2
-fun! vimball#SaveSettings()
+" mnvball#SaveSettings: {{{2
+fun! mnvball#SaveSettings()
 "  call Dfunc("SaveSettings()")
   let s:makeep  = getpos("'a")
   let s:regakeep= @a
@@ -756,14 +756,14 @@ fun! vimball#SaveSettings()
   else
    setlocal ei=all ve=all       nofen noic report=999 nohid bt= ma lz pm= ff=unix noswf
   endif
-  " vimballs should be in unix format
+  " mnvballs should be in unix format
   setlocal ff=unix
 "  call Dret("SaveSettings")
 endfun
 
 " ---------------------------------------------------------------------
-" vimball#RestoreSettings: {{{2
-fun! vimball#RestoreSettings()
+" mnvball#RestoreSettings: {{{2
+fun! mnvball#RestoreSettings()
 "  call Dfunc("RestoreSettings()")
   let @a      = s:regakeep
   if exists("+acd")
@@ -795,4 +795,4 @@ unlet s:keepcpo
 
 " ---------------------------------------------------------------------
 " Modelines: {{{1
-" vim: fdm=marker
+" mnv: fdm=marker
diff --git a/uvim/runtime/autoload/vimcomplete.vim b/uvim/runtime/autoload/mnvcomplete.mnv
index d95c8b1caa..c89e0121d0 100644
--- a/uvim/runtime/autoload/vimcomplete.vim
+++ b/uvim/runtime/autoload/mnvcomplete.mnv
@@ -1,14 +1,14 @@
-vim9script
+mnv9script
 
-# Vim completion script
-# Language:    Vim script
+# MNV completion script
+# Language:    MNV script
 # Maintainer:  Maxim Kim <habamax@gmail.com>
 # Last Change: 2025-10-15
 #
 # Usage:
-# setlocal omnifunc=vimcomplete#Complete
+# setlocal omnifunc=mnvcomplete#Complete
 #
-# Simple complete function for Vim script
+# Simple complete function for MNV script
 
 var trigger: string = ""
 var prefix: string = ""
@@ -42,7 +42,7 @@ export def Complete(findstart: number, base: string): any
         var line = getline('.')->strpart(0, col('.') - 1)
         var keyword = line->matchstr('\k\+$')
         var stx = synstack(line('.'), col('.') - 1)->map('synIDattr(v:val, "name")')->join()
-        if stx =~? 'Comment' || (stx =~ 'String' && stx !~ 'vimStringInterpolationExpr')
+        if stx =~? 'Comment' || (stx =~ 'String' && stx !~ 'mnvStringInterpolationExpr')
             return -2
         endif
         var trigger_len: number = 0
diff --git a/uvim/runtime/autoload/vimgoto.vim b/uvim/runtime/autoload/mnvgoto.mnv
index 634457dff5..d963d77e5a 100644
--- a/uvim/runtime/autoload/vimgoto.vim
+++ b/uvim/runtime/autoload/mnvgoto.mnv
@@ -1,17 +1,17 @@
-vim9script
+mnv9script
 
-# Language:     Vim9 script
+# Language:     MNV9 script
 # Contributers: @lacygoill
 #               Shane-XB-Qian
 #               Andrew Radev
 #               thinca
 # Last Change:  2026 Mar 30
 #
-# Vim script to handle jumping to the targets of several types of Vim commands
+# MNV script to handle jumping to the targets of several types of MNV commands
 # (:import, :packadd, :runtime, :colorscheme), and to autoloaded functions of
 # the style <path>#<function_name>.
 #
-# see runtime/ftplugin/vim.vim
+# see runtime/ftplugin/mnv.mnv
 
 # Interface {{{1
 export def Find(editcmd: string) #{{{2
@@ -41,7 +41,7 @@ export def Find(editcmd: string) #{{{2
 
     if stridx(curfunc, '#') >= 0
         var parts = split(curfunc, '#')
-        var path = $"autoload/{join(parts[0 : -2], '/')}.vim"
+        var path = $"autoload/{join(parts[0 : -2], '/')}.mnv"
         var resolved_path = globpath(&runtimepath, path, 1, 1)
 
         if !resolved_path->empty()
@@ -63,7 +63,7 @@ def HandlePackaddLine(editcmd: string, curline: string) #{{{2
     var pat: string = '\s*\%(:\s*\)\=packadd!\=\s\+\zs\S\+\>\ze'
     var plugin: string = curline
         ->matchstr(pat)
-        ->substitute('^vim-\|\.vim$', '', 'g')
+        ->substitute('^mnv-\|\.mnv$', '', 'g')
 
     if plugin == ''
         Fallback(editcmd)
@@ -234,4 +234,4 @@ def FindCurfunc(): string #{{{2
     return curfunc
 enddef
 
-# vim: sw=4 et
+# mnv: sw=4 et
diff --git a/uvim/runtime/autoload/modula2.vim b/uvim/runtime/autoload/modula2.mnv
index 284dc2768f..0e0fb1b2b3 100644
--- a/uvim/runtime/autoload/modula2.vim
+++ b/uvim/runtime/autoload/modula2.mnv
@@ -1,4 +1,4 @@
-" Vim filetype plugin file
+" MNV filetype plugin file
 " Language:	Modula-2
 " Maintainer:	Doug Kearns <dougkearns@gmail.com>
 " Last Change:	2024 Jan 04
@@ -28,4 +28,4 @@ function modula2#SetDialect(dialect, extension = "") abort
   lockvar! b:modula2
 endfunction
 
-" vim: nowrap sw=2 sts=2 ts=8 noet fdm=marker:
+" mnv: nowrap sw=2 sts=2 ts=8 noet fdm=marker:
diff --git a/uvim/runtime/autoload/paste.vim b/uvim/runtime/autoload/paste.mnv
index 1ba336c2b3..7af7e8b73c 100644
--- a/uvim/runtime/autoload/paste.vim
+++ b/uvim/runtime/autoload/paste.mnv
@@ -1,10 +1,10 @@
-" Vim support file to help with paste mappings and menus
-" Maintainer:	The Vim Project <https://github.com/vim/vim>
+" MNV support file to help with paste mappings and menus
+" Maintainer:	The MNV Project <https://github.com/Project-Tick/Project-Tick>
 " Last Change:	2023 Aug 10
-" Former Maintainer:	Bram Moolenaar <Bram@vim.org>
+" Former Maintainer:	Bram Moolenaar <Bram@mnv.org>
 
 " Define the string to use for items that are present both in Edit, Popup and
-" Toolbar menu.  Also used in mswin.vim and macmap.vim.
+" Toolbar menu.  Also used in mswin.mnv and macmap.mnv.
 
 let paste#paste_cmd = {'n': ":call paste#Paste()<CR>"}
 let paste#paste_cmd['v'] = '"-c<Esc>' . paste#paste_cmd['n']
diff --git a/uvim/runtime/autoload/phpcomplete.vim b/uvim/runtime/autoload/phpcomplete.mnv
index 5b4263ae45..622c24412c 100644
--- a/uvim/runtime/autoload/phpcomplete.vim
+++ b/uvim/runtime/autoload/phpcomplete.mnv
@@ -1,8 +1,8 @@
-" Vim completion script
+" MNV completion script
 " Language:	PHP
 " Maintainer:	Dávid Szabó ( complex857 AT gmail DOT com )
 " Previous Maintainer:	Mikolaj Machowski ( mikmach AT wp DOT pl )
-" URL: https://github.com/shawncplus/phpcomplete.vim
+" URL: https://github.com/shawncplus/phpcomplete.mnv
 " Last Change:  2021 Feb 08
 "
 "	OPTIONS:
@@ -28,7 +28,7 @@
 "			This option controls the number of characters the user needs to type before
 "			the tags will be searched for namespaces and classes in typed out namespaces in
 "			"use ..." context. Setting this to 0 is not recommended because that means the code
-"			have to scan every tag, and vim's taglist() function runs extremely slow with a
+"			have to scan every tag, and mnv's taglist() function runs extremely slow with a
 "			"match everything" pattern.
 "
 "		let g:phpcomplete_parse_docblock_comments = 1/0 [default 0]
@@ -175,7 +175,7 @@ function! phpcomplete#CompletePHP(findstart, base) " {{{
 			endif
 
 			if classlocation != ''
-				if classlocation == 'VIMPHP_BUILTINOBJECT' && has_key(g:php_builtin_classes, tolower(classname))
+				if classlocation == 'MNVPHP_BUILTINOBJECT' && has_key(g:php_builtin_classes, tolower(classname))
 					return phpcomplete#CompleteBuiltInClass(context, classname, a:base)
 				endif
 
@@ -902,7 +902,7 @@ function! s:getNextCharWithPos(filelines, current_pos) " {{{
 	else
 		" we've reached the end of the current line, jump to the next
 		" non-blank line (blank lines have no position where we can read from,
-		" not even a whitespace. The newline char does not positionable by vim
+		" not even a whitespace. The newline char does not positionable by mnv
 		let line_no += 1
 		while strlen(a:filelines[line_no]) == 0
 			let line_no += 1
@@ -1364,7 +1364,7 @@ function! phpcomplete#GetCallChainReturnType(classname_candidate, class_candidat
 
 		let classlocation = phpcomplete#GetClassLocation(classname_candidate, class_candidate_namespace)
 
-		if classlocation == 'VIMPHP_BUILTINOBJECT' && has_key(g:php_builtin_classes, tolower(classname_candidate))
+		if classlocation == 'MNVPHP_BUILTINOBJECT' && has_key(g:php_builtin_classes, tolower(classname_candidate))
 			let class_info = g:php_builtin_classes[tolower(classname_candidate)]
 			if has_key(class_info['methods'], method)
 				return phpcomplete#GetCallChainReturnType(class_info['methods'][method].return_type, '\', a:imports, methodstack)
@@ -1582,7 +1582,7 @@ function! phpcomplete#GetClassName(start_line, context, current_namespace, impor
 			let function_file = phpcomplete#GetFunctionLocation(function_name, '\')
 		endif
 
-		if function_file == 'VIMPHP_BUILTINFUNCTION'
+		if function_file == 'MNVPHP_BUILTINFUNCTION'
 			" built in function, grab the return type from the info string
 			let return_type = matchstr(g:php_builtin_functions[function_name.'('], '\v\|\s+\zs.+$')
 			let classname_candidate = return_type
@@ -1817,7 +1817,7 @@ function! phpcomplete#GetClassName(start_line, context, current_namespace, impor
 					let function_file = phpcomplete#GetFunctionLocation(function_name, '\')
 				endif
 
-				if function_file == 'VIMPHP_BUILTINFUNCTION'
+				if function_file == 'MNVPHP_BUILTINFUNCTION'
 					" built in function, grab the return type from the info string
 					let return_type = matchstr(g:php_builtin_functions[function_name.'('], '\v\|\s+\zs.+$')
 					let classname_candidate = return_type
@@ -1910,10 +1910,10 @@ endfunction
 function! phpcomplete#GetClassLocation(classname, namespace) " {{{
 	" Check classname may be name of built in object
 	if has_key(g:php_builtin_classes, tolower(a:classname)) && (a:namespace == '' || a:namespace == '\')
-		return 'VIMPHP_BUILTINOBJECT'
+		return 'MNVPHP_BUILTINOBJECT'
 	endif
 	if has_key(g:php_builtin_interfaces, tolower(a:classname)) && (a:namespace == '' || a:namespace == '\')
-		return 'VIMPHP_BUILTINOBJECT'
+		return 'MNVPHP_BUILTINOBJECT'
 	endif
 
 	if a:namespace == '' || a:namespace == '\'
@@ -1963,7 +1963,7 @@ function! phpcomplete#GetFunctionLocation(function_name, namespace) " {{{
 	" builtin functions doesn't need explicit \ in front of them even in namespaces,
 	" aliased built-in function names are not handled
 	if has_key(g:php_builtin_functions, a:function_name.'(')
-		return 'VIMPHP_BUILTINFUNCTION'
+		return 'MNVPHP_BUILTINFUNCTION'
 	endif
 
 
@@ -2185,7 +2185,7 @@ function! phpcomplete#GetClassContentsStructure(file_path, file_lines, class_nam
 				let namespace = '\'
 			endif
 			let classlocation = phpcomplete#GetClassLocation(class, namespace)
-			if classlocation == "VIMPHP_BUILTINOBJECT"
+			if classlocation == "MNVPHP_BUILTINOBJECT"
 				if has_key(g:php_builtin_classes, tolower(class))
 					let result += [phpcomplete#GenerateBuiltinClassStub('class', g:php_builtin_classes[tolower(class)])]
 				endif
@@ -2266,7 +2266,7 @@ function! phpcomplete#GenerateBuiltinClassStub(type, class_info) " {{{
 				\ 'content': re,
 				\ 'namespace': '',
 				\ 'imports': {},
-				\ 'file': 'VIMPHP_BUILTINOBJECT',
+				\ 'file': 'MNVPHP_BUILTINOBJECT',
 				\ 'mtime': 0,
 				\ }
 endfunction " }}}
@@ -2985,4 +2985,4 @@ let g:php_builtin_vars ={
 endfunction
 " }}}
 
-" vim: foldmethod=marker:noexpandtab:ts=8:sts=4
+" mnv: foldmethod=marker:noexpandtab:ts=8:sts=4
diff --git a/uvim/runtime/autoload/python.vim b/uvim/runtime/autoload/python.mnv
index cf01198d73..6a3bd3d601 100644
--- a/uvim/runtime/autoload/python.vim
+++ b/uvim/runtime/autoload/python.mnv
@@ -1,7 +1,7 @@
-" Support for Python indenting, see runtime/indent/python.vim
+" Support for Python indenting, see runtime/indent/python.mnv
 
 let s:keepcpo= &cpo
-set cpo&vim
+set cpo&mnv
 
 " need to inspect some old g:pyindent_* variables to be backward compatible
 let g:python_indent = extend(get(g:, 'python_indent', {}), #{
@@ -20,12 +20,12 @@ let g:python_indent = extend(get(g:, 'python_indent', {}), #{
 let s:maxoff = 50       " maximum number of lines to look backwards for ()
 
 function s:SearchBracket(fromlnum, flags)
-  " VIM_INDENT_TEST_TRACE_START
+  " MNV_INDENT_TEST_TRACE_START
   return searchpairpos('[[({]', '', '[])}]', a:flags,
           \ {-> synstack('.', col('.'))
           \ ->indexof({_, id -> synIDattr(id, 'name') =~ '\%(Comment\|Todo\|String\)$'}) >= 0},
           \ [0, a:fromlnum - s:maxoff]->max(), g:python_indent.searchpair_timeout)
-  " VIM_INDENT_TEST_TRACE_END python#s:SearchBracket
+  " MNV_INDENT_TEST_TRACE_END python#s:SearchBracket
 endfunction
 
 " See if the specified line is already user-dedented from the expected value.
diff --git a/uvim/runtime/autoload/python3complete.vim b/uvim/runtime/autoload/python3complete.mnv
index 3e54433f41..8fd1f14579 100644
--- a/uvim/runtime/autoload/python3complete.vim
+++ b/uvim/runtime/autoload/python3complete.mnv
@@ -1,10 +1,10 @@
-"python3complete.vim - Omni Completion for python
+"python3complete.mnv - Omni Completion for python
 " Maintainer: <vacancy>
 " Previous Maintainer: Aaron Griffin <aaronmgriffin@gmail.com>
 " Version: 0.9
 " Last Updated: 2022 Mar 30
 "
-" Roland Puntaier: this file contains adaptations for python3 and is parallel to pythoncomplete.vim
+" Roland Puntaier: this file contains adaptations for python3 and is parallel to pythoncomplete.mnv
 "
 " Changes
 " TODO:
@@ -28,7 +28,7 @@
 "
 " v 0.7
 "   * Fixed function list sorting (_ and __ at the bottom)
-"   * Removed newline removal from docs.  It appears vim handles these better in
+"   * Removed newline removal from docs.  It appears mnv handles these better in
 "   recent patches
 "
 " v 0.6:
@@ -45,7 +45,7 @@
 "
 
 if !has('python3')
-    echo "Error: Required vim compiled with +python3"
+    echo "Error: Required mnv compiled with +python3"
     finish
 endif
 
@@ -70,7 +70,7 @@ function! python3complete#Complete(findstart, base)
         return idx
     "findstart = 0 when we need to return the list of completions
     else
-        "vim no longer moves the cursor upon completion... fix that
+        "mnv no longer moves the cursor upon completion... fix that
         let line = getline('.')
         let idx = col('.')
         let cword = ''
@@ -84,7 +84,7 @@ function! python3complete#Complete(findstart, base)
                 break
             endif
         endwhile
-	execute "py3 vimpy3complete('" . escape(cword, "'") . "', '" . escape(a:base, "'") . "')"
+	execute "py3 mnvpy3complete('" . escape(cword, "'") . "', '" . escape(a:base, "'") . "')"
         return g:python3complete_completions
     endif
 endfunction
@@ -102,13 +102,13 @@ def dbg(s): debugstmts.append(s)
 def showdbg():
     for d in debugstmts: print("DBG: %s " % d)
 
-def vimpy3complete(context,match):
+def mnvpy3complete(context,match):
     global debugstmts
     debugstmts = []
     try:
-        import vim
+        import mnv
         cmpl = Completer()
-        cmpl.evalsource('\n'.join(vim.current.buffer),vim.eval("line('.')"))
+        cmpl.evalsource('\n'.join(mnv.current.buffer),mnv.eval("line('.')"))
         all = cmpl.get_completions(context,match)
         all.sort(key=lambda x:x['abbr'].replace('_','z'))
         dictstr = '['
@@ -120,10 +120,10 @@ def vimpy3complete(context,match):
         if dictstr[-1] == ',': dictstr = dictstr[:-1]
         dictstr += ']'
         #dbg("dict: %s" % dictstr)
-        vim.command("silent let g:python3complete_completions = %s" % dictstr)
+        mnv.command("silent let g:python3complete_completions = %s" % dictstr)
         #dbg("Completion dict:\n%s" % all)
-    except vim.error:
-        dbg("VIM Error: %s" % vim.error)
+    except mnv.error:
+        dbg("MNV Error: %s" % mnv.error)
 
 class Completer(object):
     def __init__(self):
@@ -525,7 +525,7 @@ class PyParser:
         self.currentscope = newscope
         return self.currentscope
 
-    #p.parse(vim.current.buffer[:],vim.eval("line('.')"))
+    #p.parse(mnv.current.buffer[:],mnv.eval("line('.')"))
     def parse(self,text,curline=0):
         self.curline = int(curline)
         buf = io.StringIO(''.join(text) + '\n')
diff --git a/uvim/runtime/autoload/pythoncomplete.vim b/uvim/runtime/autoload/pythoncomplete.mnv
index aa28bb721f..7c6a38c59f 100644
--- a/uvim/runtime/autoload/pythoncomplete.vim
+++ b/uvim/runtime/autoload/pythoncomplete.mnv
@@ -1,4 +1,4 @@
-"pythoncomplete.vim - Omni Completion for python
+"pythoncomplete.mnv - Omni Completion for python
 " Maintainer: <vacancy>
 " Previous Maintainer: Aaron Griffin <aaronmgriffin@gmail.com>
 " Version: 0.9
@@ -26,7 +26,7 @@
 "
 " v 0.7
 "   * Fixed function list sorting (_ and __ at the bottom)
-"   * Removed newline removal from docs.  It appears vim handles these better in
+"   * Removed newline removal from docs.  It appears mnv handles these better in
 "   recent patches
 "
 " v 0.6:
@@ -43,7 +43,7 @@
 "
 
 if !has('python')
-    echo "Error: Required vim compiled with +python"
+    echo "Error: Required mnv compiled with +python"
     finish
 endif
 
@@ -68,7 +68,7 @@ function! pythoncomplete#Complete(findstart, base)
         return idx
     "findstart = 0 when we need to return the list of completions
     else
-        "vim no longer moves the cursor upon completion... fix that
+        "mnv no longer moves the cursor upon completion... fix that
         let line = getline('.')
         let idx = col('.')
         let cword = ''
@@ -82,7 +82,7 @@ function! pythoncomplete#Complete(findstart, base)
                 break
             endif
         endwhile
-        execute "python vimcomplete('" . escape(cword, "'") . "', '" . escape(a:base, "'") . "')"
+        execute "python mnvcomplete('" . escape(cword, "'") . "', '" . escape(a:base, "'") . "')"
         return g:pythoncomplete_completions
     endif
 endfunction
@@ -97,11 +97,11 @@ def dbg(s): debugstmts.append(s)
 def showdbg():
     for d in debugstmts: print "DBG: %s " % d
 
-def vimcomplete(context,match):
+def mnvcomplete(context,match):
     global debugstmts
     debugstmts = []
     try:
-        import vim
+        import mnv
         def complsort(x,y):
             try:
                 xa = x['abbr']
@@ -122,7 +122,7 @@ def vimcomplete(context,match):
             except:
                 return 0
         cmpl = Completer()
-        cmpl.evalsource('\n'.join(vim.current.buffer),vim.eval("line('.')"))
+        cmpl.evalsource('\n'.join(mnv.current.buffer),mnv.eval("line('.')"))
         all = cmpl.get_completions(context,match)
         all.sort(complsort)
         dictstr = '['
@@ -134,10 +134,10 @@ def vimcomplete(context,match):
         if dictstr[-1] == ',': dictstr = dictstr[:-1]
         dictstr += ']'
         #dbg("dict: %s" % dictstr)
-        vim.command("silent let g:pythoncomplete_completions = %s" % dictstr)
+        mnv.command("silent let g:pythoncomplete_completions = %s" % dictstr)
         #dbg("Completion dict:\n%s" % all)
-    except vim.error:
-        dbg("VIM Error: %s" % vim.error)
+    except mnv.error:
+        dbg("MNV Error: %s" % mnv.error)
 
 class Completer(object):
     def __init__(self):
@@ -540,7 +540,7 @@ class PyParser:
         self.currentscope = newscope
         return self.currentscope
 
-    #p.parse(vim.current.buffer[:],vim.eval("line('.')"))
+    #p.parse(mnv.current.buffer[:],mnv.eval("line('.')"))
     def parse(self,text,curline=0):
         self.curline = int(curline)
         buf = cStringIO.StringIO(''.join(text) + '\n')
@@ -624,4 +624,4 @@ PYTHONEOF
 endfunction
 
 call s:DefPython()
-" vim: set et ts=4:
+" mnv: set et ts=4:
diff --git a/uvim/runtime/autoload/racket.vim b/uvim/runtime/autoload/racket.mnv
index 02b493b84d..f69a1468dd 100644
--- a/uvim/runtime/autoload/racket.vim
+++ b/uvim/runtime/autoload/racket.mnv
@@ -1,7 +1,7 @@
 " Maintainer: D. Ben Knoble <ben.knoble+github@gmail.com>
-" URL: https://github.com/benknoble/vim-racket
+" URL: https://github.com/benknoble/mnv-racket
 " Last Change: 2024 Nov 12
-vim9script
+mnv9script
 
 def MakePatternFromLiterals(xs: list<string>): string
   return printf('\V%s', xs->mapnew((_, v) => escape(v, '\'))->join('\|'))
@@ -56,7 +56,7 @@ export def Indent(): number
       # Lispword, but not for/fold second form (or first form couldn't be
       # found): indent like define or lambda.
       # 2 extra indent, but subtract 1 for columns starting at 1.
-      # Current vim9 doesn't constant fold "x + 2 - 1", so write "x + 1"
+      # Current mnv9 doesn't constant fold "x + 2 - 1", so write "x + 1"
       return amount + 1
     endif
   else
diff --git a/uvim/runtime/autoload/rubycomplete.vim b/uvim/runtime/autoload/rubycomplete.mnv
index 6ead0fd837..34a9d626a1 100644
--- a/uvim/runtime/autoload/rubycomplete.vim
+++ b/uvim/runtime/autoload/rubycomplete.mnv
@@ -1,7 +1,7 @@
-" Vim completion script
+" MNV completion script
 " Language:		Ruby
 " Maintainer:		Mark Guzman <segfault@hasno.info>
-" URL:			https://github.com/vim-ruby/vim-ruby
+" URL:			https://github.com/mnv-ruby/mnv-ruby
 " Last Change:		2023 Dec 31
 " ----------------------------------------------------------------------------
 "
@@ -17,7 +17,7 @@ function! s:ErrMsg(msg)
 endfunction
 
 if !has('ruby')
-    call s:ErrMsg( "Error: Rubycomplete requires vim compiled with +ruby" )
+    call s:ErrMsg( "Error: Rubycomplete requires mnv compiled with +ruby" )
     call s:ErrMsg( "Error: falling back to syntax completion" )
     " lets fall back to syntax completion
     setlocal omnifunc=syntaxcomplete#Complete
@@ -25,7 +25,7 @@ if !has('ruby')
 endif
 
 if version < 700
-    call s:ErrMsg( "Error: Required vim >= 7.0" )
+    call s:ErrMsg( "Error: Required mnv >= 7.0" )
     finish
 endif
 " }}} requirement checks
@@ -69,7 +69,7 @@ let s:end_end_regex = '\%(^\|[^.:@$]\)\@<=\<end:\@!\>'
 
 " }}} regex patterns
 
-" {{{ vim-side support functions
+" {{{ mnv-side support functions
 let s:rubycomplete_debug = 0
 
 function! s:dprint(msg)
@@ -207,11 +207,11 @@ function! s:GetRubyVarType(v)
     return ''
 endfunction
 
-"}}} vim-side support functions
+"}}} mnv-side support functions
 
-"{{{ vim-side completion function
+"{{{ mnv-side completion function
 function! rubycomplete#Init()
-    execute "ruby VimRubyCompletion.preload_rails"
+    execute "ruby MNVRubyCompletion.preload_rails"
 endfunction
 
 function! rubycomplete#Complete(findstart, base)
@@ -236,11 +236,11 @@ function! rubycomplete#Complete(findstart, base)
     "findstart = 0 when we need to return the list of completions
     else
         let g:rubycomplete_completions = []
-        execute "ruby VimRubyCompletion.get_completions('" . a:base . "')"
+        execute "ruby MNVRubyCompletion.get_completions('" . a:base . "')"
         return g:rubycomplete_completions
     endif
 endfunction
-"}}} vim-side completion function
+"}}} mnv-side completion function
 
 "{{{ ruby-side code
 function! s:DefRuby()
@@ -252,7 +252,7 @@ begin
 rescue Exception
     #ignore?
 end
-class VimRubyCompletion
+class MNVRubyCompletion
 # {{{ constants
   @@debug = false
   @@ReservedWords = [
@@ -283,13 +283,13 @@ class VimRubyCompletion
 # {{{ buffer analysis magic
   def load_requires
 
-    custom_paths = VIM::evaluate("get(g:, 'rubycomplete_load_paths', [])")
+    custom_paths = MNV::evaluate("get(g:, 'rubycomplete_load_paths', [])")
 
     if !custom_paths.empty?
       $LOAD_PATH.concat(custom_paths).uniq!
     end
 
-    buf = VIM::Buffer.current
+    buf = MNV::Buffer.current
     enum = buf.line_number
     nums = Range.new( 1, enum )
     nums.each do |x|
@@ -308,9 +308,9 @@ class VimRubyCompletion
   end
 
   def load_gems
-    fpath = VIM::evaluate("get(g:, 'rubycomplete_gemfile_path', 'Gemfile')")
+    fpath = MNV::evaluate("get(g:, 'rubycomplete_gemfile_path', 'Gemfile')")
     return unless File.file?(fpath) && File.readable?(fpath)
-    want_bundler = VIM::evaluate("get(g:, 'rubycomplete_use_bundler')")
+    want_bundler = MNV::evaluate("get(g:, 'rubycomplete_use_bundler')")
     parse_file = !want_bundler
     begin
       require 'bundler'
@@ -343,7 +343,7 @@ class VimRubyCompletion
     begin
       eval classdef
     rescue Exception
-      VIM::evaluate( "s:ErrMsg( 'Problem loading class \"%s\", was it already completed?' )" % name )
+      MNV::evaluate( "s:ErrMsg( 'Problem loading class \"%s\", was it already completed?' )" % name )
     end
     dprint "load_buffer_class(%s) END" % name
   end
@@ -356,26 +356,26 @@ class VimRubyCompletion
     begin
       eval classdef
     rescue Exception
-      VIM::evaluate( "s:ErrMsg( 'Problem loading module \"%s\", was it already completed?' )" % name )
+      MNV::evaluate( "s:ErrMsg( 'Problem loading module \"%s\", was it already completed?' )" % name )
     end
     dprint "load_buffer_module(%s) END" % name
   end
 
-  def get_buffer_entity(name, vimfun)
-    loading_allowed = VIM::evaluate("exists('g:rubycomplete_buffer_loading') && g:rubycomplete_buffer_loading")
+  def get_buffer_entity(name, mnvfun)
+    loading_allowed = MNV::evaluate("exists('g:rubycomplete_buffer_loading') && g:rubycomplete_buffer_loading")
     return nil if loading_allowed.to_i.zero?
     return nil if /(\"|\')+/.match( name )
-    buf = VIM::Buffer.current
-    nums = eval( VIM::evaluate( vimfun % name ) )
+    buf = MNV::Buffer.current
+    nums = eval( MNV::evaluate( mnvfun % name ) )
     return nil if nums == nil
     return nil if nums.min == nums.max && nums.min == 0
 
     dprint "get_buffer_entity START"
     visited = []
     clscnt = 0
-    bufname = VIM::Buffer.current.name
+    bufname = MNV::Buffer.current.name
     classdef = ""
-    cur_line = VIM::Buffer.current.line_number
+    cur_line = MNV::Buffer.current.line_number
     while (nums != nil && !(nums.min == 0 && nums.max == 0) )
       dprint "visited: %s" % visited.to_s
       break if visited.index( nums )
@@ -401,9 +401,9 @@ class VimRubyCompletion
       end
 
       nm = "%s(::.*)*\", %s, \"" % [ name, nums.last ]
-      nums = eval( VIM::evaluate( vimfun % nm ) )
+      nums = eval( MNV::evaluate( mnvfun % nm ) )
       dprint "nm: \"%s\"" % nm
-      dprint "vimfun: %s" % (vimfun % nm)
+      dprint "mnvfun: %s" % (mnvfun % nm)
       dprint "got nums: %s" % nums.to_s
     end
     if classdef.length > 1
@@ -423,7 +423,7 @@ class VimRubyCompletion
     if /(\"|\')+/.match( receiver )
       "String"
     else
-      VIM::evaluate("s:GetRubyVarType('%s')" % receiver)
+      MNV::evaluate("s:GetRubyVarType('%s')" % receiver)
     end
   end
 
@@ -431,17 +431,17 @@ class VimRubyCompletion
     print txt if @@debug
   end
 
-  def escape_vim_singlequote_string(str)
+  def escape_mnv_singlequote_string(str)
     str.to_s.gsub(/'/,"\\'")
   end
 
   def get_buffer_entity_list( type )
     # this will be a little expensive.
-    loading_allowed = VIM::evaluate("exists('g:rubycomplete_buffer_loading') && g:rubycomplete_buffer_loading")
-    allow_aggressive_load = VIM::evaluate("exists('g:rubycomplete_classes_in_global') && g:rubycomplete_classes_in_global")
+    loading_allowed = MNV::evaluate("exists('g:rubycomplete_buffer_loading') && g:rubycomplete_buffer_loading")
+    allow_aggressive_load = MNV::evaluate("exists('g:rubycomplete_classes_in_global') && g:rubycomplete_classes_in_global")
     return [] if allow_aggressive_load.to_i.zero? || loading_allowed.to_i.zero?
 
-    buf = VIM::Buffer.current
+    buf = MNV::Buffer.current
     eob = buf.length
     ret = []
     rg = 1..eob
@@ -449,7 +449,7 @@ class VimRubyCompletion
 
     rg.each do |x|
       if re.match( buf[x] )
-        next if type == "def" && eval( VIM::evaluate("s:IsPosInClassDef(%s)" % x) ) != nil
+        next if type == "def" && eval( MNV::evaluate("s:IsPosInClassDef(%s)" % x) ) != nil
         ret.push $1
       end
     end
@@ -470,17 +470,17 @@ class VimRubyCompletion
   end
 
   def load_rails
-    allow_rails = VIM::evaluate("exists('g:rubycomplete_rails') && g:rubycomplete_rails")
+    allow_rails = MNV::evaluate("exists('g:rubycomplete_rails') && g:rubycomplete_rails")
     return if allow_rails.to_i.zero?
 
-    buf_path = VIM::evaluate('expand("%:p")')
-    file_name = VIM::evaluate('expand("%:t")')
-    vim_dir = VIM::evaluate('getcwd()')
+    buf_path = MNV::evaluate('expand("%:p")')
+    file_name = MNV::evaluate('expand("%:t")')
+    mnv_dir = MNV::evaluate('getcwd()')
     file_dir = buf_path.gsub( file_name, '' )
     file_dir.gsub!( /\\/, "/" )
-    vim_dir.gsub!( /\\/, "/" )
-    vim_dir << "/"
-    dirs = [ vim_dir, file_dir ]
+    mnv_dir.gsub!( /\\/, "/" )
+    mnv_dir << "/"
+    dirs = [ mnv_dir, file_dir ]
     sdirs = [ "", "./", "../", "../../", "../../../", "../../../../" ]
     rails_base = nil
 
@@ -514,21 +514,21 @@ class VimRubyCompletion
           # assume 1.0
         end
         #eval( "Rails::Initializer.run" ) #not necessary?
-        VIM::command('let s:rubycomplete_rails_loaded = 1')
+        MNV::command('let s:rubycomplete_rails_loaded = 1')
         dprint "rails loaded"
       rescue Exception
         dprint "Rails Error %s" % $!
-        VIM::evaluate( "s:ErrMsg('Error loading rails environment')" )
+        MNV::evaluate( "s:ErrMsg('Error loading rails environment')" )
       end
     end
   end
 
   def get_rails_helpers
-    allow_rails = VIM::evaluate("exists('g:rubycomplete_rails') && g:rubycomplete_rails")
-    rails_loaded = VIM::evaluate('s:rubycomplete_rails_loaded')
+    allow_rails = MNV::evaluate("exists('g:rubycomplete_rails') && g:rubycomplete_rails")
+    rails_loaded = MNV::evaluate('s:rubycomplete_rails_loaded')
     return [] if allow_rails.to_i.zero? || rails_loaded.to_i.zero?
 
-    buf_path = VIM::evaluate('expand("%:p")')
+    buf_path = MNV::evaluate('expand("%:p")')
     buf_path.gsub!( /\\/, "/" )
     path_elm = buf_path.split( "/" )
     dprint "buf_path: %s" % buf_path
@@ -573,8 +573,8 @@ class VimRubyCompletion
   end
 
   def add_rails_columns( cls )
-    allow_rails = VIM::evaluate("exists('g:rubycomplete_rails') && g:rubycomplete_rails")
-    rails_loaded = VIM::evaluate('s:rubycomplete_rails_loaded')
+    allow_rails = MNV::evaluate("exists('g:rubycomplete_rails') && g:rubycomplete_rails")
+    rails_loaded = MNV::evaluate('s:rubycomplete_rails_loaded')
     return [] if allow_rails.to_i.zero? || rails_loaded.to_i.zero?
 
     begin
@@ -596,11 +596,11 @@ class VimRubyCompletion
   end
 
   def get_rails_view_methods
-    allow_rails = VIM::evaluate("exists('g:rubycomplete_rails') && g:rubycomplete_rails")
-    rails_loaded = VIM::evaluate('s:rubycomplete_rails_loaded')
+    allow_rails = MNV::evaluate("exists('g:rubycomplete_rails') && g:rubycomplete_rails")
+    rails_loaded = MNV::evaluate('s:rubycomplete_rails_loaded')
     return [] if allow_rails.to_i.zero? || rails_loaded.to_i.zero?
 
-    buf_path = VIM::evaluate('expand("%:p")')
+    buf_path = MNV::evaluate('expand("%:p")')
     buf_path.gsub!( /\\/, "/" )
     pelm = buf_path.split( "/" )
     idx = pelm.index( "views" )
@@ -625,8 +625,8 @@ class VimRubyCompletion
 
 # {{{ main completion code
   def self.preload_rails
-    a = VimRubyCompletion.new
-    if VIM::evaluate("has('nvim')") == 0
+    a = MNVRubyCompletion.new
+    if MNV::evaluate("has('nmnv')") == 0
       require 'thread'
       Thread.new(a) do |b|
         begin
@@ -640,22 +640,22 @@ class VimRubyCompletion
   end
 
   def self.get_completions(base)
-    b = VimRubyCompletion.new
+    b = MNVRubyCompletion.new
     b.get_completions base
   end
 
   def get_completions(base)
-    loading_allowed = VIM::evaluate("exists('g:rubycomplete_buffer_loading') && g:rubycomplete_buffer_loading")
+    loading_allowed = MNV::evaluate("exists('g:rubycomplete_buffer_loading') && g:rubycomplete_buffer_loading")
     if loading_allowed.to_i == 1
       load_requires
       load_rails
     end
 
-    want_gems = VIM::evaluate("get(g:, 'rubycomplete_load_gemfile')")
+    want_gems = MNV::evaluate("get(g:, 'rubycomplete_load_gemfile')")
     load_gems unless want_gems.to_i.zero?
 
-    input = VIM::Buffer.current.line
-    cpos = VIM::Window.current.cursor[1] - 1
+    input = MNV::Buffer.current.line
+    cpos = MNV::Window.current.cursor[1] - 1
     input = input[0..cpos]
     input += base
     input.sub!(/.*[ \t\n\"\\'`><=;|&{(]/, '') # Readline.basic_word_break_characters
@@ -786,11 +786,11 @@ class VimRubyCompletion
 
     else
       dprint "default/other"
-      inclass = eval( VIM::evaluate("s:IsInClassDef()") )
+      inclass = eval( MNV::evaluate("s:IsInClassDef()") )
 
       if inclass != nil
         dprint "inclass"
-        classdef = "%s\n" % VIM::Buffer.current[ inclass.min ]
+        classdef = "%s\n" % MNV::Buffer.current[ inclass.min ]
         found = /^\s*class\s*([A-Za-z0-9_-]*)(\s*<\s*([A-Za-z0-9_:-]*))?\s*\n$/.match( classdef )
 
         if found != nil
@@ -817,7 +817,7 @@ class VimRubyCompletion
         classes += get_buffer_classes
         classes += get_buffer_modules
 
-        include_objectspace = VIM::evaluate("exists('g:rubycomplete_include_objectspace') && g:rubycomplete_include_objectspace")
+        include_objectspace = MNV::evaluate("exists('g:rubycomplete_include_objectspace') && g:rubycomplete_include_objectspace")
         ObjectSpace.each_object(Class) { |cls| classes << cls.to_s } if include_objectspace == "1"
         message = receiver = input
       end
@@ -826,14 +826,14 @@ class VimRubyCompletion
       methods += Kernel.public_methods
     end
 
-    include_object = VIM::evaluate("exists('g:rubycomplete_include_object') && g:rubycomplete_include_object")
+    include_object = MNV::evaluate("exists('g:rubycomplete_include_object') && g:rubycomplete_include_object")
     methods = clean_sel( methods, message )
     methods = (methods-Object.instance_methods) if include_object == "0"
-    rbcmeth = (VimRubyCompletion.instance_methods-Object.instance_methods) # lets remove those rubycomplete methods
+    rbcmeth = (MNVRubyCompletion.instance_methods-Object.instance_methods) # lets remove those rubycomplete methods
     methods = (methods-rbcmeth)
 
     variables = clean_sel( variables, message )
-    classes = clean_sel( classes, message ) - ["VimRubyCompletion"]
+    classes = clean_sel( classes, message ) - ["MNVRubyCompletion"]
     constants = clean_sel( constants, message )
 
     valid = []
@@ -849,16 +849,16 @@ class VimRubyCompletion
     rg.step(150) do |x|
       stpos = 0+x
       enpos = 150+x
-      valid[stpos..enpos].each { |c| outp += "{'word':'%s','item':'%s','kind':'%s'}," % [ c[:name], c[:name], c[:type] ].map{|x|escape_vim_singlequote_string(x)} }
+      valid[stpos..enpos].each { |c| outp += "{'word':'%s','item':'%s','kind':'%s'}," % [ c[:name], c[:name], c[:type] ].map{|x|escape_mnv_singlequote_string(x)} }
       outp.sub!(/,$/, '')
 
-      VIM::command("call extend(g:rubycomplete_completions, [%s])" % outp)
+      MNV::command("call extend(g:rubycomplete_completions, [%s])" % outp)
       outp = ""
     end
   end
 # }}} main completion code
 
-end # VimRubyCompletion
+end # MNVRubyCompletion
 # }}} ruby completion
 RUBYEOF
 endfunction
@@ -868,4 +868,4 @@ let s:rubycomplete_rails_loaded = 0
 call s:DefRuby()
 "}}} ruby-side code
 
-" vim:tw=78:sw=4:ts=8:et:fdm=marker:ft=vim:norl:
+" mnv:tw=78:sw=4:ts=8:et:fdm=marker:ft=mnv:norl:
diff --git a/uvim/runtime/autoload/rust.vim b/uvim/runtime/autoload/rust.mnv
index 5ccbf4b382..1665c3a96e 100644
--- a/uvim/runtime/autoload/rust.vim
+++ b/uvim/runtime/autoload/rust.mnv
@@ -1,6 +1,6 @@
 " Description: Helper functions for Rust commands/mappings
 " Last Modified: 2023-09-11
-" For bugs, patches and license go to https://github.com/rust-lang/rust.vim
+" For bugs, patches and license go to https://github.com/rust-lang/rust.mnv
 
 function! rust#Load()
     " Utility call to get this script loaded, for debugging
@@ -410,7 +410,7 @@ function! s:RmDir(path)
     return delete(a:path, 'rf') == 0
 endfunction
 
-" Executes {cmd} with the cwd set to {pwd}, without changing Vim's cwd.
+" Executes {cmd} with the cwd set to {pwd}, without changing MNV's cwd.
 " If {pwd} is the empty string then it doesn't change the cwd.
 function! s:system(pwd, cmd)
     let cmd = a:cmd
@@ -421,9 +421,9 @@ function! s:system(pwd, cmd)
 endfunction
 
 " Playpen Support {{{1
-" Parts of gist.vim by Yasuhiro Matsumoto <mattn.jp@gmail.com> reused
-" gist.vim available under the BSD license, available at
-" http://github.com/mattn/gist-vim
+" Parts of gist.mnv by Yasuhiro Matsumoto <mattn.jp@gmail.com> reused
+" gist.mnv available under the BSD license, available at
+" http://github.com/mattn/gist-mnv
 function! s:has_webapi()
     if !exists("*webapi#http#post")
         try
@@ -441,7 +441,7 @@ function! rust#Play(count, line1, line2, ...) abort
     let l:rust_shortener_url = get(g:, 'rust_shortener_url', 'https://is.gd/')
 
     if !s:has_webapi()
-        echohl ErrorMsg | echomsg ':RustPlay depends on webapi.vim (https://github.com/mattn/webapi-vim)' | echohl None
+        echohl ErrorMsg | echomsg ':RustPlay depends on webapi.mnv (https://github.com/mattn/webapi-mnv)' | echohl None
         return
     endif
 
@@ -502,7 +502,7 @@ function! s:SearchTestFunctionNameUnderCursor() abort
     if maparg('<Plug>(MatchitNormalForward)') ==# ''
         keepjumps normal! %
     else
-        " Prefer matchit.vim official plugin to native % since the plugin
+        " Prefer matchit.mnv official plugin to native % since the plugin
         " provides better behavior than original % (#391)
         " To load the plugin, run:
         "   :packadd matchit
@@ -530,7 +530,7 @@ function! rust#Test(mods, winsize, all, options) abort
         else
             let cmd = printf('%s terminal ', a:mods)
         endif
-    elseif has('nvim')
+    elseif has('nmnv')
         let cmd = printf('%s noautocmd %snew | terminal ', a:mods, winsize)
     else
         let cmd = '!'
@@ -567,4 +567,4 @@ endfunction
 
 " }}}1
 
-" vim: set et sw=4 sts=4 ts=8:
+" mnv: set et sw=4 sts=4 ts=8:
diff --git a/uvim/runtime/autoload/rust/debugging.vim b/uvim/runtime/autoload/rust/debugging.mnv
index 0e84183172..89d0080e98 100644
--- a/uvim/runtime/autoload/rust/debugging.vim
+++ b/uvim/runtime/autoload/rust/debugging.mnv
@@ -1,6 +1,6 @@
 " Last Modified: 2023-09-11
 
-" For debugging, inspired by https://github.com/w0rp/rust/blob/master/autoload/rust/debugging.vim
+" For debugging, inspired by https://github.com/w0rp/rust/blob/master/autoload/rust/debugging.mnv
 
 let s:global_variable_list = [
             \ '_rustfmt_autosave_because_of_config',
@@ -60,7 +60,7 @@ function! rust#debugging#Info() abort
     call cargo#Load()
     call rust#Load()
     call rustfmt#Load()
-    call s:Echo('rust.vim Global Variables:')
+    call s:Echo('rust.mnv Global Variables:')
     call s:Echo('')
     call s:EchoGlobalVariables()
 
@@ -102,4 +102,4 @@ function! rust#debugging#InfoToFile(filename) abort
     call s:Echo('RustInfo written to ' . l:expanded_filename)
 endfunction
 
-" vim: set et sw=4 sts=4 ts=8:
+" mnv: set et sw=4 sts=4 ts=8:
diff --git a/uvim/runtime/autoload/rustfmt.vim b/uvim/runtime/autoload/rustfmt.mnv
index 771c95a877..ab418fb487 100644
--- a/uvim/runtime/autoload/rustfmt.vim
+++ b/uvim/runtime/autoload/rustfmt.mnv
@@ -1,12 +1,12 @@
 " Author: Stephen Sugden <stephen@stephensugden.com>
 " Last Modified: 2023-09-11
 " Last Change:
-" 2025 Oct 27 by Vim project: don't use rustfmt as 'formatprg' by default
-" 2026 Jan 25 by Vim project: don't hide rustfmt errors, restore default var
-" 2026 Mar 30 by Vim project: use fnameescape for :chdir commands
+" 2025 Oct 27 by MNV project: don't use rustfmt as 'formatprg' by default
+" 2026 Jan 25 by MNV project: don't hide rustfmt errors, restore default var
+" 2026 Mar 30 by MNV project: use fnameescape for :chdir commands
 "
-" Adapted from https://github.com/fatih/vim-go
-" For bugs, patches and license go to https://github.com/rust-lang/rust.vim
+" Adapted from https://github.com/fatih/mnv-go
+" For bugs, patches and license go to https://github.com/rust-lang/rust.mnv
 
 if !exists("g:rustfmt_autosave")
     let g:rustfmt_autosave = 0
@@ -203,7 +203,7 @@ function! s:RunRustfmt(command, tmpname, from_writepre)
             call setloclist(0, l:errors, 'r')
             echohl Error | echomsg "rustfmt returned error" | echohl None
         else
-            echo "rust.vim: was not able to parse rustfmt messages. Here is the raw output:"
+            echo "rust.mnv: was not able to parse rustfmt messages. Here is the raw output:"
             echo "\n"
             for l:line in l:stderr
                 echomsg l:line
@@ -228,7 +228,7 @@ function! s:RunRustfmt(command, tmpname, from_writepre)
     if l:open_lwindow == 1
         try
         lwindow
-        catch /^Vim\%((\S\+)\)\=:E776:/
+        catch /^MNV\%((\S\+)\)\=:E776:/
         endtry
     endif
 
@@ -276,4 +276,4 @@ function! rustfmt#PreWrite()
 endfunction
 
 
-" vim: set et sw=4 sts=4 ts=8:
+" mnv: set et sw=4 sts=4 ts=8:
diff --git a/uvim/runtime/autoload/spellfile.vim b/uvim/runtime/autoload/spellfile.mnv
index 43f7dffa1a..04298655f1 100644
--- a/uvim/runtime/autoload/spellfile.vim
+++ b/uvim/runtime/autoload/spellfile.mnv
@@ -1,12 +1,12 @@
-" Vim script to download a missing spell file
-" Maintainer:	The Vim Project <https://github.com/vim/vim>
+" MNV script to download a missing spell file
+" Maintainer:	The MNV Project <https://github.com/Project-Tick/Project-Tick>
 " Last Change:	2023 Aug 10
-" Former Maintainer:	Bram Moolenaar <Bram@vim.org>
+" Former Maintainer:	Bram Moolenaar <Bram@mnv.org>
 
 if !exists('g:spellfile_URL')
   " Always use https:// because it's secure.  The certificate is for nluug.nl,
-  " thus we can't use the alias ftp.vim.org here.
-  let g:spellfile_URL = 'https://ftp.nluug.nl/pub/vim/runtime/spell'
+  " thus we can't use the alias ftp.mnv.org here.
+  let g:spellfile_URL = 'https://ftp.nluug.nl/pub/mnv/runtime/spell'
 endif
 let s:spellfile_URL = ''    " Start with nothing so that s:donedict is reset.
 
@@ -71,7 +71,7 @@ function! spellfile#LoadFile(lang)
     setlocal bin fenc=
     echo 'Downloading ' . fname . '...'
     call spellfile#Nread(fname)
-    if getline(2) !~ 'VIMspell'
+    if getline(2) !~ 'MNVspell'
       " Didn't work, perhaps there is an ASCII one.
       " Careful: Nread() may have opened a new window for the error message,
       " we need to go back to our own buffer and window.
@@ -96,7 +96,7 @@ function! spellfile#LoadFile(lang)
       let fname = lang . '.ascii.spl'
       echo 'Could not find it, trying ' . fname . '...'
       call spellfile#Nread(fname)
-      if getline(2) !~ 'VIMspell'
+      if getline(2) !~ 'MNVspell'
 	echo 'Sorry, downloading failed'
 	exe newbufnr . "bwipe!"
 	return
@@ -130,7 +130,7 @@ function! spellfile#LoadFile(lang)
 	let fname = substitute(fname, '\.spl$', '.sug', '')
 	echo 'Downloading ' . fname . '...'
 	call spellfile#Nread(fname)
-	if getline(2) =~ 'VIMsug'
+	if getline(2) =~ 'MNVsug'
 	  1d
 	  exe "write " . dirname . '/' . fname
 	  set nomod
@@ -168,7 +168,7 @@ function! spellfile#Nread(fname)
     " for an ftp server use a default login and password to avoid a prompt
     let machine = substitute(g:spellfile_URL, 'ftp://\([^/]*\).*', '\1', '')
     let dir = substitute(g:spellfile_URL, 'ftp://[^/]*/\(.*\)', '\1', '')
-    exe 'Nread "' . machine . ' anonymous vim7user ' . dir . '/' . a:fname . '"'
+    exe 'Nread "' . machine . ' anonymous mnv7user ' . dir . '/' . a:fname . '"'
   else
     exe 'Nread ' g:spellfile_URL . '/' . a:fname
   endif
@@ -195,8 +195,8 @@ endfunc
 
 function! spellfile#WritableSpellDir()
   if has("unix")
-    " For Unix always use the $HOME/.vim directory
-    return $HOME . "/.vim/spell"
+    " For Unix always use the $HOME/.mnv directory
+    return $HOME . "/.mnv/spell"
   endif
   for dir in split(&rtp, ',')
     if filewritable(dir) == 2
diff --git a/uvim/runtime/autoload/spotbugs.vim b/uvim/runtime/autoload/spotbugs.mnv
index e2262074ed..9669ee2608 100644
--- a/uvim/runtime/autoload/spotbugs.vim
+++ b/uvim/runtime/autoload/spotbugs.mnv
@@ -3,13 +3,13 @@
 " Last Change:  2024 Dec 08
 
 let s:save_cpo = &cpo
-set cpo&vim
+set cpo&mnv
 
-" Look for the setting of "g:spotbugs#state" in "ftplugin/java.vim".
+" Look for the setting of "g:spotbugs#state" in "ftplugin/java.mnv".
 let s:state = get(g:, 'spotbugs#state', {})
 let s:commands = get(s:state, 'commands', {})
 let s:compiler = get(s:state, 'compiler', '')
-let s:readable = filereadable($VIMRUNTIME . '/compiler/' . s:compiler . '.vim')
+let s:readable = filereadable($MNVRUNTIME . '/compiler/' . s:compiler . '.mnv')
 
 if has_key(s:commands, 'DefaultPreCompilerCommand')
   let g:SpotBugsPreCompilerCommand = s:commands.DefaultPreCompilerCommand
@@ -349,4 +349,4 @@ command! -bar -nargs=+ -complete=event SpotBugsRemoveBufferAutocmd
 let &cpo = s:save_cpo
 unlet s:commands s:state s:save_cpo
 
-" vim: set foldmethod=syntax shiftwidth=2 expandtab:
+" mnv: set foldmethod=syntax shiftwidth=2 expandtab:
diff --git a/uvim/runtime/autoload/sqlcomplete.vim b/uvim/runtime/autoload/sqlcomplete.mnv
index 4017ae9b05..363943a0fd 100644
--- a/uvim/runtime/autoload/sqlcomplete.vim
+++ b/uvim/runtime/autoload/sqlcomplete.mnv
@@ -1,14 +1,14 @@
-" Vim OMNI completion script for SQL
+" MNV OMNI completion script for SQL
 " Language:    SQL
-" Maintainer:  David Fishburn <dfishburn dot vim at gmail dot com>
+" Maintainer:  David Fishburn <dfishburn dot mnv at gmail dot com>
 " Version:     16.0
 " Last Change: 2017 Oct 15
-" 2025 Nov 11 by Vim project: only set 'omnifunc' if dbext script was loaded #18716
-" Homepage:    http://www.vim.org/scripts/script.php?script_id=1572
+" 2025 Nov 11 by MNV project: only set 'omnifunc' if dbext script was loaded #18716
+" Homepage:    http://www.mnv.org/scripts/script.php?script_id=1572
 " Usage:       For detailed help
 "              ":help sql.txt"
 "              or ":help ft-sql-omni"
-"              or read $VIMRUNTIME/doc/sql.txt
+"              or read $MNVRUNTIME/doc/sql.txt
 
 " History
 "
@@ -61,7 +61,7 @@
 "         - You can specify which type of completion to default to
 "           when pressing <C-X><C-O>.  The entire list of available
 "           choices can be found in the calls to sqlcomplete#Map in:
-"               ftplugin/sql.vim
+"               ftplugin/sql.mnv
 "
 " Version 10.0
 "     Updated PreCacheSyntax()
@@ -111,7 +111,7 @@ if exists('g:loaded_sql_completion')
 endif
 let g:loaded_sql_completion = 160
 let s:keepcpo= &cpo
-set cpo&vim
+set cpo&mnv
 
 " Maintains filename of dictionary
 let s:sql_file_table        = ""
@@ -289,7 +289,7 @@ function! sqlcomplete#Complete(findstart, base)
                 \ compl_type == 'procedure' ||
                 \ compl_type == 'view'
 
-        " This type of completion relies upon the dbext.vim plugin
+        " This type of completion relies upon the dbext.mnv plugin
         if s:SQLCCheck4dbext() == -1
             return []
         endif
@@ -318,7 +318,7 @@ function! sqlcomplete#Complete(findstart, base)
         endif
     elseif compl_type =~? 'column'
 
-        " This type of completion relies upon the dbext.vim plugin
+        " This type of completion relies upon the dbext.mnv plugin
         if s:SQLCCheck4dbext() == -1
             return []
         endif
@@ -993,4 +993,4 @@ endfunction
 "  Restore:
 let &cpo= s:keepcpo
 unlet s:keepcpo
-" vim: ts=4 fdm=marker
+" mnv: ts=4 fdm=marker
diff --git a/uvim/runtime/autoload/syntaxcomplete.vim b/uvim/runtime/autoload/syntaxcomplete.mnv
index 396193d8b0..a44afe22ee 100644
--- a/uvim/runtime/autoload/syntaxcomplete.vim
+++ b/uvim/runtime/autoload/syntaxcomplete.mnv
@@ -1,6 +1,6 @@
-" Vim completion script
+" MNV completion script
 " Language:    All languages, uses existing syntax highlighting rules
-" Maintainer:  David Fishburn <dfishburn dot vim at gmail dot com>
+" Maintainer:  David Fishburn <dfishburn dot mnv at gmail dot com>
 " Version:     15.0
 " Last Change: 2021 Apr 27
 " Usage:       For detailed help, ":help ft-syntax-omni"
@@ -9,11 +9,11 @@
 "
 " Version 15.0
 "   - SyntaxComplete ignored all buffer specific overrides, always used global
-"     https://github.com/vim/vim/issues/8153
+"     https://github.com/Project-Tick/Project-Tick/issues/8153
 "
 " Version 14.0
 "   - Fixed issue with single quotes and is_keyword
-"     https://github.com/vim/vim/issues/7463
+"     https://github.com/Project-Tick/Project-Tick/issues/7463
 "
 " Version 13.0
 "   - Extended the option omni_syntax_group_include_{filetype}
@@ -21,7 +21,7 @@
 "     string.  For example, for the javascript filetype you could
 "     use:
 "        let g:omni_syntax_group_include_javascript = 'javascript\w\+,jquery\w\+'
-"   - Some syntax files (perl.vim) use the match // syntax as a mechanism
+"   - Some syntax files (perl.mnv) use the match // syntax as a mechanism
 "     to identify keywords.  This update attempts to parse the
 "     match syntax and pull out syntax items which are at least
 "     3 words or more.
@@ -98,7 +98,7 @@ let g:loaded_syntax_completion = 150
 
 " Turn on support for line continuations when creating the script
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 " Set ignorecase to the ftplugin standard
 " This is the default setting, but if you define a buffer local
@@ -136,7 +136,7 @@ if !exists('g:omni_syntax_minimum_length')
 endif
 
 " This script will build a completion list based on the syntax
-" elements defined by the files in $VIMRUNTIME/syntax.
+" elements defined by the files in $MNVRUNTIME/syntax.
 " let s:syn_remove_words = 'match,matchgroup=,contains,'.
 let s:syn_remove_words = 'matchgroup=,contains,'.
             \ 'links to,start=,end='
@@ -298,7 +298,7 @@ function! OmniSyntaxList(...)
     " work generically for any filetype that does not already
     " have a plugin defined.
     " This ASSUMES the syntax groupname BEGINS with the name
-    " of the filetype.  From my casual viewing of the vim7\syntax
+    " of the filetype.  From my casual viewing of the mnv7\syntax
     " directory this is true for almost all syntax definitions.
     " As an example, the SQL syntax groups have this pattern:
     "     sqlType
@@ -377,7 +377,7 @@ function! OmniSyntaxList(...)
 
             " Syntax rules can contain items for more than just the current
             " filetype.  They can contain additional items added by the user
-            " via autocmds or their vimrc.
+            " via autocmds or their mnvrc.
             " Some syntax files can be combined (html, php, jsp).
             " We want only items that begin with the filetype we are interested in.
             let next_group_regex = '\n' .
@@ -456,7 +456,7 @@ function! OmniSyntaxList(...)
 
 "       " Syntax rules can contain items for more than just the current
 "       " filetype.  They can contain additional items added by the user
-"       " via autocmds or their vimrc.
+"       " via autocmds or their mnvrc.
 "       " Some syntax files can be combined (html, php, jsp).
 "       " We want only items that begin with the filetype we are interested in.
 "       let next_group_regex = '\n' .
@@ -524,7 +524,7 @@ function! OmniSyntaxList(...)
     " Convert the string to a List and sort it.
     let compl_list = sort(split(syn_list))
 
-    if &filetype == 'vim'
+    if &filetype == 'mnv'
         let short_compl_list = []
         for i in range(len(compl_list))
             if i == len(compl_list)-1
@@ -674,7 +674,7 @@ function! s:SyntaxCSyntaxGroupItems( group_name, syntax_full )
                     \ )
 
         " This can leave lines like this
-        "     =@vimMenuList  skipwhite onoremenu
+        "     =@mnvMenuList  skipwhite onoremenu
         " Strip the special option keywords first
         "     :h :syn-skipwhite*
         let syn_list = substitute(
@@ -690,7 +690,7 @@ function! s:SyntaxCSyntaxGroupItems( group_name, syntax_full )
  
         if l:omni_syntax_use_iskeyword == 0
             " There are a number of items which have non-word characters in
-            " them, *'T_F1'*.  vim.vim is one such file.
+            " them, *'T_F1'*.  mnv.mnv is one such file.
             " This will replace non-word characters with spaces.
             "   setlocal filetype=forth
             "   let g:omni_syntax_use_iskeyword = 1
@@ -698,9 +698,9 @@ function! s:SyntaxCSyntaxGroupItems( group_name, syntax_full )
             " You will see entries like
             "   #>>
             "   (.local)
-            " These were found doing a grep in vim82\syntax
+            " These were found doing a grep in mnv82\syntax
             "   grep iskeyword *
-            "   forth.vim:setlocal iskeyword=!,@,33-35,%,$,38-64,A-Z,91-96,a-z,123-126,128-255
+            "   forth.mnv:setlocal iskeyword=!,@,33-35,%,$,38-64,A-Z,91-96,a-z,123-126,128-255
             let syn_list = substitute( syn_list, '[^0-9A-Za-z_ ]', ' ', 'g' )
         else
             if l:omni_syntax_use_iskeyword_numeric == 1
diff --git a/uvim/runtime/autoload/tar.vim b/uvim/runtime/autoload/tar.mnv
index 73829a2d5c..4a5240da38 100644
--- a/uvim/runtime/autoload/tar.vim
+++ b/uvim/runtime/autoload/tar.mnv
@@ -1,33 +1,33 @@
-" tar.vim: Handles browsing tarfiles -  AUTOLOAD PORTION
+" tar.mnv: Handles browsing tarfiles -  AUTOLOAD PORTION
 " Date:		Mar 01, 2025
-" Version:	32b  (with modifications from the Vim Project)
+" Version:	32b  (with modifications from the MNV Project)
 " Maintainer:	This runtime file is looking for a new maintainer.
 " Former Maintainer: Charles E Campbell
-" License:	Vim License  (see vim's :help license)
+" License:	MNV License  (see mnv's :help license)
 " Last Change:
-"   2024 Jan 08 by Vim Project: fix a few problems (#138331, #12637, #8109)
-"   2024 Feb 19 by Vim Project: announce adoption
-"   2024 Nov 11 by Vim Project: support permissions (#7379)
-"   2025 Feb 06 by Vim Project: add support for lz4 (#16591)
-"   2025 Feb 28 by Vim Project: add support for bzip3 (#16755)
-"   2025 Mar 01 by Vim Project: fix syntax error in tar#Read()
-"   2025 Mar 02 by Vim Project: escape the filename before using :read
-"   2025 Mar 02 by Vim Project: determine the compression using readblob()
+"   2024 Jan 08 by MNV Project: fix a few problems (#138331, #12637, #8109)
+"   2024 Feb 19 by MNV Project: announce adoption
+"   2024 Nov 11 by MNV Project: support permissions (#7379)
+"   2025 Feb 06 by MNV Project: add support for lz4 (#16591)
+"   2025 Feb 28 by MNV Project: add support for bzip3 (#16755)
+"   2025 Mar 01 by MNV Project: fix syntax error in tar#Read()
+"   2025 Mar 02 by MNV Project: escape the filename before using :read
+"   2025 Mar 02 by MNV Project: determine the compression using readblob()
 "                               instead of shelling out to file(1)
-"   2025 Apr 16 by Vim Project: decouple from netrw by adding s:WinPath()
-"   2025 May 19 by Vim Project: restore working directory after read/write
-"   2025 Jul 13 by Vim Project: warn with path traversal attacks
-"   2025 Jul 16 by Vim Project: update minimum vim version
-"   2026 Feb 06 by Vim Project: consider 'nowrapscan' (#19333)
-"   2026 Feb 07 by Vim Project: make the path traversal detection more robust (#19341)
+"   2025 Apr 16 by MNV Project: decouple from netrw by adding s:WinPath()
+"   2025 May 19 by MNV Project: restore working directory after read/write
+"   2025 Jul 13 by MNV Project: warn with path traversal attacks
+"   2025 Jul 16 by MNV Project: update minimum mnv version
+"   2026 Feb 06 by MNV Project: consider 'nowrapscan' (#19333)
+"   2026 Feb 07 by MNV Project: make the path traversal detection more robust (#19341)
 "
-"	Contains many ideas from Michael Toren's <tar.vim>
+"	Contains many ideas from Michael Toren's <tar.mnv>
 "
 " Copyright:    Copyright (C) 2005-2017 Charles E. Campbell {{{1
 "               Permission is hereby granted to use and distribute this code,
 "               with or without modifications, provided that this copyright
 "               notice is copied with it. Like anything else that's free,
-"               tar.vim and tarPlugin.vim are provided *as is* and comes
+"               tar.mnv and tarPlugin.mnv are provided *as is* and comes
 "               with no warranty of any kind, either expressed or implied.
 "               By using this plugin, you agree that in no event will the
 "               copyright holder be liable for any damages resulting from
@@ -40,12 +40,12 @@ endif
 let g:loaded_tar= "v32b"
 if v:versionlong < 9011024
  echohl WarningMsg
- echo "***warning*** this version of tar needs vim 9.1.1024"
+ echo "***warning*** this version of tar needs mnv 9.1.1024"
  echohl Normal
  finish
 endif
 let s:keepcpo= &cpo
-set cpo&vim
+set cpo&mnv
 
 " ---------------------------------------------------------------------
 "  Default Settings: {{{1
@@ -145,7 +145,7 @@ fun! tar#Browse(tarfile)
   endif
   if !filereadable(a:tarfile)
    if a:tarfile !~# '^\a\+://'
-    " if it's an url, don't complain, let url-handlers such as vim do its thing
+    " if it's an url, don't complain, let url-handlers such as mnv do its thing
     call s:Msg('tar#Browse', 'error', $"File not readable<{a:tarfile}>")
    endif
    let &report= repkeep
@@ -165,7 +165,7 @@ fun! tar#Browse(tarfile)
 
   " give header
   let lastline= line("$")
-  call setline(lastline+1,'" tar.vim version '.g:loaded_tar)
+  call setline(lastline+1,'" tar.mnv version '.g:loaded_tar)
   call setline(lastline+2,'" Browsing tarfile '.a:tarfile)
   call setline(lastline+3,'" Select a file with cursor and press ENTER, "x" to extract a file')
   keepj $put =''
@@ -305,18 +305,18 @@ fun! tar#Read(fname)
   " attempt to change to the indicated directory
   try
    exe "lcd ".fnameescape(tmpdir)
-  catch /^Vim\%((\a\+)\)\=:E344/
+  catch /^MNV\%((\a\+)\)\=:E344/
    call s:Msg('tar#Read', 'error', "cannot lcd to temporary directory")
    let &report= repkeep
    return
   endtry
 
-  " place temporary files under .../_ZIPVIM_/
-  if isdirectory("_ZIPVIM_")
-   call s:Rmdir("_ZIPVIM_")
+  " place temporary files under .../_ZIPMNV_/
+  if isdirectory("_ZIPMNV_")
+   call s:Rmdir("_ZIPMNV_")
   endif
-  call mkdir("_ZIPVIM_")
-  lcd _ZIPVIM_
+  call mkdir("_ZIPMNV_")
+  lcd _ZIPMNV_
 
   if has("win32unix") && executable("cygpath")
    " assuming cygwin
@@ -409,7 +409,7 @@ fun! tar#Read(fname)
 
   if v:shell_error != 0
    lcd ..
-   call s:Rmdir("_ZIPVIM_")
+   call s:Rmdir("_ZIPMNV_")
    exe "lcd ".fnameescape(curdir)
    call s:Msg('tar#Read', 'error', $"sorry, unable to open or extract {tarfile} with {fname}")
   endif
@@ -458,13 +458,13 @@ fun! tar#Write(fname)
     call mkdir(fnameescape(tmpdir), 'p')
   endif
   exe $"lcd {fnameescape(tmpdir)}"
-  if isdirectory("_ZIPVIM_")
-    call s:Rmdir("_ZIPVIM_")
+  if isdirectory("_ZIPMNV_")
+    call s:Rmdir("_ZIPMNV_")
   endif
-  call mkdir("_ZIPVIM_")
-  lcd _ZIPVIM_
+  call mkdir("_ZIPMNV_")
+  lcd _ZIPMNV_
   let dir = fnamemodify(fname, ':p:h')
-  if dir !~# '_ZIPVIM_$'
+  if dir !~# '_ZIPMNV_$'
     call mkdir(dir)
   endif
 
@@ -566,7 +566,7 @@ fun! tar#Write(fname)
 
   " cleanup and restore current directory
   lcd ..
-  call s:Rmdir("_ZIPVIM_")
+  call s:Rmdir("_ZIPMNV_")
   exe "lcd ".fnameescape(pwdkeep)
   setlocal nomod
 
@@ -580,7 +580,7 @@ fun! tar#Diff(userfname,fname)
   if a:userfname != ""
    let fname= a:userfname
   endif
-  exe "lcd ".fnameescape(b:tmpdir). '/_ZIPVIM_'
+  exe "lcd ".fnameescape(b:tmpdir). '/_ZIPMNV_'
   if filereadable(fname)
    " sets current file (from tarball) for diff'ing
    " splits window vertically
@@ -775,8 +775,8 @@ fun! s:WinPath(path)
 endfun
 
 " ---------------------------------------------------------------------
-" tar#Vimuntar: installs a tarball in the user's .vim / vimfiles directory {{{2
-fun! tar#Vimuntar(...)
+" tar#MNVuntar: installs a tarball in the user's .mnv / mnvfiles directory {{{2
+fun! tar#MNVuntar(...)
   let tarball = expand("%")
   let tarbase = substitute(tarball,'\..*$','','')
   let tarhome = expand("%:p")
@@ -786,17 +786,17 @@ fun! tar#Vimuntar(...)
   let tarhome= substitute(tarhome,'/[^/]*$','','')
   let tartail = expand("%:t")
   let curdir  = getcwd()
-  " set up vimhome
+  " set up mnvhome
   if a:0 > 0 && a:1 != ""
-   let vimhome= a:1
+   let mnvhome= a:1
   else
-   let vimhome= vimball#VimballHome()
+   let mnvhome= mnvball#MNVballHome()
   endif
 
-  if simplify(curdir) != simplify(vimhome)
-   " copy (possibly compressed) tarball to .vim/vimfiles
-   call system(s:WinPath(g:tar_copycmd)." ".shellescape(tartail)." ".shellescape(vimhome))
-   exe "lcd ".fnameescape(vimhome)
+  if simplify(curdir) != simplify(mnvhome)
+   " copy (possibly compressed) tarball to .mnv/mnvfiles
+   call system(s:WinPath(g:tar_copycmd)." ".shellescape(tartail)." ".shellescape(mnvhome))
+   exe "lcd ".fnameescape(mnvhome)
   endif
 
   " if necessary, decompress the tarball; then, extract it
@@ -815,7 +815,7 @@ fun! tar#Vimuntar(...)
     return
    endif
   else
-   call vimball#Decompress(tartail,0)
+   call mnvball#Decompress(tartail,0)
   endif
   let extractcmd= s:WinPath(g:tar_extractcmd)
   call system(extractcmd." ".shellescape(tarbase.".tar"))
@@ -825,9 +825,9 @@ fun! tar#Vimuntar(...)
    exe "helptags ".getcwd()."/doc"
   endif
 
-  if simplify(tarhome) != simplify(vimhome)
+  if simplify(tarhome) != simplify(mnvhome)
    " remove decompressed tarball, restore directory
-   call delete(vimhome."/".tarbase.".tar")
+   call delete(mnvhome."/".tarbase.".tar")
    exe "lcd ".fnameescape(curdir)
   endif
 endfun
@@ -836,4 +836,4 @@ endfun
 " Modelines And Restoration: {{{1
 let &cpo= s:keepcpo
 unlet s:keepcpo
-" vim:ts=8 fdm=marker
+" mnv:ts=8 fdm=marker
diff --git a/uvim/runtime/autoload/tohtml.vim b/uvim/runtime/autoload/tohtml.mnv
index d2722a4021..346516d5c4 100644
--- a/uvim/runtime/autoload/tohtml.vim
+++ b/uvim/runtime/autoload/tohtml.mnv
@@ -1,24 +1,24 @@
-" Vim autoload file for the tohtml plugin.
+" MNV autoload file for the tohtml plugin.
 " Maintainer: Ben Fritz <fritzophrenic@gmail.com>
 " Last Change: 2023 Sep 03
 "
 " Additional contributors:
 "
-"	      Original by Bram Moolenaar <Bram@vim.org>
+"	      Original by Bram Moolenaar <Bram@mnv.org>
 "	      Diff2HTML() added by Christian Brabandt <cb@256bit.org>
 "
 "	      See Mercurial change logs for more!
 
 " this file uses line continuations
 let s:cpo_sav = &cpo
-set cpo&vim
+set cpo&mnv
 
-" Automatically find charsets from all encodings supported natively by Vim. With
-" the 8bit- and 2byte- prefixes, Vim can actually support more encodings than
+" Automatically find charsets from all encodings supported natively by MNV. With
+" the 8bit- and 2byte- prefixes, MNV can actually support more encodings than
 " this. Let the user specify these however since they won't be supported on
 " every system.
 "
-" Note, not all of Vim's supported encodings have a charset to use.
+" Note, not all of MNV's supported encodings have a charset to use.
 "
 " Names in this list are from:
 "   http://www.iana.org/assignments/character-sets
@@ -82,11 +82,11 @@ let g:tohtml#encoding_to_charset = {
 lockvar g:tohtml#encoding_to_charset
 " Notes:
 "   1. All UCS/UTF are converted to UTF-8 because it is much better supported
-"   2. Any blank spaces are there because Vim supports it but at least one major
+"   2. Any blank spaces are there because MNV supports it but at least one major
 "      web browser does not according to http://wiki.whatwg.org/wiki/Web_Encodings.
 " }}}
 
-" Only automatically find encodings supported natively by Vim, let the user
+" Only automatically find encodings supported natively by MNV, let the user
 " specify the encoding if it's not natively supported. This function is only
 " used when the user specifies the charset, they better know what they are
 " doing!
@@ -298,7 +298,7 @@ func! tohtml#Convert2HTML(line1, line2) "{{{
       let g:html_start_line = a:line2
       let g:html_end_line = a:line1
     endif
-    runtime syntax/2html.vim "}}}
+    runtime syntax/2html.mnv "}}}
   else "{{{
     let win_list = []
     let buf_list = []
@@ -313,12 +313,12 @@ func! tohtml#Convert2HTML(line1, line2) "{{{
       " default to UTF-8
       if !exists('g:html_use_encoding') &&
 	    \ (((&l:fileencoding=='' || (&l:buftype!='' && &l:buftype!=?'help'))
-	    \      && &encoding!=?s:settings.vim_encoding)
-	    \ || &l:fileencoding!='' && &l:fileencoding!=?s:settings.vim_encoding)
+	    \      && &encoding!=?s:settings.mnv_encoding)
+	    \ || &l:fileencoding!='' && &l:fileencoding!=?s:settings.mnv_encoding)
 	echohl WarningMsg
 	echomsg "TOhtml: mismatched file encodings in Diff buffers, using UTF-8"
 	echohl None
-	let s:settings.vim_encoding = 'utf-8'
+	let s:settings.mnv_encoding = 'utf-8'
 	let s:settings.encoding = 'UTF-8'
       endif
 
@@ -328,7 +328,7 @@ func! tohtml#Convert2HTML(line1, line2) "{{{
       let g:html_diff_win_num += 1
 
       " convert this file
-      runtime syntax/2html.vim
+      runtime syntax/2html.mnv
 
       " remember the HTML buffer for later combination
       call add(buf_list, bufnr('%'))
@@ -394,7 +394,7 @@ func! tohtml#Diff2HTML(win_list, buf_list) "{{{
     endif
 
     call add(html, '<title>diff</title>')
-    call add(html, '<meta name="Generator" content="Vim/'..v:version/100..'.'..v:version%100..'"'..tag_close)
+    call add(html, '<meta name="Generator" content="MNV/'..v:version/100..'.'..v:version%100..'"'..tag_close)
     call add(html, '<meta name="plugin-version" content="'..g:loaded_2html_plugin..'"'..tag_close)
     call add(html, '<meta name="settings" content="'.
 	  \ join(filter(keys(s:settings),'s:settings[v:val]'),',').
@@ -410,7 +410,7 @@ func! tohtml#Diff2HTML(win_list, buf_list) "{{{
     let body_line_num = len(html)
     call add(html, '<body'..(s:settings.line_ids ? ' onload="JumpToLine();"' : '')..'>')
   endif
-  call add(html, "<table "..(s:settings.use_css? "" : "border='1' width='100%' ").."id='vimCodeElement"..s:settings.id_suffix.."'>")
+  call add(html, "<table "..(s:settings.use_css? "" : "border='1' width='100%' ").."id='mnvCodeElement"..s:settings.id_suffix.."'>")
 
   call add(html, '<tr>')
   for buf in a:win_list
@@ -482,7 +482,7 @@ func! tohtml#Diff2HTML(win_list, buf_list) "{{{
     let temp = getline(1,'$')
     " clean out id on the main content container because we already set it on
     " the table
-    let temp[0] = substitute(temp[0], " id='vimCodeElement[^']*'", "", "")
+    let temp[0] = substitute(temp[0], " id='mnvCodeElement[^']*'", "", "")
     " undo deletion of start and end part
     " so we can later save the file as valid html
     " TODO: restore using grabbed lines if undolevel is 1?
@@ -522,7 +522,7 @@ func! tohtml#Diff2HTML(win_list, buf_list) "{{{
   " Make sure the user doesn't do syntax folding when loading a generated file,
   " using a modeline.
   if !s:settings.no_modeline
-    call add(html, '<!-- vim: set foldmethod=manual : -->')
+    call add(html, '<!-- mnv: set foldmethod=manual : -->')
   endif
 
   let i = 1
@@ -546,13 +546,13 @@ func! tohtml#Diff2HTML(win_list, buf_list) "{{{
   %d
 
   " set the fileencoding to match the charset we'll be using
-  let &l:fileencoding=s:settings.vim_encoding
+  let &l:fileencoding=s:settings.mnv_encoding
 
   " According to http://www.w3.org/TR/html4/charset.html#doc-char-set, the byte
   " order mark is highly recommend on the web when using multibyte encodings. But,
-  " it is not a good idea to include it on UTF-8 files. Otherwise, let Vim
+  " it is not a good idea to include it on UTF-8 files. Otherwise, let MNV
   " determine when it is actually inserted.
-  if s:settings.vim_encoding == 'utf-8'
+  if s:settings.mnv_encoding == 'utf-8'
     setlocal nobomb
   else
     setlocal bomb
@@ -601,7 +601,7 @@ func! tohtml#Diff2HTML(win_list, buf_list) "{{{
 		\ "",
 		\ "  /* navigate upwards in the DOM tree to open all folds containing the line */",
 		\ "  var node = lineElem;",
-		\ "  while (node && node.id != 'vimCodeElement"..s:settings.id_suffix.."')",
+		\ "  while (node && node.id != 'mnvCodeElement"..s:settings.id_suffix.."')",
 		\ "  {",
 		\ "    if (node.className == 'closed-fold')",
 		\ "    {",
@@ -797,8 +797,8 @@ func! tohtml#GetUserSettings() "{{{
       " user specified the desired MIME charset, figure out proper
       " 'fileencoding' from it or warn the user if we cannot
       let user_settings.encoding = g:html_use_encoding
-      let user_settings.vim_encoding = tohtml#EncodingFromCharset(g:html_use_encoding)
-      if user_settings.vim_encoding == ''
+      let user_settings.mnv_encoding = tohtml#EncodingFromCharset(g:html_use_encoding)
+      if user_settings.mnv_encoding == ''
 	echohl WarningMsg
 	echomsg "TOhtml: file encoding for"
 	      \ g:html_use_encoding
@@ -812,7 +812,7 @@ func! tohtml#GetUserSettings() "{{{
 	" be trusted; since the buffer should not be written the fileencoding is
 	" not intended to be used.
 	if &l:buftype=='' || &l:buftype==?'help'
-	  let user_settings.vim_encoding = &l:fileencoding
+	  let user_settings.mnv_encoding = &l:fileencoding
 	  call tohtml#CharsetFromEncoding(user_settings)
 	else
 	  let user_settings.encoding = '' " trigger detection using &encoding
@@ -821,13 +821,13 @@ func! tohtml#GetUserSettings() "{{{
 
       " else from 'encoding' if possible
       if &l:fileencoding == '' || user_settings.encoding == ''
-	let user_settings.vim_encoding = &encoding
+	let user_settings.mnv_encoding = &encoding
 	call tohtml#CharsetFromEncoding(user_settings)
       endif
 
       " else default to UTF-8 and warn user
       if user_settings.encoding == ''
-	let user_settings.vim_encoding = 'utf-8'
+	let user_settings.mnv_encoding = 'utf-8'
 	let user_settings.encoding = 'UTF-8'
 	echohl WarningMsg
 	echomsg "TOhtml: couldn't determine MIME charset, using UTF-8"
@@ -904,36 +904,36 @@ func! tohtml#GetUserSettings() "{{{
   endif
 endfunc "}}}
 
-" get the proper HTML charset name from a Vim encoding option.
+" get the proper HTML charset name from a MNV encoding option.
 function! tohtml#CharsetFromEncoding(settings) "{{{
-  let l:vim_encoding = a:settings.vim_encoding
-  if exists('g:html_charset_override') && has_key(g:html_charset_override, l:vim_encoding)
-    let a:settings.encoding = g:html_charset_override[l:vim_encoding]
+  let l:mnv_encoding = a:settings.mnv_encoding
+  if exists('g:html_charset_override') && has_key(g:html_charset_override, l:mnv_encoding)
+    let a:settings.encoding = g:html_charset_override[l:mnv_encoding]
   else
-    if l:vim_encoding =~ '^8bit\|^2byte'
+    if l:mnv_encoding =~ '^8bit\|^2byte'
       " 8bit- and 2byte- prefixes are to indicate encodings available on the
-      " system that Vim will convert with iconv(), look up just the encoding name,
-      " not Vim's prefix.
-      let l:vim_encoding = substitute(l:vim_encoding, '^8bit-\|^2byte-', '', '')
+      " system that MNV will convert with iconv(), look up just the encoding name,
+      " not MNV's prefix.
+      let l:mnv_encoding = substitute(l:mnv_encoding, '^8bit-\|^2byte-', '', '')
     endif
-    if has_key(g:tohtml#encoding_to_charset, l:vim_encoding)
-      let a:settings.encoding = g:tohtml#encoding_to_charset[l:vim_encoding]
+    if has_key(g:tohtml#encoding_to_charset, l:mnv_encoding)
+      let a:settings.encoding = g:tohtml#encoding_to_charset[l:mnv_encoding]
     else
       let a:settings.encoding = ""
     endif
   endif
   if a:settings.encoding != ""
-    let l:vim_encoding = tohtml#EncodingFromCharset(a:settings.encoding)
-    if l:vim_encoding != ""
-      " if the Vim encoding to HTML encoding conversion is set up (by default or
+    let l:mnv_encoding = tohtml#EncodingFromCharset(a:settings.encoding)
+    if l:mnv_encoding != ""
+      " if the MNV encoding to HTML encoding conversion is set up (by default or
       " by the user) to convert to a different encoding, we need to also change
-      " the Vim encoding of the new buffer
-      let a:settings.vim_encoding = l:vim_encoding
+      " the MNV encoding of the new buffer
+      let a:settings.mnv_encoding = l:mnv_encoding
     endif
   endif
 endfun "}}}
 
-" Get the proper Vim encoding option setting from an HTML charset name.
+" Get the proper MNV encoding option setting from an HTML charset name.
 function! tohtml#EncodingFromCharset(encoding) "{{{
   if exists('g:html_encoding_override') && has_key(g:html_encoding_override, a:encoding)
     return g:html_encoding_override[a:encoding]
@@ -948,4 +948,4 @@ let &cpo = s:cpo_sav
 unlet s:cpo_sav
 
 " Make sure any patches will probably use consistent indent
-"   vim: ts=8 sw=2 sts=2 noet fdm=marker
+"   mnv: ts=8 sw=2 sts=2 noet fdm=marker
diff --git a/uvim/runtime/autoload/tutor.vim b/uvim/runtime/autoload/tutor.mnv
index a31f74680a..f9d4f1a204 100644
--- a/uvim/runtime/autoload/tutor.vim
+++ b/uvim/runtime/autoload/tutor.mnv
@@ -1,7 +1,7 @@
-" vim: fdm=marker et ts=4 sw=4
+" mnv: fdm=marker et ts=4 sw=4
 
 " Setup: {{{1
-function! tutor#SetupVim()
+function! tutor#SetupMNV()
     if !exists('g:did_load_ftplugin') || g:did_load_ftplugin != 1
         filetype plugin on
     endif
@@ -142,13 +142,13 @@ function! s:Sort(a, b)
     if mod_a == mod_b
         let retval =  0
     elseif mod_a > mod_b
-        if match(mod_a, '^vim-') > -1 && match(mod_b, '^vim-') == -1
+        if match(mod_a, '^mnv-') > -1 && match(mod_b, '^mnv-') == -1
             let retval = -1
         else
             let retval = 1
         endif
     else
-        if match(mod_b, '^vim-') > -1 && match(mod_a, '^vim-') == -1
+        if match(mod_b, '^mnv-') > -1 && match(mod_a, '^mnv-') == -1
             let retval = 1
         else
             let retval = -1
@@ -180,7 +180,7 @@ function! tutor#TutorCmd(tutor_name)
     endif
 
     if a:tutor_name == ''
-        let l:tutor_name = 'vim-01-beginner.tutor'
+        let l:tutor_name = 'mnv-01-beginner.tutor'
     else
         let l:tutor_name = a:tutor_name
     endif
@@ -210,7 +210,7 @@ function! tutor#TutorCmd(tutor_name)
         let l:to_open = l:tutors[l:tutor_to_open-1]
     endif
 
-    call tutor#SetupVim()
+    call tutor#SetupMNV()
     exe "drop ".fnameescape(l:to_open)
     call tutor#EnableInteractive(v:true)
 endfunction
diff --git a/uvim/runtime/autoload/typeset.vim b/uvim/runtime/autoload/typeset.mnv
index 3280cb4efd..e1ae11eb25 100644
--- a/uvim/runtime/autoload/typeset.vim
+++ b/uvim/runtime/autoload/typeset.mnv
@@ -1,10 +1,10 @@
-vim9script
+mnv9script
 
 # Language:           Generic TeX typesetting engine
 # Maintainer:         Nicola Vitacolonna <nvitacolonna@gmail.com>
 # Latest Revision:    2026 Feb 19
 # Last Change:
-# 2026 Mar 30 by Vim project: Use fnameescape for the ProcessOutput command
+# 2026 Mar 30 by MNV project: Use fnameescape for the ProcessOutput command
 
 # Constants and helpers {{{
 const SLASH = !exists("+shellslash") || &shellslash ? '/' : '\'
@@ -103,7 +103,7 @@ enddef
 #
 #   % !TEX root = main.tex
 #
-# Using this line, Vim can know which file to typeset even if the current
+# Using this line, MNV can know which file to typeset even if the current
 # buffer is different from main.tex.
 #
 # This function searches for the magic line in the first ten lines of the
@@ -289,4 +289,4 @@ export def TypesetBuffer(
 enddef
 # }}}
 
-# vim: sw=2 fdm=marker
+# mnv: sw=2 fdm=marker
diff --git a/uvim/runtime/autoload/typst.vim b/uvim/runtime/autoload/typst.mnv
index 7debd60423..314dc93d41 100644
--- a/uvim/runtime/autoload/typst.vim
+++ b/uvim/runtime/autoload/typst.mnv
@@ -2,7 +2,7 @@
 " Previous Maintainer:  Luca Saccarola <github.e41mv@aleeas.com>
 " Maintainer: This runtime file is looking for a new maintainer.
 " Last Change: 2025 Aug 05
-" Based on:    https://github.com/kaarmu/typst.vim
+" Based on:    https://github.com/kaarmu/typst.mnv
 
 function! typst#indentexpr() abort
     let l:lnum = v:lnum
diff --git a/uvim/runtime/autoload/xml/html32.vim b/uvim/runtime/autoload/xml/html32.mnv
index 242f52b1ab..a264ea9984 100644
--- a/uvim/runtime/autoload/xml/html32.vim
+++ b/uvim/runtime/autoload/xml/html32.mnv
@@ -1,6 +1,6 @@
 let g:xmldata_html32 = {
-\ 'vimxmlentities': ['AElig', 'Aacute', 'Acirc', 'Agrave', 'Aring', 'Atilde', 'Auml', 'Ccedil', 'ETH', 'Eacute', 'Ecirc', 'Egrave', 'Euml', 'Iacute', 'Icirc', 'Igrave', 'Iuml', 'Ntilde', 'Oacute', 'Ocirc', 'Ograve', 'Oslash', 'Otilde', 'Ouml', 'THORN', 'Uacute', 'Ucirc', 'Ugrave', 'Uuml', 'Yacute', 'aacute', 'acirc', 'acute', 'aelig', 'agrave', 'amp', 'aring', 'atilde', 'auml', 'brvbar', 'ccedil', 'cedil', 'cent', 'copy', 'curren', 'deg', 'divide', 'eacute', 'ecirc', 'egrave', 'eth', 'euml', 'frac12', 'frac14', 'frac34', 'gt', 'iacute', 'icirc', 'iexcl', 'igrave', 'iquest', 'iuml', 'laquo', 'lt', 'macr', 'micro', 'middot', 'nbsp', 'not', 'ntilde', 'oacute', 'ocirc', 'ograve', 'ordf', 'ordm', 'oslash', 'otilde', 'ouml', 'para', 'plusmn', 'pound', 'raquo', 'reg', 'sect', 'shy', 'sup1', 'sup2', 'sup3', 'szlig', 'thorn', 'times', 'uacute', 'ucirc', 'ugrave', 'uml', 'uuml', 'yacute', 'yen', 'yuml'],
-\ 'vimxmlroot': ['html'],
+\ 'mnvxmlentities': ['AElig', 'Aacute', 'Acirc', 'Agrave', 'Aring', 'Atilde', 'Auml', 'Ccedil', 'ETH', 'Eacute', 'Ecirc', 'Egrave', 'Euml', 'Iacute', 'Icirc', 'Igrave', 'Iuml', 'Ntilde', 'Oacute', 'Ocirc', 'Ograve', 'Oslash', 'Otilde', 'Ouml', 'THORN', 'Uacute', 'Ucirc', 'Ugrave', 'Uuml', 'Yacute', 'aacute', 'acirc', 'acute', 'aelig', 'agrave', 'amp', 'aring', 'atilde', 'auml', 'brvbar', 'ccedil', 'cedil', 'cent', 'copy', 'curren', 'deg', 'divide', 'eacute', 'ecirc', 'egrave', 'eth', 'euml', 'frac12', 'frac14', 'frac34', 'gt', 'iacute', 'icirc', 'iexcl', 'igrave', 'iquest', 'iuml', 'laquo', 'lt', 'macr', 'micro', 'middot', 'nbsp', 'not', 'ntilde', 'oacute', 'ocirc', 'ograve', 'ordf', 'ordm', 'oslash', 'otilde', 'ouml', 'para', 'plusmn', 'pound', 'raquo', 'reg', 'sect', 'shy', 'sup1', 'sup2', 'sup3', 'szlig', 'thorn', 'times', 'uacute', 'ucirc', 'ugrave', 'uml', 'uuml', 'yacute', 'yen', 'yuml'],
+\ 'mnvxmlroot': ['html'],
 \ 'a': [
 \ ['tt', 'i', 'b', 'u', 'strike', 'big', 'small', 'sub', 'sup', 'em', 'strong', 'dfn', 'code', 'samp', 'kbd', 'var', 'cite', 'img', 'applet', 'font', 'basefont', 'br', 'script', 'map', 'input', 'select', 'textarea'],
 \ { 'rel': [], 'href': [], 'name': [], 'rev': [], 'title': []}
@@ -281,7 +281,7 @@ let g:xmldata_html32 = {
 \ [],
 \ { }
 \ ],
-\ 'vimxmlattrinfo' : {
+\ 'mnvxmlattrinfo' : {
 \ 'accept' : ['ContentType', ''],
 \ 'accesskey' : ['Character', ''],
 \ 'action' : ['*URI', ''],
@@ -367,7 +367,7 @@ let g:xmldata_html32 = {
 \ 'width' : ['Number', ''],
 \ 'xmlns' : ['URI', '']
 \ },
-\ 'vimxmltaginfo': {
+\ 'mnvxmltaginfo': {
 \ 'area': ['/>', ''],
 \ 'base': ['/>', ''],
 \ 'basefont': ['/>', ''],
diff --git a/uvim/runtime/autoload/xml/html401f.vim b/uvim/runtime/autoload/xml/html401f.mnv
index 1797a5a078..54d9255582 100644
--- a/uvim/runtime/autoload/xml/html401f.vim
+++ b/uvim/runtime/autoload/xml/html401f.mnv
@@ -1,6 +1,6 @@
 let g:xmldata_html401t = {
-\ 'vimxmlentities': ['AElig', 'Aacute', 'Acirc', 'Agrave', 'Alpha', 'Aring', 'Atilde', 'Auml', 'Beta', 'Ccedil', 'Chi', 'Dagger', 'Delta', 'ETH', 'Eacute', 'Ecirc', 'Egrave', 'Epsilon', 'Eta', 'Euml', 'Gamma', 'Iacute', 'Icirc', 'Igrave', 'Iota', 'Iuml', 'Kappa', 'Lambda', 'Mu', 'Ntilde', 'Nu', 'OElig', 'Oacute', 'Ocirc', 'Ograve', 'Omega', 'Omicron', 'Oslash', 'Otilde', 'Ouml', 'Phi', 'Pi', 'Prime', 'Psi', 'Rho', 'Scaron', 'Sigma', 'THORN', 'Tau', 'Theta', 'Uacute', 'Ucirc', 'Ugrave', 'Upsilon', 'Uuml', 'Xi', 'Yacute', 'Yuml', 'Zeta', 'aacute', 'acirc', 'acute', 'aelig', 'agrave', 'alefsym', 'alpha', 'amp', 'and', 'ang', 'apos', 'aring', 'asymp', 'atilde', 'auml', 'bdquo', 'beta', 'brvbar', 'bull', 'cap', 'ccedil', 'cedil', 'cent', 'chi', 'circ', 'clubs', 'cong', 'copy', 'crarr', 'cup', 'curren', 'dArr', 'dagger', 'darr', 'deg', 'delta', 'diams', 'divide', 'eacute', 'ecirc', 'egrave', 'empty', 'emsp', 'ensp', 'epsilon', 'equiv', 'eta', 'eth', 'euml', 'euro', 'exist', 'fnof', 'forall', 'frac12', 'frac14', 'frac34', 'frasl', 'gamma', 'ge', 'gt', 'hArr', 'harr', 'hearts', 'hellip', 'iacute', 'icirc', 'iexcl', 'igrave', 'image', 'infin', 'int', 'iota', 'iquest', 'isin', 'iuml', 'kappa', 'lArr', 'lambda', 'lang', 'laquo', 'larr', 'lceil', 'ldquo', 'le', 'lfloor', 'lowast', 'loz', 'lrm', 'lsaquo', 'lsquo', 'lt', 'macr', 'mdash', 'micro', 'middot', 'minus', 'mu', 'nabla', 'nbsp', 'ndash', 'ne', 'ni', 'not', 'notin', 'nsub', 'ntilde', 'nu', 'oacute', 'ocirc', 'oelig', 'ograve', 'oline', 'omega', 'omicron', 'oplus', 'or', 'ordf', 'ordm', 'oslash', 'otilde', 'otimes', 'ouml', 'para', 'part', 'permil', 'perp', 'phi', 'pi', 'piv', 'plusmn', 'pound', 'prime', 'prod', 'prop', 'psi', 'quot', 'rArr', 'radic', 'rang', 'raquo', 'rarr', 'rceil', 'rdquo', 'real', 'reg', 'rfloor', 'rho', 'rlm', 'rsaquo', 'rsquo', 'sbquo', 'scaron', 'sdot', 'sect', 'shy', 'sigma', 'sigmaf', 'sim', 'spades', 'sub', 'sube', 'sum', 'sup', 'sup1', 'sup2', 'sup3', 'supe', 'szlig', 'tau', 'there4', 'theta', 'thetasym', 'thinsp', 'thorn', 'tilde', 'times', 'trade', 'uArr', 'uacute', 'uarr', 'ucirc', 'ugrave', 'uml', 'upsih', 'upsilon', 'uuml', 'weierp', 'xi', 'yacute', 'yen', 'yuml', 'zeta', 'zwj', 'zwnj'],
-\ 'vimxmlroot': ['html'],
+\ 'mnvxmlentities': ['AElig', 'Aacute', 'Acirc', 'Agrave', 'Alpha', 'Aring', 'Atilde', 'Auml', 'Beta', 'Ccedil', 'Chi', 'Dagger', 'Delta', 'ETH', 'Eacute', 'Ecirc', 'Egrave', 'Epsilon', 'Eta', 'Euml', 'Gamma', 'Iacute', 'Icirc', 'Igrave', 'Iota', 'Iuml', 'Kappa', 'Lambda', 'Mu', 'Ntilde', 'Nu', 'OElig', 'Oacute', 'Ocirc', 'Ograve', 'Omega', 'Omicron', 'Oslash', 'Otilde', 'Ouml', 'Phi', 'Pi', 'Prime', 'Psi', 'Rho', 'Scaron', 'Sigma', 'THORN', 'Tau', 'Theta', 'Uacute', 'Ucirc', 'Ugrave', 'Upsilon', 'Uuml', 'Xi', 'Yacute', 'Yuml', 'Zeta', 'aacute', 'acirc', 'acute', 'aelig', 'agrave', 'alefsym', 'alpha', 'amp', 'and', 'ang', 'apos', 'aring', 'asymp', 'atilde', 'auml', 'bdquo', 'beta', 'brvbar', 'bull', 'cap', 'ccedil', 'cedil', 'cent', 'chi', 'circ', 'clubs', 'cong', 'copy', 'crarr', 'cup', 'curren', 'dArr', 'dagger', 'darr', 'deg', 'delta', 'diams', 'divide', 'eacute', 'ecirc', 'egrave', 'empty', 'emsp', 'ensp', 'epsilon', 'equiv', 'eta', 'eth', 'euml', 'euro', 'exist', 'fnof', 'forall', 'frac12', 'frac14', 'frac34', 'frasl', 'gamma', 'ge', 'gt', 'hArr', 'harr', 'hearts', 'hellip', 'iacute', 'icirc', 'iexcl', 'igrave', 'image', 'infin', 'int', 'iota', 'iquest', 'isin', 'iuml', 'kappa', 'lArr', 'lambda', 'lang', 'laquo', 'larr', 'lceil', 'ldquo', 'le', 'lfloor', 'lowast', 'loz', 'lrm', 'lsaquo', 'lsquo', 'lt', 'macr', 'mdash', 'micro', 'middot', 'minus', 'mu', 'nabla', 'nbsp', 'ndash', 'ne', 'ni', 'not', 'notin', 'nsub', 'ntilde', 'nu', 'oacute', 'ocirc', 'oelig', 'ograve', 'oline', 'omega', 'omicron', 'oplus', 'or', 'ordf', 'ordm', 'oslash', 'otilde', 'otimes', 'ouml', 'para', 'part', 'permil', 'perp', 'phi', 'pi', 'piv', 'plusmn', 'pound', 'prime', 'prod', 'prop', 'psi', 'quot', 'rArr', 'radic', 'rang', 'raquo', 'rarr', 'rceil', 'rdquo', 'real', 'reg', 'rfloor', 'rho', 'rlm', 'rsaquo', 'rsquo', 'sbquo', 'scaron', 'sdot', 'sect', 'shy', 'sigma', 'sigmaf', 'sim', 'spades', 'sub', 'sube', 'sum', 'sup', 'sup1', 'sup2', 'sup3', 'supe', 'szlig', 'tau', 'there4', 'theta', 'thetasym', 'thinsp', 'thorn', 'tilde', 'times', 'trade', 'uArr', 'uacute', 'uarr', 'ucirc', 'ugrave', 'uml', 'upsih', 'upsilon', 'uuml', 'weierp', 'xi', 'yacute', 'yen', 'yuml', 'zeta', 'zwj', 'zwnj'],
+\ 'mnvxmlroot': ['html'],
 \ 'a': [
 \ ['tt', 'i', 'b', 'u', 's', 'strike', 'big', 'small', 'em', 'strong', 'dfn', 'code', 'samp', 'kbd', 'var', 'cite', 'abbr', 'acronym', 'img', 'applet', 'object', 'font', 'basefont', 'br', 'script', 'map', 'q', 'sub', 'sup', 'span', 'bdo', 'iframe', 'input', 'select', 'textarea', 'label', 'button'],
 \ { 'rel': [], 'accesskey': [], 'coords': [], 'ondblclick': [], 'dir': ['ltr', 'rtl'], 'onblur': [], 'onkeydown': [], 'onfocus': [], 'target': [], 'onkeyup': [], 'href': [], 'onmouseup': [], 'id': [], 'onmouseover': [], 'tabindex': [], 'lang': [], 'onmouseout': [], 'onmousemove': [], 'style': [], 'name': [], 'charset': [], 'hreflang': [], 'onkeypress': [], 'onmousedown': [], 'rev': [], 'class': [], 'title': [], 'onclick': [], 'type': [], 'shape': ['rect', 'circle', 'poly', 'default']}
@@ -365,7 +365,7 @@ let g:xmldata_html401t = {
 \ ['tt', 'i', 'b', 'u', 's', 'strike', 'big', 'small', 'em', 'strong', 'dfn', 'code', 'samp', 'kbd', 'var', 'cite', 'abbr', 'acronym', 'a', 'img', 'applet', 'object', 'font', 'basefont', 'br', 'script', 'map', 'q', 'sub', 'sup', 'span', 'bdo', 'iframe', 'input', 'select', 'textarea', 'label', 'button'],
 \ { 'ondblclick': [], 'onkeydown': [], 'onkeyup': [], 'onmouseup': [], 'id': [], 'onmouseover': [], 'lang': [], 'onmousedown': [], 'onkeypress': [], 'onclick': [], 'title': [], 'class': [], 'dir': ['ltr', 'rtl'], 'style': [], 'onmousemove': [], 'onmouseout': []}
 \ ],
-\ 'vimxmlattrinfo' : {
+\ 'mnvxmlattrinfo' : {
 \ 'accept' : ['ContentType', ''],
 \ 'accesskey' : ['Character', ''],
 \ 'action' : ['*URI', ''],
@@ -451,7 +451,7 @@ let g:xmldata_html401t = {
 \ 'width' : ['Number', ''],
 \ 'xmlns' : ['URI', '']
 \ },
-\ 'vimxmltaginfo': {
+\ 'mnvxmltaginfo': {
 \ 'area': ['/>', ''],
 \ 'base': ['/>', ''],
 \ 'basefont': ['/>', ''],
diff --git a/uvim/runtime/autoload/xml/html401s.vim b/uvim/runtime/autoload/xml/html401s.mnv
index 37f581ba2b..ee57e885d0 100644
--- a/uvim/runtime/autoload/xml/html401s.vim
+++ b/uvim/runtime/autoload/xml/html401s.mnv
@@ -1,6 +1,6 @@
 let g:xmldata_html401s = {
-\ 'vimxmlentities': ['AElig', 'Aacute', 'Acirc', 'Agrave', 'Alpha', 'Aring', 'Atilde', 'Auml', 'Beta', 'Ccedil', 'Chi', 'Dagger', 'Delta', 'ETH', 'Eacute', 'Ecirc', 'Egrave', 'Epsilon', 'Eta', 'Euml', 'Gamma', 'Iacute', 'Icirc', 'Igrave', 'Iota', 'Iuml', 'Kappa', 'Lambda', 'Mu', 'Ntilde', 'Nu', 'OElig', 'Oacute', 'Ocirc', 'Ograve', 'Omega', 'Omicron', 'Oslash', 'Otilde', 'Ouml', 'Phi', 'Pi', 'Prime', 'Psi', 'Rho', 'Scaron', 'Sigma', 'THORN', 'Tau', 'Theta', 'Uacute', 'Ucirc', 'Ugrave', 'Upsilon', 'Uuml', 'Xi', 'Yacute', 'Yuml', 'Zeta', 'aacute', 'acirc', 'acute', 'aelig', 'agrave', 'alefsym', 'alpha', 'amp', 'and', 'ang', 'apos', 'aring', 'asymp', 'atilde', 'auml', 'bdquo', 'beta', 'brvbar', 'bull', 'cap', 'ccedil', 'cedil', 'cent', 'chi', 'circ', 'clubs', 'cong', 'copy', 'crarr', 'cup', 'curren', 'dArr', 'dagger', 'darr', 'deg', 'delta', 'diams', 'divide', 'eacute', 'ecirc', 'egrave', 'empty', 'emsp', 'ensp', 'epsilon', 'equiv', 'eta', 'eth', 'euml', 'euro', 'exist', 'fnof', 'forall', 'frac12', 'frac14', 'frac34', 'frasl', 'gamma', 'ge', 'gt', 'hArr', 'harr', 'hearts', 'hellip', 'iacute', 'icirc', 'iexcl', 'igrave', 'image', 'infin', 'int', 'iota', 'iquest', 'isin', 'iuml', 'kappa', 'lArr', 'lambda', 'lang', 'laquo', 'larr', 'lceil', 'ldquo', 'le', 'lfloor', 'lowast', 'loz', 'lrm', 'lsaquo', 'lsquo', 'lt', 'macr', 'mdash', 'micro', 'middot', 'minus', 'mu', 'nabla', 'nbsp', 'ndash', 'ne', 'ni', 'not', 'notin', 'nsub', 'ntilde', 'nu', 'oacute', 'ocirc', 'oelig', 'ograve', 'oline', 'omega', 'omicron', 'oplus', 'or', 'ordf', 'ordm', 'oslash', 'otilde', 'otimes', 'ouml', 'para', 'part', 'permil', 'perp', 'phi', 'pi', 'piv', 'plusmn', 'pound', 'prime', 'prod', 'prop', 'psi', 'quot', 'rArr', 'radic', 'rang', 'raquo', 'rarr', 'rceil', 'rdquo', 'real', 'reg', 'rfloor', 'rho', 'rlm', 'rsaquo', 'rsquo', 'sbquo', 'scaron', 'sdot', 'sect', 'shy', 'sigma', 'sigmaf', 'sim', 'spades', 'sub', 'sube', 'sum', 'sup', 'sup1', 'sup2', 'sup3', 'supe', 'szlig', 'tau', 'there4', 'theta', 'thetasym', 'thinsp', 'thorn', 'tilde', 'times', 'trade', 'uArr', 'uacute', 'uarr', 'ucirc', 'ugrave', 'uml', 'upsih', 'upsilon', 'uuml', 'weierp', 'xi', 'yacute', 'yen', 'yuml', 'zeta', 'zwj', 'zwnj'],
-\ 'vimxmlroot': ['html'],
+\ 'mnvxmlentities': ['AElig', 'Aacute', 'Acirc', 'Agrave', 'Alpha', 'Aring', 'Atilde', 'Auml', 'Beta', 'Ccedil', 'Chi', 'Dagger', 'Delta', 'ETH', 'Eacute', 'Ecirc', 'Egrave', 'Epsilon', 'Eta', 'Euml', 'Gamma', 'Iacute', 'Icirc', 'Igrave', 'Iota', 'Iuml', 'Kappa', 'Lambda', 'Mu', 'Ntilde', 'Nu', 'OElig', 'Oacute', 'Ocirc', 'Ograve', 'Omega', 'Omicron', 'Oslash', 'Otilde', 'Ouml', 'Phi', 'Pi', 'Prime', 'Psi', 'Rho', 'Scaron', 'Sigma', 'THORN', 'Tau', 'Theta', 'Uacute', 'Ucirc', 'Ugrave', 'Upsilon', 'Uuml', 'Xi', 'Yacute', 'Yuml', 'Zeta', 'aacute', 'acirc', 'acute', 'aelig', 'agrave', 'alefsym', 'alpha', 'amp', 'and', 'ang', 'apos', 'aring', 'asymp', 'atilde', 'auml', 'bdquo', 'beta', 'brvbar', 'bull', 'cap', 'ccedil', 'cedil', 'cent', 'chi', 'circ', 'clubs', 'cong', 'copy', 'crarr', 'cup', 'curren', 'dArr', 'dagger', 'darr', 'deg', 'delta', 'diams', 'divide', 'eacute', 'ecirc', 'egrave', 'empty', 'emsp', 'ensp', 'epsilon', 'equiv', 'eta', 'eth', 'euml', 'euro', 'exist', 'fnof', 'forall', 'frac12', 'frac14', 'frac34', 'frasl', 'gamma', 'ge', 'gt', 'hArr', 'harr', 'hearts', 'hellip', 'iacute', 'icirc', 'iexcl', 'igrave', 'image', 'infin', 'int', 'iota', 'iquest', 'isin', 'iuml', 'kappa', 'lArr', 'lambda', 'lang', 'laquo', 'larr', 'lceil', 'ldquo', 'le', 'lfloor', 'lowast', 'loz', 'lrm', 'lsaquo', 'lsquo', 'lt', 'macr', 'mdash', 'micro', 'middot', 'minus', 'mu', 'nabla', 'nbsp', 'ndash', 'ne', 'ni', 'not', 'notin', 'nsub', 'ntilde', 'nu', 'oacute', 'ocirc', 'oelig', 'ograve', 'oline', 'omega', 'omicron', 'oplus', 'or', 'ordf', 'ordm', 'oslash', 'otilde', 'otimes', 'ouml', 'para', 'part', 'permil', 'perp', 'phi', 'pi', 'piv', 'plusmn', 'pound', 'prime', 'prod', 'prop', 'psi', 'quot', 'rArr', 'radic', 'rang', 'raquo', 'rarr', 'rceil', 'rdquo', 'real', 'reg', 'rfloor', 'rho', 'rlm', 'rsaquo', 'rsquo', 'sbquo', 'scaron', 'sdot', 'sect', 'shy', 'sigma', 'sigmaf', 'sim', 'spades', 'sub', 'sube', 'sum', 'sup', 'sup1', 'sup2', 'sup3', 'supe', 'szlig', 'tau', 'there4', 'theta', 'thetasym', 'thinsp', 'thorn', 'tilde', 'times', 'trade', 'uArr', 'uacute', 'uarr', 'ucirc', 'ugrave', 'uml', 'upsih', 'upsilon', 'uuml', 'weierp', 'xi', 'yacute', 'yen', 'yuml', 'zeta', 'zwj', 'zwnj'],
+\ 'mnvxmlroot': ['html'],
 \ 'a': [
 \ ['tt', 'i', 'b', 'big', 'small', 'em', 'strong', 'dfn', 'code', 'samp', 'kbd', 'var', 'cite', 'abbr', 'acronym', 'img', 'object', 'br', 'script', 'map', 'q', 'sub', 'sup', 'span', 'bdo', 'input', 'select', 'textarea', 'label', 'button'],
 \ { 'rel': [], 'accesskey': [], 'coords': [], 'ondblclick': [], 'dir': ['ltr', 'rtl'], 'onblur': [], 'onfocus': [], 'onkeydown': [], 'onkeyup': [], 'href': [], 'onmouseup': [], 'id': [], 'onmouseover': [], 'tabindex': [], 'lang': [], 'onmouseout': [], 'onmousemove': [], 'name': [], 'style': [], 'charset': [], 'hreflang': [], 'onkeypress': [], 'onmousedown': [], 'rev': [], 'class': [], 'title': [], 'onclick': [], 'type': [], 'shape': ['rect', 'circle', 'poly', 'default']}
@@ -309,7 +309,7 @@ let g:xmldata_html401s = {
 \ ['tt', 'i', 'b', 'big', 'small', 'em', 'strong', 'dfn', 'code', 'samp', 'kbd', 'var', 'cite', 'abbr', 'acronym', 'a', 'img', 'object', 'br', 'script', 'map', 'q', 'sub', 'sup', 'span', 'bdo', 'input', 'select', 'textarea', 'label', 'button'],
 \ { 'ondblclick': [], 'onkeydown': [], 'onkeyup': [], 'onmouseup': [], 'id': [], 'onmouseover': [], 'lang': [], 'onmousedown': [], 'onkeypress': [], 'onclick': [], 'title': [], 'class': [], 'dir': ['ltr', 'rtl'], 'style': [], 'onmousemove': [], 'onmouseout': []}
 \ ],
-\ 'vimxmlattrinfo' : {
+\ 'mnvxmlattrinfo' : {
 \ 'accept' : ['ContentType', ''],
 \ 'accesskey' : ['Character', ''],
 \ 'action' : ['*URI', ''],
@@ -395,7 +395,7 @@ let g:xmldata_html401s = {
 \ 'width' : ['Number', ''],
 \ 'xmlns' : ['URI', '']
 \ },
-\ 'vimxmltaginfo': {
+\ 'mnvxmltaginfo': {
 \ 'area': ['/>', ''],
 \ 'base': ['/>', ''],
 \ 'br': ['/>', ''],
diff --git a/uvim/runtime/autoload/xml/html401t.vim b/uvim/runtime/autoload/xml/html401t.mnv
index ae6c63f60f..c9b5907b6f 100644
--- a/uvim/runtime/autoload/xml/html401t.vim
+++ b/uvim/runtime/autoload/xml/html401t.mnv
@@ -1,6 +1,6 @@
 let g:xmldata_html401t = {
-\ 'vimxmlentities': ['AElig', 'Aacute', 'Acirc', 'Agrave', 'Alpha', 'Aring', 'Atilde', 'Auml', 'Beta', 'Ccedil', 'Chi', 'Dagger', 'Delta', 'ETH', 'Eacute', 'Ecirc', 'Egrave', 'Epsilon', 'Eta', 'Euml', 'Gamma', 'Iacute', 'Icirc', 'Igrave', 'Iota', 'Iuml', 'Kappa', 'Lambda', 'Mu', 'Ntilde', 'Nu', 'OElig', 'Oacute', 'Ocirc', 'Ograve', 'Omega', 'Omicron', 'Oslash', 'Otilde', 'Ouml', 'Phi', 'Pi', 'Prime', 'Psi', 'Rho', 'Scaron', 'Sigma', 'THORN', 'Tau', 'Theta', 'Uacute', 'Ucirc', 'Ugrave', 'Upsilon', 'Uuml', 'Xi', 'Yacute', 'Yuml', 'Zeta', 'aacute', 'acirc', 'acute', 'aelig', 'agrave', 'alefsym', 'alpha', 'amp', 'and', 'ang', 'apos', 'aring', 'asymp', 'atilde', 'auml', 'bdquo', 'beta', 'brvbar', 'bull', 'cap', 'ccedil', 'cedil', 'cent', 'chi', 'circ', 'clubs', 'cong', 'copy', 'crarr', 'cup', 'curren', 'dArr', 'dagger', 'darr', 'deg', 'delta', 'diams', 'divide', 'eacute', 'ecirc', 'egrave', 'empty', 'emsp', 'ensp', 'epsilon', 'equiv', 'eta', 'eth', 'euml', 'euro', 'exist', 'fnof', 'forall', 'frac12', 'frac14', 'frac34', 'frasl', 'gamma', 'ge', 'gt', 'hArr', 'harr', 'hearts', 'hellip', 'iacute', 'icirc', 'iexcl', 'igrave', 'image', 'infin', 'int', 'iota', 'iquest', 'isin', 'iuml', 'kappa', 'lArr', 'lambda', 'lang', 'laquo', 'larr', 'lceil', 'ldquo', 'le', 'lfloor', 'lowast', 'loz', 'lrm', 'lsaquo', 'lsquo', 'lt', 'macr', 'mdash', 'micro', 'middot', 'minus', 'mu', 'nabla', 'nbsp', 'ndash', 'ne', 'ni', 'not', 'notin', 'nsub', 'ntilde', 'nu', 'oacute', 'ocirc', 'oelig', 'ograve', 'oline', 'omega', 'omicron', 'oplus', 'or', 'ordf', 'ordm', 'oslash', 'otilde', 'otimes', 'ouml', 'para', 'part', 'permil', 'perp', 'phi', 'pi', 'piv', 'plusmn', 'pound', 'prime', 'prod', 'prop', 'psi', 'quot', 'rArr', 'radic', 'rang', 'raquo', 'rarr', 'rceil', 'rdquo', 'real', 'reg', 'rfloor', 'rho', 'rlm', 'rsaquo', 'rsquo', 'sbquo', 'scaron', 'sdot', 'sect', 'shy', 'sigma', 'sigmaf', 'sim', 'spades', 'sub', 'sube', 'sum', 'sup', 'sup1', 'sup2', 'sup3', 'supe', 'szlig', 'tau', 'there4', 'theta', 'thetasym', 'thinsp', 'thorn', 'tilde', 'times', 'trade', 'uArr', 'uacute', 'uarr', 'ucirc', 'ugrave', 'uml', 'upsih', 'upsilon', 'uuml', 'weierp', 'xi', 'yacute', 'yen', 'yuml', 'zeta', 'zwj', 'zwnj'],
-\ 'vimxmlroot': ['html'],
+\ 'mnvxmlentities': ['AElig', 'Aacute', 'Acirc', 'Agrave', 'Alpha', 'Aring', 'Atilde', 'Auml', 'Beta', 'Ccedil', 'Chi', 'Dagger', 'Delta', 'ETH', 'Eacute', 'Ecirc', 'Egrave', 'Epsilon', 'Eta', 'Euml', 'Gamma', 'Iacute', 'Icirc', 'Igrave', 'Iota', 'Iuml', 'Kappa', 'Lambda', 'Mu', 'Ntilde', 'Nu', 'OElig', 'Oacute', 'Ocirc', 'Ograve', 'Omega', 'Omicron', 'Oslash', 'Otilde', 'Ouml', 'Phi', 'Pi', 'Prime', 'Psi', 'Rho', 'Scaron', 'Sigma', 'THORN', 'Tau', 'Theta', 'Uacute', 'Ucirc', 'Ugrave', 'Upsilon', 'Uuml', 'Xi', 'Yacute', 'Yuml', 'Zeta', 'aacute', 'acirc', 'acute', 'aelig', 'agrave', 'alefsym', 'alpha', 'amp', 'and', 'ang', 'apos', 'aring', 'asymp', 'atilde', 'auml', 'bdquo', 'beta', 'brvbar', 'bull', 'cap', 'ccedil', 'cedil', 'cent', 'chi', 'circ', 'clubs', 'cong', 'copy', 'crarr', 'cup', 'curren', 'dArr', 'dagger', 'darr', 'deg', 'delta', 'diams', 'divide', 'eacute', 'ecirc', 'egrave', 'empty', 'emsp', 'ensp', 'epsilon', 'equiv', 'eta', 'eth', 'euml', 'euro', 'exist', 'fnof', 'forall', 'frac12', 'frac14', 'frac34', 'frasl', 'gamma', 'ge', 'gt', 'hArr', 'harr', 'hearts', 'hellip', 'iacute', 'icirc', 'iexcl', 'igrave', 'image', 'infin', 'int', 'iota', 'iquest', 'isin', 'iuml', 'kappa', 'lArr', 'lambda', 'lang', 'laquo', 'larr', 'lceil', 'ldquo', 'le', 'lfloor', 'lowast', 'loz', 'lrm', 'lsaquo', 'lsquo', 'lt', 'macr', 'mdash', 'micro', 'middot', 'minus', 'mu', 'nabla', 'nbsp', 'ndash', 'ne', 'ni', 'not', 'notin', 'nsub', 'ntilde', 'nu', 'oacute', 'ocirc', 'oelig', 'ograve', 'oline', 'omega', 'omicron', 'oplus', 'or', 'ordf', 'ordm', 'oslash', 'otilde', 'otimes', 'ouml', 'para', 'part', 'permil', 'perp', 'phi', 'pi', 'piv', 'plusmn', 'pound', 'prime', 'prod', 'prop', 'psi', 'quot', 'rArr', 'radic', 'rang', 'raquo', 'rarr', 'rceil', 'rdquo', 'real', 'reg', 'rfloor', 'rho', 'rlm', 'rsaquo', 'rsquo', 'sbquo', 'scaron', 'sdot', 'sect', 'shy', 'sigma', 'sigmaf', 'sim', 'spades', 'sub', 'sube', 'sum', 'sup', 'sup1', 'sup2', 'sup3', 'supe', 'szlig', 'tau', 'there4', 'theta', 'thetasym', 'thinsp', 'thorn', 'tilde', 'times', 'trade', 'uArr', 'uacute', 'uarr', 'ucirc', 'ugrave', 'uml', 'upsih', 'upsilon', 'uuml', 'weierp', 'xi', 'yacute', 'yen', 'yuml', 'zeta', 'zwj', 'zwnj'],
+\ 'mnvxmlroot': ['html'],
 \ 'a': [
 \ ['tt', 'i', 'b', 'u', 's', 'strike', 'big', 'small', 'em', 'strong', 'dfn', 'code', 'samp', 'kbd', 'var', 'cite', 'abbr', 'acronym', 'img', 'applet', 'object', 'font', 'basefont', 'br', 'script', 'map', 'q', 'sub', 'sup', 'span', 'bdo', 'iframe', 'input', 'select', 'textarea', 'label', 'button'],
 \ { 'rel': [], 'accesskey': [], 'coords': [], 'ondblclick': [], 'dir': ['ltr', 'rtl'], 'onblur': [], 'onkeydown': [], 'onfocus': [], 'target': [], 'onkeyup': [], 'href': [], 'onmouseup': [], 'id': [], 'onmouseover': [], 'tabindex': [], 'lang': [], 'onmouseout': [], 'onmousemove': [], 'style': [], 'name': [], 'charset': [], 'hreflang': [], 'onkeypress': [], 'onmousedown': [], 'rev': [], 'class': [], 'title': [], 'onclick': [], 'type': [], 'shape': ['rect', 'circle', 'poly', 'default']}
@@ -357,7 +357,7 @@ let g:xmldata_html401t = {
 \ ['tt', 'i', 'b', 'u', 's', 'strike', 'big', 'small', 'em', 'strong', 'dfn', 'code', 'samp', 'kbd', 'var', 'cite', 'abbr', 'acronym', 'a', 'img', 'applet', 'object', 'font', 'basefont', 'br', 'script', 'map', 'q', 'sub', 'sup', 'span', 'bdo', 'iframe', 'input', 'select', 'textarea', 'label', 'button'],
 \ { 'ondblclick': [], 'onkeydown': [], 'onkeyup': [], 'onmouseup': [], 'id': [], 'onmouseover': [], 'lang': [], 'onmousedown': [], 'onkeypress': [], 'onclick': [], 'title': [], 'class': [], 'dir': ['ltr', 'rtl'], 'style': [], 'onmousemove': [], 'onmouseout': []}
 \ ],
-\ 'vimxmlattrinfo' : {
+\ 'mnvxmlattrinfo' : {
 \ 'accept' : ['ContentType', ''],
 \ 'accesskey' : ['Character', ''],
 \ 'action' : ['*URI', ''],
@@ -443,7 +443,7 @@ let g:xmldata_html401t = {
 \ 'width' : ['Number', ''],
 \ 'xmlns' : ['URI', '']
 \ },
-\ 'vimxmltaginfo': {
+\ 'mnvxmltaginfo': {
 \ 'area': ['/>', ''],
 \ 'base': ['/>', ''],
 \ 'basefont': ['/>', ''],
diff --git a/uvim/runtime/autoload/xml/html40f.vim b/uvim/runtime/autoload/xml/html40f.mnv
index b5ba99f8f6..037c2ac5cb 100644
--- a/uvim/runtime/autoload/xml/html40f.vim
+++ b/uvim/runtime/autoload/xml/html40f.mnv
@@ -1,6 +1,6 @@
 let g:xmldata_html40t = {
-\ 'vimxmlentities': ['AElig', 'Aacute', 'Acirc', 'Agrave', 'Alpha', 'Aring', 'Atilde', 'Auml', 'Beta', 'Ccedil', 'Chi', 'Dagger', 'Delta', 'ETH', 'Eacute', 'Ecirc', 'Egrave', 'Epsilon', 'Eta', 'Euml', 'Gamma', 'Iacute', 'Icirc', 'Igrave', 'Iota', 'Iuml', 'Kappa', 'Lambda', 'Mu', 'Ntilde', 'Nu', 'OElig', 'Oacute', 'Ocirc', 'Ograve', 'Omega', 'Omicron', 'Oslash', 'Otilde', 'Ouml', 'Phi', 'Pi', 'Prime', 'Psi', 'Rho', 'Scaron', 'Sigma', 'THORN', 'Tau', 'Theta', 'Uacute', 'Ucirc', 'Ugrave', 'Upsilon', 'Uuml', 'Xi', 'Yacute', 'Yuml', 'Zeta', 'aacute', 'acirc', 'acute', 'aelig', 'agrave', 'alefsym', 'alpha', 'amp', 'and', 'ang', 'apos', 'aring', 'asymp', 'atilde', 'auml', 'bdquo', 'beta', 'brvbar', 'bull', 'cap', 'ccedil', 'cedil', 'cent', 'chi', 'circ', 'clubs', 'cong', 'copy', 'crarr', 'cup', 'curren', 'dArr', 'dagger', 'darr', 'deg', 'delta', 'diams', 'divide', 'eacute', 'ecirc', 'egrave', 'empty', 'emsp', 'ensp', 'epsilon', 'equiv', 'eta', 'eth', 'euml', 'euro', 'exist', 'fnof', 'forall', 'frac12', 'frac14', 'frac34', 'frasl', 'gamma', 'ge', 'gt', 'hArr', 'harr', 'hearts', 'hellip', 'iacute', 'icirc', 'iexcl', 'igrave', 'image', 'infin', 'int', 'iota', 'iquest', 'isin', 'iuml', 'kappa', 'lArr', 'lambda', 'lang', 'laquo', 'larr', 'lceil', 'ldquo', 'le', 'lfloor', 'lowast', 'loz', 'lrm', 'lsaquo', 'lsquo', 'lt', 'macr', 'mdash', 'micro', 'middot', 'minus', 'mu', 'nabla', 'nbsp', 'ndash', 'ne', 'ni', 'not', 'notin', 'nsub', 'ntilde', 'nu', 'oacute', 'ocirc', 'oelig', 'ograve', 'oline', 'omega', 'omicron', 'oplus', 'or', 'ordf', 'ordm', 'oslash', 'otilde', 'otimes', 'ouml', 'para', 'part', 'permil', 'perp', 'phi', 'pi', 'piv', 'plusmn', 'pound', 'prime', 'prod', 'prop', 'psi', 'quot', 'rArr', 'radic', 'rang', 'raquo', 'rarr', 'rceil', 'rdquo', 'real', 'reg', 'rfloor', 'rho', 'rlm', 'rsaquo', 'rsquo', 'sbquo', 'scaron', 'sdot', 'sect', 'shy', 'sigma', 'sigmaf', 'sim', 'spades', 'sub', 'sube', 'sum', 'sup', 'sup1', 'sup2', 'sup3', 'supe', 'szlig', 'tau', 'there4', 'theta', 'thetasym', 'thinsp', 'thorn', 'tilde', 'times', 'trade', 'uArr', 'uacute', 'uarr', 'ucirc', 'ugrave', 'uml', 'upsih', 'upsilon', 'uuml', 'weierp', 'xi', 'yacute', 'yen', 'yuml', 'zeta', 'zwj', 'zwnj'],
-\ 'vimxmlroot': ['html'],
+\ 'mnvxmlentities': ['AElig', 'Aacute', 'Acirc', 'Agrave', 'Alpha', 'Aring', 'Atilde', 'Auml', 'Beta', 'Ccedil', 'Chi', 'Dagger', 'Delta', 'ETH', 'Eacute', 'Ecirc', 'Egrave', 'Epsilon', 'Eta', 'Euml', 'Gamma', 'Iacute', 'Icirc', 'Igrave', 'Iota', 'Iuml', 'Kappa', 'Lambda', 'Mu', 'Ntilde', 'Nu', 'OElig', 'Oacute', 'Ocirc', 'Ograve', 'Omega', 'Omicron', 'Oslash', 'Otilde', 'Ouml', 'Phi', 'Pi', 'Prime', 'Psi', 'Rho', 'Scaron', 'Sigma', 'THORN', 'Tau', 'Theta', 'Uacute', 'Ucirc', 'Ugrave', 'Upsilon', 'Uuml', 'Xi', 'Yacute', 'Yuml', 'Zeta', 'aacute', 'acirc', 'acute', 'aelig', 'agrave', 'alefsym', 'alpha', 'amp', 'and', 'ang', 'apos', 'aring', 'asymp', 'atilde', 'auml', 'bdquo', 'beta', 'brvbar', 'bull', 'cap', 'ccedil', 'cedil', 'cent', 'chi', 'circ', 'clubs', 'cong', 'copy', 'crarr', 'cup', 'curren', 'dArr', 'dagger', 'darr', 'deg', 'delta', 'diams', 'divide', 'eacute', 'ecirc', 'egrave', 'empty', 'emsp', 'ensp', 'epsilon', 'equiv', 'eta', 'eth', 'euml', 'euro', 'exist', 'fnof', 'forall', 'frac12', 'frac14', 'frac34', 'frasl', 'gamma', 'ge', 'gt', 'hArr', 'harr', 'hearts', 'hellip', 'iacute', 'icirc', 'iexcl', 'igrave', 'image', 'infin', 'int', 'iota', 'iquest', 'isin', 'iuml', 'kappa', 'lArr', 'lambda', 'lang', 'laquo', 'larr', 'lceil', 'ldquo', 'le', 'lfloor', 'lowast', 'loz', 'lrm', 'lsaquo', 'lsquo', 'lt', 'macr', 'mdash', 'micro', 'middot', 'minus', 'mu', 'nabla', 'nbsp', 'ndash', 'ne', 'ni', 'not', 'notin', 'nsub', 'ntilde', 'nu', 'oacute', 'ocirc', 'oelig', 'ograve', 'oline', 'omega', 'omicron', 'oplus', 'or', 'ordf', 'ordm', 'oslash', 'otilde', 'otimes', 'ouml', 'para', 'part', 'permil', 'perp', 'phi', 'pi', 'piv', 'plusmn', 'pound', 'prime', 'prod', 'prop', 'psi', 'quot', 'rArr', 'radic', 'rang', 'raquo', 'rarr', 'rceil', 'rdquo', 'real', 'reg', 'rfloor', 'rho', 'rlm', 'rsaquo', 'rsquo', 'sbquo', 'scaron', 'sdot', 'sect', 'shy', 'sigma', 'sigmaf', 'sim', 'spades', 'sub', 'sube', 'sum', 'sup', 'sup1', 'sup2', 'sup3', 'supe', 'szlig', 'tau', 'there4', 'theta', 'thetasym', 'thinsp', 'thorn', 'tilde', 'times', 'trade', 'uArr', 'uacute', 'uarr', 'ucirc', 'ugrave', 'uml', 'upsih', 'upsilon', 'uuml', 'weierp', 'xi', 'yacute', 'yen', 'yuml', 'zeta', 'zwj', 'zwnj'],
+\ 'mnvxmlroot': ['html'],
 \ 'a': [
 \ ['tt', 'i', 'b', 'u', 's', 'strike', 'big', 'small', 'em', 'strong', 'dfn', 'code', 'samp', 'kbd', 'var', 'cite', 'abbr', 'acronym', 'img', 'applet', 'object', 'font', 'basefont', 'br', 'script', 'map', 'q', 'sub', 'sup', 'span', 'bdo', 'iframe', 'input', 'select', 'textarea', 'label', 'button'],
 \ { 'rel': [], 'accesskey': [], 'coords': [], 'ondblclick': [], 'dir': ['ltr', 'rtl'], 'onblur': [], 'onkeydown': [], 'onfocus': [], 'target': [], 'onkeyup': [], 'href': [], 'onmouseup': [], 'id': [], 'onmouseover': [], 'tabindex': [], 'lang': [], 'onmouseout': [], 'onmousemove': [], 'style': [], 'name': [], 'charset': [], 'hreflang': [], 'onkeypress': [], 'onmousedown': [], 'rev': [], 'class': [], 'title': [], 'onclick': [], 'type': [], 'shape': ['rect', 'circle', 'poly', 'default']}
@@ -365,7 +365,7 @@ let g:xmldata_html40t = {
 \ ['tt', 'i', 'b', 'u', 's', 'strike', 'big', 'small', 'em', 'strong', 'dfn', 'code', 'samp', 'kbd', 'var', 'cite', 'abbr', 'acronym', 'a', 'img', 'applet', 'object', 'font', 'basefont', 'br', 'script', 'map', 'q', 'sub', 'sup', 'span', 'bdo', 'iframe', 'input', 'select', 'textarea', 'label', 'button'],
 \ { 'ondblclick': [], 'onkeydown': [], 'onkeyup': [], 'onmouseup': [], 'id': [], 'onmouseover': [], 'lang': [], 'onmousedown': [], 'onkeypress': [], 'onclick': [], 'title': [], 'class': [], 'dir': ['ltr', 'rtl'], 'style': [], 'onmousemove': [], 'onmouseout': []}
 \ ],
-\ 'vimxmlattrinfo' : {
+\ 'mnvxmlattrinfo' : {
 \ 'accept' : ['ContentType', ''],
 \ 'accesskey' : ['Character', ''],
 \ 'action' : ['*URI', ''],
@@ -451,7 +451,7 @@ let g:xmldata_html40t = {
 \ 'width' : ['Number', ''],
 \ 'xmlns' : ['URI', '']
 \ },
-\ 'vimxmltaginfo': {
+\ 'mnvxmltaginfo': {
 \ 'area': ['/>', ''],
 \ 'base': ['/>', ''],
 \ 'basefont': ['/>', ''],
diff --git a/uvim/runtime/autoload/xml/html40s.vim b/uvim/runtime/autoload/xml/html40s.mnv
index bb3a45b55c..7efd06c0a1 100644
--- a/uvim/runtime/autoload/xml/html40s.vim
+++ b/uvim/runtime/autoload/xml/html40s.mnv
@@ -1,6 +1,6 @@
 let g:xmldata_html40s = {
-\ 'vimxmlentities': ['AElig', 'Aacute', 'Acirc', 'Agrave', 'Alpha', 'Aring', 'Atilde', 'Auml', 'Beta', 'Ccedil', 'Chi', 'Dagger', 'Delta', 'ETH', 'Eacute', 'Ecirc', 'Egrave', 'Epsilon', 'Eta', 'Euml', 'Gamma', 'Iacute', 'Icirc', 'Igrave', 'Iota', 'Iuml', 'Kappa', 'Lambda', 'Mu', 'Ntilde', 'Nu', 'OElig', 'Oacute', 'Ocirc', 'Ograve', 'Omega', 'Omicron', 'Oslash', 'Otilde', 'Ouml', 'Phi', 'Pi', 'Prime', 'Psi', 'Rho', 'Scaron', 'Sigma', 'THORN', 'Tau', 'Theta', 'Uacute', 'Ucirc', 'Ugrave', 'Upsilon', 'Uuml', 'Xi', 'Yacute', 'Yuml', 'Zeta', 'aacute', 'acirc', 'acute', 'aelig', 'agrave', 'alefsym', 'alpha', 'amp', 'and', 'ang', 'apos', 'aring', 'asymp', 'atilde', 'auml', 'bdquo', 'beta', 'brvbar', 'bull', 'cap', 'ccedil', 'cedil', 'cent', 'chi', 'circ', 'clubs', 'cong', 'copy', 'crarr', 'cup', 'curren', 'dArr', 'dagger', 'darr', 'deg', 'delta', 'diams', 'divide', 'eacute', 'ecirc', 'egrave', 'empty', 'emsp', 'ensp', 'epsilon', 'equiv', 'eta', 'eth', 'euml', 'euro', 'exist', 'fnof', 'forall', 'frac12', 'frac14', 'frac34', 'frasl', 'gamma', 'ge', 'gt', 'hArr', 'harr', 'hearts', 'hellip', 'iacute', 'icirc', 'iexcl', 'igrave', 'image', 'infin', 'int', 'iota', 'iquest', 'isin', 'iuml', 'kappa', 'lArr', 'lambda', 'lang', 'laquo', 'larr', 'lceil', 'ldquo', 'le', 'lfloor', 'lowast', 'loz', 'lrm', 'lsaquo', 'lsquo', 'lt', 'macr', 'mdash', 'micro', 'middot', 'minus', 'mu', 'nabla', 'nbsp', 'ndash', 'ne', 'ni', 'not', 'notin', 'nsub', 'ntilde', 'nu', 'oacute', 'ocirc', 'oelig', 'ograve', 'oline', 'omega', 'omicron', 'oplus', 'or', 'ordf', 'ordm', 'oslash', 'otilde', 'otimes', 'ouml', 'para', 'part', 'permil', 'perp', 'phi', 'pi', 'piv', 'plusmn', 'pound', 'prime', 'prod', 'prop', 'psi', 'quot', 'rArr', 'radic', 'rang', 'raquo', 'rarr', 'rceil', 'rdquo', 'real', 'reg', 'rfloor', 'rho', 'rlm', 'rsaquo', 'rsquo', 'sbquo', 'scaron', 'sdot', 'sect', 'shy', 'sigma', 'sigmaf', 'sim', 'spades', 'sub', 'sube', 'sum', 'sup', 'sup1', 'sup2', 'sup3', 'supe', 'szlig', 'tau', 'there4', 'theta', 'thetasym', 'thinsp', 'thorn', 'tilde', 'times', 'trade', 'uArr', 'uacute', 'uarr', 'ucirc', 'ugrave', 'uml', 'upsih', 'upsilon', 'uuml', 'weierp', 'xi', 'yacute', 'yen', 'yuml', 'zeta', 'zwj', 'zwnj'],
-\ 'vimxmlroot': ['html'],
+\ 'mnvxmlentities': ['AElig', 'Aacute', 'Acirc', 'Agrave', 'Alpha', 'Aring', 'Atilde', 'Auml', 'Beta', 'Ccedil', 'Chi', 'Dagger', 'Delta', 'ETH', 'Eacute', 'Ecirc', 'Egrave', 'Epsilon', 'Eta', 'Euml', 'Gamma', 'Iacute', 'Icirc', 'Igrave', 'Iota', 'Iuml', 'Kappa', 'Lambda', 'Mu', 'Ntilde', 'Nu', 'OElig', 'Oacute', 'Ocirc', 'Ograve', 'Omega', 'Omicron', 'Oslash', 'Otilde', 'Ouml', 'Phi', 'Pi', 'Prime', 'Psi', 'Rho', 'Scaron', 'Sigma', 'THORN', 'Tau', 'Theta', 'Uacute', 'Ucirc', 'Ugrave', 'Upsilon', 'Uuml', 'Xi', 'Yacute', 'Yuml', 'Zeta', 'aacute', 'acirc', 'acute', 'aelig', 'agrave', 'alefsym', 'alpha', 'amp', 'and', 'ang', 'apos', 'aring', 'asymp', 'atilde', 'auml', 'bdquo', 'beta', 'brvbar', 'bull', 'cap', 'ccedil', 'cedil', 'cent', 'chi', 'circ', 'clubs', 'cong', 'copy', 'crarr', 'cup', 'curren', 'dArr', 'dagger', 'darr', 'deg', 'delta', 'diams', 'divide', 'eacute', 'ecirc', 'egrave', 'empty', 'emsp', 'ensp', 'epsilon', 'equiv', 'eta', 'eth', 'euml', 'euro', 'exist', 'fnof', 'forall', 'frac12', 'frac14', 'frac34', 'frasl', 'gamma', 'ge', 'gt', 'hArr', 'harr', 'hearts', 'hellip', 'iacute', 'icirc', 'iexcl', 'igrave', 'image', 'infin', 'int', 'iota', 'iquest', 'isin', 'iuml', 'kappa', 'lArr', 'lambda', 'lang', 'laquo', 'larr', 'lceil', 'ldquo', 'le', 'lfloor', 'lowast', 'loz', 'lrm', 'lsaquo', 'lsquo', 'lt', 'macr', 'mdash', 'micro', 'middot', 'minus', 'mu', 'nabla', 'nbsp', 'ndash', 'ne', 'ni', 'not', 'notin', 'nsub', 'ntilde', 'nu', 'oacute', 'ocirc', 'oelig', 'ograve', 'oline', 'omega', 'omicron', 'oplus', 'or', 'ordf', 'ordm', 'oslash', 'otilde', 'otimes', 'ouml', 'para', 'part', 'permil', 'perp', 'phi', 'pi', 'piv', 'plusmn', 'pound', 'prime', 'prod', 'prop', 'psi', 'quot', 'rArr', 'radic', 'rang', 'raquo', 'rarr', 'rceil', 'rdquo', 'real', 'reg', 'rfloor', 'rho', 'rlm', 'rsaquo', 'rsquo', 'sbquo', 'scaron', 'sdot', 'sect', 'shy', 'sigma', 'sigmaf', 'sim', 'spades', 'sub', 'sube', 'sum', 'sup', 'sup1', 'sup2', 'sup3', 'supe', 'szlig', 'tau', 'there4', 'theta', 'thetasym', 'thinsp', 'thorn', 'tilde', 'times', 'trade', 'uArr', 'uacute', 'uarr', 'ucirc', 'ugrave', 'uml', 'upsih', 'upsilon', 'uuml', 'weierp', 'xi', 'yacute', 'yen', 'yuml', 'zeta', 'zwj', 'zwnj'],
+\ 'mnvxmlroot': ['html'],
 \ 'a': [
 \ ['tt', 'i', 'b', 'big', 'small', 'em', 'strong', 'dfn', 'code', 'samp', 'kbd', 'var', 'cite', 'abbr', 'acronym', 'img', 'object', 'br', 'script', 'map', 'q', 'sub', 'sup', 'span', 'bdo', 'input', 'select', 'textarea', 'label', 'button'],
 \ { 'rel': [], 'accesskey': [], 'coords': [], 'ondblclick': [], 'dir': ['ltr', 'rtl'], 'onblur': [], 'onfocus': [], 'onkeydown': [], 'onkeyup': [], 'href': [], 'onmouseup': [], 'id': [], 'onmouseover': [], 'tabindex': [], 'lang': [], 'onmouseout': [], 'onmousemove': [], 'name': [], 'style': [], 'charset': [], 'hreflang': [], 'onkeypress': [], 'onmousedown': [], 'rev': [], 'class': [], 'title': [], 'onclick': [], 'type': [], 'shape': ['rect', 'circle', 'poly', 'default']}
@@ -309,7 +309,7 @@ let g:xmldata_html40s = {
 \ ['tt', 'i', 'b', 'big', 'small', 'em', 'strong', 'dfn', 'code', 'samp', 'kbd', 'var', 'cite', 'abbr', 'acronym', 'a', 'img', 'object', 'br', 'script', 'map', 'q', 'sub', 'sup', 'span', 'bdo', 'input', 'select', 'textarea', 'label', 'button'],
 \ { 'ondblclick': [], 'onkeydown': [], 'onkeyup': [], 'onmouseup': [], 'id': [], 'onmouseover': [], 'lang': [], 'onmousedown': [], 'onkeypress': [], 'onclick': [], 'title': [], 'class': [], 'dir': ['ltr', 'rtl'], 'style': [], 'onmousemove': [], 'onmouseout': []}
 \ ],
-\ 'vimxmlattrinfo' : {
+\ 'mnvxmlattrinfo' : {
 \ 'accept' : ['ContentType', ''],
 \ 'accesskey' : ['Character', ''],
 \ 'action' : ['*URI', ''],
@@ -395,7 +395,7 @@ let g:xmldata_html40s = {
 \ 'width' : ['Number', ''],
 \ 'xmlns' : ['URI', '']
 \ },
-\ 'vimxmltaginfo': {
+\ 'mnvxmltaginfo': {
 \ 'area': ['/>', ''],
 \ 'base': ['/>', ''],
 \ 'br': ['/>', ''],
diff --git a/uvim/runtime/autoload/xml/html40t.vim b/uvim/runtime/autoload/xml/html40t.mnv
index 2d73246523..f38eedcd47 100644
--- a/uvim/runtime/autoload/xml/html40t.vim
+++ b/uvim/runtime/autoload/xml/html40t.mnv
@@ -1,6 +1,6 @@
 let g:xmldata_html40t = {
-\ 'vimxmlentities': ['AElig', 'Aacute', 'Acirc', 'Agrave', 'Alpha', 'Aring', 'Atilde', 'Auml', 'Beta', 'Ccedil', 'Chi', 'Dagger', 'Delta', 'ETH', 'Eacute', 'Ecirc', 'Egrave', 'Epsilon', 'Eta', 'Euml', 'Gamma', 'Iacute', 'Icirc', 'Igrave', 'Iota', 'Iuml', 'Kappa', 'Lambda', 'Mu', 'Ntilde', 'Nu', 'OElig', 'Oacute', 'Ocirc', 'Ograve', 'Omega', 'Omicron', 'Oslash', 'Otilde', 'Ouml', 'Phi', 'Pi', 'Prime', 'Psi', 'Rho', 'Scaron', 'Sigma', 'THORN', 'Tau', 'Theta', 'Uacute', 'Ucirc', 'Ugrave', 'Upsilon', 'Uuml', 'Xi', 'Yacute', 'Yuml', 'Zeta', 'aacute', 'acirc', 'acute', 'aelig', 'agrave', 'alefsym', 'alpha', 'amp', 'and', 'ang', 'apos', 'aring', 'asymp', 'atilde', 'auml', 'bdquo', 'beta', 'brvbar', 'bull', 'cap', 'ccedil', 'cedil', 'cent', 'chi', 'circ', 'clubs', 'cong', 'copy', 'crarr', 'cup', 'curren', 'dArr', 'dagger', 'darr', 'deg', 'delta', 'diams', 'divide', 'eacute', 'ecirc', 'egrave', 'empty', 'emsp', 'ensp', 'epsilon', 'equiv', 'eta', 'eth', 'euml', 'euro', 'exist', 'fnof', 'forall', 'frac12', 'frac14', 'frac34', 'frasl', 'gamma', 'ge', 'gt', 'hArr', 'harr', 'hearts', 'hellip', 'iacute', 'icirc', 'iexcl', 'igrave', 'image', 'infin', 'int', 'iota', 'iquest', 'isin', 'iuml', 'kappa', 'lArr', 'lambda', 'lang', 'laquo', 'larr', 'lceil', 'ldquo', 'le', 'lfloor', 'lowast', 'loz', 'lrm', 'lsaquo', 'lsquo', 'lt', 'macr', 'mdash', 'micro', 'middot', 'minus', 'mu', 'nabla', 'nbsp', 'ndash', 'ne', 'ni', 'not', 'notin', 'nsub', 'ntilde', 'nu', 'oacute', 'ocirc', 'oelig', 'ograve', 'oline', 'omega', 'omicron', 'oplus', 'or', 'ordf', 'ordm', 'oslash', 'otilde', 'otimes', 'ouml', 'para', 'part', 'permil', 'perp', 'phi', 'pi', 'piv', 'plusmn', 'pound', 'prime', 'prod', 'prop', 'psi', 'quot', 'rArr', 'radic', 'rang', 'raquo', 'rarr', 'rceil', 'rdquo', 'real', 'reg', 'rfloor', 'rho', 'rlm', 'rsaquo', 'rsquo', 'sbquo', 'scaron', 'sdot', 'sect', 'shy', 'sigma', 'sigmaf', 'sim', 'spades', 'sub', 'sube', 'sum', 'sup', 'sup1', 'sup2', 'sup3', 'supe', 'szlig', 'tau', 'there4', 'theta', 'thetasym', 'thinsp', 'thorn', 'tilde', 'times', 'trade', 'uArr', 'uacute', 'uarr', 'ucirc', 'ugrave', 'uml', 'upsih', 'upsilon', 'uuml', 'weierp', 'xi', 'yacute', 'yen', 'yuml', 'zeta', 'zwj', 'zwnj'],
-\ 'vimxmlroot': ['html'],
+\ 'mnvxmlentities': ['AElig', 'Aacute', 'Acirc', 'Agrave', 'Alpha', 'Aring', 'Atilde', 'Auml', 'Beta', 'Ccedil', 'Chi', 'Dagger', 'Delta', 'ETH', 'Eacute', 'Ecirc', 'Egrave', 'Epsilon', 'Eta', 'Euml', 'Gamma', 'Iacute', 'Icirc', 'Igrave', 'Iota', 'Iuml', 'Kappa', 'Lambda', 'Mu', 'Ntilde', 'Nu', 'OElig', 'Oacute', 'Ocirc', 'Ograve', 'Omega', 'Omicron', 'Oslash', 'Otilde', 'Ouml', 'Phi', 'Pi', 'Prime', 'Psi', 'Rho', 'Scaron', 'Sigma', 'THORN', 'Tau', 'Theta', 'Uacute', 'Ucirc', 'Ugrave', 'Upsilon', 'Uuml', 'Xi', 'Yacute', 'Yuml', 'Zeta', 'aacute', 'acirc', 'acute', 'aelig', 'agrave', 'alefsym', 'alpha', 'amp', 'and', 'ang', 'apos', 'aring', 'asymp', 'atilde', 'auml', 'bdquo', 'beta', 'brvbar', 'bull', 'cap', 'ccedil', 'cedil', 'cent', 'chi', 'circ', 'clubs', 'cong', 'copy', 'crarr', 'cup', 'curren', 'dArr', 'dagger', 'darr', 'deg', 'delta', 'diams', 'divide', 'eacute', 'ecirc', 'egrave', 'empty', 'emsp', 'ensp', 'epsilon', 'equiv', 'eta', 'eth', 'euml', 'euro', 'exist', 'fnof', 'forall', 'frac12', 'frac14', 'frac34', 'frasl', 'gamma', 'ge', 'gt', 'hArr', 'harr', 'hearts', 'hellip', 'iacute', 'icirc', 'iexcl', 'igrave', 'image', 'infin', 'int', 'iota', 'iquest', 'isin', 'iuml', 'kappa', 'lArr', 'lambda', 'lang', 'laquo', 'larr', 'lceil', 'ldquo', 'le', 'lfloor', 'lowast', 'loz', 'lrm', 'lsaquo', 'lsquo', 'lt', 'macr', 'mdash', 'micro', 'middot', 'minus', 'mu', 'nabla', 'nbsp', 'ndash', 'ne', 'ni', 'not', 'notin', 'nsub', 'ntilde', 'nu', 'oacute', 'ocirc', 'oelig', 'ograve', 'oline', 'omega', 'omicron', 'oplus', 'or', 'ordf', 'ordm', 'oslash', 'otilde', 'otimes', 'ouml', 'para', 'part', 'permil', 'perp', 'phi', 'pi', 'piv', 'plusmn', 'pound', 'prime', 'prod', 'prop', 'psi', 'quot', 'rArr', 'radic', 'rang', 'raquo', 'rarr', 'rceil', 'rdquo', 'real', 'reg', 'rfloor', 'rho', 'rlm', 'rsaquo', 'rsquo', 'sbquo', 'scaron', 'sdot', 'sect', 'shy', 'sigma', 'sigmaf', 'sim', 'spades', 'sub', 'sube', 'sum', 'sup', 'sup1', 'sup2', 'sup3', 'supe', 'szlig', 'tau', 'there4', 'theta', 'thetasym', 'thinsp', 'thorn', 'tilde', 'times', 'trade', 'uArr', 'uacute', 'uarr', 'ucirc', 'ugrave', 'uml', 'upsih', 'upsilon', 'uuml', 'weierp', 'xi', 'yacute', 'yen', 'yuml', 'zeta', 'zwj', 'zwnj'],
+\ 'mnvxmlroot': ['html'],
 \ 'a': [
 \ ['tt', 'i', 'b', 'u', 's', 'strike', 'big', 'small', 'em', 'strong', 'dfn', 'code', 'samp', 'kbd', 'var', 'cite', 'abbr', 'acronym', 'img', 'applet', 'object', 'font', 'basefont', 'br', 'script', 'map', 'q', 'sub', 'sup', 'span', 'bdo', 'iframe', 'input', 'select', 'textarea', 'label', 'button'],
 \ { 'rel': [], 'accesskey': [], 'coords': [], 'ondblclick': [], 'dir': ['ltr', 'rtl'], 'onblur': [], 'onkeydown': [], 'onfocus': [], 'target': [], 'onkeyup': [], 'href': [], 'onmouseup': [], 'id': [], 'onmouseover': [], 'tabindex': [], 'lang': [], 'onmouseout': [], 'onmousemove': [], 'style': [], 'name': [], 'charset': [], 'hreflang': [], 'onkeypress': [], 'onmousedown': [], 'rev': [], 'class': [], 'title': [], 'onclick': [], 'type': [], 'shape': ['rect', 'circle', 'poly', 'default']}
@@ -357,7 +357,7 @@ let g:xmldata_html40t = {
 \ ['tt', 'i', 'b', 'u', 's', 'strike', 'big', 'small', 'em', 'strong', 'dfn', 'code', 'samp', 'kbd', 'var', 'cite', 'abbr', 'acronym', 'a', 'img', 'applet', 'object', 'font', 'basefont', 'br', 'script', 'map', 'q', 'sub', 'sup', 'span', 'bdo', 'iframe', 'input', 'select', 'textarea', 'label', 'button'],
 \ { 'ondblclick': [], 'onkeydown': [], 'onkeyup': [], 'onmouseup': [], 'id': [], 'onmouseover': [], 'lang': [], 'onmousedown': [], 'onkeypress': [], 'onclick': [], 'title': [], 'class': [], 'dir': ['ltr', 'rtl'], 'style': [], 'onmousemove': [], 'onmouseout': []}
 \ ],
-\ 'vimxmlattrinfo' : {
+\ 'mnvxmlattrinfo' : {
 \ 'accept' : ['ContentType', ''],
 \ 'accesskey' : ['Character', ''],
 \ 'action' : ['*URI', ''],
@@ -443,7 +443,7 @@ let g:xmldata_html40t = {
 \ 'width' : ['Number', ''],
 \ 'xmlns' : ['URI', '']
 \ },
-\ 'vimxmltaginfo': {
+\ 'mnvxmltaginfo': {
 \ 'area': ['/>', ''],
 \ 'base': ['/>', ''],
 \ 'basefont': ['/>', ''],
diff --git a/uvim/runtime/autoload/xml/xhtml10f.vim b/uvim/runtime/autoload/xml/xhtml10f.mnv
index 0bfa30ce9d..31e84c88af 100644
--- a/uvim/runtime/autoload/xml/xhtml10f.vim
+++ b/uvim/runtime/autoload/xml/xhtml10f.mnv
@@ -1,6 +1,6 @@
 let g:xmldata_xhtml10f = {
-\ 'vimxmlentities': ['AElig', 'Aacute', 'Acirc', 'Agrave', 'Alpha', 'Aring', 'Atilde', 'Auml', 'Beta', 'Ccedil', 'Chi', 'Dagger', 'Delta', 'ETH', 'Eacute', 'Ecirc', 'Egrave', 'Epsilon', 'Eta', 'Euml', 'Gamma', 'Iacute', 'Icirc', 'Igrave', 'Iota', 'Iuml', 'Kappa', 'Lambda', 'Mu', 'Ntilde', 'Nu', 'OElig', 'Oacute', 'Ocirc', 'Ograve', 'Omega', 'Omicron', 'Oslash', 'Otilde', 'Ouml', 'Phi', 'Pi', 'Prime', 'Psi', 'Rho', 'Scaron', 'Sigma', 'THORN', 'Tau', 'Theta', 'Uacute', 'Ucirc', 'Ugrave', 'Upsilon', 'Uuml', 'Xi', 'Yacute', 'Yuml', 'Zeta', 'aacute', 'acirc', 'acute', 'aelig', 'agrave', 'alefsym', 'alpha', 'amp', 'and', 'ang', 'apos', 'aring', 'asymp', 'atilde', 'auml', 'bdquo', 'beta', 'brvbar', 'bull', 'cap', 'ccedil', 'cedil', 'cent', 'chi', 'circ', 'clubs', 'cong', 'copy', 'crarr', 'cup', 'curren', 'dArr', 'dagger', 'darr', 'deg', 'delta', 'diams', 'divide', 'eacute', 'ecirc', 'egrave', 'empty', 'emsp', 'ensp', 'epsilon', 'equiv', 'eta', 'eth', 'euml', 'euro', 'exist', 'fnof', 'forall', 'frac12', 'frac14', 'frac34', 'frasl', 'gamma', 'ge', 'gt', 'hArr', 'harr', 'hearts', 'hellip', 'iacute', 'icirc', 'iexcl', 'igrave', 'image', 'infin', 'int', 'iota', 'iquest', 'isin', 'iuml', 'kappa', 'lArr', 'lambda', 'lang', 'laquo', 'larr', 'lceil', 'ldquo', 'le', 'lfloor', 'lowast', 'loz', 'lrm', 'lsaquo', 'lsquo', 'lt', 'macr', 'mdash', 'micro', 'middot', 'minus', 'mu', 'nabla', 'nbsp', 'ndash', 'ne', 'ni', 'not', 'notin', 'nsub', 'ntilde', 'nu', 'oacute', 'ocirc', 'oelig', 'ograve', 'oline', 'omega', 'omicron', 'oplus', 'or', 'ordf', 'ordm', 'oslash', 'otilde', 'otimes', 'ouml', 'para', 'part', 'permil', 'perp', 'phi', 'pi', 'piv', 'plusmn', 'pound', 'prime', 'prod', 'prop', 'psi', 'quot', 'rArr', 'radic', 'rang', 'raquo', 'rarr', 'rceil', 'rdquo', 'real', 'reg', 'rfloor', 'rho', 'rlm', 'rsaquo', 'rsquo', 'sbquo', 'scaron', 'sdot', 'sect', 'shy', 'sigma', 'sigmaf', 'sim', 'spades', 'sub', 'sube', 'sum', 'sup', 'sup1', 'sup2', 'sup3', 'supe', 'szlig', 'tau', 'there4', 'theta', 'thetasym', 'thinsp', 'thorn', 'tilde', 'times', 'trade', 'uArr', 'uacute', 'uarr', 'ucirc', 'ugrave', 'uml', 'upsih', 'upsilon', 'uuml', 'weierp', 'xi', 'yacute', 'yen', 'yuml', 'zeta', 'zwj', 'zwnj'],
-\ 'vimxmlroot': ['html'],
+\ 'mnvxmlentities': ['AElig', 'Aacute', 'Acirc', 'Agrave', 'Alpha', 'Aring', 'Atilde', 'Auml', 'Beta', 'Ccedil', 'Chi', 'Dagger', 'Delta', 'ETH', 'Eacute', 'Ecirc', 'Egrave', 'Epsilon', 'Eta', 'Euml', 'Gamma', 'Iacute', 'Icirc', 'Igrave', 'Iota', 'Iuml', 'Kappa', 'Lambda', 'Mu', 'Ntilde', 'Nu', 'OElig', 'Oacute', 'Ocirc', 'Ograve', 'Omega', 'Omicron', 'Oslash', 'Otilde', 'Ouml', 'Phi', 'Pi', 'Prime', 'Psi', 'Rho', 'Scaron', 'Sigma', 'THORN', 'Tau', 'Theta', 'Uacute', 'Ucirc', 'Ugrave', 'Upsilon', 'Uuml', 'Xi', 'Yacute', 'Yuml', 'Zeta', 'aacute', 'acirc', 'acute', 'aelig', 'agrave', 'alefsym', 'alpha', 'amp', 'and', 'ang', 'apos', 'aring', 'asymp', 'atilde', 'auml', 'bdquo', 'beta', 'brvbar', 'bull', 'cap', 'ccedil', 'cedil', 'cent', 'chi', 'circ', 'clubs', 'cong', 'copy', 'crarr', 'cup', 'curren', 'dArr', 'dagger', 'darr', 'deg', 'delta', 'diams', 'divide', 'eacute', 'ecirc', 'egrave', 'empty', 'emsp', 'ensp', 'epsilon', 'equiv', 'eta', 'eth', 'euml', 'euro', 'exist', 'fnof', 'forall', 'frac12', 'frac14', 'frac34', 'frasl', 'gamma', 'ge', 'gt', 'hArr', 'harr', 'hearts', 'hellip', 'iacute', 'icirc', 'iexcl', 'igrave', 'image', 'infin', 'int', 'iota', 'iquest', 'isin', 'iuml', 'kappa', 'lArr', 'lambda', 'lang', 'laquo', 'larr', 'lceil', 'ldquo', 'le', 'lfloor', 'lowast', 'loz', 'lrm', 'lsaquo', 'lsquo', 'lt', 'macr', 'mdash', 'micro', 'middot', 'minus', 'mu', 'nabla', 'nbsp', 'ndash', 'ne', 'ni', 'not', 'notin', 'nsub', 'ntilde', 'nu', 'oacute', 'ocirc', 'oelig', 'ograve', 'oline', 'omega', 'omicron', 'oplus', 'or', 'ordf', 'ordm', 'oslash', 'otilde', 'otimes', 'ouml', 'para', 'part', 'permil', 'perp', 'phi', 'pi', 'piv', 'plusmn', 'pound', 'prime', 'prod', 'prop', 'psi', 'quot', 'rArr', 'radic', 'rang', 'raquo', 'rarr', 'rceil', 'rdquo', 'real', 'reg', 'rfloor', 'rho', 'rlm', 'rsaquo', 'rsquo', 'sbquo', 'scaron', 'sdot', 'sect', 'shy', 'sigma', 'sigmaf', 'sim', 'spades', 'sub', 'sube', 'sum', 'sup', 'sup1', 'sup2', 'sup3', 'supe', 'szlig', 'tau', 'there4', 'theta', 'thetasym', 'thinsp', 'thorn', 'tilde', 'times', 'trade', 'uArr', 'uacute', 'uarr', 'ucirc', 'ugrave', 'uml', 'upsih', 'upsilon', 'uuml', 'weierp', 'xi', 'yacute', 'yen', 'yuml', 'zeta', 'zwj', 'zwnj'],
+\ 'mnvxmlroot': ['html'],
 \ 'a': [
 \ ['br', 'span', 'bdo', 'object', 'applet', 'img', 'map', 'iframe', 'tt', 'i', 'b', 'u', 's', 'strike', 'big', 'small', 'font', 'basefont', 'em', 'strong', 'dfn', 'code', 'q', 'samp', 'kbd', 'var', 'cite', 'abbr', 'acronym', 'sub', 'sup', 'input', 'select', 'textarea', 'label', 'button', 'ins', 'del', 'script'],
 \ { 'accesskey': [], 'rel': [], 'coords': [], 'ondblclick': [], 'dir': ['ltr', 'rtl'], 'onblur': [], 'onkeydown': [], 'target': [], 'onfocus': [], 'onkeyup': [], 'href': [], 'onmouseup': [], 'id': [], 'onmouseover': [], 'lang': [], 'tabindex': [], 'onmouseout': [], 'onmousemove': [], 'style': [], 'name': [], 'charset': [], 'xml:lang': [], 'hreflang': [], 'onkeypress': [], 'onmousedown': [], 'rev': [], 'class': [], 'title': [], 'onclick': [], 'type': [], 'shape': ['rect', 'circle', 'poly', 'default']}
@@ -365,7 +365,7 @@ let g:xmldata_xhtml10f = {
 \ ['a', 'br', 'span', 'bdo', 'object', 'applet', 'img', 'map', 'iframe', 'tt', 'i', 'b', 'u', 's', 'strike', 'big', 'small', 'font', 'basefont', 'em', 'strong', 'dfn', 'code', 'q', 'samp', 'kbd', 'var', 'cite', 'abbr', 'acronym', 'sub', 'sup', 'input', 'select', 'textarea', 'label', 'button', 'ins', 'del', 'script'],
 \ { 'ondblclick': [], 'onkeydown': [], 'onkeyup': [], 'onmouseup': [], 'id': [], 'onmouseover': [], 'lang': [], 'onmousedown': [], 'onkeypress': [], 'onclick': [], 'title': [], 'class': [], 'dir': ['ltr', 'rtl'], 'style': [], 'onmousemove': [], 'onmouseout': [], 'xml:lang': []}
 \ ],
-\ 'vimxmlattrinfo' : {
+\ 'mnvxmlattrinfo' : {
 \ 'accept' : ['ContentType', ''],
 \ 'accesskey' : ['Character', ''],
 \ 'action' : ['*URI', ''],
@@ -451,7 +451,7 @@ let g:xmldata_xhtml10f = {
 \ 'width' : ['Number', ''],
 \ 'xmlns' : ['URI', '']
 \ },
-\ 'vimxmltaginfo': {
+\ 'mnvxmltaginfo': {
 \ 'area': ['/>', ''],
 \ 'base': ['/>', ''],
 \ 'basefont': ['/>', ''],
diff --git a/uvim/runtime/autoload/xml/xhtml10s.vim b/uvim/runtime/autoload/xml/xhtml10s.mnv
index 3fb7cf8c44..147bd07899 100644
--- a/uvim/runtime/autoload/xml/xhtml10s.vim
+++ b/uvim/runtime/autoload/xml/xhtml10s.mnv
@@ -1,6 +1,6 @@
 let g:xmldata_xhtml10s = {
-\ 'vimxmlentities': ['AElig', 'Aacute', 'Acirc', 'Agrave', 'Alpha', 'Aring', 'Atilde', 'Auml', 'Beta', 'Ccedil', 'Chi', 'Dagger', 'Delta', 'ETH', 'Eacute', 'Ecirc', 'Egrave', 'Epsilon', 'Eta', 'Euml', 'Gamma', 'Iacute', 'Icirc', 'Igrave', 'Iota', 'Iuml', 'Kappa', 'Lambda', 'Mu', 'Ntilde', 'Nu', 'OElig', 'Oacute', 'Ocirc', 'Ograve', 'Omega', 'Omicron', 'Oslash', 'Otilde', 'Ouml', 'Phi', 'Pi', 'Prime', 'Psi', 'Rho', 'Scaron', 'Sigma', 'THORN', 'Tau', 'Theta', 'Uacute', 'Ucirc', 'Ugrave', 'Upsilon', 'Uuml', 'Xi', 'Yacute', 'Yuml', 'Zeta', 'aacute', 'acirc', 'acute', 'aelig', 'agrave', 'alefsym', 'alpha', 'amp', 'and', 'ang', 'apos', 'aring', 'asymp', 'atilde', 'auml', 'bdquo', 'beta', 'brvbar', 'bull', 'cap', 'ccedil', 'cedil', 'cent', 'chi', 'circ', 'clubs', 'cong', 'copy', 'crarr', 'cup', 'curren', 'dArr', 'dagger', 'darr', 'deg', 'delta', 'diams', 'divide', 'eacute', 'ecirc', 'egrave', 'empty', 'emsp', 'ensp', 'epsilon', 'equiv', 'eta', 'eth', 'euml', 'euro', 'exist', 'fnof', 'forall', 'frac12', 'frac14', 'frac34', 'frasl', 'gamma', 'ge', 'gt', 'hArr', 'harr', 'hearts', 'hellip', 'iacute', 'icirc', 'iexcl', 'igrave', 'image', 'infin', 'int', 'iota', 'iquest', 'isin', 'iuml', 'kappa', 'lArr', 'lambda', 'lang', 'laquo', 'larr', 'lceil', 'ldquo', 'le', 'lfloor', 'lowast', 'loz', 'lrm', 'lsaquo', 'lsquo', 'lt', 'macr', 'mdash', 'micro', 'middot', 'minus', 'mu', 'nabla', 'nbsp', 'ndash', 'ne', 'ni', 'not', 'notin', 'nsub', 'ntilde', 'nu', 'oacute', 'ocirc', 'oelig', 'ograve', 'oline', 'omega', 'omicron', 'oplus', 'or', 'ordf', 'ordm', 'oslash', 'otilde', 'otimes', 'ouml', 'para', 'part', 'permil', 'perp', 'phi', 'pi', 'piv', 'plusmn', 'pound', 'prime', 'prod', 'prop', 'psi', 'quot', 'rArr', 'radic', 'rang', 'raquo', 'rarr', 'rceil', 'rdquo', 'real', 'reg', 'rfloor', 'rho', 'rlm', 'rsaquo', 'rsquo', 'sbquo', 'scaron', 'sdot', 'sect', 'shy', 'sigma', 'sigmaf', 'sim', 'spades', 'sub', 'sube', 'sum', 'sup', 'sup1', 'sup2', 'sup3', 'supe', 'szlig', 'tau', 'there4', 'theta', 'thetasym', 'thinsp', 'thorn', 'tilde', 'times', 'trade', 'uArr', 'uacute', 'uarr', 'ucirc', 'ugrave', 'uml', 'upsih', 'upsilon', 'uuml', 'weierp', 'xi', 'yacute', 'yen', 'yuml', 'zeta', 'zwj', 'zwnj'],
-\ 'vimxmlroot': ['html'],
+\ 'mnvxmlentities': ['AElig', 'Aacute', 'Acirc', 'Agrave', 'Alpha', 'Aring', 'Atilde', 'Auml', 'Beta', 'Ccedil', 'Chi', 'Dagger', 'Delta', 'ETH', 'Eacute', 'Ecirc', 'Egrave', 'Epsilon', 'Eta', 'Euml', 'Gamma', 'Iacute', 'Icirc', 'Igrave', 'Iota', 'Iuml', 'Kappa', 'Lambda', 'Mu', 'Ntilde', 'Nu', 'OElig', 'Oacute', 'Ocirc', 'Ograve', 'Omega', 'Omicron', 'Oslash', 'Otilde', 'Ouml', 'Phi', 'Pi', 'Prime', 'Psi', 'Rho', 'Scaron', 'Sigma', 'THORN', 'Tau', 'Theta', 'Uacute', 'Ucirc', 'Ugrave', 'Upsilon', 'Uuml', 'Xi', 'Yacute', 'Yuml', 'Zeta', 'aacute', 'acirc', 'acute', 'aelig', 'agrave', 'alefsym', 'alpha', 'amp', 'and', 'ang', 'apos', 'aring', 'asymp', 'atilde', 'auml', 'bdquo', 'beta', 'brvbar', 'bull', 'cap', 'ccedil', 'cedil', 'cent', 'chi', 'circ', 'clubs', 'cong', 'copy', 'crarr', 'cup', 'curren', 'dArr', 'dagger', 'darr', 'deg', 'delta', 'diams', 'divide', 'eacute', 'ecirc', 'egrave', 'empty', 'emsp', 'ensp', 'epsilon', 'equiv', 'eta', 'eth', 'euml', 'euro', 'exist', 'fnof', 'forall', 'frac12', 'frac14', 'frac34', 'frasl', 'gamma', 'ge', 'gt', 'hArr', 'harr', 'hearts', 'hellip', 'iacute', 'icirc', 'iexcl', 'igrave', 'image', 'infin', 'int', 'iota', 'iquest', 'isin', 'iuml', 'kappa', 'lArr', 'lambda', 'lang', 'laquo', 'larr', 'lceil', 'ldquo', 'le', 'lfloor', 'lowast', 'loz', 'lrm', 'lsaquo', 'lsquo', 'lt', 'macr', 'mdash', 'micro', 'middot', 'minus', 'mu', 'nabla', 'nbsp', 'ndash', 'ne', 'ni', 'not', 'notin', 'nsub', 'ntilde', 'nu', 'oacute', 'ocirc', 'oelig', 'ograve', 'oline', 'omega', 'omicron', 'oplus', 'or', 'ordf', 'ordm', 'oslash', 'otilde', 'otimes', 'ouml', 'para', 'part', 'permil', 'perp', 'phi', 'pi', 'piv', 'plusmn', 'pound', 'prime', 'prod', 'prop', 'psi', 'quot', 'rArr', 'radic', 'rang', 'raquo', 'rarr', 'rceil', 'rdquo', 'real', 'reg', 'rfloor', 'rho', 'rlm', 'rsaquo', 'rsquo', 'sbquo', 'scaron', 'sdot', 'sect', 'shy', 'sigma', 'sigmaf', 'sim', 'spades', 'sub', 'sube', 'sum', 'sup', 'sup1', 'sup2', 'sup3', 'supe', 'szlig', 'tau', 'there4', 'theta', 'thetasym', 'thinsp', 'thorn', 'tilde', 'times', 'trade', 'uArr', 'uacute', 'uarr', 'ucirc', 'ugrave', 'uml', 'upsih', 'upsilon', 'uuml', 'weierp', 'xi', 'yacute', 'yen', 'yuml', 'zeta', 'zwj', 'zwnj'],
+\ 'mnvxmlroot': ['html'],
 \ 'a': [
 \ ['br', 'span', 'bdo', 'map', 'object', 'img', 'tt', 'i', 'b', 'big', 'small', 'em', 'strong', 'dfn', 'code', 'q', 'samp', 'kbd', 'var', 'cite', 'abbr', 'acronym', 'sub', 'sup', 'input', 'select', 'textarea', 'label', 'button', 'ins', 'del', 'script'],
 \ { 'accesskey': [], 'rel': [], 'coords': [], 'ondblclick': [], 'dir': ['ltr', 'rtl'], 'onblur': [], 'onfocus': [], 'onkeydown': [], 'onkeyup': [], 'href': [], 'onmouseup': [], 'id': [], 'onmouseover': [], 'lang': [], 'tabindex': [], 'onmouseout': [], 'onmousemove': [], 'name': [], 'style': [], 'charset': [], 'xml:lang': [], 'hreflang': [], 'onkeypress': [], 'onmousedown': [], 'rev': [], 'class': [], 'title': [], 'onclick': [], 'type': [], 'shape': ['rect', 'circle', 'poly', 'default']}
@@ -309,7 +309,7 @@ let g:xmldata_xhtml10s = {
 \ ['a', 'br', 'span', 'bdo', 'map', 'object', 'img', 'tt', 'i', 'b', 'big', 'small', 'em', 'strong', 'dfn', 'code', 'q', 'samp', 'kbd', 'var', 'cite', 'abbr', 'acronym', 'sub', 'sup', 'input', 'select', 'textarea', 'label', 'button', 'ins', 'del', 'script'],
 \ { 'ondblclick': [], 'onkeydown': [], 'onkeyup': [], 'onmouseup': [], 'id': [], 'onmouseover': [], 'lang': [], 'onmousedown': [], 'onkeypress': [], 'onclick': [], 'title': [], 'class': [], 'dir': ['ltr', 'rtl'], 'style': [], 'onmousemove': [], 'onmouseout': [], 'xml:lang': []}
 \ ],
-\ 'vimxmlattrinfo' : {
+\ 'mnvxmlattrinfo' : {
 \ 'accept' : ['ContentType', ''],
 \ 'accesskey' : ['Character', ''],
 \ 'action' : ['*URI', ''],
@@ -395,7 +395,7 @@ let g:xmldata_xhtml10s = {
 \ 'width' : ['Number', ''],
 \ 'xmlns' : ['URI', '']
 \ },
-\ 'vimxmltaginfo': {
+\ 'mnvxmltaginfo': {
 \ 'area': ['/>', ''],
 \ 'base': ['/>', ''],
 \ 'br': ['/>', ''],
diff --git a/uvim/runtime/autoload/xml/xhtml10t.vim b/uvim/runtime/autoload/xml/xhtml10t.mnv
index 0e857ac9b2..7672fba640 100644
--- a/uvim/runtime/autoload/xml/xhtml10t.vim
+++ b/uvim/runtime/autoload/xml/xhtml10t.mnv
@@ -1,6 +1,6 @@
 let g:xmldata_xhtml10t = {
-\ 'vimxmlentities': ['AElig', 'Aacute', 'Acirc', 'Agrave', 'Alpha', 'Aring', 'Atilde', 'Auml', 'Beta', 'Ccedil', 'Chi', 'Dagger', 'Delta', 'ETH', 'Eacute', 'Ecirc', 'Egrave', 'Epsilon', 'Eta', 'Euml', 'Gamma', 'Iacute', 'Icirc', 'Igrave', 'Iota', 'Iuml', 'Kappa', 'Lambda', 'Mu', 'Ntilde', 'Nu', 'OElig', 'Oacute', 'Ocirc', 'Ograve', 'Omega', 'Omicron', 'Oslash', 'Otilde', 'Ouml', 'Phi', 'Pi', 'Prime', 'Psi', 'Rho', 'Scaron', 'Sigma', 'THORN', 'Tau', 'Theta', 'Uacute', 'Ucirc', 'Ugrave', 'Upsilon', 'Uuml', 'Xi', 'Yacute', 'Yuml', 'Zeta', 'aacute', 'acirc', 'acute', 'aelig', 'agrave', 'alefsym', 'alpha', 'amp', 'and', 'ang', 'apos', 'aring', 'asymp', 'atilde', 'auml', 'bdquo', 'beta', 'brvbar', 'bull', 'cap', 'ccedil', 'cedil', 'cent', 'chi', 'circ', 'clubs', 'cong', 'copy', 'crarr', 'cup', 'curren', 'dArr', 'dagger', 'darr', 'deg', 'delta', 'diams', 'divide', 'eacute', 'ecirc', 'egrave', 'empty', 'emsp', 'ensp', 'epsilon', 'equiv', 'eta', 'eth', 'euml', 'euro', 'exist', 'fnof', 'forall', 'frac12', 'frac14', 'frac34', 'frasl', 'gamma', 'ge', 'gt', 'hArr', 'harr', 'hearts', 'hellip', 'iacute', 'icirc', 'iexcl', 'igrave', 'image', 'infin', 'int', 'iota', 'iquest', 'isin', 'iuml', 'kappa', 'lArr', 'lambda', 'lang', 'laquo', 'larr', 'lceil', 'ldquo', 'le', 'lfloor', 'lowast', 'loz', 'lrm', 'lsaquo', 'lsquo', 'lt', 'macr', 'mdash', 'micro', 'middot', 'minus', 'mu', 'nabla', 'nbsp', 'ndash', 'ne', 'ni', 'not', 'notin', 'nsub', 'ntilde', 'nu', 'oacute', 'ocirc', 'oelig', 'ograve', 'oline', 'omega', 'omicron', 'oplus', 'or', 'ordf', 'ordm', 'oslash', 'otilde', 'otimes', 'ouml', 'para', 'part', 'permil', 'perp', 'phi', 'pi', 'piv', 'plusmn', 'pound', 'prime', 'prod', 'prop', 'psi', 'quot', 'rArr', 'radic', 'rang', 'raquo', 'rarr', 'rceil', 'rdquo', 'real', 'reg', 'rfloor', 'rho', 'rlm', 'rsaquo', 'rsquo', 'sbquo', 'scaron', 'sdot', 'sect', 'shy', 'sigma', 'sigmaf', 'sim', 'spades', 'sub', 'sube', 'sum', 'sup', 'sup1', 'sup2', 'sup3', 'supe', 'szlig', 'tau', 'there4', 'theta', 'thetasym', 'thinsp', 'thorn', 'tilde', 'times', 'trade', 'uArr', 'uacute', 'uarr', 'ucirc', 'ugrave', 'uml', 'upsih', 'upsilon', 'uuml', 'weierp', 'xi', 'yacute', 'yen', 'yuml', 'zeta', 'zwj', 'zwnj'],
-\ 'vimxmlroot': ['html'],
+\ 'mnvxmlentities': ['AElig', 'Aacute', 'Acirc', 'Agrave', 'Alpha', 'Aring', 'Atilde', 'Auml', 'Beta', 'Ccedil', 'Chi', 'Dagger', 'Delta', 'ETH', 'Eacute', 'Ecirc', 'Egrave', 'Epsilon', 'Eta', 'Euml', 'Gamma', 'Iacute', 'Icirc', 'Igrave', 'Iota', 'Iuml', 'Kappa', 'Lambda', 'Mu', 'Ntilde', 'Nu', 'OElig', 'Oacute', 'Ocirc', 'Ograve', 'Omega', 'Omicron', 'Oslash', 'Otilde', 'Ouml', 'Phi', 'Pi', 'Prime', 'Psi', 'Rho', 'Scaron', 'Sigma', 'THORN', 'Tau', 'Theta', 'Uacute', 'Ucirc', 'Ugrave', 'Upsilon', 'Uuml', 'Xi', 'Yacute', 'Yuml', 'Zeta', 'aacute', 'acirc', 'acute', 'aelig', 'agrave', 'alefsym', 'alpha', 'amp', 'and', 'ang', 'apos', 'aring', 'asymp', 'atilde', 'auml', 'bdquo', 'beta', 'brvbar', 'bull', 'cap', 'ccedil', 'cedil', 'cent', 'chi', 'circ', 'clubs', 'cong', 'copy', 'crarr', 'cup', 'curren', 'dArr', 'dagger', 'darr', 'deg', 'delta', 'diams', 'divide', 'eacute', 'ecirc', 'egrave', 'empty', 'emsp', 'ensp', 'epsilon', 'equiv', 'eta', 'eth', 'euml', 'euro', 'exist', 'fnof', 'forall', 'frac12', 'frac14', 'frac34', 'frasl', 'gamma', 'ge', 'gt', 'hArr', 'harr', 'hearts', 'hellip', 'iacute', 'icirc', 'iexcl', 'igrave', 'image', 'infin', 'int', 'iota', 'iquest', 'isin', 'iuml', 'kappa', 'lArr', 'lambda', 'lang', 'laquo', 'larr', 'lceil', 'ldquo', 'le', 'lfloor', 'lowast', 'loz', 'lrm', 'lsaquo', 'lsquo', 'lt', 'macr', 'mdash', 'micro', 'middot', 'minus', 'mu', 'nabla', 'nbsp', 'ndash', 'ne', 'ni', 'not', 'notin', 'nsub', 'ntilde', 'nu', 'oacute', 'ocirc', 'oelig', 'ograve', 'oline', 'omega', 'omicron', 'oplus', 'or', 'ordf', 'ordm', 'oslash', 'otilde', 'otimes', 'ouml', 'para', 'part', 'permil', 'perp', 'phi', 'pi', 'piv', 'plusmn', 'pound', 'prime', 'prod', 'prop', 'psi', 'quot', 'rArr', 'radic', 'rang', 'raquo', 'rarr', 'rceil', 'rdquo', 'real', 'reg', 'rfloor', 'rho', 'rlm', 'rsaquo', 'rsquo', 'sbquo', 'scaron', 'sdot', 'sect', 'shy', 'sigma', 'sigmaf', 'sim', 'spades', 'sub', 'sube', 'sum', 'sup', 'sup1', 'sup2', 'sup3', 'supe', 'szlig', 'tau', 'there4', 'theta', 'thetasym', 'thinsp', 'thorn', 'tilde', 'times', 'trade', 'uArr', 'uacute', 'uarr', 'ucirc', 'ugrave', 'uml', 'upsih', 'upsilon', 'uuml', 'weierp', 'xi', 'yacute', 'yen', 'yuml', 'zeta', 'zwj', 'zwnj'],
+\ 'mnvxmlroot': ['html'],
 \ 'a': [
 \ ['br', 'span', 'bdo', 'object', 'applet', 'img', 'map', 'iframe', 'tt', 'i', 'b', 'u', 's', 'strike', 'big', 'small', 'font', 'basefont', 'em', 'strong', 'dfn', 'code', 'q', 'samp', 'kbd', 'var', 'cite', 'abbr', 'acronym', 'sub', 'sup', 'input', 'select', 'textarea', 'label', 'button', 'ins', 'del', 'script'],
 \ { 'accesskey': [], 'rel': [], 'coords': [], 'ondblclick': [], 'dir': ['ltr', 'rtl'], 'onblur': [], 'onkeydown': [], 'target': [], 'onfocus': [], 'onkeyup': [], 'href': [], 'onmouseup': [], 'id': [], 'onmouseover': [], 'lang': [], 'tabindex': [], 'onmouseout': [], 'onmousemove': [], 'style': [], 'name': [], 'charset': [], 'xml:lang': [], 'hreflang': [], 'onkeypress': [], 'onmousedown': [], 'rev': [], 'class': [], 'title': [], 'onclick': [], 'type': [], 'shape': ['rect', 'circle', 'poly', 'default']}
@@ -357,7 +357,7 @@ let g:xmldata_xhtml10t = {
 \ ['a', 'br', 'span', 'bdo', 'object', 'applet', 'img', 'map', 'iframe', 'tt', 'i', 'b', 'u', 's', 'strike', 'big', 'small', 'font', 'basefont', 'em', 'strong', 'dfn', 'code', 'q', 'samp', 'kbd', 'var', 'cite', 'abbr', 'acronym', 'sub', 'sup', 'input', 'select', 'textarea', 'label', 'button', 'ins', 'del', 'script'],
 \ { 'ondblclick': [], 'onkeydown': [], 'onkeyup': [], 'onmouseup': [], 'id': [], 'onmouseover': [], 'lang': [], 'onmousedown': [], 'onkeypress': [], 'onclick': [], 'title': [], 'class': [], 'dir': ['ltr', 'rtl'], 'style': [], 'onmousemove': [], 'onmouseout': [], 'xml:lang': []}
 \ ],
-\ 'vimxmlattrinfo' : {
+\ 'mnvxmlattrinfo' : {
 \ 'accept' : ['ContentType', ''],
 \ 'accesskey' : ['Character', ''],
 \ 'action' : ['*URI', ''],
@@ -443,7 +443,7 @@ let g:xmldata_xhtml10t = {
 \ 'width' : ['Number', ''],
 \ 'xmlns' : ['URI', '']
 \ },
-\ 'vimxmltaginfo': {
+\ 'mnvxmltaginfo': {
 \ 'area': ['/>', ''],
 \ 'base': ['/>', ''],
 \ 'basefont': ['/>', ''],
diff --git a/uvim/runtime/autoload/xml/xhtml11.vim b/uvim/runtime/autoload/xml/xhtml11.mnv
index ef79fd7714..dae7eb8570 100644
--- a/uvim/runtime/autoload/xml/xhtml11.vim
+++ b/uvim/runtime/autoload/xml/xhtml11.mnv
@@ -1,6 +1,6 @@
 let g:xmldata_xhtml11 = {
-\ 'vimxmlentities': ['AElig', 'Aacute', 'Acirc', 'Agrave', 'Alpha', 'Aring', 'Atilde', 'Auml', 'Beta', 'Ccedil', 'Chi', 'Dagger', 'Delta', 'ETH', 'Eacute', 'Ecirc', 'Egrave', 'Epsilon', 'Eta', 'Euml', 'Gamma', 'Iacute', 'Icirc', 'Igrave', 'Iota', 'Iuml', 'Kappa', 'Lambda', 'Mu', 'Ntilde', 'Nu', 'OElig', 'Oacute', 'Ocirc', 'Ograve', 'Omega', 'Omicron', 'Oslash', 'Otilde', 'Ouml', 'Phi', 'Pi', 'Prime', 'Psi', 'Rho', 'Scaron', 'Sigma', 'THORN', 'Tau', 'Theta', 'Uacute', 'Ucirc', 'Ugrave', 'Upsilon', 'Uuml', 'Xi', 'Yacute', 'Yuml', 'Zeta', 'aacute', 'acirc', 'acute', 'aelig', 'agrave', 'alefsym', 'alpha', 'amp', 'and', 'ang', 'apos', 'aring', 'asymp', 'atilde', 'auml', 'bdquo', 'beta', 'brvbar', 'bull', 'cap', 'ccedil', 'cedil', 'cent', 'chi', 'circ', 'clubs', 'cong', 'copy', 'crarr', 'cup', 'curren', 'dArr', 'dagger', 'darr', 'deg', 'delta', 'diams', 'divide', 'eacute', 'ecirc', 'egrave', 'empty', 'emsp', 'ensp', 'epsilon', 'equiv', 'eta', 'eth', 'euml', 'euro', 'exist', 'fnof', 'forall', 'frac12', 'frac14', 'frac34', 'frasl', 'gamma', 'ge', 'gt', 'hArr', 'harr', 'hearts', 'hellip', 'iacute', 'icirc', 'iexcl', 'igrave', 'image', 'infin', 'int', 'iota', 'iquest', 'isin', 'iuml', 'kappa', 'lArr', 'lambda', 'lang', 'laquo', 'larr', 'lceil', 'ldquo', 'le', 'lfloor', 'lowast', 'loz', 'lrm', 'lsaquo', 'lsquo', 'lt', 'macr', 'mdash', 'micro', 'middot', 'minus', 'mu', 'nabla', 'nbsp', 'ndash', 'ne', 'ni', 'not', 'notin', 'nsub', 'ntilde', 'nu', 'oacute', 'ocirc', 'oelig', 'ograve', 'oline', 'omega', 'omicron', 'oplus', 'or', 'ordf', 'ordm', 'oslash', 'otilde', 'otimes', 'ouml', 'para', 'part', 'permil', 'perp', 'phi', 'pi', 'piv', 'plusmn', 'pound', 'prime', 'prod', 'prop', 'psi', 'quot', 'rArr', 'radic', 'rang', 'raquo', 'rarr', 'rceil', 'rdquo', 'real', 'reg', 'rfloor', 'rho', 'rlm', 'rsaquo', 'rsquo', 'sbquo', 'scaron', 'sdot', 'sect', 'shy', 'sigma', 'sigmaf', 'sim', 'spades', 'sub', 'sube', 'sum', 'sup', 'sup1', 'sup2', 'sup3', 'supe', 'szlig', 'tau', 'there4', 'theta', 'thetasym', 'thinsp', 'thorn', 'tilde', 'times', 'trade', 'uArr', 'uacute', 'uarr', 'ucirc', 'ugrave', 'uml', 'upsih', 'upsilon', 'uuml', 'weierp', 'xi', 'yacute', 'yen', 'yuml', 'zeta', 'zwj', 'zwnj'],
-\ 'vimxmlroot': ['html'],
+\ 'mnvxmlentities': ['AElig', 'Aacute', 'Acirc', 'Agrave', 'Alpha', 'Aring', 'Atilde', 'Auml', 'Beta', 'Ccedil', 'Chi', 'Dagger', 'Delta', 'ETH', 'Eacute', 'Ecirc', 'Egrave', 'Epsilon', 'Eta', 'Euml', 'Gamma', 'Iacute', 'Icirc', 'Igrave', 'Iota', 'Iuml', 'Kappa', 'Lambda', 'Mu', 'Ntilde', 'Nu', 'OElig', 'Oacute', 'Ocirc', 'Ograve', 'Omega', 'Omicron', 'Oslash', 'Otilde', 'Ouml', 'Phi', 'Pi', 'Prime', 'Psi', 'Rho', 'Scaron', 'Sigma', 'THORN', 'Tau', 'Theta', 'Uacute', 'Ucirc', 'Ugrave', 'Upsilon', 'Uuml', 'Xi', 'Yacute', 'Yuml', 'Zeta', 'aacute', 'acirc', 'acute', 'aelig', 'agrave', 'alefsym', 'alpha', 'amp', 'and', 'ang', 'apos', 'aring', 'asymp', 'atilde', 'auml', 'bdquo', 'beta', 'brvbar', 'bull', 'cap', 'ccedil', 'cedil', 'cent', 'chi', 'circ', 'clubs', 'cong', 'copy', 'crarr', 'cup', 'curren', 'dArr', 'dagger', 'darr', 'deg', 'delta', 'diams', 'divide', 'eacute', 'ecirc', 'egrave', 'empty', 'emsp', 'ensp', 'epsilon', 'equiv', 'eta', 'eth', 'euml', 'euro', 'exist', 'fnof', 'forall', 'frac12', 'frac14', 'frac34', 'frasl', 'gamma', 'ge', 'gt', 'hArr', 'harr', 'hearts', 'hellip', 'iacute', 'icirc', 'iexcl', 'igrave', 'image', 'infin', 'int', 'iota', 'iquest', 'isin', 'iuml', 'kappa', 'lArr', 'lambda', 'lang', 'laquo', 'larr', 'lceil', 'ldquo', 'le', 'lfloor', 'lowast', 'loz', 'lrm', 'lsaquo', 'lsquo', 'lt', 'macr', 'mdash', 'micro', 'middot', 'minus', 'mu', 'nabla', 'nbsp', 'ndash', 'ne', 'ni', 'not', 'notin', 'nsub', 'ntilde', 'nu', 'oacute', 'ocirc', 'oelig', 'ograve', 'oline', 'omega', 'omicron', 'oplus', 'or', 'ordf', 'ordm', 'oslash', 'otilde', 'otimes', 'ouml', 'para', 'part', 'permil', 'perp', 'phi', 'pi', 'piv', 'plusmn', 'pound', 'prime', 'prod', 'prop', 'psi', 'quot', 'rArr', 'radic', 'rang', 'raquo', 'rarr', 'rceil', 'rdquo', 'real', 'reg', 'rfloor', 'rho', 'rlm', 'rsaquo', 'rsquo', 'sbquo', 'scaron', 'sdot', 'sect', 'shy', 'sigma', 'sigmaf', 'sim', 'spades', 'sub', 'sube', 'sum', 'sup', 'sup1', 'sup2', 'sup3', 'supe', 'szlig', 'tau', 'there4', 'theta', 'thetasym', 'thinsp', 'thorn', 'tilde', 'times', 'trade', 'uArr', 'uacute', 'uarr', 'ucirc', 'ugrave', 'uml', 'upsih', 'upsilon', 'uuml', 'weierp', 'xi', 'yacute', 'yen', 'yuml', 'zeta', 'zwj', 'zwnj'],
+\ 'mnvxmlroot': ['html'],
 \ 'a': [
 \ ['br', 'span', 'em', 'strong', 'dfn', 'code', 'samp', 'kbd', 'var', 'cite', 'abbr', 'acronym', 'q', 'tt', 'i', 'b', 'big', 'small', 'sub', 'sup', 'bdo', 'img', 'map', 'object', 'input', 'select', 'textarea', 'label', 'button', 'ruby', 'ins', 'del', 'script', 'noscript'],
 \ { 'coords': [], 'shape': ['rect', 'circle', 'poly', 'default']}
@@ -333,7 +333,7 @@ let g:xmldata_xhtml11 = {
 \ ['br', 'span', 'em', 'strong', 'dfn', 'code', 'samp', 'kbd', 'var', 'cite', 'abbr', 'acronym', 'q', 'tt', 'i', 'b', 'big', 'small', 'sub', 'sup', 'bdo', 'a', 'img', 'map', 'object', 'input', 'select', 'textarea', 'label', 'button', 'ruby', 'ins', 'del', 'script', 'noscript'],
 \ { 'xmlns': ['http://www.w3.org/1999/xhtml'], 'ondblclick': [], 'dir': ['ltr', 'rtl'], 'onkeydown': [], 'onkeyup': [], 'onmouseup': [], 'id': [], 'onmouseover': [], 'style': [], 'onmousemove': [], 'onmouseout': [], 'xml:lang': [], 'onmousedown': [], 'onkeypress': [], 'onclick': [], 'title': [], 'class': []}
 \ ],
-\ 'vimxmlattrinfo' : {
+\ 'mnvxmlattrinfo' : {
 \ 'accept' : ['ContentType', ''],
 \ 'accesskey' : ['Character', ''],
 \ 'action' : ['*URI', ''],
@@ -419,7 +419,7 @@ let g:xmldata_xhtml11 = {
 \ 'width' : ['Number', ''],
 \ 'xmlns' : ['URI', '']
 \ },
-\ 'vimxmltaginfo': {
+\ 'mnvxmltaginfo': {
 \ 'area': ['/>', ''],
 \ 'base': ['/>', ''],
 \ 'br': ['/>', ''],
diff --git a/uvim/runtime/autoload/xml/xsd.vim b/uvim/runtime/autoload/xml/xsd.mnv
index 8a673ea21e..8a673ea21e 100644
--- a/uvim/runtime/autoload/xml/xsd.vim
+++ b/uvim/runtime/autoload/xml/xsd.mnv
diff --git a/uvim/runtime/autoload/xml/xsl.vim b/uvim/runtime/autoload/xml/xsl.mnv
index b8aa29daa0..b8aa29daa0 100644
--- a/uvim/runtime/autoload/xml/xsl.vim
+++ b/uvim/runtime/autoload/xml/xsl.mnv
diff --git a/uvim/runtime/autoload/xmlcomplete.vim b/uvim/runtime/autoload/xmlcomplete.mnv
index 55fb031e68..80bf6385c7 100644
--- a/uvim/runtime/autoload/xmlcomplete.vim
+++ b/uvim/runtime/autoload/xmlcomplete.mnv
@@ -1,4 +1,4 @@
-" Vim completion script
+" MNV completion script
 " Language:	XML
 " Maintainer:	Mikolaj Machowski ( mikmach AT wp DOT pl )
 " Last Change:	2013 Jun 29
@@ -14,7 +14,7 @@
 " canonical (system) names of data files.  Names should be lowercase,
 " descriptive to avoid any future conflicts. For example 'xhtml10s' should be
 " name for data of XHTML 1.0 Strict and 'xhtml10t' for XHTML 1.0 Transitional
-" User interface will be provided by XMLns command defined in ftplugin/xml.vim
+" User interface will be provided by XMLns command defined in ftplugin/xml.mnv
 " Currently supported canonicals are:
 " xhtml10s - XHTML 1.0 Strict
 " xsl      - XSL
@@ -31,7 +31,7 @@ function! xmlcomplete#CreateConnection(canonical, ...) " {{{
 	" Source data file. Due to suspected errors in autoload do it with
 	" :runtime.
 	" TODO: make it properly (using autoload, that is) later
-	exe "runtime autoload/xml/".a:canonical.".vim"
+	exe "runtime autoload/xml/".a:canonical.".mnv"
 
 	" Remove all traces of unexisting files to return [] when trying
 	" omnicomplete something
@@ -139,9 +139,9 @@ function! xmlcomplete#CompleteTags(findstart, base)
 		unlet! b:entitiescompl
 
 		if !exists("g:xmldata_entconnect") || g:xmldata_entconnect == 'DEFAULT'
-			let values =  g:xmldata{'_'.g:xmldata_connection['DEFAULT']}['vimxmlentities']
+			let values =  g:xmldata{'_'.g:xmldata_connection['DEFAULT']}['mnvxmlentities']
 		else
-			let values =  g:xmldata{'_'.g:xmldata_entconnect}['vimxmlentities']
+			let values =  g:xmldata{'_'.g:xmldata_entconnect}['mnvxmlentities']
 		endif
 
 		" Get only lines with entity declarations but throw out
@@ -269,12 +269,12 @@ function! xmlcomplete#CompleteTags(findstart, base)
 		endfor
 		let menu = res + res2
 		let final_menu = []
-		if has_key(g:xmldata{'_'.g:xmldata_connection[b:xml_namespace]}, 'vimxmlattrinfo')
+		if has_key(g:xmldata{'_'.g:xmldata_connection[b:xml_namespace]}, 'mnvxmlattrinfo')
 			for i in range(len(menu))
 				let item = menu[i]
-				if has_key(g:xmldata{'_'.g:xmldata_connection[b:xml_namespace]}['vimxmlattrinfo'], item)
-					let m_menu = g:xmldata{'_'.g:xmldata_connection[b:xml_namespace]}['vimxmlattrinfo'][item][0]
-					let m_info = g:xmldata{'_'.g:xmldata_connection[b:xml_namespace]}['vimxmlattrinfo'][item][1]
+				if has_key(g:xmldata{'_'.g:xmldata_connection[b:xml_namespace]}['mnvxmlattrinfo'], item)
+					let m_menu = g:xmldata{'_'.g:xmldata_connection[b:xml_namespace]}['mnvxmlattrinfo'][item][0]
+					let m_info = g:xmldata{'_'.g:xmldata_connection[b:xml_namespace]}['mnvxmlattrinfo'][item][1]
 				else
 					let m_menu = ''
 					let m_info = ''
@@ -352,7 +352,7 @@ function! xmlcomplete#CompleteTags(findstart, base)
 	if opentag == ''
 		"return []
 	    let tags = keys(g:xmldata{'_'.g:xmldata_connection[b:xml_namespace]})
-		call filter(tags, 'v:val !~ "^vimxml"')
+		call filter(tags, 'v:val !~ "^mnvxml"')
 	else
 		if !has_key(g:xmldata{'_'.g:xmldata_connection[b:xml_namespace]}, opentag)
 			" Abandon when data file isn't complete
@@ -376,13 +376,13 @@ function! xmlcomplete#CompleteTags(findstart, base)
 	else
 		let xml_namespace = b:xml_namespace.':'
 	endif
-	if has_key(g:xmldata{'_'.g:xmldata_connection[b:xml_namespace]}, 'vimxmltaginfo')
+	if has_key(g:xmldata{'_'.g:xmldata_connection[b:xml_namespace]}, 'mnvxmltaginfo')
 		let final_menu = []
 		for i in range(len(menu))
 			let item = menu[i]
-			if has_key(g:xmldata{'_'.g:xmldata_connection[b:xml_namespace]}['vimxmltaginfo'], item)
-				let m_menu = g:xmldata{'_'.g:xmldata_connection[b:xml_namespace]}['vimxmltaginfo'][item][0]
-				let m_info = g:xmldata{'_'.g:xmldata_connection[b:xml_namespace]}['vimxmltaginfo'][item][1]
+			if has_key(g:xmldata{'_'.g:xmldata_connection[b:xml_namespace]}['mnvxmltaginfo'], item)
+				let m_menu = g:xmldata{'_'.g:xmldata_connection[b:xml_namespace]}['mnvxmltaginfo'][item][0]
+				let m_info = g:xmldata{'_'.g:xmldata_connection[b:xml_namespace]}['mnvxmltaginfo'][item][1]
 			else
 				let m_menu = ''
 				let m_info = ''
@@ -398,7 +398,7 @@ function! xmlcomplete#CompleteTags(findstart, base)
   endif
 endfunction
 
-" MM: This is severely reduced closetag.vim used with kind permission of Steven
+" MM: This is severely reduced closetag.mnv used with kind permission of Steven
 "     Mueller
 "     Changes: strip all comments; delete error messages; add checking for
 "     namespace
@@ -536,4 +536,4 @@ endfunction
 function! s:Clearstack(sname)
 	exe 'let '.a:sname."=''"
 endfunction
-" vim:set foldmethod=marker:
+" mnv:set foldmethod=marker:
diff --git a/uvim/runtime/autoload/xmlformat.vim b/uvim/runtime/autoload/xmlformat.mnv
index c541e65755..44c5ddc435 100644
--- a/uvim/runtime/autoload/xmlformat.vim
+++ b/uvim/runtime/autoload/xmlformat.mnv
@@ -1,9 +1,9 @@
-" Vim plugin for formatting XML
+" MNV plugin for formatting XML
 " Last Change: 2023 March 15th
 "     Version: 0.3
 "      Author: Christian Brabandt <cb@256bit.org>
-"  Repository: https://github.com/chrisbra/vim-xml-ftplugin
-"     License: VIM License
+"  Repository: https://github.com/chrisbra/mnv-xml-ftplugin
+"     License: MNV License
 " Documentation: see :h xmlformat.txt (TODO!)
 " ---------------------------------------------------------------------
 " Load Once: {{{1
@@ -12,12 +12,12 @@ if exists("g:loaded_xmlformat") || &cp
 endif
 let g:loaded_xmlformat = 1
 let s:keepcpo       = &cpo
-set cpo&vim
+set cpo&mnv
 
 " Main function: Format the input {{{1
 func! xmlformat#Format() abort
   " only allow reformatting through the gq command
-  " (e.g. Vim is in normal mode)
+  " (e.g. MNV is in normal mode)
   if mode() != 'n'
     " do not fall back to internal formatting
     return 0
@@ -208,4 +208,4 @@ endfunc
 let &cpo= s:keepcpo
 unlet s:keepcpo
 " Modeline {{{1
-" vim: fdm=marker fdl=0 ts=2 et sw=0 sts=-1
+" mnv: fdm=marker fdl=0 ts=2 et sw=0 sts=-1
diff --git a/uvim/runtime/autoload/zip.vim b/uvim/runtime/autoload/zip.mnv
index 1ce9cfc2f7..e690c7a231 100644
--- a/uvim/runtime/autoload/zip.vim
+++ b/uvim/runtime/autoload/zip.mnv
@@ -1,32 +1,32 @@
-" zip.vim: Handles browsing zipfiles
+" zip.mnv: Handles browsing zipfiles
 " AUTOLOAD PORTION
 " Date:		2024 Aug 21
 " Version:	34
 " Maintainer:	This runtime file is looking for a new maintainer.
 " Former Maintainer:	Charles E Campbell
 " Last Change:
-" 2024 Jun 16 by Vim Project: handle whitespace on Windows properly (#14998)
-" 2024 Jul 23 by Vim Project: fix 'x' command
-" 2024 Jul 24 by Vim Project: use delete() function
-" 2024 Jul 30 by Vim Project: fix opening remote zipfile
-" 2024 Aug 04 by Vim Project: escape '[' in name of file to be extracted
-" 2024 Aug 05 by Vim Project: workaround for the FreeBSD's unzip
-" 2024 Aug 05 by Vim Project: clean-up and make it work with shellslash on Windows
-" 2024 Aug 18 by Vim Project: correctly handle special globbing chars
-" 2024 Aug 21 by Vim Project: simplify condition to detect MS-Windows
-" 2025 Mar 11 by Vim Project: handle filenames with leading '-' correctly
-" 2025 Jul 12 by Vim Project: drop ../ on write to prevent path traversal attacks
-" 2025 Sep 22 by Vim Project: support PowerShell Core
-" 2025 Dec 20 by Vim Project: use :lcd instead of :cd
-" 2026 Feb 08 by Vim Project: use system() instead of :!
-" 2026 Mar 08 by Vim Project: Make ZipUpdatePS() check for powershell
-" 2026 Apr 01 by Vim Project: Detect more path traversal attacks
-" License:	Vim License  (see vim's :help license)
+" 2024 Jun 16 by MNV Project: handle whitespace on Windows properly (#14998)
+" 2024 Jul 23 by MNV Project: fix 'x' command
+" 2024 Jul 24 by MNV Project: use delete() function
+" 2024 Jul 30 by MNV Project: fix opening remote zipfile
+" 2024 Aug 04 by MNV Project: escape '[' in name of file to be extracted
+" 2024 Aug 05 by MNV Project: workaround for the FreeBSD's unzip
+" 2024 Aug 05 by MNV Project: clean-up and make it work with shellslash on Windows
+" 2024 Aug 18 by MNV Project: correctly handle special globbing chars
+" 2024 Aug 21 by MNV Project: simplify condition to detect MS-Windows
+" 2025 Mar 11 by MNV Project: handle filenames with leading '-' correctly
+" 2025 Jul 12 by MNV Project: drop ../ on write to prevent path traversal attacks
+" 2025 Sep 22 by MNV Project: support PowerShell Core
+" 2025 Dec 20 by MNV Project: use :lcd instead of :cd
+" 2026 Feb 08 by MNV Project: use system() instead of :!
+" 2026 Mar 08 by MNV Project: Make ZipUpdatePS() check for powershell
+" 2026 Apr 01 by MNV Project: Detect more path traversal attacks
+" License:	MNV License  (see mnv's :help license)
 " Copyright:	Copyright (C) 2005-2019 Charles E. Campbell {{{1
 "		Permission is hereby granted to use and distribute this code,
 "		with or without modifications, provided that this copyright
 "		notice is copied with it. Like anything else that's free,
-"		zip.vim and zipPlugin.vim are provided *as is* and comes with
+"		zip.mnv and zipPlugin.mnv are provided *as is* and comes with
 "		no warranty of any kind, either expressed or implied. By using
 "		this plugin, you agree that in no event will the copyright
 "		holder be liable for any damages resulting from the use
@@ -39,7 +39,7 @@ if &cp || exists("g:loaded_zip")
 endif
 let g:loaded_zip= "v34"
 let s:keepcpo= &cpo
-set cpo&vim
+set cpo&mnv
 
 let s:zipfile_escape = ' ?&;\'
 let s:ERROR          = 2
@@ -79,7 +79,7 @@ endfun
 
 if v:version < 901
  " required for defer
- call s:Mess('WarningMsg', "***warning*** this version of zip needs vim 9.1 or later")
+ call s:Mess('WarningMsg', "***warning*** this version of zip needs mnv 9.1 or later")
  finish
 endif
 " sanity checks
@@ -87,7 +87,7 @@ if !executable(g:zip_unzipcmd) && &shell !~ 'pwsh'
  call s:Mess('Error', "***error*** (zip#Browse) unzip not available on your system")
  finish
 endif
-if !dist#vim#IsSafeExecutable('zip', g:zip_unzipcmd) && &shell !~ 'pwsh'
+if !dist#mnv#IsSafeExecutable('zip', g:zip_unzipcmd) && &shell !~ 'pwsh'
  call s:Mess('Error', "Warning: NOT executing " .. g:zip_unzipcmd .. " from current directory!")
  finish
 endif
@@ -225,7 +225,7 @@ fun! zip#Browse(zipfile)
   endif
   if !filereadable(a:zipfile)
    if a:zipfile !~# '^\a\+://'
-    " if it's an url, don't complain, let url-handlers such as vim do its thing
+    " if it's an url, don't complain, let url-handlers such as mnv do its thing
     call s:Mess('Error', "***error*** (zip#Browse) File not readable <".a:zipfile.">")
    endif
    return
@@ -241,15 +241,15 @@ fun! zip#Browse(zipfile)
   setlocal nobuflisted
   setlocal nowrap
 
-  " Oct 12, 2021: need to re-use Bram's syntax/tar.vim.
+  " Oct 12, 2021: need to re-use Bram's syntax/tar.mnv.
   " Setting the filetype to zip doesn't do anything (currently),
   " but it is perhaps less confusing to curious perusers who do
   " a :echo &ft
   setf zip
-  run! syntax/tar.vim
+  run! syntax/tar.mnv
 
   " give header
-  call append(0, ['" zip.vim version '.g:loaded_zip,
+  call append(0, ['" zip.mnv version '.g:loaded_zip,
  \                '" Browsing zipfile '.a:zipfile,
  \                '" Select a file with cursor and press ENTER'])
   keepj $
@@ -385,12 +385,12 @@ fun! zip#Write(fname)
     return
   endif
 
-  " place temporary files under .../_ZIPVIM_/
-  if isdirectory("_ZIPVIM_")
-    call delete("_ZIPVIM_", "rf")
+  " place temporary files under .../_ZIPMNV_/
+  if isdirectory("_ZIPMNV_")
+    call delete("_ZIPMNV_", "rf")
   endif
-  call mkdir("_ZIPVIM_")
-  lcd _ZIPVIM_
+  call mkdir("_ZIPMNV_")
+  lcd _ZIPMNV_
 
   if has("unix")
     let zipfile = substitute(a:fname,'zipfile://\(.\{-}\)::[^\\].*$','\1','')
@@ -435,7 +435,7 @@ fun! zip#Write(fname)
   let ps_cmd = 'call system(''' . substitute(ps_cmd, "'", "''", 'g') . ''')'
   call s:TryExecGnuFallBackToPs(g:zip_zipcmd, gnu_cmd, ps_cmd)
   if &shell =~ 'pwsh'
-    " Vim flashes 'creation in progress ...' from what I believe is the
+    " MNV flashes 'creation in progress ...' from what I believe is the
     " ProgressAction stream of PowerShell. Unfortunately, this cannot be
     " suppressed (as of 250824) due to an open PowerShell issue.
     " https://github.com/PowerShell/PowerShell/issues/21074
@@ -466,7 +466,7 @@ fun! zip#Write(fname)
 
   " cleanup and restore current directory
   lcd ..
-  call delete("_ZIPVIM_", "rf")
+  call delete("_ZIPMNV_", "rf")
   call s:ChgDir(curdir,s:WARNING,"(zip#Write) unable to return to ".curdir."!")
   call delete(tmpdir, "rf")
   setlocal nomod
@@ -547,7 +547,7 @@ endfun
 fun! s:ChgDir(newdir,errlvl,errmsg)
   try
    exe "lcd ".fnameescape(a:newdir)
-  catch /^Vim\%((\a\+)\)\=:E344/
+  catch /^MNV\%((\a\+)\)\=:E344/
    redraw!
    if a:errlvl == s:NOTE
     echomsg "***note*** ".a:errmsg
@@ -587,4 +587,4 @@ endfun
 " Modelines And Restoration: {{{1
 let &cpo= s:keepcpo
 unlet s:keepcpo
-" vim:ts=8 fdm=marker
+" mnv:ts=8 fdm=marker