diff --git a/lisp/progmodes/cmake-ts-mode.el b/lisp/progmodes/cmake-ts-mode.el
index 8e49b18f731..9625b0f0330 100644
--- a/lisp/progmodes/cmake-ts-mode.el
+++ b/lisp/progmodes/cmake-ts-mode.el
@@ -61,16 +61,16 @@
     table)
   "Syntax table for `cmake-ts-mode'.")
 
-(defvar cmake-ts-mode--indent-rules nil
-  "Tree-sitter indent rules for `cmake-ts-mode'.")
+(defvar cmake-ts-mode--indent-rules-cached nil
+  "Cached tree-sitter indent rules for `cmake-ts-mode'.")
 
 (defun cmake-ts-mode--indent-rules ()
   "Return tree-sitter indent rules for `cmake-ts-mode'.
 
-Tree-sitter indent rules are evaluated the first time this function
-is called.  Subsequent calls return the first evaluated value."
-  (or cmake-ts-mode--indent-rules
-      (setq cmake-ts-mode--indent-rules
+Tree-sitter indent rules are evaluated the first time this function is
+called.  Subsequent calls return the first evaluated value."
+  (or cmake-ts-mode--indent-rules-cached
+      (setq cmake-ts-mode--indent-rules-cached
             `((cmake
                ((node-is ")") parent-bol 0)
                ((node-is "else_command") parent-bol 0)
@@ -148,16 +148,16 @@ Check if a node type is available, then return the right font lock rules."
                           eol))
                   @font-lock-constant-face))))))))
 
-(defvar cmake-ts-mode--font-lock-settings nil
-  "Tree-sitter font-lock settings for `cmake-ts-mode'.")
+(defvar cmake-ts-mode--font-lock-settings-cached nil
+  "Cached tree-sitter font-lock settings for `cmake-ts-mode'.")
 
 (defun cmake-ts-mode--font-lock-settings ()
   "Return tree-sitter font-lock settings for `cmake-ts-mode'.
 
-Tree-sitter font-lock rules are evaluated the first time this function
-is called.  Subsequent calls return the first evaluated value."
-  (or cmake-ts-mode--font-lock-settings
-      (setq cmake-ts-mode--font-lock-settings
+Tree-sitter font-lock settings are evaluated the first time this
+function is called.  Subsequent calls return the first evaluated value."
+  (or cmake-ts-mode--font-lock-settings-cached
+      (setq cmake-ts-mode--font-lock-settings-cached
             (treesit-font-lock-rules
              :language 'cmake
              :feature 'bracket
diff --git a/lisp/progmodes/go-ts-mode.el b/lisp/progmodes/go-ts-mode.el
index 1b44478f41a..91664a4de48 100644
--- a/lisp/progmodes/go-ts-mode.el
+++ b/lisp/progmodes/go-ts-mode.el
@@ -162,16 +162,16 @@
   (ignore-errors
     (or (treesit-query-string "" '((method_elem) @cap) 'go) t)))
 
-(defvar go-ts-mode--font-lock-settings nil
-  "Tree-sitter font-lock settings for `go-ts-mode'.")
+(defvar go-ts-mode--font-lock-settings-cached nil
+  "Cached tree-sitter font-lock settings for `go-ts-mode'.")
 
 (defun go-ts-mode--font-lock-settings ()
   "Return tree-sitter font-lock settings for `go-ts-mode'.
 
-Tree-sitter font-lock rules are evaluated the first time this function
-is called.  Subsequent calls return the first evaluated value."
-  (or go-ts-mode--font-lock-settings
-      (setq go-ts-mode--font-lock-settings
+Tree-sitter font-lock settings are evaluated the first time this
+function is called.  Subsequent calls return the first evaluated value."
+  (or go-ts-mode--font-lock-settings-cached
+      (setq go-ts-mode--font-lock-settings-cached
             (treesit-font-lock-rules
              :language 'go
              :feature 'bracket
diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el
index 0fda7d62145..5e54383cd9f 100644
--- a/lisp/progmodes/js.el
+++ b/lisp/progmodes/js.el
@@ -3513,16 +3513,16 @@ characters of the current line."
               node parent bol args)
        js-indent-level)))
 
-(defvar js--treesit-indent-rules nil
-  "Tree-sitter indent rules for `js-ts-mode'.")
+(defvar js--treesit-indent-rules-cached nil
+  "Cached tree-sitter indent rules for `js-ts-mode'.")
 
 (defun js--treesit-indent-rules ()
   "Return tree-sitter indent rules for `js-ts-mode'.
 
-Tree-sitter indent rules are evaluated the first time this function
-is called.  Subsequent calls return the first evaluated value."
-  (or js--treesit-indent-rules
-      (setq js--treesit-indent-rules
+Tree-sitter indent rules are evaluated the first time this function is
+called.  Subsequent calls return the first evaluated value."
+  (or js--treesit-indent-rules-cached
+      (setq js--treesit-indent-rules-cached
             `((javascript
                ((parent-is "program") parent-bol 0)
                ((node-is "}") standalone-parent 0)
@@ -3595,16 +3595,16 @@ is called.  Subsequent calls return the first evaluated value."
     "&&" "||" "!")
   "JavaScript operators for tree-sitter font-locking.")
 
-(defvar js--treesit-font-lock-settings nil
-  "Tree-sitter font-lock settings for `js-ts-mode'.")
+(defvar js--treesit-font-lock-settings-cached nil
+  "Cached tree-sitter font-lock settings for `js-ts-mode'.")
 
 (defun js--treesit-font-lock-settings ()
   "Return tree-sitter font-lock settings for `js-ts-mode'.
 
-Tree-sitter font-lock rules are evaluated the first time this function
-is called.  Subsequent calls return the first evaluated value."
-  (or js--treesit-font-lock-settings
-      (setq js--treesit-font-lock-settings
+Tree-sitter font-lock settings are evaluated the first time this
+function is called.  Subsequent calls return the first evaluated value."
+  (or js--treesit-font-lock-settings-cached
+      (setq js--treesit-font-lock-settings-cached
             (treesit-font-lock-rules
 
              :language 'javascript