diff --git a/configure.ac b/configure.ac
index 22082cf737b..253276d8de5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5078,16 +5078,16 @@ AC_DEFUN([libgccjit_smoke_test], [
       }]])])
 
 AC_DEFUN([libgccjit_not_found_err], [
-  AC_MSG_ERROR([Elisp native compiler was requested, but libgccjit was not found.
+  AC_MSG_ERROR([Lisp native compiler was requested, but libgccjit was not found.
 Please try installing libgccjit or a similar package.
-If you are sure you want Emacs be compiled without Elisp native compiler,
+If you are sure you want Emacs be compiled without the Lisp native compiler,
 pass the --without-native-compilation option to configure.])])
 
 AC_DEFUN([libgccjit_dev_not_found_err], [
-  AC_MSG_ERROR([Elisp native compiler was requested, but libgccjit header files were
+  AC_MSG_ERROR([Lisp native compiler was requested, but libgccjit header files were
 not found.
 Please try installing libgccjit-dev or a similar package.
-If you are sure you want Emacs be compiled without Elisp native compiler,
+If you are sure you want Emacs be compiled without the Lisp native compiler,
 pass the --without-native-compilation option to configure.])])
 
 AC_DEFUN([libgccjit_broken_err], [
diff --git a/doc/lispref/elisp.texi b/doc/lispref/elisp.texi
index ee73d50e8ce..def50ef7c64 100644
--- a/doc/lispref/elisp.texi
+++ b/doc/lispref/elisp.texi
@@ -1388,7 +1388,7 @@ Parsing Program Source
 * Pattern Matching::         Pattern matching with query patterns.
 * Multiple Languages::       Parse text written in multiple languages.
 * Tree-sitter Major Modes::  Develop major modes using tree-sitter.
-* Tree-sitter C API::        Compare the C API and the Elisp API.
+* Tree-sitter C API::        Compare the C API and the Lisp API.
 
 Syntax Descriptors
 
diff --git a/doc/lispref/functions.texi b/doc/lispref/functions.texi
index 122b6f52a8e..1279b15b819 100644
--- a/doc/lispref/functions.texi
+++ b/doc/lispref/functions.texi
@@ -219,7 +219,7 @@ function.  For example:
 
 @defun compiled-function-p object
 This function returns @code{t} if @var{object} is a function object
-that is not in the form of Elisp source code but something like
+that is not in the form of Lisp source code but something like
 machine code or byte code instead.  More specifically it returns
 @code{t} if the function is built-in (a.k.a.@: ``primitive'',
 @pxref{What Is a Function}), or byte-compiled (@pxref{Byte
diff --git a/doc/lispref/parsing.texi b/doc/lispref/parsing.texi
index 8968eafd91b..3e8e0851f2c 100644
--- a/doc/lispref/parsing.texi
+++ b/doc/lispref/parsing.texi
@@ -48,7 +48,7 @@ source files that mix multiple programming languages.
 * User-defined Things::      User-defined ``Things'' and Navigation.
 * Multiple Languages::       Parse text written in multiple languages.
 * Tree-sitter Major Modes::  Develop major modes using tree-sitter.
-* Tree-sitter C API::        Compare the C API and the Elisp API.
+* Tree-sitter C API::        Compare the C API and the Lisp API.
 @end menu
 
 @node Language Grammar
@@ -2305,8 +2305,8 @@ Null nodes are converted to @code{nil}.
 @end itemize
 
 Below is the correspondence between all C API functions and their
-Elisp counterparts.  Sometimes one Elisp function corresponds to
-multiple C functions, and many C functions don't have an Elisp
+Lisp counterparts.  Sometimes one Lisp function corresponds to
+multiple C functions, and many C functions don't have a Lisp
 counterpart.
 
 @example
diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi
index 0ef3afb7f7c..62909fc99f1 100644
--- a/doc/misc/gnus.texi
+++ b/doc/misc/gnus.texi
@@ -26271,7 +26271,7 @@ etc.@: backends.
 @item
 Store arbitrary data
 
-Through a simple Elisp API, the registry can remember any data for a
+Through a simple Lisp API, the registry can remember any data for a
 message.  A built-in inverse map, when activated, allows quick lookups
 of all messages matching a particular set of criteria.
 @end enumerate
diff --git a/etc/TODO b/etc/TODO
index 77c1a276cd5..0700452b757 100644
--- a/etc/TODO
+++ b/etc/TODO
@@ -105,7 +105,7 @@ longer)."
 
 ** Do interactive mode tagging for commands
 Change "(interactive)" to "(interactive nil foo-mode)" for command
-completion purposes.  Pick a major mode or Elisp library, and check
+completion purposes.  Pick a major mode or Lisp library, and check
 all interactive commands to see if they are only relevant in one
 particular mode.  This requires care as some commands might be useful
 outside of the mode they were written for.
@@ -730,9 +730,9 @@ H-S-C-M-s-double-wheel-up, ...
 
 *** Support for the $ (paired delimiter) in parse-partial-sexp
 
-*** Support for hook-chars whose effect is specified by Elisp code
+*** Support for hook-chars whose effect is specified by Lisp
 Hook-chars could have their effect on the parsing-state specified by
-Elisp code.  Thus a character could both close a string and open a
+Lisp code.  Thus a character could both close a string and open a
 comment at the same time and do it in a context-sensitive way.
 
 *** Ability to add mode-specific data to the partial-parse-state
diff --git a/lisp/auth-source.el b/lisp/auth-source.el
index 06f23af5b11..1d039d8b0d1 100644
--- a/lisp/auth-source.el
+++ b/lisp/auth-source.el
@@ -638,7 +638,7 @@ will ensure that any results will actually have a :secret
 property.
 
 :delete t means to delete any found entries.  nil by default.
-Use `auth-source-delete' in Elisp code instead of calling
+Use `auth-source-delete' in Lisp code instead of calling
 `auth-source-search' directly with this parameter.
 
 :type (X Y Z) will check only those backend types.  `netrc' and
diff --git a/lisp/cedet/semantic/bovine/el.el b/lisp/cedet/semantic/bovine/el.el
index f27bb479c48..fddb1884c9d 100644
--- a/lisp/cedet/semantic/bovine/el.el
+++ b/lisp/cedet/semantic/bovine/el.el
@@ -926,7 +926,7 @@ See `semantic-format-tag-prototype' for Emacs Lisp for more details."
 (defvar-mode-local emacs-lisp-mode semantic-stickyfunc-sticky-classes
   '(function type variable)
   "Add variables.
-Elisp variables can be pretty long, so track this one too.")
+Elisp variable names can be pretty long, so track this one too.")
 
 (with-suppressed-warnings ((obsolete define-child-mode))
   ;; FIXME: We should handle this some other way!
diff --git a/lisp/editorconfig.el b/lisp/editorconfig.el
index bf29f34e2db..7cdd79fa3b0 100644
--- a/lisp/editorconfig.el
+++ b/lisp/editorconfig.el
@@ -604,7 +604,7 @@ This function also removes `unset' properties and calls
 Every function is called with one argument, a hash-table indexed by
 EditorConfig settings represented as symbols and whose corresponding value
 is represented as a string.  It should return a list of (VAR . VAL) settings
-where VAR is an Elisp variable and VAL is the value to which it should be set.")
+where VAR is a Lisp variable and VAL is the value to which it should be set.")
 
 (defun editorconfig--get-local-variables (props)
   "Get variables settings according to EditorConfig PROPS."
diff --git a/lisp/emacs-lisp/cconv.el b/lisp/emacs-lisp/cconv.el
index c6e8db11b16..170c7828cdd 100644
--- a/lisp/emacs-lisp/cconv.el
+++ b/lisp/emacs-lisp/cconv.el
@@ -904,7 +904,7 @@ lexically and dynamically bound symbols actually used by FORM."
 
 (defun cconv-make-interpreted-closure (args body env docstring iform)
   "Make a closure for the interpreter.
-This is intended to be called at runtime by the Elisp interpreter (when
+This is intended to be called at runtime by the Lisp interpreter (when
 the code has not been compiled).
 FUN is the closure's source code, must be a lambda form.
 ENV is the runtime representation of the lexical environment,
diff --git a/lisp/emacs-lisp/oclosure.el b/lisp/emacs-lisp/oclosure.el
index 2574c7dac60..d38429648e6 100644
--- a/lisp/emacs-lisp/oclosure.el
+++ b/lisp/emacs-lisp/oclosure.el
@@ -555,7 +555,7 @@ immutable fields are indeed not mutated."
 (defun cconv--interactive-helper (fun if)
   "Add interactive \"form\" IF to FUN.
 Returns a new command that otherwise behaves like FUN.
-IF can be an Elisp form to be interpreted or a function of no arguments."
+IF can be a Lisp form to be interpreted or a function of no arguments."
   (oclosure-lambda (cconv--interactive-helper (fun fun) (if if))
       (&rest args)
     (apply (if (called-interactively-p 'any)
diff --git a/lisp/net/tramp-message.el b/lisp/net/tramp-message.el
index 00d20e31edc..20bf720c41b 100644
--- a/lisp/net/tramp-message.el
+++ b/lisp/net/tramp-message.el
@@ -109,7 +109,7 @@ When it is used for regexp matching, the regexp groups are
   3 for the verbosity level.")
 
 (defconst tramp-debug-font-lock-keywords
-  ;; FIXME: Make it a function instead of an Elisp expression, so you
+  ;; FIXME: Make it a function instead of a Lisp expression, so you
   ;; can evaluate it with `funcall' rather than `eval'!
   ;; Also, in `font-lock-defaults' you can specify a function name for
   ;; the "KEYWORDS" part, so font-lock calls it to get the actual keywords!
diff --git a/lisp/progmodes/peg.el b/lisp/progmodes/peg.el
index aa32624436b..f8fc7acc436 100644
--- a/lisp/progmodes/peg.el
+++ b/lisp/progmodes/peg.el
@@ -659,7 +659,7 @@ rulesets defined previously with `define-peg-ruleset'."
 
 ;; This is the main translation function.
 (defun peg-translate-exp (exp)
-  "Return the Elisp code to match the PE EXP."
+  "Return the Emacs Lisp code to match the PE EXP."
   ;; FIXME: This expansion basically duplicates `exp' in the output, which is
   ;; a serious problem because it's done recursively, so it makes the output
   ;; code's size exponentially larger than the input!
diff --git a/src/frame.c b/src/frame.c
index decb92bca21..bbff0dec2e4 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -1892,7 +1892,7 @@ do_switch_frame (Lisp_Object frame, int track, int for_deletion, Lisp_Object nor
 
   /* After setting `selected_frame`, we're temporarily in an inconsistent
      state where (selected-window) != (frame-selected-window).  Until this
-     invariant is restored we should be very careful not to run Elisp code.
+     invariant is restored we should be very careful not to run any Lisp.
      (bug#58343)  */
   selected_frame = frame;
 
diff --git a/test/lisp/emacs-lisp/shortdoc-tests.el b/test/lisp/emacs-lisp/shortdoc-tests.el
index d826d596951..1cbec24a556 100644
--- a/test/lisp/emacs-lisp/shortdoc-tests.el
+++ b/test/lisp/emacs-lisp/shortdoc-tests.el
@@ -90,7 +90,7 @@
                   (shortdoc-function-examples 'string-match-p)))))
 
 (ert-deftest shortdoc-help-fns-examples-function-test ()
-  "Test that `shortdoc-help-fns-examples-function' correctly prints Elisp function examples."
+  "Test that `shortdoc-help-fns-examples-function' correctly prints Lisp function examples."
   (with-temp-buffer
     (shortdoc-help-fns-examples-function 'string-fill)
     (should (equal "\n  Examples:\n\n  (string-fill \"Three short words\" 12)\n    => \"Three short\\nwords\"\n  (string-fill \"Long-word\" 3)\n    => \"Long-word\"\n\n"