diff --git a/src/Make_cyg_ming.mak b/src/Make_cyg_ming.mak
index 991feb9..c8d2707 100644
--- a/src/Make_cyg_ming.mak
+++ b/src/Make_cyg_ming.mak
@@ -1215,14 +1215,14 @@
 	$(MAKE) -C xxd -f Make_ming.mak clean
 	$(MAKE) -C tee -f Make_ming.mak clean
 
-# Run vim script to generate the Ex command lookup table.
+# Run Vim script to generate the Ex command lookup table.
 # This only needs to be run when a command name has been added or changed.
 # If this fails because you don't have Vim yet, first build and install Vim
 # without changes.
 cmdidxs: ex_cmds.h
 	vim --clean -N -X --not-a-term -u create_cmdidxs.vim -c quit
 
-# Run vim script to generate the normal/visual mode command lookup table.
+# Run Vim script to generate the normal/visual mode command lookup table.
 # This only needs to be run when a new normal/visual mode command has been
 # added.  If this fails because you don't have Vim yet:
 #   - change nv_cmds[] in nv_cmds.h to add the new normal/visual mode command.
diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak
index ab6bd6c..d6dbd2b 100644
--- a/src/Make_mvc.mak
+++ b/src/Make_mvc.mak
@@ -1430,14 +1430,14 @@
 	$(MAKE) /NOLOGO -f Make_mvc.mak clean
 	cd ..
 
-# Run vim script to generate the Ex command lookup table.
+# Run Vim script to generate the Ex command lookup table.
 # This only needs to be run when a command name has been added or changed.
 # If this fails because you don't have Vim yet, first build and install Vim
 # without changes.
 cmdidxs: ex_cmds.h
 	vim --clean -N -X --not-a-term -u create_cmdidxs.vim -c quit
 
-# Run vim script to generate the normal/visual mode command lookup table.
+# Run Vim script to generate the normal/visual mode command lookup table.
 # This only needs to be run when a new normal/visual mode command has been
 # added.  If this fails because you don't have Vim yet:
 #   - change nv_cmds[] in nv_cmds.h to add the new normal/visual mode command.
diff --git a/src/Makefile b/src/Makefile
index cde2e55..962e47b 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -2037,7 +2037,7 @@
 	-rm -rf autom4te.cache
 	-rm -f auto/config.status auto/config.cache
 
-# Run vim script to generate the Ex command lookup table.
+# Run Vim script to generate the Ex command lookup table.
 # This only needs to be run when a command name has been added or changed.
 # If this fails because you don't have Vim yet, first build and install Vim
 # without changes.
@@ -2045,7 +2045,7 @@
 cmdidxs: ex_cmds.h
 	vim --clean -X --not-a-term -S create_cmdidxs.vim -c quit
 
-# Run vim script to generate the normal/visual mode command lookup table.
+# Run Vim script to generate the normal/visual mode command lookup table.
 # This only needs to be run when a new normal/visual mode command has been
 # added.
 # This requires a "vim" executable with the +eval feature.
diff --git a/src/README.md b/src/README.md
index 4042988..a01f695 100644
--- a/src/README.md
+++ b/src/README.md
@@ -35,7 +35,7 @@
 clipboard.c	| handling the clipboard
 cmdexpand.c	| command-line completion
 cmdhist.c	| command-line history
-debugger.c	| vim script debugger
+debugger.c	| Vim script debugger
 diff.c		| diff mode (vimdiff)
 drawline.c	| drawing a window line
 drawscreen.c	| drawing the windows
@@ -70,7 +70,7 @@
 optionstr.c	| handling string options
 popupmenu.c	| popup menu
 popupwin.c	| popup window
-profiler.c	| vim script profiler
+profiler.c	| Vim script profiler
 quickfix.c	| quickfix commands (":make", ":cn")
 regexp.c	| pattern matching
 register.c	| handling registers
