diff --git a/runtime/autoload/dist/vim.vim b/runtime/autoload/dist/vim.vim
index bb858c5..1632aed 100644
--- a/runtime/autoload/dist/vim.vim
+++ b/runtime/autoload/dist/vim.vim
@@ -1,9 +1,9 @@
 " Vim runtime support library,
-" runs the vim9 script version or legacy script version
+" runs the Vim9 script version or legacy script version
 " on demand (mostly for Neovim compatability)
 "
 " Maintainer:	The Vim Project <https://github.com/vim/vim>
-" Last Change:	2023 Nov 04
+" Last Change:	2025 Apr 27
 
 
 " enable the zip and gzip plugin by default, if not set
diff --git a/runtime/doc/filetype.txt b/runtime/doc/filetype.txt
index 018dbca..fa9506d 100644
--- a/runtime/doc/filetype.txt
+++ b/runtime/doc/filetype.txt
@@ -1,4 +1,4 @@
-*filetype.txt*	For Vim version 9.1.  Last change: 2025 Apr 22
+*filetype.txt*	For Vim version 9.1.  Last change: 2025 Apr 27
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -269,7 +269,7 @@
       item of the 'runtimepath' option.  Example for Unix: >
 	:!mkdir ~/.vim
 <
-   2. Create a vim script file for doing this.  Example: >
+   2. Create a Vim script file for doing this.  Example: >
 	if did_filetype()	" filetype already set..
 	  finish		" ..don't do these checks
 	endif
diff --git a/runtime/doc/if_perl.txt b/runtime/doc/if_perl.txt
index 86edd05..85e5a90 100644
--- a/runtime/doc/if_perl.txt
+++ b/runtime/doc/if_perl.txt
@@ -1,4 +1,4 @@
-*if_perl.txt*   For Vim version 9.1.  Last change: 2023 May 14
+*if_perl.txt*   For Vim version 9.1.  Last change: 2025 Apr 27
 
 
 		  VIM REFERENCE MANUAL    by Sven Verdoolaege
@@ -74,7 +74,7 @@
 			|script-here|.
 
 
-Example vim script: >
+Example Vim script: >
 
 	function! WhitePearl()
 	perl << EOF
diff --git a/runtime/doc/pi_getscript.txt b/runtime/doc/pi_getscript.txt
index 20caab1..e549ea6 100644
--- a/runtime/doc/pi_getscript.txt
+++ b/runtime/doc/pi_getscript.txt
@@ -1,4 +1,4 @@
-*pi_getscript.txt*  For Vim version 9.1.  Last change: 2025 Mar 15
+*pi_getscript.txt*  For Vim version 9.1.  Last change: 2025 Apr 27
 >
 		GETSCRIPT REFERENCE MANUAL  by Charles E. Campbell
 <
@@ -156,7 +156,7 @@
 
 	" GetLatestVimScripts: 884  1 :AutoInstall: AutoAlign.vim
 
-This comment line tells getscript.vim to check vimscript #884 and that the
+This comment line tells getscript.vim to check Vim script #884 and that the
 script is automatically installable.  Getscript will also use this line to
 help build the GetLatestVimScripts.dat file, by including a line such as: >
 
