100 files changed, 1016 insertions, 1016 deletions
diff --git a/uvim/runtime/keymap/README.txt b/uvim/runtime/keymap/README.txt
index d42e026933..d1b54fa469 100644
--- a/uvim/runtime/keymap/README.txt
+++ b/uvim/runtime/keymap/README.txt
@@ -1,10 +1,10 @@
-keymap files for Vim
+keymap files for MNV
 
 One of these files is loaded when the 'keymap' option is set.
 
 The name of the file consists of these parts:
 
-	{language}[-{layout}][_{encoding}].vim
+	{language}[-{layout}][_{encoding}].mnv
 
 {language}	Name of the language (e.g., "hebrew", "greek")
 
@@ -22,5 +22,5 @@ Each file starts with a header, naming the maintainer and the date when it was
 last changed.  If you find a problem in a keymap file, check if you have the
 most recent version.  If necessary, report a problem to the maintainer.
 
-The format of the keymap lines below "loadkeymap" is explained in the Vim help
+The format of the keymap lines below "loadkeymap" is explained in the MNV help
 files, see ":help keymap-file-format".
diff --git a/uvim/runtime/keymap/accents.mnv b/uvim/runtime/keymap/accents.mnv
new file mode 100644
index 0000000000..245909cbb3
--- /dev/null
+++ b/uvim/runtime/keymap/accents.mnv
@@ -0,0 +1,78 @@
+" MNV Keymap file for latin1 accents through dead characters
+" Maintainer:	The MNV Project <https://github.com/Project-Tick/Project-Tick>
+" Last Change:	2023 Aug 13
+
+" All characters are given literally, conversion to another encoding (e.g.,
+" UTF-8) should work.
+scriptencoding latin1
+
+" Use this short name in the status line.
+let b:keymap_name = "acc"
+
+loadkeymap
+`A	�
+'A	�
+�A	�
+^A	�
+~A	�
+:A	�
+'C	�
+�C	�
+`E	�
+'E	�
+�E	�
+^E	�
+`I	�
+'I	�
+�I	�
+^I	�
+~N	�
+`O	�
+'O	�
+�O	�
+^O	�
+~O	�
+:O	�
+`U	�
+'U	�
+�U	�
+^U	�
+:U	�
+'Y	�
+�Y	�
+`a	�
+'a	�
+�a	�
+^a	�
+~a	�
+:a	�
+'c	�
+�c	�
+`e	�
+'e	�
+�e	�
+^e	�
+`i	�
+'i	�
+�i	�
+^i	�
+~n	�
+`o	�
+'o	�
+�o	�
+^o	�
+~o	�
+:o	�
+`u	�
+'u	�
+�u	�
+^u	�
+:u	�
+'y	�
+�y	�
+''	'
+��	�
+``	`
+^^	^
+~~	~
+::	:
diff --git a/uvim/runtime/keymap/accents.vim b/uvim/runtime/keymap/accents.vim
deleted file mode 100644
index a97a280881..0000000000
--- a/uvim/runtime/keymap/accents.vim
+++ /dev/null
@@ -1,78 +0,0 @@
-" Vim Keymap file for latin1 accents through dead characters
-" Maintainer:	The Vim Project <https://github.com/vim/vim>
-" Last Change:	2023 Aug 13
-
-" All characters are given literally, conversion to another encoding (e.g.,
-" UTF-8) should work.
-scriptencoding latin1
-
-" Use this short name in the status line.
-let b:keymap_name = "acc"
-
-loadkeymap
-`A	�
-'A	�
-�A	�
-^A	�
-~A	�
-:A	�
-'C	�
-�C	�
-`E	�
-'E	�
-�E	�
-^E	�
-`I	�
-'I	�
-�I	�
-^I	�
-~N	�
-`O	�
-'O	�
-�O	�
-^O	�
-~O	�
-:O	�
-`U	�
-'U	�
-�U	�
-^U	�
-:U	�
-'Y	�
-�Y	�
-`a	�
-'a	�
-�a	�
-^a	�
-~a	�
-:a	�
-'c	�
-�c	�
-`e	�
-'e	�
-�e	�
-^e	�
-`i	�
-'i	�
-�i	�
-^i	�
-~n	�
-`o	�
-'o	�
-�o	�
-^o	�
-~o	�
-:o	�
-`u	�
-'u	�
-�u	�
-^u	�
-:u	�
-'y	�
-�y	�
-''	'
-��	�
-``	`
-^^	^
-~~	~
-::	:
diff --git a/uvim/runtime/keymap/arabic.vim b/uvim/runtime/keymap/arabic.mnv
index 7eb9a17dd1..5c0f75e613 100644
--- a/uvim/runtime/keymap/arabic.vim
+++ b/uvim/runtime/keymap/arabic.mnv
@@ -1,2 +1,2 @@
 " Assume 'encoding' is set to "latin1" while actually iso-8859-6 is used
-source <sfile>:p:h/arabic_utf-8.vim
+source <sfile>:p:h/arabic_utf-8.mnv
diff --git a/uvim/runtime/keymap/arabic_buckwalter.vim b/uvim/runtime/keymap/arabic_buckwalter.mnv
index 7535cf4976..52fab72367 100644
--- a/uvim/runtime/keymap/arabic_buckwalter.vim
+++ b/uvim/runtime/keymap/arabic_buckwalter.mnv
@@ -1,4 +1,4 @@
-" Vim Keymap file for Arabic using Buckwalter Transliteration
+" MNV Keymap file for Arabic using Buckwalter Transliteration
 " see
 " http://qamus.org/transliteration.htm
 " https://en.wikipedia.org/wiki/Buckwalter_transliteration
diff --git a/uvim/runtime/keymap/arabic_utf-8.vim b/uvim/runtime/keymap/arabic_utf-8.mnv
index 60fd05fc81..c54f44a953 100644
--- a/uvim/runtime/keymap/arabic_utf-8.vim
+++ b/uvim/runtime/keymap/arabic_utf-8.mnv
@@ -1,4 +1,4 @@
-" Vim Keymap file for Arabic
+" MNV Keymap file for Arabic
 " Maintainer   : Arabic Support group <support-at-arabeyes.org>
 " Created by   : Nadim Shaikli <nadim-at-arabeyes.org>
 " Last Updated : 2023-10-27
diff --git a/uvim/runtime/keymap/armenian-eastern_utf-8.vim b/uvim/runtime/keymap/armenian-eastern_utf-8.mnv
index eaa60a77f8..e9b1651221 100644
--- a/uvim/runtime/keymap/armenian-eastern_utf-8.vim
+++ b/uvim/runtime/keymap/armenian-eastern_utf-8.mnv
@@ -1,6 +1,6 @@
-" Maintainer: Benjamin Linskey <vim@benlinskey.com>
+" Maintainer: Benjamin Linskey <mnv@benlinskey.com>
 " Last Changed: 2016 December 5
-" URL: https://github.com/blinskey/vim-armenian-keymaps
+" URL: https://github.com/blinskey/mnv-armenian-keymaps
 
 let b:keymap_name = "hy"
 
diff --git a/uvim/runtime/keymap/armenian-western_utf-8.vim b/uvim/runtime/keymap/armenian-western_utf-8.mnv
index cf3efdc00f..6a9b14a954 100644
--- a/uvim/runtime/keymap/armenian-western_utf-8.vim
+++ b/uvim/runtime/keymap/armenian-western_utf-8.mnv
@@ -1,6 +1,6 @@
-" Maintainer: Benjamin Linskey <vim@benlinskey.com>
+" Maintainer: Benjamin Linskey <mnv@benlinskey.com>
 " Last Changed: 2016 December 5
-" URL: https://github.com/blinskey/vim-armenian-keymaps
+" URL: https://github.com/blinskey/mnv-armenian-keymaps
 
 let b:keymap_name = "hy"
 
diff --git a/uvim/runtime/keymap/azerbaijani.vim b/uvim/runtime/keymap/azerbaijani.mnv
index 823a3ef9e6..d445317f62 100644
--- a/uvim/runtime/keymap/azerbaijani.vim
+++ b/uvim/runtime/keymap/azerbaijani.mnv
@@ -1,4 +1,4 @@
-" Vim keymap file for Azerbaijani language
+" MNV keymap file for Azerbaijani language
 " Maintainer: Rasul Samadzade <rasul.samadzade@protonmail.com>
 " Last changed: 2025-06-13
 
diff --git a/uvim/runtime/keymap/belarusian-jcuken.vim b/uvim/runtime/keymap/belarusian-jcuken.mnv
index 73c84aaae1..1cfb1bea70 100644
--- a/uvim/runtime/keymap/belarusian-jcuken.vim
+++ b/uvim/runtime/keymap/belarusian-jcuken.mnv
@@ -1,7 +1,7 @@
-" Vim Keymap file for Belarusian characters, layout 'jcuken', classical variant
+" MNV Keymap file for Belarusian characters, layout 'jcuken', classical variant
 " Useful mainly with UTF-8, but may work with other encodings.
 
-" Derived From: russian-jcuken.vim
+" Derived From: russian-jcuken.mnv
 " Maintainer:   Aliaksei Nestserau <aliaksei@screencustoms.com>
 " Last Changed: 2012 Jul 23
 
diff --git a/uvim/runtime/keymap/brazilian_portuguese-abnt.vim b/uvim/runtime/keymap/brazilian_portuguese-abnt.mnv
index b67bf1cfdc..d120b7c2bb 100644
--- a/uvim/runtime/keymap/brazilian_portuguese-abnt.vim
+++ b/uvim/runtime/keymap/brazilian_portuguese-abnt.mnv
@@ -1,4 +1,4 @@
-" Vim Keymap file for Brazilian Portuguese - ABNT (without altgr because that would be ABNT2)
+" MNV Keymap file for Brazilian Portuguese - ABNT (without altgr because that would be ABNT2)
 
 " Maintainer:   Elsarques
 " Last Changed: 2025-04-06
diff --git a/uvim/runtime/keymap/brazilian_portuguese-compact.vim b/uvim/runtime/keymap/brazilian_portuguese-compact.mnv
index 9b34c59ff5..41acc7f0cc 100644
--- a/uvim/runtime/keymap/brazilian_portuguese-compact.vim
+++ b/uvim/runtime/keymap/brazilian_portuguese-compact.mnv
@@ -1,4 +1,4 @@
-" Vim Keymap file for Brazilian Portuguese - ABNT Compact (for keyboards
+" MNV Keymap file for Brazilian Portuguese - ABNT Compact (for keyboards
 " with less keys and without altgr because that would be ABNT2)
 
 " Maintainer:   Elsarques
diff --git a/uvim/runtime/keymap/bulgarian-bds.vim b/uvim/runtime/keymap/bulgarian-bds.mnv
index 3377edbbd8..ec8821dffc 100644
--- a/uvim/runtime/keymap/bulgarian-bds.vim
+++ b/uvim/runtime/keymap/bulgarian-bds.mnv
@@ -1,10 +1,10 @@
-" Vim keymap file for Bulgarian and Russian characters, "bds" layout.
+" MNV keymap file for Bulgarian and Russian characters, "bds" layout.
 " Most of it can be used with both utf-8 and cp1251 file encodings, except
 " the accented characters which can only be stored in utf-8.
 " This file itself is in utf-8.
 
 " Maintainer: Boyko Bantchev <boykobb@gmail.com>
-" URI: http://www.math.bas.bg/bantchev/vim/bulgarian-bds.vim
+" URI: http://www.math.bas.bg/bantchev/mnv/bulgarian-bds.mnv
 " Last Changed: 2010 May 4
 
 " This keymap corresponds to what is called Bulgarian standard typewriter
@@ -37,7 +37,7 @@
 " For details of what key or key combination maps to what character, please
 " see below the map itself.
 "
-" See also http://www.math.bas.bg/bantchev/vim/kbdbul.html (in Bulgarian).
+" See also http://www.math.bas.bg/bantchev/mnv/kbdbul.html (in Bulgarian).
 
 scriptencoding utf-8
 
diff --git a/uvim/runtime/keymap/bulgarian-phonetic.vim b/uvim/runtime/keymap/bulgarian-phonetic.mnv
index eab2f15e5c..3f680ab8e8 100644
--- a/uvim/runtime/keymap/bulgarian-phonetic.vim
+++ b/uvim/runtime/keymap/bulgarian-phonetic.mnv
@@ -1,10 +1,10 @@
-" Vim keymap file for Bulgarian and Russian characters, "phonetic" layout.
+" MNV keymap file for Bulgarian and Russian characters, "phonetic" layout.
 " Most of it can be used with both utf-8 and cp1251 file encodings, except
 " the accented vowels which can only be stored in utf-8.
 " This file itself is in utf-8.
 
 " Maintainer:   Boyko Bantchev <boykobb@gmail.com>
-" URI: http://www.math.bas.bg/bantchev/vim/bulgarian-phonetic.vim
+" URI: http://www.math.bas.bg/bantchev/mnv/bulgarian-phonetic.mnv
 " Last Changed: 2010 May 4
 
 " This keymap corresponds to what is called "phonetic layout" in Bulgaria:
@@ -31,7 +31,7 @@
 " For details of what key or key combination maps to what character, please
 " see below the map itself.
 "
-" See also http://www.math.bas.bg/bantchev/vim/kbdbul.html (in Bulgarian).
+" See also http://www.math.bas.bg/bantchev/mnv/kbdbul.html (in Bulgarian).
 
 scriptencoding utf-8
 
diff --git a/uvim/runtime/keymap/canfr-win.vim b/uvim/runtime/keymap/canfr-win.mnv
index 1907fc5b46..6e9568554a 100644
--- a/uvim/runtime/keymap/canfr-win.vim
+++ b/uvim/runtime/keymap/canfr-win.mnv
@@ -1,4 +1,4 @@
-" Vim Keymap file for the normalized Canadian multilingual keyboard
+" MNV Keymap file for the normalized Canadian multilingual keyboard
 " CAN/CSA Z243.200-92 using the latin1 encoding.
 " This mapping is limited in scope, as it assumes that the AltGr
 " key works as it typically does in a Windows system with a multilingual
@@ -25,67 +25,67 @@ let b:keymap_name = "canfr"
 loadkeymap
 <	'
 >	"
-/	�
-?	�
-'	�
-\"	�
-\\	�
-|	�
-[a	�
-[e	�
-[i	�
-[o	�
-[u	�
-[A	�
-[E	�
-[I	�
-[O	�
-[U	�
+/	�
+?	�
+'	�
+\"	�
+\\	�
+|	�
+[a	�
+[e	�
+[i	�
+[o	�
+[u	�
+[A	�
+[E	�
+[I	�
+[O	�
+[U	�
 [[	^
-{a	�
-{e	�
-{i	�
-{o	�
-{u	�
-{y	�
-{A	�
-{E	�
-{I	�
-{O	�
-{U	�
-]	�
-}	�
+{a	�
+{e	�
+{i	�
+{o	�
+{u	�
+{y	�
+{A	�
+{E	�
+{I	�
+{O	�
+{U	�
+]	�
+}	�
 `	/
 ~	\\
 ^	?
-�	�
-�	�
-�	<
-�	>
-�	�
-�a	�
-�e	�
-�i	�
-�o	�
-�u	�
-�A	�
-�E	�
-�I	�
-�O	�
-�U	�
-��	`
-�a	�
-�o	�
-�n	�
-�s	�
-�A	�
-�O	�
-�N	�
-�S	�
-��	~
-�	|
-�	{
-�	}
-�	[
-�	]
-�	�
+�	�
+�	�
+�	<
+�	>
+�	�
+�a	�
+�e	�
+�i	�
+�o	�
+�u	�
+�A	�
+�E	�
+�I	�
+�O	�
+�U	�
+��	`
+�a	�
+�o	�
+�n	�
+�s	�
+�A	�
+�O	�
+�N	�
+�S	�
+��	~
+�	|
+�	{
+�	}
+�	[
+�	]
+�	�
diff --git a/uvim/runtime/keymap/croatian.vim b/uvim/runtime/keymap/croatian.mnv
index b52eba03fa..3f9b2cb193 100644
--- a/uvim/runtime/keymap/croatian.vim
+++ b/uvim/runtime/keymap/croatian.mnv
@@ -8,9 +8,9 @@ if s:encoding == 'latin1'
 endif
 
 if s:encoding == 'utf-8'
-	source <sfile>:p:h/croatian_utf-8.vim
+	source <sfile>:p:h/croatian_utf-8.mnv
 elseif s:encoding == 'cp1250'
-	source <sfile>:p:h/croatian_cp1250.vim
+	source <sfile>:p:h/croatian_cp1250.mnv
 else
-	source <sfile>:p:h/croatian_iso-8859-2.vim
+	source <sfile>:p:h/croatian_iso-8859-2.mnv
 endif
diff --git a/uvim/runtime/keymap/croatian_cp1250.vim b/uvim/runtime/keymap/croatian_cp1250.mnv
index a5a92e385d..8cb5ab0c05 100644
--- a/uvim/runtime/keymap/croatian_cp1250.vim
+++ b/uvim/runtime/keymap/croatian_cp1250.mnv
@@ -1,4 +1,4 @@
-" Vim Keymap file for Croatian characters, classical variant, cp1250 encoding
+" MNV Keymap file for Croatian characters, classical variant, cp1250 encoding
 " 
 " Maintainer:   Paul B. Mahol <onemda@gmail.com>
 " Last Changed: 2007 Oct 15
@@ -14,28 +14,28 @@ z	y
 Z	Y
 y	z
 Y	Z
-[	�
-{	�
-]	�
-}	�
-;	�
-:	�
-'	�
-"	�
-\	�
-|	�
+[	�
+{	�
+]	�
+}	�
+;	�
+:	�
+'	�
+"	�
+\	�
+|	�
 /	-
 ?	_
 >	:
 <	;
-�	<
-�	>
-�	{
-�	}
-�	[
-�	]
-�	\
-�	|
+�	<
+�	>
+�	{
+�	}
+�	[
+�	]
+�	\
+�	|
 =	+
 +	*
 -	'
@@ -46,20 +46,20 @@ Y	Z
 *	(
 (	)
 )	=
-�	~
-�	@
-�	^
-�	�
-�	�
-�	�
-�	�
-�	�
-�	�
-�	�
-�	�
-�	`
-�	�
-�	�
-�	�
-�	�
-�	�
+�	~
+�	@
+�	^
+�	�
+�	�
+�	�
+�	�
+�	�
+�	�
+�	�
+�	�
+�	`
+�	�
+�	�
+�	�
+�	�
+�	�
diff --git a/uvim/runtime/keymap/croatian_iso-8859-2.vim b/uvim/runtime/keymap/croatian_iso-8859-2.mnv
index 4afb0a1e82..fc77fe2dbb 100644
--- a/uvim/runtime/keymap/croatian_iso-8859-2.vim
+++ b/uvim/runtime/keymap/croatian_iso-8859-2.mnv
@@ -1,4 +1,4 @@
-" Vim Keymap file for Croatian characters, classical variant, iso-8859-2 encoding
+" MNV Keymap file for Croatian characters, classical variant, iso-8859-2 encoding
 " 
 " Maintainer:   Paul B. Mahol <onemda@gmail.com>
 " Last Changed: 2007 Oct 14
@@ -17,39 +17,39 @@ y	z
 Y	Z
 
 " s<
-[	�
+[	�
 " S<
-{	�
+{	�
 " D/
-}	�
+}	�
 " d/
-]	�
+]	�
 " c<
-;	�
+;	�
 " c'
-'	�
+'	�
 " C<
-:	�
+:	�
 " C'
-"	�
+"	�
 " z<
-\	�
+\	�
 " Z<
-|	�
-�	|
-�	@
-�	\
-�	�
-�	�
-�	�
-�	�
-�	�
-�	�
-�	�
-�	{
-�	}
-�	[
-�	]
+|	�
+�	|
+�	@
+�	\
+�	�
+�	�
+�	�
+�	�
+�	�
+�	�
+�	�
+�	{
+�	}
+�	[
+�	]
 @	"
 ^	&
 &	/
@@ -64,21 +64,21 @@ _	?
 <	;
 >	:
 ?	_
-�	~
-�	�
-�	�
-�	�
-�	^
-�	�
-�	�
-�	`
-�	�
-�	�
-�	�
+�	~
+�	�
+�	�
+�	�
+�	^
+�	�
+�	�
+�	`
+�	�
+�	�
+�	�
 
 " you still want to be able to type <, >
-�	<
-�	>
+�	<
+�	>
 
-`	�
-�	�
+`	�
+�	�
diff --git a/uvim/runtime/keymap/croatian_utf-8.vim b/uvim/runtime/keymap/croatian_utf-8.mnv
index 11c005f0c3..406232b40d 100644
--- a/uvim/runtime/keymap/croatian_utf-8.vim
+++ b/uvim/runtime/keymap/croatian_utf-8.mnv
@@ -1,4 +1,4 @@
-" Vim Keymap file for Croatian characters, classical variant, UTF-8 encoding
+" MNV Keymap file for Croatian characters, classical variant, UTF-8 encoding
 " 
 " Maintainer:   Paul B. Mahol <onemda@gmail.com>
 " Last Changed: 2007 Oct 14
diff --git a/uvim/runtime/keymap/czech.mnv b/uvim/runtime/keymap/czech.mnv
new file mode 100644
index 0000000000..f236a278a7
--- /dev/null
+++ b/uvim/runtime/keymap/czech.mnv
@@ -0,0 +1 @@
+source <sfile>:p:h/czech_utf-8.mnv
diff --git a/uvim/runtime/keymap/czech.vim b/uvim/runtime/keymap/czech.vim
deleted file mode 100644
index ffca531c0f..0000000000
--- a/uvim/runtime/keymap/czech.vim
+++ /dev/null
@@ -1 +0,0 @@
-source <sfile>:p:h/czech_utf-8.vim
diff --git a/uvim/runtime/keymap/czech_utf-8.vim b/uvim/runtime/keymap/czech_utf-8.mnv
index 0a084742db..0a084742db 100644
--- a/uvim/runtime/keymap/czech_utf-8.vim
+++ b/uvim/runtime/keymap/czech_utf-8.mnv
diff --git a/uvim/runtime/keymap/dvorak.vim b/uvim/runtime/keymap/dvorak.mnv
index 77dc530b1b..77dc530b1b 100644
--- a/uvim/runtime/keymap/dvorak.vim
+++ b/uvim/runtime/keymap/dvorak.mnv
diff --git a/uvim/runtime/keymap/esperanto.mnv b/uvim/runtime/keymap/esperanto.mnv
new file mode 100644
index 0000000000..647d68be40
--- /dev/null
+++ b/uvim/runtime/keymap/esperanto.mnv
@@ -0,0 +1 @@
+source <sfile>:p:h/esperanto_utf-8.mnv
diff --git a/uvim/runtime/keymap/esperanto.vim b/uvim/runtime/keymap/esperanto.vim
deleted file mode 100644
index 42b3987bb2..0000000000
--- a/uvim/runtime/keymap/esperanto.vim
+++ /dev/null
@@ -1 +0,0 @@
-source <sfile>:p:h/esperanto_utf-8.vim
diff --git a/uvim/runtime/keymap/esperanto_utf-8.vim b/uvim/runtime/keymap/esperanto_utf-8.mnv
index 2910a6f080..2910a6f080 100644
--- a/uvim/runtime/keymap/esperanto_utf-8.vim
+++ b/uvim/runtime/keymap/esperanto_utf-8.mnv
diff --git a/uvim/runtime/keymap/french-azerty.vim b/uvim/runtime/keymap/french-azerty.mnv
index b0fd758e97..729a9945b9 100644
--- a/uvim/runtime/keymap/french-azerty.vim
+++ b/uvim/runtime/keymap/french-azerty.mnv
@@ -1,5 +1,5 @@
-" Vim Keymap file for French standard keyboard layout (without AltGr keys as
-" they don't work reliably in all version of vim)
+" MNV Keymap file for French standard keyboard layout (without AltGr keys as
+" they don't work reliably in all version of mnv)
 
 " Maintainer:   Yerlan Sergaziyev <yerlaser@outlook.com>
 " Last Changed: 2020-07-18
diff --git a/uvim/runtime/keymap/georgian-qwerty.vim b/uvim/runtime/keymap/georgian-qwerty.mnv
index df18729f06..c08bf8300e 100644
--- a/uvim/runtime/keymap/georgian-qwerty.vim
+++ b/uvim/runtime/keymap/georgian-qwerty.mnv
@@ -1,4 +1,4 @@
-" Vim keymap file for Georgian (Mkhedruli) layout
+" MNV keymap file for Georgian (Mkhedruli) layout
 " Maintainer: Mishiko Okropiridze <misho.okropiridze@gmail.com>
 " Last changed: 2024-06-14
 
diff --git a/uvim/runtime/keymap/german-qwertz.vim b/uvim/runtime/keymap/german-qwertz.mnv
index c2ccb1bfe2..a74d75462b 100644
--- a/uvim/runtime/keymap/german-qwertz.vim
+++ b/uvim/runtime/keymap/german-qwertz.mnv
@@ -1,5 +1,5 @@
-" Vim Keymap file for German standard keyboard layout (without AltGr keys as
-" they don't work reliably in all version of vim)
+" MNV Keymap file for German standard keyboard layout (without AltGr keys as
+" they don't work reliably in all version of mnv)
 
 " Maintainer:   Yerlan Sergaziyev <yerlaser@outlook.com>
 " Last Changed: 2020-07-18
diff --git a/uvim/runtime/keymap/greek.vim b/uvim/runtime/keymap/greek.mnv
index eb2c1dedc8..5134edd4bb 100644
--- a/uvim/runtime/keymap/greek.vim
+++ b/uvim/runtime/keymap/greek.mnv
@@ -1,7 +1,7 @@
 " Assume 'encoding' is set to "latin1" while actually cp1253 or iso-8859-7 is
 " being used
 if has("win16") || has("win32") || has("win32unix")
-  source <sfile>:p:h/greek_cp1253.vim
+  source <sfile>:p:h/greek_cp1253.mnv
 else
-  source <sfile>:p:h/greek_iso-8859-7.vim
+  source <sfile>:p:h/greek_iso-8859-7.mnv
 endif
diff --git a/uvim/runtime/keymap/greek_cp1253.mnv b/uvim/runtime/keymap/greek_cp1253.mnv
new file mode 100644
index 0000000000..290d61a51e
--- /dev/null
+++ b/uvim/runtime/keymap/greek_cp1253.mnv
@@ -0,0 +1,119 @@
+" MNV Keymap file for greek
+" Maintainer: Grigorios Magklis <maglis@cs.rochester.edu>
+" Patched for MS-Windows CP1253: Panagiotis Louridas <louridas@acm.org>
+" Last Updated: Fri 13 Feb 2004 13:01:33
+"
+" This keyboard layout allows all Greek symbols to be typed,
+" including accented capitals, diaeresis & accent on the same
+" vowel, and the Greek semicolon sign.
+"
+" accent			";" + letter
+" diaeresis			":" + letter
+" diaeresis + accent		";" + ":" (or ":" + ";") + letter
+" semicolon			"q"
+" colon				"Q"
+" greek semicolon		"W"
+" sigma at end of word		"w"
+" greek left double-quote	"<" twice
+" greek right double-quote	">" twice
+
+" Use this short name in the status line.
+let b:keymap_name = "greek"
+
+loadkeymap
+" capital
+A	<char-193>	" �
+B	<char-194>	" �
+G	<char-195>	" �
+D	<char-196>	" �
+E	<char-197>	" �
+Z	<char-198>	" �
+H	<char-199>	" �
+U	<char-200>	" �
+I	<char-201>	" �
+K	<char-202>	" �
+L	<char-203>	" �
+M	<char-204>	" �
+N	<char-205>	" �
+J	<char-206>	" �
+O	<char-207>	" �
+P	<char-208>	" �
+R	<char-209>	" �
+S	<char-211>	" �
+T	<char-212>	" �
+Y	<char-213>	" �
+F	<char-214>	" �
+X	<char-215>	" �
+C	<char-216>	" �
+V	<char-217>	" �
+
+" small
+a	<char-225>	" �
+b	<char-226>	" �
+g	<char-227>	" �
+d	<char-228>	" �
+e	<char-229>	" �
+z	<char-230>	" �
+h	<char-231>	" �
+u	<char-232>	" �
+i	<char-233>	" �
+k	<char-234>	" �
+l	<char-235>	" �
+m	<char-236>	" �
+n	<char-237>	" �
+j	<char-238>	" �
+o	<char-239>	" �
+p	<char-240>	" �
+r	<char-241>	" �
+w	<char-242>	" �
+s	<char-243>	" �
+t	<char-244>	" �
+y	<char-245>	" �
+f	<char-246>	" �
+x	<char-247>	" �
+c	<char-248>	" �
+v	<char-249>	" �
+
+" accented capital
+;A	<char-162>	" �
+;E	<char-184>	" �
+;H	<char-185>	" �
+;I	<char-186>	" �
+;Y	<char-190>	" �
+;O	<char-188>	" �
+;V	<char-191>	" �
+"
+:I	<char-218>	" �
+:Y	<char-219>	" �
+
+" accented small
+;a	<char-220>	" �
+;e	<char-221>	" �
+;h	<char-222>	" �
+;i	<char-223>	" �
+;y	<char-253>	" �
+;o	<char-252>	" �
+;v	<char-254>	" �
+"
+:i	<char-250>	" �
+:y	<char-251>	" �
+"
+;:i	<char-192>	" �
+:;i	<char-192>	" �
+;:y	<char-224>	" �
+:;y	<char-224>	" �
+
+" symbols
+q	;		" ;
+Q	:		" :
+W	<char-183>	" �
+;	<char-180>	" �
+:	<char-168>	" �
+;:	<char-181>	" �
+:;	<char-181>	" �
+
+" quotes
+<<	<char-171>	" �
+>>	<char-187>	" �
+" <char-161>	" �
+" <char-162>	" �
diff --git a/uvim/runtime/keymap/greek_cp1253.vim b/uvim/runtime/keymap/greek_cp1253.vim
deleted file mode 100644
index a146477da8..0000000000
--- a/uvim/runtime/keymap/greek_cp1253.vim
+++ /dev/null
@@ -1,119 +0,0 @@
-" Vim Keymap file for greek
-" Maintainer: Grigorios Magklis <maglis@cs.rochester.edu>
-" Patched for MS-Windows CP1253: Panagiotis Louridas <louridas@acm.org>
-" Last Updated: Fri 13 Feb 2004 13:01:33
-"
-" This keyboard layout allows all Greek symbols to be typed,
-" including accented capitals, diaeresis & accent on the same
-" vowel, and the Greek semicolon sign.
-"
-" accent			";" + letter
-" diaeresis			":" + letter
-" diaeresis + accent		";" + ":" (or ":" + ";") + letter
-" semicolon			"q"
-" colon				"Q"
-" greek semicolon		"W"
-" sigma at end of word		"w"
-" greek left double-quote	"<" twice
-" greek right double-quote	">" twice
-
-" Use this short name in the status line.
-let b:keymap_name = "greek"
-
-loadkeymap
-" capital
-A	<char-193>	" �
-B	<char-194>	" �
-G	<char-195>	" �
-D	<char-196>	" �
-E	<char-197>	" �
-Z	<char-198>	" �
-H	<char-199>	" �
-U	<char-200>	" �
-I	<char-201>	" �
-K	<char-202>	" �
-L	<char-203>	" �
-M	<char-204>	" �
-N	<char-205>	" �
-J	<char-206>	" �
-O	<char-207>	" �
-P	<char-208>	" �
-R	<char-209>	" �
-S	<char-211>	" �
-T	<char-212>	" �
-Y	<char-213>	" �
-F	<char-214>	" �
-X	<char-215>	" �
-C	<char-216>	" �
-V	<char-217>	" �
-
-" small
-a	<char-225>	" �
-b	<char-226>	" �
-g	<char-227>	" �
-d	<char-228>	" �
-e	<char-229>	" �
-z	<char-230>	" �
-h	<char-231>	" �
-u	<char-232>	" �
-i	<char-233>	" �
-k	<char-234>	" �
-l	<char-235>	" �
-m	<char-236>	" �
-n	<char-237>	" �
-j	<char-238>	" �
-o	<char-239>	" �
-p	<char-240>	" �
-r	<char-241>	" �
-w	<char-242>	" �
-s	<char-243>	" �
-t	<char-244>	" �
-y	<char-245>	" �
-f	<char-246>	" �
-x	<char-247>	" �
-c	<char-248>	" �
-v	<char-249>	" �
-
-" accented capital
-;A	<char-162>	" �
-;E	<char-184>	" �
-;H	<char-185>	" �
-;I	<char-186>	" �
-;Y	<char-190>	" �
-;O	<char-188>	" �
-;V	<char-191>	" �
-"
-:I	<char-218>	" �
-:Y	<char-219>	" �
-
-" accented small
-;a	<char-220>	" �
-;e	<char-221>	" �
-;h	<char-222>	" �
-;i	<char-223>	" �
-;y	<char-253>	" �
-;o	<char-252>	" �
-;v	<char-254>	" �
-"
-:i	<char-250>	" �
-:y	<char-251>	" �
-"
-;:i	<char-192>	" �
-:;i	<char-192>	" �
-;:y	<char-224>	" �
-:;y	<char-224>	" �
-
-" symbols
-q	;		" ;
-Q	:		" :
-W	<char-183>	" �
-;	<char-180>	" �
-:	<char-168>	" �
-;:	<char-181>	" �
-:;	<char-181>	" �
-
-" quotes
-<<	<char-171>	" �
->>	<char-187>	" �
-" <char-161>	" �
-" <char-162>	" �
diff --git a/uvim/runtime/keymap/greek_cp737.mnv b/uvim/runtime/keymap/greek_cp737.mnv
new file mode 100644
index 0000000000..e979d99415
--- /dev/null
+++ b/uvim/runtime/keymap/greek_cp737.mnv
@@ -0,0 +1,104 @@
+" MNV Keymap file for greek DOS cp737
+" Maintainer: Panagiotis Louridas <louridas@acm.org>
+" Last Updated: Thu Mar 23 14:05:45 EET 2006
+
+" This keyboard layout allows all Greek symbols to be typed,
+" including accented capitals and diaeresis. It does not
+" include diaeresis and accent on the same vowel, nor
+" the greek quotes, as these were not included in the codepage.
+" It includes the Greek semicolon sign.
+
+"
+" accent			";" + letter
+" diaeresis			":" + letter
+" diaeresis + accent		";" + ":" (or ":" + ";") + letter
+" semicolon			"q"
+" colon				"Q"
+" greek semicolon		"W"
+" sigma at end of word		"w"
+
+" Use this short name in the status line.
+let b:keymap_name = "greek"
+
+loadkeymap
+" capital
+A	<char-128>	" �
+B	<char-129>	" �
+G	<char-130>	" �
+D	<char-131>	" �
+E	<char-132>	" �
+Z	<char-133>	" �
+H	<char-134>	" �
+U	<char-135>	" �
+I	<char-136>	" �
+K	<char-137>	" �
+L	<char-138>	" �
+M	<char-139>	" �
+N	<char-140>	" �
+J	<char-141>	" �
+O	<char-142>	" �
+P	<char-143>	" �
+R	<char-144>	" �
+S	<char-145>	" �
+T	<char-146>	" �
+Y	<char-147>	" �
+F	<char-148>	" �
+X	<char-149>	" �
+C	<char-150>	" �
+V	<char-151>	" �
+
+" small
+a	<char-152>	" �
+b	<char-153>	" �
+g	<char-154>	" �
+d	<char-155>	" �
+e	<char-156>	" �
+z	<char-157>	" �
+h	<char-158>	" �
+u	<char-159>	" �
+i	<char-160>	" �
+k	<char-161>	" �
+l	<char-162>	" �
+m	<char-163>	" �
+n	<char-164>	" �
+j	<char-165>	" �
+o	<char-166>	" �
+p	<char-167>	" �
+r	<char-168>	" �
+s	<char-169>	" �
+w	<char-170>	" �
+t	<char-171>	" �
+y	<char-172>	" �
+f	<char-173>	" �
+x	<char-174>	" �
+c	<char-175>	" �
+v	<char-224>	" �
+
+" accented capital
+;A	<char-234>	" �
+;E	<char-235>	" �
+;H	<char-236>	" �
+;I	<char-237>	" �
+;O	<char-238>	" �
+;Y	<char-239>	" �
+;V	<char-240>	" �
+"
+:I	<char-244>	" �
+:Y	<char-245>	" �
+
+" accented small
+;a	<char-225>	" �
+;e	<char-226>	" �
+;h	<char-227>	" �
+;i	<char-229>	" �
+;o	<char-230>	" �
+;y	<char-231>	" �
+;v	<char-233>	" �
+"
+:i	<char-228>	" �
+:y	<char-232>	" �
+"
+" symbols
+q	;		" ;
+Q	:		" :
+W	<char-250>	" �
diff --git a/uvim/runtime/keymap/greek_cp737.vim b/uvim/runtime/keymap/greek_cp737.vim
deleted file mode 100644
index dd0b372820..0000000000
--- a/uvim/runtime/keymap/greek_cp737.vim
+++ /dev/null
@@ -1,104 +0,0 @@
-" Vim Keymap file for greek DOS cp737
-" Maintainer: Panagiotis Louridas <louridas@acm.org>
-" Last Updated: Thu Mar 23 14:05:45 EET 2006
-
-" This keyboard layout allows all Greek symbols to be typed,
-" including accented capitals and diaeresis. It does not
-" include diaeresis and accent on the same vowel, nor
-" the greek quotes, as these were not included in the codepage.
-" It includes the Greek semicolon sign.
-
-"
-" accent			";" + letter
-" diaeresis			":" + letter
-" diaeresis + accent		";" + ":" (or ":" + ";") + letter
-" semicolon			"q"
-" colon				"Q"
-" greek semicolon		"W"
-" sigma at end of word		"w"
-
-" Use this short name in the status line.
-let b:keymap_name = "greek"
-
-loadkeymap
-" capital
-A	<char-128>	" �
-B	<char-129>	" �
-G	<char-130>	" �
-D	<char-131>	" �
-E	<char-132>	" �
-Z	<char-133>	" �
-H	<char-134>	" �
-U	<char-135>	" �
-I	<char-136>	" �
-K	<char-137>	" �
-L	<char-138>	" �
-M	<char-139>	" �
-N	<char-140>	" �
-J	<char-141>	" �
-O	<char-142>	" �
-P	<char-143>	" �
-R	<char-144>	" �
-S	<char-145>	" �
-T	<char-146>	" �
-Y	<char-147>	" �
-F	<char-148>	" �
-X	<char-149>	" �
-C	<char-150>	" �
-V	<char-151>	" �
-
-" small
-a	<char-152>	" �
-b	<char-153>	" �
-g	<char-154>	" �
-d	<char-155>	" �
-e	<char-156>	" �
-z	<char-157>	" �
-h	<char-158>	" �
-u	<char-159>	" �
-i	<char-160>	" �
-k	<char-161>	" �
-l	<char-162>	" �
-m	<char-163>	" �
-n	<char-164>	" �
-j	<char-165>	" �
-o	<char-166>	" �
-p	<char-167>	" �
-r	<char-168>	" �
-s	<char-169>	" �
-w	<char-170>	" �
-t	<char-171>	" �
-y	<char-172>	" �
-f	<char-173>	" �
-x	<char-174>	" �
-c	<char-175>	" �
-v	<char-224>	" �
-
-" accented capital
-;A	<char-234>	" �
-;E	<char-235>	" �
-;H	<char-236>	" �
-;I	<char-237>	" �
-;O	<char-238>	" �
-;Y	<char-239>	" �
-;V	<char-240>	" �
-"
-:I	<char-244>	" �
-:Y	<char-245>	" �
-
-" accented small
-;a	<char-225>	" �
-;e	<char-226>	" �
-;h	<char-227>	" �
-;i	<char-229>	" �
-;o	<char-230>	" �
-;y	<char-231>	" �
-;v	<char-233>	" �
-"
-:i	<char-228>	" �
-:y	<char-232>	" �
-"
-" symbols
-q	;		" ;
-Q	:		" :
-W	<char-250>	" �
diff --git a/uvim/runtime/keymap/greek_iso-8859-7.mnv b/uvim/runtime/keymap/greek_iso-8859-7.mnv
new file mode 100644
index 0000000000..fc57adb3e7
--- /dev/null
+++ b/uvim/runtime/keymap/greek_iso-8859-7.mnv
@@ -0,0 +1,118 @@
+" MNV Keymap file for greek
+" Maintainer: Grigorios Magklis <maglis@cs.rochester.edu>
+" Last Updated: Tue 10 Jul 2001 16:50:50
+"
+" This keyboard layout allows all Greek symbols to be typed,
+" including accented capitals, diaeresis & accent on the same
+" vowel, and the Greek semicolon sign.
+"
+" accent			";" + letter
+" diaeresis			":" + letter
+" diaeresis + accent		";" + ":" (or ":" + ";") + letter
+" semicolon			"q"
+" colon				"Q"
+" greek semicolon		"W"
+" sigma at end of word		"w"
+" greek left double-quote	"<" twice
+" greek right double-quote	">" twice
+
+" Use this short name in the status line.
+let b:keymap_name = "greek"
+
+loadkeymap
+" capital
+A	<char-193>	" �
+B	<char-194>	" �
+G	<char-195>	" �
+D	<char-196>	" �
+E	<char-197>	" �
+Z	<char-198>	" �
+H	<char-199>	" �
+U	<char-200>	" �
+I	<char-201>	" �
+K	<char-202>	" �
+L	<char-203>	" �
+M	<char-204>	" �
+N	<char-205>	" �
+J	<char-206>	" �
+O	<char-207>	" �
+P	<char-208>	" �
+R	<char-209>	" �
+S	<char-211>	" �
+T	<char-212>	" �
+Y	<char-213>	" �
+F	<char-214>	" �
+X	<char-215>	" �
+C	<char-216>	" �
+V	<char-217>	" �
+
+" small
+a	<char-225>	" �
+b	<char-226>	" �
+g	<char-227>	" �
+d	<char-228>	" �
+e	<char-229>	" �
+z	<char-230>	" �
+h	<char-231>	" �
+u	<char-232>	" �
+i	<char-233>	" �
+k	<char-234>	" �
+l	<char-235>	" �
+m	<char-236>	" �
+n	<char-237>	" �
+j	<char-238>	" �
+o	<char-239>	" �
+p	<char-240>	" �
+r	<char-241>	" �
+w	<char-242>	" �
+s	<char-243>	" �
+t	<char-244>	" �
+y	<char-245>	" �
+f	<char-246>	" �
+x	<char-247>	" �
+c	<char-248>	" �
+v	<char-249>	" �
+
+" accented capital
+;A	<char-182>	" �
+;E	<char-184>	" �
+;H	<char-185>	" �
+;I	<char-186>	" �
+;Y	<char-190>	" �
+;O	<char-188>	" �
+;V	<char-191>	" �
+"
+:I	<char-218>	" �
+:Y	<char-219>	" �
+
+" accented small
+;a	<char-220>	" �
+;e	<char-221>	" �
+;h	<char-222>	" �
+;i	<char-223>	" �
+;y	<char-253>	" �
+;o	<char-252>	" �
+;v	<char-254>	" �
+"
+:i	<char-250>	" �
+:y	<char-251>	" �
+"
+;:i	<char-192>	" �
+:;i	<char-192>	" �
+;:y	<char-224>	" �
+:;y	<char-224>	" �
+
+" symbols
+q	;		" ;
+Q	:		" :
+W	<char-183>	" �
+;	<char-180>	" �
+:	<char-168>	" �
+;:	<char-181>	" �
+:;	<char-181>	" �
+
+" quotes
+<<	<char-171>	" �
+>>	<char-187>	" �
+" <char-161>	" �
+" <char-162>	" �
diff --git a/uvim/runtime/keymap/greek_iso-8859-7.vim b/uvim/runtime/keymap/greek_iso-8859-7.vim
deleted file mode 100644
index 5cfd936b3d..0000000000
--- a/uvim/runtime/keymap/greek_iso-8859-7.vim
+++ /dev/null
@@ -1,118 +0,0 @@
-" Vim Keymap file for greek
-" Maintainer: Grigorios Magklis <maglis@cs.rochester.edu>
-" Last Updated: Tue 10 Jul 2001 16:50:50
-"
-" This keyboard layout allows all Greek symbols to be typed,
-" including accented capitals, diaeresis & accent on the same
-" vowel, and the Greek semicolon sign.
-"
-" accent			";" + letter
-" diaeresis			":" + letter
-" diaeresis + accent		";" + ":" (or ":" + ";") + letter
-" semicolon			"q"
-" colon				"Q"
-" greek semicolon		"W"
-" sigma at end of word		"w"
-" greek left double-quote	"<" twice
-" greek right double-quote	">" twice
-
-" Use this short name in the status line.
-let b:keymap_name = "greek"
-
-loadkeymap
-" capital
-A	<char-193>	" �
-B	<char-194>	" �
-G	<char-195>	" �
-D	<char-196>	" �
-E	<char-197>	" �
-Z	<char-198>	" �
-H	<char-199>	" �
-U	<char-200>	" �
-I	<char-201>	" �
-K	<char-202>	" �
-L	<char-203>	" �
-M	<char-204>	" �
-N	<char-205>	" �
-J	<char-206>	" �
-O	<char-207>	" �
-P	<char-208>	" �
-R	<char-209>	" �
-S	<char-211>	" �
-T	<char-212>	" �
-Y	<char-213>	" �
-F	<char-214>	" �
-X	<char-215>	" �
-C	<char-216>	" �
-V	<char-217>	" �
-
-" small
-a	<char-225>	" �
-b	<char-226>	" �
-g	<char-227>	" �
-d	<char-228>	" �
-e	<char-229>	" �
-z	<char-230>	" �
-h	<char-231>	" �
-u	<char-232>	" �
-i	<char-233>	" �
-k	<char-234>	" �
-l	<char-235>	" �
-m	<char-236>	" �
-n	<char-237>	" �
-j	<char-238>	" �
-o	<char-239>	" �
-p	<char-240>	" �
-r	<char-241>	" �
-w	<char-242>	" �
-s	<char-243>	" �
-t	<char-244>	" �
-y	<char-245>	" �
-f	<char-246>	" �
-x	<char-247>	" �
-c	<char-248>	" �
-v	<char-249>	" �
-
-" accented capital
-;A	<char-182>	" �
-;E	<char-184>	" �
-;H	<char-185>	" �
-;I	<char-186>	" �
-;Y	<char-190>	" �
-;O	<char-188>	" �
-;V	<char-191>	" �
-"
-:I	<char-218>	" �
-:Y	<char-219>	" �
-
-" accented small
-;a	<char-220>	" �
-;e	<char-221>	" �
-;h	<char-222>	" �
-;i	<char-223>	" �
-;y	<char-253>	" �
-;o	<char-252>	" �
-;v	<char-254>	" �
-"
-:i	<char-250>	" �
-:y	<char-251>	" �
-"
-;:i	<char-192>	" �
-:;i	<char-192>	" �
-;:y	<char-224>	" �
-:;y	<char-224>	" �
-
-" symbols
-q	;		" ;
-Q	:		" :
-W	<char-183>	" �
-;	<char-180>	" �
-:	<char-168>	" �
-;:	<char-181>	" �
-:;	<char-181>	" �
-
-" quotes
-<<	<char-171>	" �
->>	<char-187>	" �
-" <char-161>	" �
-" <char-162>	" �
diff --git a/uvim/runtime/keymap/greek_utf-8.vim b/uvim/runtime/keymap/greek_utf-8.mnv
index 15292e9870..3c35c635a0 100644
--- a/uvim/runtime/keymap/greek_utf-8.vim
+++ b/uvim/runtime/keymap/greek_utf-8.mnv
@@ -1,8 +1,8 @@
-" Vim Keymap file for greek
+" MNV Keymap file for greek
 " Maintainer: Panagiotis Louridas <louridas@acm.org>
 " Last Updated: Thu Mar 23 23:45:02 EET 2006
 
-" This file was corrected for Vim after the version adapted for Vim 6 from
+" This file was corrected for MNV after the version adapted for MNV 6 from
 " the yudit distribution by Robert Goulding <goulding@princeton.edu>
 "
 " The monotonic part of this kmap was made by Constantine Stathopoulos
diff --git a/uvim/runtime/keymap/hebrew.vim b/uvim/runtime/keymap/hebrew.mnv
index 0928fca486..0738fd2571 100644
--- a/uvim/runtime/keymap/hebrew.vim
+++ b/uvim/runtime/keymap/hebrew.mnv
@@ -8,9 +8,9 @@ if encoding == 'latin1'
 endif
 
 if encoding == 'utf-8'
-	source <sfile>:p:h/hebrew_utf-8.vim
+	source <sfile>:p:h/hebrew_utf-8.mnv
 elseif encoding == 'cp1255'
-	source <sfile>:p:h/hebrew_cp1255.vim
+	source <sfile>:p:h/hebrew_cp1255.mnv
 else
-	source <sfile>:p:h/hebrew_iso-8859-8.vim
+	source <sfile>:p:h/hebrew_iso-8859-8.mnv
 endif
diff --git a/uvim/runtime/keymap/hebrew_cp1255.vim b/uvim/runtime/keymap/hebrew_cp1255.mnv
index 67a8ca7736..67a8ca7736 100644
--- a/uvim/runtime/keymap/hebrew_cp1255.vim
+++ b/uvim/runtime/keymap/hebrew_cp1255.mnv
diff --git a/uvim/runtime/keymap/hebrew_iso-8859-8.mnv b/uvim/runtime/keymap/hebrew_iso-8859-8.mnv
new file mode 100644
index 0000000000..8170702b2d
--- /dev/null
+++ b/uvim/runtime/keymap/hebrew_iso-8859-8.mnv
@@ -0,0 +1,41 @@
+" MNV Keymap file for hebrew
+" Maintainer  : Ron Aaron <ron@ronware.org>
+" Last Updated: Wed 28 Feb 2001 21:28:51
+" This is the standard Israeli keyboard layout
+
+" Use this short name in the status line.
+let b:keymap_name = "heb"
+
+loadkeymap
+a	<char-249>	" � - shin
+b	<char-240>	" � - nun
+c	<char-225>	" � - bet
+d	<char-226>	" � - gimel
+e	<char-247>	" � - qof
+f	<char-235>	" � - kaf
+g	<char-242>	" � - ayin
+h	<char-233>	" � - yod
+i	<char-239>	" � - final nun
+j	<char-231>	" � - het
+k	<char-236>	" � - lamed
+l	<char-234>	" � - final kaf
+m	<char-246>	" � - tsadi
+n	<char-238>	" � - mem
+o	<char-237>	" � - final mem
+p	<char-244>	" � - pe
+q	/		" / - slash
+r	<char-248>	" � - resh
+s	<char-227>	" � - dalet
+t	<char-224>	" � - alef
+u	<char-229>	" � - vav
+v	<char-228>	" � - he
+w	'		" ' - single-quote
+x	<char-241>	" � - samekh
+y	<char-232>	" � - tet
+z	<char-230>	" � - zayin
+,	<char-250>	" � - tav
+.	<char-245>	" � - final tsadi
+;	<char-243>	" � - final pe
+'	,		" , - comma
+/	.		" . - period
+`	;		" ; - semicolon
diff --git a/uvim/runtime/keymap/hebrew_iso-8859-8.vim b/uvim/runtime/keymap/hebrew_iso-8859-8.vim
deleted file mode 100644
index eab3084d50..0000000000
--- a/uvim/runtime/keymap/hebrew_iso-8859-8.vim
+++ /dev/null
@@ -1,41 +0,0 @@
-" Vim Keymap file for hebrew
-" Maintainer  : Ron Aaron <ron@ronware.org>
-" Last Updated: Wed 28 Feb 2001 21:28:51
-" This is the standard Israeli keyboard layout
-
-" Use this short name in the status line.
-let b:keymap_name = "heb"
-
-loadkeymap
-a	<char-249>	" � - shin
-b	<char-240>	" � - nun
-c	<char-225>	" � - bet
-d	<char-226>	" � - gimel
-e	<char-247>	" � - qof
-f	<char-235>	" � - kaf
-g	<char-242>	" � - ayin
-h	<char-233>	" � - yod
-i	<char-239>	" � - final nun
-j	<char-231>	" � - het
-k	<char-236>	" � - lamed
-l	<char-234>	" � - final kaf
-m	<char-246>	" � - tsadi
-n	<char-238>	" � - mem
-o	<char-237>	" � - final mem
-p	<char-244>	" � - pe
-q	/		" / - slash
-r	<char-248>	" � - resh
-s	<char-227>	" � - dalet
-t	<char-224>	" � - alef
-u	<char-229>	" � - vav
-v	<char-228>	" � - he
-w	'		" ' - single-quote
-x	<char-241>	" � - samekh
-y	<char-232>	" � - tet
-z	<char-230>	" � - zayin
-,	<char-250>	" � - tav
-.	<char-245>	" � - final tsadi
-;	<char-243>	" � - final pe
-'	,		" , - comma
-/	.		" . - period
-`	;		" ; - semicolon
diff --git a/uvim/runtime/keymap/hebrew_utf-8.vim b/uvim/runtime/keymap/hebrew_utf-8.mnv
index 63438845a6..4c5c7f8c70 100644
--- a/uvim/runtime/keymap/hebrew_utf-8.vim
+++ b/uvim/runtime/keymap/hebrew_utf-8.mnv
@@ -1,4 +1,4 @@
-" Vim Keymap file for hebrew
+" MNV Keymap file for hebrew
 " Maintainer  : Ron Aaron <ron@ronware.org>
 " Last Updated: Wed 28 Feb 2001 21:28:51
 " This is the standard Israeli keyboard layout with (my nonstandard locations
diff --git a/uvim/runtime/keymap/hebrewp.vim b/uvim/runtime/keymap/hebrewp.mnv
index a87cdc735d..e84ea592f5 100644
--- a/uvim/runtime/keymap/hebrewp.vim
+++ b/uvim/runtime/keymap/hebrewp.mnv
@@ -8,9 +8,9 @@ if encoding == 'latin1'
 endif
 
 if encoding == 'utf-8'
-	source <sfile>:p:h/hebrewp_utf-8.vim
+	source <sfile>:p:h/hebrewp_utf-8.mnv
 elseif encoding == 'cp1255'
-	source <sfile>:p:h/hebrewp_cp1255.vim
+	source <sfile>:p:h/hebrewp_cp1255.mnv
 else
-	source <sfile>:p:h/hebrewp_iso-8859-8.vim
+	source <sfile>:p:h/hebrewp_iso-8859-8.mnv
 endif
diff --git a/uvim/runtime/keymap/hebrewp_cp1255.vim b/uvim/runtime/keymap/hebrewp_cp1255.mnv
index 990f908599..990f908599 100644
--- a/uvim/runtime/keymap/hebrewp_cp1255.vim
+++ b/uvim/runtime/keymap/hebrewp_cp1255.mnv
diff --git a/uvim/runtime/keymap/hebrewp_iso-8859-8.vim b/uvim/runtime/keymap/hebrewp_iso-8859-8.mnv
index d4b9714d25..586329ae4e 100644
--- a/uvim/runtime/keymap/hebrewp_iso-8859-8.vim
+++ b/uvim/runtime/keymap/hebrewp_iso-8859-8.mnv
@@ -1,4 +1,4 @@
-" Vim Keymap file for hebrew
+" MNV Keymap file for hebrew
 " Maintainer  : Ron Aaron <ron@ronware.org>
 " Last Updated: Sun 10 Feb 2002 11:50:56
 " This is my version of a phonetic Hebrew
diff --git a/uvim/runtime/keymap/hebrewp_utf-8.vim b/uvim/runtime/keymap/hebrewp_utf-8.mnv
index 526174a3ac..92182a39d4 100644
--- a/uvim/runtime/keymap/hebrewp_utf-8.vim
+++ b/uvim/runtime/keymap/hebrewp_utf-8.mnv
@@ -1,4 +1,4 @@
-" Vim Keymap file for hebrew
+" MNV Keymap file for hebrew
 " Maintainer  : Ron Aaron <ron@ronware.org>
 " Last Updated: Thu 08 Mar 2001 13:49:01
 " This is my version of a phonetic Hebrew
diff --git a/uvim/runtime/keymap/kana.vim b/uvim/runtime/keymap/kana.mnv
index 9aff4eba41..8b73641932 100644
--- a/uvim/runtime/keymap/kana.vim
+++ b/uvim/runtime/keymap/kana.mnv
@@ -50,7 +50,7 @@
 "  HISTORY
 "  -------
 "  2005-01-11	<danken@cs.technion.ac.il>
-"	* Converted to Vim format.
+"	* Converted to MNV format.
 "  2003-01-22	<kazunobu.kuriyama@nifty.com>
 "
 "	* Submitted to gsinai@yudit.org
diff --git a/uvim/runtime/keymap/kazakh-jcuken.vim b/uvim/runtime/keymap/kazakh-jcuken.mnv
index 63d122d112..088b78b8f1 100644
--- a/uvim/runtime/keymap/kazakh-jcuken.vim
+++ b/uvim/runtime/keymap/kazakh-jcuken.mnv
@@ -1,6 +1,6 @@
-" Vim Keymap file for kazakh characters, layout 'jcuken', classical variant
+" MNV Keymap file for kazakh characters, layout 'jcuken', classical variant
 
-" Derived from russian-jcuken.vim by Artem Chuprina <ran@ran.pp.ru>
+" Derived from russian-jcuken.mnv by Artem Chuprina <ran@ran.pp.ru>
 " Maintainer:   Darkhan Kubigenov <darkhanu@gmail.com>
 " Last Changed: 2016 Oct 25
 
diff --git a/uvim/runtime/keymap/korean-dubeolsik_utf-8.vim b/uvim/runtime/keymap/korean-dubeolsik_utf-8.mnv
index a6b5f2a24c..a6b5f2a24c 100644
--- a/uvim/runtime/keymap/korean-dubeolsik_utf-8.vim
+++ b/uvim/runtime/keymap/korean-dubeolsik_utf-8.mnv
diff --git a/uvim/runtime/keymap/korean.vim b/uvim/runtime/keymap/korean.mnv
index 64ae519320..b7fad6e7e6 100644
--- a/uvim/runtime/keymap/korean.vim
+++ b/uvim/runtime/keymap/korean.mnv
@@ -20,4 +20,4 @@
 " completed before typing next one. To reduce such inconvenience, I suggest to
 " set `timeoutlen` with their own value. (default value is 1000ms)
 
-source <sfile>:p:h/korean-dubeolsik_utf-8.vim
+source <sfile>:p:h/korean-dubeolsik_utf-8.mnv
diff --git a/uvim/runtime/keymap/lithuanian-baltic.vim b/uvim/runtime/keymap/lithuanian-baltic.mnv
index b888db6e76..48729b3633 100644
--- a/uvim/runtime/keymap/lithuanian-baltic.vim
+++ b/uvim/runtime/keymap/lithuanian-baltic.mnv
@@ -1,4 +1,4 @@
-" Vim Keymap file for lithuanian characters, phonetic layout 'Baltic'
+" MNV Keymap file for lithuanian characters, phonetic layout 'Baltic'
 " Useful mainly with utf-8 but may work with other encodings
 
 " Maintainer:   Alex Jakushev <Alex.Jakushev@kemek.lt>
diff --git a/uvim/runtime/keymap/magyar_utf-8.vim b/uvim/runtime/keymap/magyar_utf-8.mnv
index 729771768f..729771768f 100644
--- a/uvim/runtime/keymap/magyar_utf-8.vim
+++ b/uvim/runtime/keymap/magyar_utf-8.mnv
diff --git a/uvim/runtime/keymap/mongolian_utf-8.vim b/uvim/runtime/keymap/mongolian_utf-8.mnv
index a52e3e9a90..a52e3e9a90 100644
--- a/uvim/runtime/keymap/mongolian_utf-8.vim
+++ b/uvim/runtime/keymap/mongolian_utf-8.mnv
diff --git a/uvim/runtime/keymap/oldturkic-orkhon_utf-8.vim b/uvim/runtime/keymap/oldturkic-orkhon_utf-8.mnv
index e1f0015a2a..e1f0015a2a 100644
--- a/uvim/runtime/keymap/oldturkic-orkhon_utf-8.vim
+++ b/uvim/runtime/keymap/oldturkic-orkhon_utf-8.mnv
diff --git a/uvim/runtime/keymap/oldturkic-yenisei_utf-8.vim b/uvim/runtime/keymap/oldturkic-yenisei_utf-8.mnv
index 09722e70a2..09722e70a2 100644
--- a/uvim/runtime/keymap/oldturkic-yenisei_utf-8.vim
+++ b/uvim/runtime/keymap/oldturkic-yenisei_utf-8.mnv
diff --git a/uvim/runtime/keymap/persian-iranian_utf-8.vim b/uvim/runtime/keymap/persian-iranian_utf-8.mnv
index e8dcd76e7d..6db7dd7e13 100644
--- a/uvim/runtime/keymap/persian-iranian_utf-8.vim
+++ b/uvim/runtime/keymap/persian-iranian_utf-8.mnv
@@ -1,4 +1,4 @@
-" Vim Keymap file for Persian Standard Keyboard Layout
+" MNV Keymap file for Persian Standard Keyboard Layout
 " Maintainers: Behnam 'ZWNJ' Esfahbod <behnam@zwnj.org>,
 "	       Amir Hedayaty <hedayaty@gmail.com>
 " Last Change: 2006 Apr 21
diff --git a/uvim/runtime/keymap/persian.vim b/uvim/runtime/keymap/persian.mnv
index 7bf5cd61a6..7779e41310 100644
--- a/uvim/runtime/keymap/persian.vim
+++ b/uvim/runtime/keymap/persian.mnv
@@ -4,5 +4,5 @@ if encoding == ''
 endif
 
 if encoding == 'utf-8'
-	source <sfile>:p:h/persian-iranian_utf-8.vim
+	source <sfile>:p:h/persian-iranian_utf-8.mnv
 endif
diff --git a/uvim/runtime/keymap/pinyin.vim b/uvim/runtime/keymap/pinyin.mnv
index 253814c753..460288f1a6 100644
--- a/uvim/runtime/keymap/pinyin.vim
+++ b/uvim/runtime/keymap/pinyin.mnv
@@ -1,4 +1,4 @@
-" Vim Keymap file for Hanyu Pinyin tone marks through numbers.
+" MNV Keymap file for Hanyu Pinyin tone marks through numbers.
 " Maintainer: Fredrik Roubert <fredrik@roubert.name>
 " Last Changed: February 15, 2004
 
diff --git a/uvim/runtime/keymap/polish-slash.vim b/uvim/runtime/keymap/polish-slash.mnv
index a4300781fc..957edad262 100644
--- a/uvim/runtime/keymap/polish-slash.vim
+++ b/uvim/runtime/keymap/polish-slash.mnv
@@ -1,4 +1,4 @@
-" Polish letters under VIM >= 6
+" Polish letters under MNV >= 6
 " Maintainer:   HS6_06 <hs6_06@o2.pl>
 " Last changed: 2005 Jan 12
 " Current version: 1.0.2
@@ -17,11 +17,11 @@ if encoding == 'latin1'
 endif
 
 if encoding == 'utf-8'
-	source <sfile>:p:h/polish-slash_utf-8.vim
+	source <sfile>:p:h/polish-slash_utf-8.mnv
 elseif encoding == 'cp1250'
-	source <sfile>:p:h/polish-slash_cp1250.vim
+	source <sfile>:p:h/polish-slash_cp1250.mnv
 elseif encoding == 'iso-8859-2'
-	source <sfile>:p:h/polish-slash_iso-8859-2.vim
+	source <sfile>:p:h/polish-slash_iso-8859-2.mnv
 else
-	source <sfile>:p:h/polish-slash_cp852.vim
+	source <sfile>:p:h/polish-slash_cp852.mnv
 endif
diff --git a/uvim/runtime/keymap/polish-slash_cp1250.vim b/uvim/runtime/keymap/polish-slash_cp1250.mnv
index 4ef2b22a0c..e2bfc72758 100644
--- a/uvim/runtime/keymap/polish-slash_cp1250.vim
+++ b/uvim/runtime/keymap/polish-slash_cp1250.mnv
@@ -2,7 +2,7 @@
 " Maintainer:	HS6_06	<hs6_06@o2.pl>
 " Last Changed:	2005 Jan 12
 " Current version: 1.0.2
-" History: see polish-slash.vim
+" History: see polish-slash.mnv
 
 " This keymap adds the special Polish letters
 " to an existing Latin keyboard.
diff --git a/uvim/runtime/keymap/polish-slash_cp852.vim b/uvim/runtime/keymap/polish-slash_cp852.mnv
index 22c1809e19..3ac5f496d1 100644
--- a/uvim/runtime/keymap/polish-slash_cp852.vim
+++ b/uvim/runtime/keymap/polish-slash_cp852.mnv
@@ -2,7 +2,7 @@
 " Maintainer:	HS6_06	<hs6_06@o2.pl>
 " Last Changed:	2005 Jan 12
 " Current version: 1.0.2
-" History: see polish-slash.vim
+" History: see polish-slash.mnv
 
 " This keymap adds the special Polish letters
 " to an existing Latin keyboard.
diff --git a/uvim/runtime/keymap/polish-slash_iso-8859-2.vim b/uvim/runtime/keymap/polish-slash_iso-8859-2.mnv
index 3a1203af81..eb3f2d2f5c 100644
--- a/uvim/runtime/keymap/polish-slash_iso-8859-2.vim
+++ b/uvim/runtime/keymap/polish-slash_iso-8859-2.mnv
@@ -2,7 +2,7 @@
 " Maintainer:	HS6_06	<hs6_06@o2.pl>
 " Last Changed:	2005 Jan 12
 " Current version: 1.0.2
-" History: polish-slash.vim
+" History: polish-slash.mnv
 
 " This keymap adds the special Polish letters
 " to an existing Latin keyboard.
diff --git a/uvim/runtime/keymap/polish-slash_utf-8.vim b/uvim/runtime/keymap/polish-slash_utf-8.mnv
index 3a4eb70e29..fc938a6aca 100644
--- a/uvim/runtime/keymap/polish-slash_utf-8.vim
+++ b/uvim/runtime/keymap/polish-slash_utf-8.mnv
@@ -2,7 +2,7 @@
 " Maintainer:	HS6_06	<hs6_06@o2.pl>
 " Last Changed:	2005 Jan 12
 " Current version: 1.0.2
-" History: see polish-slash.vim
+" History: see polish-slash.mnv
 
 " This keymap adds the special Polish letters
 " to an existing Latin keyboard.
diff --git a/uvim/runtime/keymap/russian-dvorak.vim b/uvim/runtime/keymap/russian-dvorak.mnv
index 498ffa1b0f..7b5bd9efc6 100644
--- a/uvim/runtime/keymap/russian-dvorak.vim
+++ b/uvim/runtime/keymap/russian-dvorak.mnv
@@ -1,5 +1,5 @@
-" Vim Keymap file for russian characters, layout 'dvorak', MS Windows variant
-" Derived from russian-jcuken.vim by Artem Chuprina <ran@ran.pp.ru>
+" MNV Keymap file for russian characters, layout 'dvorak', MS Windows variant
+" Derived from russian-jcuken.mnv by Artem Chuprina <ran@ran.pp.ru>
 " Useful mainly with utf-8 but may work with other encodings
 
 " Maintainer:   Serhiy Boiko <cris.kiev@gmail.com>
diff --git a/uvim/runtime/keymap/russian-jcuken.vim b/uvim/runtime/keymap/russian-jcuken.mnv
index 840ec8c4e0..227b78692a 100644
--- a/uvim/runtime/keymap/russian-jcuken.vim
+++ b/uvim/runtime/keymap/russian-jcuken.mnv
@@ -1,4 +1,4 @@
-" Vim Keymap file for russian characters, layout 'jcuken', classical variant
+" MNV Keymap file for russian characters, layout 'jcuken', classical variant
 " (compatible with XFree86 'ru' keymap)
 " Useful mainly with utf-8 but may work with other encodings
 
diff --git a/uvim/runtime/keymap/russian-jcukenmac.vim b/uvim/runtime/keymap/russian-jcukenmac.mnv
index e2120ca1d4..2471929a2f 100644
--- a/uvim/runtime/keymap/russian-jcukenmac.vim
+++ b/uvim/runtime/keymap/russian-jcukenmac.mnv
@@ -1,6 +1,6 @@
-" Vim Keymap file for russian characters, layout 'jcuken', Mac variant
+" MNV Keymap file for russian characters, layout 'jcuken', Mac variant
 
-" Derived from russian-jcuken.vim by Artem Chuprina <ran@ran.pp.ru>
+" Derived from russian-jcuken.mnv by Artem Chuprina <ran@ran.pp.ru>
 " Maintainer:   Anton Fonarev <avfonarev@gmail.com>
 " Last Changed: 2016 August 17
 
diff --git a/uvim/runtime/keymap/russian-jcukenwin.vim b/uvim/runtime/keymap/russian-jcukenwin.mnv
index 58eac10691..0514f983c5 100644
--- a/uvim/runtime/keymap/russian-jcukenwin.vim
+++ b/uvim/runtime/keymap/russian-jcukenwin.mnv
@@ -1,10 +1,10 @@
-" Vim Keymap file for russian characters, layout 'jcuken', MS Windows variant
+" MNV Keymap file for russian characters, layout 'jcuken', MS Windows variant
 " (slightly incompatible with XFree86 'ru' keymap - makes use of NUMERO SIGN)
 " Useful mainly with utf-8 but may work with other encodings
 
 " Maintainer:   Artem Chuprina <ran@ran.pp.ru>
 " Last Changed: 2001 Jun 23
-" 2025 Mar 17 by The Vim Project (added /, #16912)
+" 2025 Mar 17 by The MNV Project (added /, #16912)
 
 " All characters are given literally, conversion to another encoding (e.g.,
 " UTF-8) should work.
diff --git a/uvim/runtime/keymap/russian-jcukenwintype.vim b/uvim/runtime/keymap/russian-jcukenwintype.mnv
index 2d5856ad0c..8bfd5874b5 100644
--- a/uvim/runtime/keymap/russian-jcukenwintype.vim
+++ b/uvim/runtime/keymap/russian-jcukenwintype.mnv
@@ -1,9 +1,9 @@
-" Vim Keymap file for russian characters, layout 'jcuken', MS Windows
+" MNV Keymap file for russian characters, layout 'jcuken', MS Windows
 " Typewriter variant (slightly incompatible with XFree86 'ru' keymap -
 " makes use of NUMERO SIGN)
 " Useful mainly with utf-8 but may work with other encodings
 
-" Derived from russian-jcuken.vim by Artem Chuprina <ran@ran.pp.ru>
+" Derived from russian-jcuken.mnv by Artem Chuprina <ran@ran.pp.ru>
 " Typewriter variant of standard russian layout
 " Maintainer:   Denis Proskurin <danwerspb@gmail.com>
 " Last Changed: 2015 May 15
diff --git a/uvim/runtime/keymap/russian-typograph.vim b/uvim/runtime/keymap/russian-typograph.mnv
index 7c5aed6089..ead7289f27 100644
--- a/uvim/runtime/keymap/russian-typograph.vim
+++ b/uvim/runtime/keymap/russian-typograph.mnv
@@ -1,4 +1,4 @@
-" Vim Keymap file for Russian characters
+" MNV Keymap file for Russian characters
 " layout English-US 104 key 'QWERTY'
 "
 " Maintainer:	 Restorer <restorer@mail2k.ru>
@@ -7,7 +7,7 @@
 " Description:	 описание дано после изображений клавиатуры
 
 " Расположение символов для русского языка при подключенном файле с раскладкой
-" клавиатуры «русская типографская» (russian-typograph.vim). Версия 3.3
+" клавиатуры «русская типографская» (russian-typograph.mnv). Версия 3.3
 
 
 "		  Ни одна из клавиш модификаторов не нажата
diff --git a/uvim/runtime/keymap/russian-yawerty.vim b/uvim/runtime/keymap/russian-yawerty.mnv
index 64949ffaf2..8474ba9b3e 100644
--- a/uvim/runtime/keymap/russian-yawerty.vim
+++ b/uvim/runtime/keymap/russian-yawerty.mnv
@@ -1,4 +1,4 @@
-" Vim Keymap file for russian characters, phonetic layout 'yawerty'
+" MNV Keymap file for russian characters, phonetic layout 'yawerty'
 " Useful mainly with utf-8 but may work with other encodings
 
 " Maintainer:   Igor Goldenberg <igogold@gmail.com>
diff --git a/uvim/runtime/keymap/serbian-latin.mnv b/uvim/runtime/keymap/serbian-latin.mnv
new file mode 100644
index 0000000000..3a51dfb24f
--- /dev/null
+++ b/uvim/runtime/keymap/serbian-latin.mnv
@@ -0,0 +1 @@
+source <sfile>:p:h/serbian-latin_utf-8.mnv
diff --git a/uvim/runtime/keymap/serbian-latin.vim b/uvim/runtime/keymap/serbian-latin.vim
deleted file mode 100644
index 0d2de15d04..0000000000
--- a/uvim/runtime/keymap/serbian-latin.vim
+++ /dev/null
@@ -1 +0,0 @@
-source <sfile>:p:h/serbian-latin_utf-8.vim
diff --git a/uvim/runtime/keymap/serbian-latin_utf-8.vim b/uvim/runtime/keymap/serbian-latin_utf-8.mnv
index a1b577a113..89eb3cf599 100644
--- a/uvim/runtime/keymap/serbian-latin_utf-8.vim
+++ b/uvim/runtime/keymap/serbian-latin_utf-8.mnv
@@ -1,7 +1,7 @@
-" Vim Keymap file for Serbian characters, classical variant, UTF-8 encoding
+" MNV Keymap file for Serbian characters, classical variant, UTF-8 encoding
 "
 " Maintainer:   Aleksandar Veselinovic <aleksa@cs.cmu.edu>
-" URL:		    http://www.cs.cmu.edu/~aleksa/personal/vim/keymap/serbian-latin-UTF-8.vim
+" URL:		    http://www.cs.cmu.edu/~aleksa/personal/mnv/keymap/serbian-latin-UTF-8.mnv
 " Last Changed: 2002 Mar 29
 
 scriptencoding UTF-8
diff --git a/uvim/runtime/keymap/serbian.vim b/uvim/runtime/keymap/serbian.mnv
index 56d247cf49..cb7450a9c9 100644
--- a/uvim/runtime/keymap/serbian.vim
+++ b/uvim/runtime/keymap/serbian.mnv
@@ -8,13 +8,13 @@ if encoding == 'latin1'
 endif
 
 if encoding == 'utf-8'
-	source <sfile>:p:h/serbian_utf-8.vim
+	source <sfile>:p:h/serbian_utf-8.mnv
 elseif encoding == 'cp1250'
-	source <sfile>:p:h/serbian_cp1250.vim
+	source <sfile>:p:h/serbian_cp1250.mnv
 elseif encoding == 'cp1251'
-	source <sfile>:p:h/serbian_cp1251.vim
+	source <sfile>:p:h/serbian_cp1251.mnv
 elseif encoding == 'iso-8859-2'
-	source <sfile>:p:h/serbian_iso-8859-2.vim
+	source <sfile>:p:h/serbian_iso-8859-2.mnv
 else
-	source <sfile>:p:h/serbian_iso-8859-5.vim
+	source <sfile>:p:h/serbian_iso-8859-5.mnv
 endif
diff --git a/uvim/runtime/keymap/serbian_cp1250.vim b/uvim/runtime/keymap/serbian_cp1250.mnv
index 30f80adf96..d8a4c22934 100644
--- a/uvim/runtime/keymap/serbian_cp1250.vim
+++ b/uvim/runtime/keymap/serbian_cp1250.mnv
@@ -1,7 +1,7 @@
-" Vim Keymap file for Serbian characters, classical variant, cp1250 encoding
+" MNV Keymap file for Serbian characters, classical variant, cp1250 encoding
 "
 " Maintainer:   Aleksandar Veselinovic <aleksa@cs.cmu.edu>
-" URL:		    http://galeb.etf.bg.ac.yu/~alexa/vim/keymap/serbian-cp1250.vim
+" URL:		    http://galeb.etf.bg.ac.yu/~alexa/mnv/keymap/serbian-cp1250.mnv
 " Last Changed: 2002 Mar 29
 
 scriptencoding cp1250
@@ -10,25 +10,25 @@ let b:keymap_name = "serbian-cp1250"
 
 loadkeymap
 Y	Z
-{	�
-}	�
+{	�
+}	�
 y	z
-[	�
-]	�
-:   �
-\"	�
-\|	�
-;	�
-'	�
-\\	�
+[	�
+]	�
+:   �
+\"	�
+\|	�
+;	�
+'	�
+\\	�
 "Z	Y
 "z	y
 <	;
 >	:
 /	-
 _	?
-,,	�
-''	�
+,,	�
+''	�
 
 " @	"
 " #	'
diff --git a/uvim/runtime/keymap/serbian_cp1251.mnv b/uvim/runtime/keymap/serbian_cp1251.mnv
new file mode 100644
index 0000000000..dac4b4c00b
--- /dev/null
+++ b/uvim/runtime/keymap/serbian_cp1251.mnv
@@ -0,0 +1,90 @@
+" MNV Keymap file for Serbian characters, classical variant, win cp1251
+" encoding
+"
+" Maintainer:   Aleksandar Veselinovic <aleksa@cs.cmu.edu>
+" URL:		    http://www.cs.cmu.edu/~aleksa/personal/mnv/keymap/serbian-cp1251.mnv
+" Last Changed: 2002 Mar 29
+
+scriptencoding cp1251
+
+let b:keymap_name = "serbian-cp1251"
+
+loadkeymap
+Q	�
+W	�
+E	�
+R	�
+T	�
+Y	�
+U	�
+I	�
+O	�
+P	�
+{	�
+}	�
+q	�
+w	�
+e	�
+r	�
+t	�
+y	�
+u	�
+i	�
+o	�
+p	�
+[	�
+]	�
+A	�
+S	�
+D	�
+F	�
+G	�
+H	�
+J	�
+K	�
+L	�
+:	�
+\"	�
+\|	�
+a	�
+s	�
+d	�
+f	�
+g	�
+h	�
+j	�
+k	�
+l	�
+;	�
+'	�
+\\	�
+"Z	�
+X	�
+C	�
+V	�
+B	�
+N	�
+M	�
+"z	�
+x	�
+c	�
+v	�
+b	�
+n	�
+m	�
+
+<	;
+>	:
+/	-
+_	?
+,,	�
+''	�
+
+" @	"
+" #	'
+" $	*
+" %	:
+" ^	,
+" &amp;	.
+" *	;
+
diff --git a/uvim/runtime/keymap/serbian_cp1251.vim b/uvim/runtime/keymap/serbian_cp1251.vim
deleted file mode 100644
index 0b1ce96ff9..0000000000
--- a/uvim/runtime/keymap/serbian_cp1251.vim
+++ /dev/null
@@ -1,90 +0,0 @@
-" Vim Keymap file for Serbian characters, classical variant, win cp1251
-" encoding
-"
-" Maintainer:   Aleksandar Veselinovic <aleksa@cs.cmu.edu>
-" URL:		    http://www.cs.cmu.edu/~aleksa/personal/vim/keymap/serbian-cp1251.vim
-" Last Changed: 2002 Mar 29
-
-scriptencoding cp1251
-
-let b:keymap_name = "serbian-cp1251"
-
-loadkeymap
-Q	�
-W	�
-E	�
-R	�
-T	�
-Y	�
-U	�
-I	�
-O	�
-P	�
-{	�
-}	�
-q	�
-w	�
-e	�
-r	�
-t	�
-y	�
-u	�
-i	�
-o	�
-p	�
-[	�
-]	�
-A	�
-S	�
-D	�
-F	�
-G	�
-H	�
-J	�
-K	�
-L	�
-:	�
-\"	�
-\|	�
-a	�
-s	�
-d	�
-f	�
-g	�
-h	�
-j	�
-k	�
-l	�
-;	�
-'	�
-\\	�
-"Z	�
-X	�
-C	�
-V	�
-B	�
-N	�
-M	�
-"z	�
-x	�
-c	�
-v	�
-b	�
-n	�
-m	�
-
-<	;
->	:
-/	-
-_	?
-,,	�
-''	�
-
-" @	"
-" #	'
-" $	*
-" %	:
-" ^	,
-" &amp;	.
-" *	;
-
diff --git a/uvim/runtime/keymap/serbian_iso-8859-2.vim b/uvim/runtime/keymap/serbian_iso-8859-2.mnv
index d3be35eec6..9d925183ac 100644
--- a/uvim/runtime/keymap/serbian_iso-8859-2.vim
+++ b/uvim/runtime/keymap/serbian_iso-8859-2.mnv
@@ -1,7 +1,7 @@
-" Vim Keymap file for Serbian characters, classical variant, iso-8859-2 encoding
+" MNV Keymap file for Serbian characters, classical variant, iso-8859-2 encoding
 "
 " Maintainer:   Aleksandar Veselinovic <aleksa@cs.cmu.edu>
-" URL:		    http://www.cs.cmu.edu/~aleksa/personal/vim/keymap/serbian-iso-8859-2.vim
+" URL:		    http://www.cs.cmu.edu/~aleksa/personal/mnv/keymap/serbian-iso-8859-2.mnv
 " Last Changed: 2002 Mar 29
 
 scriptencoding iso-8859-2
@@ -10,17 +10,17 @@ let b:keymap_name = "serbian-iso-8859-2"
 
 loadkeymap
 Y	Z
-{	�
-}	�
+{	�
+}	�
 y	z
-[	�
-]	�
-:   �
-\"	�
-\|	�
-;	�
-'	�
-\\	�
+[	�
+]	�
+:   �
+\"	�
+\|	�
+;	�
+'	�
+\\	�
 "Z	Y
 "z	y
 <	;
diff --git a/uvim/runtime/keymap/serbian_iso-8859-5.mnv b/uvim/runtime/keymap/serbian_iso-8859-5.mnv
new file mode 100644
index 0000000000..ce90100ced
--- /dev/null
+++ b/uvim/runtime/keymap/serbian_iso-8859-5.mnv
@@ -0,0 +1,89 @@
+" MNV Keymap file for Serbian characters, classical variant, iso-8859-5 encoding
+"
+" Maintainer:   Aleksandar Veselinovic <aleksa@cs.cmu.edu>
+" URL:		    http://www.cs.cmu.edu/~aleksa/personal/mnv/keymap/serbian-iso-8859-5.mnv
+" Last Changed: 2002 Mar 29
+
+scriptencoding iso-8859-5
+
+let b:keymap_name = "serbian-iso-8859-5"
+
+loadkeymap
+Q	�
+W	�
+E	�
+R	�
+T	�
+Y	�
+U	�
+I	�
+O	�
+P	�
+{	�
+}	�
+q	�
+w	�
+e	�
+r	�
+t	�
+y	�
+u	�
+i	�
+o	�
+p	�
+[	�
+]	�
+A	�
+S	�
+D	�
+F	�
+G	�
+H	�
+J	�
+K	�
+L	�
+:	�
+\"	�
+\|	�
+a	�
+s	�
+d	�
+f	�
+g	�
+h	�
+j	�
+k	�
+l	�
+;	�
+'	�
+\\	�
+"Z	�
+X	�
+C	�
+V	�
+B	�
+N	�
+M	�
+"z	�
+x	�
+c	�
+v	�
+b	�
+n	�
+m	�
+
+<	;
+>	:
+/	-
+_	?
+,,	?
+''	?
+
+" @	"
+" #	'
+" $	*
+" %	:
+" ^	,
+" &	.
+" *	;
+
diff --git a/uvim/runtime/keymap/serbian_iso-8859-5.vim b/uvim/runtime/keymap/serbian_iso-8859-5.vim
deleted file mode 100644
index 113383cdf5..0000000000
--- a/uvim/runtime/keymap/serbian_iso-8859-5.vim
+++ /dev/null
@@ -1,89 +0,0 @@
-" Vim Keymap file for Serbian characters, classical variant, iso-8859-5 encoding
-"
-" Maintainer:   Aleksandar Veselinovic <aleksa@cs.cmu.edu>
-" URL:		    http://www.cs.cmu.edu/~aleksa/personal/vim/keymap/serbian-iso-8859-5.vim
-" Last Changed: 2002 Mar 29
-
-scriptencoding iso-8859-5
-
-let b:keymap_name = "serbian-iso-8859-5"
-
-loadkeymap
-Q	�
-W	�
-E	�
-R	�
-T	�
-Y	�
-U	�
-I	�
-O	�
-P	�
-{	�
-}	�
-q	�
-w	�
-e	�
-r	�
-t	�
-y	�
-u	�
-i	�
-o	�
-p	�
-[	�
-]	�
-A	�
-S	�
-D	�
-F	�
-G	�
-H	�
-J	�
-K	�
-L	�
-:	�
-\"	�
-\|	�
-a	�
-s	�
-d	�
-f	�
-g	�
-h	�
-j	�
-k	�
-l	�
-;	�
-'	�
-\\	�
-"Z	�
-X	�
-C	�
-V	�
-B	�
-N	�
-M	�
-"z	�
-x	�
-c	�
-v	�
-b	�
-n	�
-m	�
-
-<	;
->	:
-/	-
-_	?
-,,	?
-''	?
-
-" @	"
-" #	'
-" $	*
-" %	:
-" ^	,
-" &	.
-" *	;
-
diff --git a/uvim/runtime/keymap/serbian_utf-8.vim b/uvim/runtime/keymap/serbian_utf-8.mnv
index 3388bfd288..67206cb71b 100644
--- a/uvim/runtime/keymap/serbian_utf-8.vim
+++ b/uvim/runtime/keymap/serbian_utf-8.mnv
@@ -1,7 +1,7 @@
-" Vim Keymap file for Serbian characters, classical variant, UTF-8 encoding
+" MNV Keymap file for Serbian characters, classical variant, UTF-8 encoding
 "
 " Maintainer:   Aleksandar Veselinovic <aleksa@cs.cmu.edu>
-" URL:		    http://www.cs.cmu.edu/~aleksa/personal/vim/keymap/serbian-UTF-8.vim
+" URL:		    http://www.cs.cmu.edu/~aleksa/personal/mnv/keymap/serbian-UTF-8.mnv
 " Last Changed: 2002 Mar 29
 
 scriptencoding UTF-8
diff --git a/uvim/runtime/keymap/sinhala-phonetic_utf-8.vim b/uvim/runtime/keymap/sinhala-phonetic_utf-8.mnv
index adedc3f7cb..58d31ebbaa 100644
--- a/uvim/runtime/keymap/sinhala-phonetic_utf-8.vim
+++ b/uvim/runtime/keymap/sinhala-phonetic_utf-8.mnv
@@ -1,12 +1,12 @@
-" Vim Keymap file for Sinhala (Sri Lanka) (2003-11-02)
+" MNV Keymap file for Sinhala (Sri Lanka) (2003-11-02)
 " Maintainer  : Harshula Jayasuriya <harshula@gmail.com>
 " Last Updated: 2007-06-30
 " This is a phonetic static mapping for a standard US-English keyboard
 " (qwerty)
 " http://www.nongnu.org/sinhala/doc/keymaps/sinhala-keyboard_3.html
 
-" Copy the keymap to ~/.vim/keymap/
-" Start gvim
+" Copy the keymap to ~/.mnv/keymap/
+" Start gmnv
 " Need to disable the menu so that you can use the 'alt' key.
 "   set guioptions-=m
 " Select the new keymap
diff --git a/uvim/runtime/keymap/sinhala.mnv b/uvim/runtime/keymap/sinhala.mnv
new file mode 100644
index 0000000000..4950f98d51
--- /dev/null
+++ b/uvim/runtime/keymap/sinhala.mnv
@@ -0,0 +1,3 @@
+" MNV Keymap file for Sinhala (Sri Lanka)
+"
+source <sfile>:p:h/sinhala-phonetic_utf-8.mnv
diff --git a/uvim/runtime/keymap/sinhala.vim b/uvim/runtime/keymap/sinhala.vim
deleted file mode 100644
index 86091b4d77..0000000000
--- a/uvim/runtime/keymap/sinhala.vim
+++ /dev/null
@@ -1,3 +0,0 @@
-" Vim Keymap file for Sinhala (Sri Lanka)
-"
-source <sfile>:p:h/sinhala-phonetic_utf-8.vim
diff --git a/uvim/runtime/keymap/slovak.vim b/uvim/runtime/keymap/slovak.mnv
index f9fd6d62a7..3983aa7fcc 100644
--- a/uvim/runtime/keymap/slovak.vim
+++ b/uvim/runtime/keymap/slovak.mnv
@@ -8,9 +8,9 @@ if encoding == 'latin1'
 endif
 
 if encoding == 'utf-8'
-	source <sfile>:p:h/slovak_utf-8.vim
+	source <sfile>:p:h/slovak_utf-8.mnv
 elseif encoding == 'cp1250'
-	source <sfile>:p:h/slovak_cp1250.vim
+	source <sfile>:p:h/slovak_cp1250.mnv
 else
-	source <sfile>:p:h/slovak_iso-8859-2.vim
+	source <sfile>:p:h/slovak_iso-8859-2.mnv
 endif
diff --git a/uvim/runtime/keymap/slovak_cp1250.vim b/uvim/runtime/keymap/slovak_cp1250.mnv
index 73234cb373..507ada839d 100644
--- a/uvim/runtime/keymap/slovak_cp1250.vim
+++ b/uvim/runtime/keymap/slovak_cp1250.mnv
@@ -1,6 +1,6 @@
 " Maintainer:	Peter Valach <pvalach@gmx.net>
 " Last Changed: 2002 Feb 3
-" URL:		http://www.pv2c.sk/free/sk_vimkeymap/
+" URL:		http://www.pv2c.sk/free/sk_mnvkeymap/
 
 let b:keymap_name = "sk"
 
@@ -15,37 +15,37 @@ Z Y
 ` ;
 1 +
 ! 1
-2 �
+2 �
 @ 2
-3 �
+3 �
 # 3
-4 �
+4 �
 $ 4
-5 �
+5 �
 % 5
-6 �
+6 �
 ^ 6
-7 �
+7 �
 & 7
-8 �
+8 �
 * 8
-9 �
+9 �
 ( 9
-0 �
+0 �
 ) 0
 - =
 _ %
 
 " Klavesy okolo Enteru :)
-[ �
+[ �
 { /
-] �
+] �
 } (
-\\ �
+\\ �
 <Bar> )
-; �
+; �
 : "
-' �
+' �
 \" !
 ", , ;-)
 < ?
@@ -55,46 +55,46 @@ _ %
 ? _
 
 " Dlzne
-=a �
-=A �
-=e �
-=E �
-=i �
-=I �
-=l �
-=L �
-=o �
-=O �
-=r �
-=R �
-=u �
-=U �
-=z �
-=Z �
+=a �
+=A �
+=e �
+=E �
+=i �
+=I �
+=l �
+=L �
+=o �
+=O �
+=r �
+=R �
+=u �
+=U �
+=z �
+=Z �
 " pre pripad omylu :) alebo slovenskej QWERTY
-=y �
-=Y �
+=y �
+=Y �
 
 " Makcene
-+a �
-+A �
-+c �
-+C �
-+d �
-+D �
-+l �
-+L �
-+n �
-+N �
-+o �
-+O �
-+s �
-+S �
-+t �
-+T �
-+y �
-+Y �
++a �
++A �
++c �
++C �
++d �
++D �
++l �
++L �
++n �
++N �
++o �
++O �
++s �
++S �
++t �
++T �
++y �
++Y �
 " pre pripad omylu :) alebo slovenskej QWERTY
-+z �
-+Z �
++z �
++Z �
 
diff --git a/uvim/runtime/keymap/slovak_iso-8859-2.vim b/uvim/runtime/keymap/slovak_iso-8859-2.mnv
index 8c43fb1127..507ada839d 100644
--- a/uvim/runtime/keymap/slovak_iso-8859-2.vim
+++ b/uvim/runtime/keymap/slovak_iso-8859-2.mnv
@@ -1,6 +1,6 @@
 " Maintainer:	Peter Valach <pvalach@gmx.net>
 " Last Changed: 2002 Feb 3
-" URL:		http://www.pv2c.sk/free/sk_vimkeymap/
+" URL:		http://www.pv2c.sk/free/sk_mnvkeymap/
 
 let b:keymap_name = "sk"
 
@@ -15,37 +15,37 @@ Z Y
 ` ;
 1 +
 ! 1
-2 �
+2 �
 @ 2
-3 �
+3 �
 # 3
-4 �
+4 �
 $ 4
-5 �
+5 �
 % 5
-6 �
+6 �
 ^ 6
-7 �
+7 �
 & 7
-8 �
+8 �
 * 8
-9 �
+9 �
 ( 9
-0 �
+0 �
 ) 0
 - =
 _ %
 
 " Klavesy okolo Enteru :)
-[ �
+[ �
 { /
-] �
+] �
 } (
-\\ �
+\\ �
 <Bar> )
-; �
+; �
 : "
-' �
+' �
 \" !
 ", , ;-)
 < ?
@@ -55,46 +55,46 @@ _ %
 ? _
 
 " Dlzne
-=a �
-=A �
-=e �
-=E �
-=i �
-=I �
-=l �
-=L �
-=o �
-=O �
-=r �
-=R �
-=u �
-=U �
-=z �
-=Z �
+=a �
+=A �
+=e �
+=E �
+=i �
+=I �
+=l �
+=L �
+=o �
+=O �
+=r �
+=R �
+=u �
+=U �
+=z �
+=Z �
 " pre pripad omylu :) alebo slovenskej QWERTY
-=y �
-=Y �
+=y �
+=Y �
 
 " Makcene
-+a �
-+A �
-+c �
-+C �
-+d �
-+D �
-+l �
-+L �
-+n �
-+N �
-+o �
-+O �
-+s �
-+S �
-+t �
-+T �
-+y �
-+Y �
++a �
++A �
++c �
++C �
++d �
++D �
++l �
++L �
++n �
++N �
++o �
++O �
++s �
++S �
++t �
++T �
++y �
++Y �
 " pre pripad omylu :) alebo slovenskej QWERTY
-+z �
-+Z �
++z �
++Z �
 
diff --git a/uvim/runtime/keymap/slovak_utf-8.vim b/uvim/runtime/keymap/slovak_utf-8.mnv
index 8e3e0838ed..a2ff3dbe11 100644
--- a/uvim/runtime/keymap/slovak_utf-8.vim
+++ b/uvim/runtime/keymap/slovak_utf-8.mnv
@@ -1,6 +1,6 @@
 " Maintainer:	Peter Valach <pvalach@gmx.net>
 " Last Changed: 2002 Nov 5
-" URL:		http://www.pv2c.sk/free/sk_vimkeymap/
+" URL:		http://www.pv2c.sk/free/sk_mnvkeymap/
 
 let b:keymap_name = "sk"
 
diff --git a/uvim/runtime/keymap/tamil_tscii.vim b/uvim/runtime/keymap/tamil_tscii.mnv
index df85a4eab5..df85a4eab5 100644
--- a/uvim/runtime/keymap/tamil_tscii.vim
+++ b/uvim/runtime/keymap/tamil_tscii.mnv
diff --git a/uvim/runtime/keymap/thaana-phonetic_utf-8.vim b/uvim/runtime/keymap/thaana-phonetic_utf-8.mnv
index ec235ac891..ec235ac891 100644
--- a/uvim/runtime/keymap/thaana-phonetic_utf-8.vim
+++ b/uvim/runtime/keymap/thaana-phonetic_utf-8.mnv
diff --git a/uvim/runtime/keymap/thaana.mnv b/uvim/runtime/keymap/thaana.mnv
new file mode 100644
index 0000000000..7380aedb73
--- /dev/null
+++ b/uvim/runtime/keymap/thaana.mnv
@@ -0,0 +1,3 @@
+if &enc == 'utf-8'
+	source <sfile>:p:h/thaana-phonetic_utf-8.mnv
+endif
diff --git a/uvim/runtime/keymap/thaana.vim b/uvim/runtime/keymap/thaana.vim
deleted file mode 100644
index bf22d80ec5..0000000000
--- a/uvim/runtime/keymap/thaana.vim
+++ /dev/null
@@ -1,3 +0,0 @@
-if &enc == 'utf-8'
-	source <sfile>:p:h/thaana-phonetic_utf-8.vim
-endif
diff --git a/uvim/runtime/keymap/turkish-f.vim b/uvim/runtime/keymap/turkish-f.mnv
index f03c5eb3e2..7a8826649b 100644
--- a/uvim/runtime/keymap/turkish-f.vim
+++ b/uvim/runtime/keymap/turkish-f.mnv
@@ -1,4 +1,4 @@
-" Vim keymap file for Turkish F layout
+" MNV keymap file for Turkish F layout
 " Maintainer: Emir SARI <bitigchi@me.com>
 " Last changed: 5 August 2020
 
diff --git a/uvim/runtime/keymap/turkish-q.vim b/uvim/runtime/keymap/turkish-q.mnv
index 326b08e4b9..0d26aac360 100644
--- a/uvim/runtime/keymap/turkish-q.vim
+++ b/uvim/runtime/keymap/turkish-q.mnv
@@ -1,4 +1,4 @@
-" Vim keymap file for Turkish Q layout
+" MNV keymap file for Turkish Q layout
 " Maintainer: Emir SARI <bitigchi@me.com>
 " Last changed: 5 August 2020
 
diff --git a/uvim/runtime/keymap/ukrainian-dvorak.vim b/uvim/runtime/keymap/ukrainian-dvorak.mnv
index 589dae1e72..5a2868683b 100644
--- a/uvim/runtime/keymap/ukrainian-dvorak.vim
+++ b/uvim/runtime/keymap/ukrainian-dvorak.mnv
@@ -1,6 +1,6 @@
-" Vim Keymap file for ukrainian characters, layout 'dvorak',
+" MNV Keymap file for ukrainian characters, layout 'dvorak',
 " MS Windows variant
-" Derived from ukrainian-jcuken.vim by Anatoli Sakhnik <sakhnik@gmail.com>
+" Derived from ukrainian-jcuken.mnv by Anatoli Sakhnik <sakhnik@gmail.com>
 " Useful mainly with utf-8 but may work with other encodings
 
 " Maintainer:   Serhiy Boiko <cris.kiev@gmail.com>
diff --git a/uvim/runtime/keymap/ukrainian-enhanced.vim b/uvim/runtime/keymap/ukrainian-enhanced.mnv
index b71e33527e..45ff55dc3a 100644
--- a/uvim/runtime/keymap/ukrainian-enhanced.vim
+++ b/uvim/runtime/keymap/ukrainian-enhanced.mnv
@@ -1,5 +1,5 @@
-" Vim Keymap file for ukrainian characters MS Windows enhanced variant.
-" This file is based on russian-jcukenwin.vim by Artem Chuprina <ran@ran.pp.ru>.
+" MNV Keymap file for ukrainian characters MS Windows enhanced variant.
+" This file is based on russian-jcukenwin.mnv by Artem Chuprina <ran@ran.pp.ru>.
 " Keymap has been originally created by Ivan Korneliuk <vansha@gmail.com>.
 
 " Maintainer: Vladyslav Rehan <rehanvladyslav@gmail.com>
diff --git a/uvim/runtime/keymap/ukrainian-jcuken.vim b/uvim/runtime/keymap/ukrainian-jcuken.mnv
index fcc1c34f8b..2d39e8e15b 100644
--- a/uvim/runtime/keymap/ukrainian-jcuken.vim
+++ b/uvim/runtime/keymap/ukrainian-jcuken.mnv
@@ -1,6 +1,6 @@
-" Vim Keymap file for ukrainian characters, layout 'jcuken', classical variant
+" MNV Keymap file for ukrainian characters, layout 'jcuken', classical variant
 " (compatible with XFree86 'uk' keymap)
-" Derived from russian-jcuken.vim by Artem Chuprina <ran@ran.pp.ru>
+" Derived from russian-jcuken.mnv by Artem Chuprina <ran@ran.pp.ru>
 " Useful mainly with utf-8 but may work with other encodings
 
 " Maintainer:   Anatoli Sakhnik <sakhnik@gmail.com>
diff --git a/uvim/runtime/keymap/vietnamese-telex_utf-8.vim b/uvim/runtime/keymap/vietnamese-telex_utf-8.mnv
index f9fd055d14..cd5552899f 100644
--- a/uvim/runtime/keymap/vietnamese-telex_utf-8.vim
+++ b/uvim/runtime/keymap/vietnamese-telex_utf-8.mnv
@@ -1,4 +1,4 @@
-" Vim Keymap file for Vietnamese through Telex method
+" MNV Keymap file for Vietnamese through Telex method
 " Maintainer: Raphael McSinyx <vn.mcsinyx@gmail.com>
 " Last Change: 2016-06-13
 
diff --git a/uvim/runtime/keymap/vietnamese-viqr_utf-8.vim b/uvim/runtime/keymap/vietnamese-viqr_utf-8.mnv
index b17be6daec..097503deaa 100644
--- a/uvim/runtime/keymap/vietnamese-viqr_utf-8.vim
+++ b/uvim/runtime/keymap/vietnamese-viqr_utf-8.mnv
@@ -1,4 +1,4 @@
-" Vim Keymap file for vietnamese through the usual viqr method
+" MNV Keymap file for vietnamese through the usual viqr method
 " Maintainer: Samuel Thibault <samuel.thibault@ens-lyon.org>
 " Last Change: 2006 Jun 17
 
diff --git a/uvim/runtime/keymap/vietnamese-vni_utf-8.vim b/uvim/runtime/keymap/vietnamese-vni_utf-8.mnv
index c9312c6854..a2bcd8d9c5 100644
--- a/uvim/runtime/keymap/vietnamese-vni_utf-8.vim
+++ b/uvim/runtime/keymap/vietnamese-vni_utf-8.mnv
@@ -1,4 +1,4 @@
-" Vim Keymap file for Vietnamese through VNI method
+" MNV Keymap file for Vietnamese through VNI method
 " Maintainer: Raphael McSinyx <vn.mcsinyx@gmail.com>
 " Last Change: 2016-06-13