@@ -91,7 +91,7 @@
 textobject.c	| text objects
 textprop.c	| text properties
 time.c		| time and timer functions
-typval.c	| vim script type/value functions
+typval.c	| Vim script type/value functions
 undo.c		| undo and redo
 usercmd.c	| user defined commands
 userfunc.c	| user defined functions
diff --git a/src/eval.c b/src/eval.c
index e891164..530cc95 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -2284,7 +2284,7 @@
     {
 	where_T	    where = WHERE_INIT;
 
-	// In a vim9 script, do type check and make sure the variable is
+	// In a Vim9 script, do type check and make sure the variable is
 	// writable.
 	if (check_typval_type(lp->ll_valtype, rettv, where) == FAIL)
 	    return NULL;
diff --git a/src/gui_w32.c b/src/gui_w32.c
index 4e6eca8..400169a 100644
--- a/src/gui_w32.c
+++ b/src/gui_w32.c
@@ -9077,7 +9077,7 @@
 	if (dict_get_bool(args, "cell", FALSE))
 	{
 	    // calculate the middle of the character cell
-	    // Note: Cell coordinates are 1-based from vimscript
+	    // Note: Cell coordinates are 1-based from Vim script
 	    int pY = (row - 1) * gui.char_height + gui.char_height / 2;
 	    int pX = (col - 1) * gui.char_width + gui.char_width / 2;
 	    gui_mouse_moved(pX, pY);
diff --git a/src/message_test.c b/src/message_test.c
index 83767ec..884a7a9 100644
--- a/src/message_test.c
+++ b/src/message_test.c
@@ -34,7 +34,7 @@
 // - warning: format ‘%S’ expects argument of type ‘wchar_t *’, but argument 4 has type ‘char *’
 // - warning: unknown conversion type character ‘b’ in format
 //
-// These formats are in practise only used from vim script printf()
+// These formats are in practise only used from Vim script printf()
 // function and never as literals in C code.
 char *fmt_012p = "%012p";
 char *fmt_5S   = "%5S";
@@ -158,12 +158,12 @@
 /*
  * Test vim_snprintf() with a focus on checking that truncation is
  * correct when buffer is small, since it cannot be tested from
- * vim script tests. Check that:
+ * Vim script tests. Check that:
  * - no buffer overflows happens (with valgrind or asan)
  * - output string is always NUL terminated.
  *
  * Not all formats of vim_snprintf() are checked here. They are
- * checked more exhaustively in Test_printf*() vim script tests.
+ * checked more exhaustively in Test_printf*() Vim script tests.
  */
     static void
 test_vim_snprintf(void)
@@ -290,7 +290,7 @@
 	assert(bsize == 0 || STRNCMP(buf, "\x01\x02", bsize_int) == 0);
 	assert(bsize == 0 || buf[MIN(n, bsize_int)] == '\0');
 
-	// %p format is not tested in vim script tests Test_printf*()
+	// %p format is not tested in Vim script tests Test_printf*()
 	// as it only makes sense in C code.
 	// NOTE: SunOS libc doesn't use the prefix "0x" on %p.
 #ifdef SUN_SYSTEM
diff --git a/src/profiler.c b/src/profiler.c
index 504d713..00da9b6 100644
--- a/src/profiler.c
+++ b/src/profiler.c
@@ -8,7 +8,7 @@
  */
 
 /*
- * profiler.c: vim script profiler
+ * profiler.c: Vim script profiler
  */
 
 #include "vim.h"
diff --git a/src/structs.h b/src/structs.h
index 45e1b18..898f620 100644
--- a/src/structs.h
+++ b/src/structs.h
@@ -1976,7 +1976,7 @@
 #define FC_DEAD	    0x80	// function kept only for reference to dfunc
 #define FC_EXPORT   0x100	// "export def Func()"
 #define FC_NOARGS   0x200	// no a: variables in lambda
-#define FC_VIM9	    0x400	// defined in vim9 script file
+#define FC_VIM9	    0x400	// defined in Vim9 script file
 #define FC_CFUNC    0x800	// defined as Lua C func
 #define FC_COPY	    0x1000	// copy of another function by
 				// copy_lambda_to_global_func()
diff --git a/src/testdir/test_cmdline.vim b/src/testdir/test_cmdline.vim
index c4b7b57..9b2fee3 100644
--- a/src/testdir/test_cmdline.vim
+++ b/src/testdir/test_cmdline.vim
@@ -4267,7 +4267,7 @@
   " required for :*
   set cpo+=*
   let list = filter(getcompletion('', 'command'), 'exists(":" . v:val) == 0')
-  " :++ and :-- are only valid in Vim9 Script context, so they can be ignored
+  " :++ and :-- are only valid in Vim9 script context, so they can be ignored
   call assert_equal(['++', '--'], sort(list))
   call assert_equal(2, exists(':k'))
   call assert_equal(0, exists(':ke'))
diff --git a/src/testdir/test_source.vim b/src/testdir/test_source.vim
index 3692eee..55b2fff 100644
--- a/src/testdir/test_source.vim
+++ b/src/testdir/test_source.vim
@@ -57,7 +57,7 @@
   call assert_fails('source XtwoScript', 'E121:')
 endfunc
 
-" When sourcing a vim script, shebang should be ignored.
+" When sourcing a Vim script, shebang should be ignored.
 func Test_source_ignore_shebang()
   call writefile(['#!./xyzabc', 'let g:val=369'], 'Xsisfile.vim', 'D')
   source Xsisfile.vim
@@ -408,7 +408,7 @@
   source
   call assert_equal(10, Xtestfunc())
 
-  " test for sourcing a vim9 script with line continuation
+  " test for sourcing a Vim9 script with line continuation
   %d _
   let lines =<< trim END
      vim9script
diff --git a/src/testdir/test_vim9_cmd.vim b/src/testdir/test_vim9_cmd.vim
index 5407662..d38e1c8 100644
--- a/src/testdir/test_vim9_cmd.vim
+++ b/src/testdir/test_vim9_cmd.vim
@@ -159,7 +159,7 @@
   v9.CheckScriptSuccess(lines)
   delfunc g:TheFunc
 
-  # vim9cmd execute(cmd) executes code in vim9 script context
+  # vim9cmd execute(cmd) executes code in Vim9 script context
   lines =<< trim END
     vim9cmd execute("g:vim9executetest = 'bar'")
     call assert_equal('bar', g:vim9executetest)
@@ -176,7 +176,7 @@
   unlet g:vim9executetest1
   unlet g:vim9executetest2
 
-  # legacy call execute(cmd) executes code in vim script context
+  # legacy call execute(cmd) executes code in Vim script context
   lines =<< trim END
     vim9script
     legacy call execute("let g:vim9executetest = 'bar'")
diff --git a/src/testdir/vim9.vim b/src/testdir/vim9.vim
index 64922b7..b994855 100644
--- a/src/testdir/vim9.vim
+++ b/src/testdir/vim9.vim
@@ -1,6 +1,6 @@
 vim9script
 
-# Utility functions for testing vim9 script
+# Utility functions for testing Vim9 script
 
 # Use a different file name for each run.
 var sequence = 1
diff --git a/src/testing.c b/src/testing.c
index b316b64..cfa01ff 100644
--- a/src/testing.c
+++ b/src/testing.c
@@ -1411,7 +1411,7 @@
 	if (dict_get_bool(args, "cell", FALSE))
 	{
 	    // calculate the middle of the character cell
-	    // Note: Cell coordinates are 1-based from vimscript
+	    // Note: Cell coordinates are 1-based from Vim script
 	    pY = (row - 1) * gui.char_height + gui.char_height / 2;
 	    pX = (col - 1) * gui.char_width + gui.char_width / 2;
 	}