diff --git a/runtime/doc/pi_netrw.txt b/runtime/doc/pi_netrw.txt
index 51688b7..0079991 100644
--- a/runtime/doc/pi_netrw.txt
+++ b/runtime/doc/pi_netrw.txt
@@ -460,7 +460,7 @@
 ==============================================================================
 4. Network-Oriented File Transfer			*netrw-xfer* {{{1
 
-Network-oriented file transfer under Vim is implemented by a vim script
+Network-oriented file transfer under Vim is implemented by a Vim script
 (<netrw.vim>) using plugin techniques.  It currently supports both reading and
 writing across networks using rcp, scp, ftp or ftp+<.netrc>, scp, fetch,
 dav/cadaver, rsync, or sftp.
diff --git a/runtime/doc/tags b/runtime/doc/tags
index a094e14..2e6c8e0 100644
--- a/runtime/doc/tags
+++ b/runtime/doc/tags
@@ -11383,6 +11383,7 @@
 vim-raku	ft_raku.txt	/*vim-raku*
 vim-script-intro	usr_41.txt	/*vim-script-intro*
 vim-script-library	eval.txt	/*vim-script-library*
+vim-script-notation	usr_41.txt	/*vim-script-notation*
 vim-security	intro.txt	/*vim-security*
 vim-shebang	various.txt	/*vim-shebang*
 vim-tutor-create	pi_tutor.txt	/*vim-tutor-create*
diff --git a/runtime/doc/usr_41.txt b/runtime/doc/usr_41.txt
index a22b6f7..ffa6fcb 100644
--- a/runtime/doc/usr_41.txt
+++ b/runtime/doc/usr_41.txt
@@ -1,4 +1,4 @@
-*usr_41.txt*	For Vim version 9.1.  Last change: 2025 Apr 24
+*usr_41.txt*	For Vim version 9.1.  Last change: 2025 Apr 27
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
@@ -35,8 +35,10 @@
 These scripts may define functions, commands and settings that Vim uses to
 customize and extend its behavior.
 
-With a slight abuse of nomenclature, we will use "Vim script" to refer to the
-Vim scripting language throughout this documentation.  This shorthand helps to
+						*vim-script-notation*
+The correct notation is "Vim script" (or "Vim9 script" when refering to the
+new Vim9 language |Vim9-script|), so we will use "Vim script" to refer to the
+Vim scripting language throughout this documentation. This shorthand helps to
 streamline explanations and discussions about scripting with Vim.
 
 A Vim plugin is a collection of one or more Vim scripts, along with additional
diff --git a/runtime/doc/vim9.txt b/runtime/doc/vim9.txt
index ba72358..0dae57d 100644
--- a/runtime/doc/vim9.txt
+++ b/runtime/doc/vim9.txt
@@ -1,4 +1,4 @@
-*vim9.txt*	For Vim version 9.1.  Last change: 2025 Apr 18
+*vim9.txt*	For Vim version 9.1.  Last change: 2025 Apr 27
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -2043,7 +2043,7 @@
 
 If the name does not end in ".vim" then the use of "as name" is required.
 
-Once a vim9 script file has been imported, the result is cached and used the
+Once a Vim9 script file has been imported, the result is cached and used the
 next time the same script is imported.  It will not be read again.
 
 It is not allowed to import the same script twice, also when using two
@@ -2056,7 +2056,7 @@
 	echo that
 		.name  # Error!
 <						*import-map*
-When you've imported a function from one script into a vim9 script you can
+When you've imported a function from one script into a Vim9 script you can
 refer to the imported function in a mapping by prefixing it with |<SID>|: >
 	noremap <silent> ,a :call <SID>name.Function()<CR>
 
diff --git a/runtime/pack/dist/opt/editorconfig/plugin/editorconfig.vim b/runtime/pack/dist/opt/editorconfig/plugin/editorconfig.vim
index 6eaa053..914e778 100644
--- a/runtime/pack/dist/opt/editorconfig/plugin/editorconfig.vim
+++ b/runtime/pack/dist/opt/editorconfig/plugin/editorconfig.vim
@@ -325,7 +325,7 @@
 " UseConfigFiles function for different modes {{{1
 
 function! s:UseConfigFiles_VimCore(bufnr, target)
-" Use the vimscript EditorConfig core
+" Use the Vim script EditorConfig core
     try
         let l:config = editorconfig_core#handler#get_configurations(
             \ { 'target': a:target } )
diff --git a/runtime/pack/dist/opt/netrw/autoload/netrw.vim b/runtime/pack/dist/opt/netrw/autoload/netrw.vim
index f284117..228f470 100644
--- a/runtime/pack/dist/opt/netrw/autoload/netrw.vim
+++ b/runtime/pack/dist/opt/netrw/autoload/netrw.vim
@@ -2540,7 +2540,7 @@
 endfun
 
 " ---------------------------------------------------------------------
-" netrw#NetSource: source a remotely hosted vim script {{{2
+" netrw#NetSource: source a remotely hosted Vim script {{{2
 " uses NetRead to get a copy of the file into a temporarily file,
 "              then sources that file,
 "              then removes that file.
diff --git a/runtime/pack/dist/opt/netrw/doc/netrw.txt b/runtime/pack/dist/opt/netrw/doc/netrw.txt
index 7c686ef..5655acf 100644
--- a/runtime/pack/dist/opt/netrw/doc/netrw.txt
+++ b/runtime/pack/dist/opt/netrw/doc/netrw.txt
@@ -460,7 +460,7 @@
 ==============================================================================
 4. Network-Oriented File Transfer			*netrw-xfer* {{{1
 
-Network-oriented file transfer under Vim is implemented by a vim script
+Network-oriented file transfer under Vim is implemented by a Vim script
 (<netrw.vim>) using plugin techniques.  It currently supports both reading and
 writing across networks using rcp, scp, ftp or ftp+<.netrc>, scp, fetch,
 dav/cadaver, rsync, or sftp.
diff --git a/runtime/syntax/generator/vim.vim.base b/runtime/syntax/generator/vim.vim.base
index 1ddc9d2..7b91ff2 100644
--- a/runtime/syntax/generator/vim.vim.base
+++ b/runtime/syntax/generator/vim.vim.base
@@ -1486,7 +1486,7 @@
 syn region	vimGlobal	matchgroup=Statement start='\<g\%[lobal]!\=/'  skip='\\.' end='/'	skipwhite nextgroup=vimSubst1
 syn region	vimGlobal	matchgroup=Statement start='\<v\%[global]!\=/' skip='\\.' end='/'	skipwhite nextgroup=vimSubst1
 
-" Vim9 Script Regions: {{{2
+" Vim9 script Regions: {{{2
 " ==================
 
 if s:vim9script
diff --git a/runtime/syntax/groovy.vim b/runtime/syntax/groovy.vim
index e48279b..3509401 100644
--- a/runtime/syntax/groovy.vim
+++ b/runtime/syntax/groovy.vim
@@ -5,10 +5,11 @@
 " Version: 	0.1.18
 " URL:	  http://www.vim.org/scripts/script.php?script_id=945
 " Last Change:	2021 Feb 03
+"               2025 Apr 27 by Vim Project correct Vim script spelling
 
 " THE ORIGINAL AUTHOR'S NOTES:
 "
-" This is my very first vim script, I hope to have
+" This is my very first Vim script, I hope to have
 " done it the right way.
 "
 " I must directly or indirectly thank the author of java.vim and ruby.vim:
diff --git a/runtime/syntax/testdir/input/vim9_expr.vim b/runtime/syntax/testdir/input/vim9_expr.vim
index fc94abd..592acad 100644
--- a/runtime/syntax/testdir/input/vim9_expr.vim
+++ b/runtime/syntax/testdir/input/vim9_expr.vim
@@ -149,7 +149,7 @@
 enddef
 
 
-# Issue #16227 (Vimscript ternary expression highlighting)
+# Issue #16227 (Vim script ternary expression highlighting)
 
 var foo = 'foo'                         # comment
 var bar = foo == 'foo' ? 'bar' : 'baz'
diff --git a/runtime/syntax/testdir/input/vim9_function_calls.vim b/runtime/syntax/testdir/input/vim9_function_calls.vim
index aecfc11..0b9f4c2 100644
--- a/runtime/syntax/testdir/input/vim9_function_calls.vim
+++ b/runtime/syntax/testdir/input/vim9_function_calls.vim
@@ -7,7 +7,7 @@
 echo "Foo" | clearmatches()
 
 
-# Issue 16721 (vimscript highlight of builtin function after |)
+# Issue 16721 (Vim script highlight of builtin function after |)
 
 &directory = $'{$MYVIMDIR}/.data/swap/'
 &backupdir = $'{$MYVIMDIR}/.data/backup//'
diff --git a/runtime/syntax/testdir/input/vim_ex_def.vim b/runtime/syntax/testdir/input/vim_ex_def.vim
index d379d8f..819a1ad 100644
--- a/runtime/syntax/testdir/input/vim_ex_def.vim
+++ b/runtime/syntax/testdir/input/vim_ex_def.vim
@@ -99,7 +99,7 @@
     z: string = "zed")
 enddef
 
-" Issue #16243 (vimscript def parameters syntax highlight is wrong)
+" Issue #16243 (Vim script def parameters syntax highlight is wrong)
 
 def Test(lines: list<number> = [line('.'), line('.')]): void
 enddef
diff --git a/runtime/syntax/testdir/input/vim_ex_function.vim b/runtime/syntax/testdir/input/vim_ex_function.vim
index c09019e..95cf458 100644
--- a/runtime/syntax/testdir/input/vim_ex_function.vim
+++ b/runtime/syntax/testdir/input/vim_ex_function.vim
@@ -177,7 +177,7 @@
 endfunction
 
 
-" Issue #16243 (vimscript def parameters syntax highlight is wrong)
+" Issue #16243 (Vim script def parameters syntax highlight is wrong)
 
 function Test(lines = [line('.'), line('.')])
 endfunction
diff --git a/runtime/syntax/vim.vim b/runtime/syntax/vim.vim
index 2ee17a2..741ec81 100644
--- a/runtime/syntax/vim.vim
+++ b/runtime/syntax/vim.vim
@@ -1546,7 +1546,7 @@
 syn region	vimGlobal	matchgroup=Statement start='\<g\%[lobal]!\=/'  skip='\\.' end='/'	skipwhite nextgroup=vimSubst1
 syn region	vimGlobal	matchgroup=Statement start='\<v\%[global]!\=/' skip='\\.' end='/'	skipwhite nextgroup=vimSubst1
 
-" Vim9 Script Regions: {{{2
+" Vim9 script Regions: {{{2
 " ==================
 
 if s:vim9script