diff --git a/lisp/emacs-lisp/comp-run.el b/lisp/emacs-lisp/comp-run.el
index 8e08eca7442..17a9ab71f7e 100644
--- a/lisp/emacs-lisp/comp-run.el
+++ b/lisp/emacs-lisp/comp-run.el
@@ -195,7 +195,7 @@ processes from `comp-async-compilations'"
   (if native-comp-async-report-warnings-errors
       (let ((warning-suppress-types
              (if (eq native-comp-async-report-warnings-errors 'silent)
-                 (cons '(comp) warning-suppress-types)
+                 (cons '(native-compiler) warning-suppress-types)
                warning-suppress-types))
             (regexp (if (eq native-comp-async-warnings-errors-kind 'all)
                         "^.*?\\(?:Error\\|Warning\\): .*$"
@@ -211,7 +211,7 @@ processes from `comp-async-compilations'"
             (accept-process-output process)
             (goto-char (or comp-last-scanned-async-output (point-min)))
             (while (re-search-forward regexp nil t)
-              (display-warning 'comp (match-string 0)))
+              (display-warning 'native-compiler (match-string 0)))
             (setq comp-last-scanned-async-output (point-max)))))
     (accept-process-output process)))
 
@@ -446,7 +446,7 @@ bytecode definition was not changed in the meantime)."
                 (setf comp-files-queue
                       (append comp-files-queue `((,file . ,load)))
                       added-something t)
-              (display-warning 'comp
+              (display-warning 'native-compiler
                                (format "No write access for %s skipping."
                                        out-filename)))))))
     ;; Perhaps nothing passed `native--compile-async-skip-p'?
diff --git a/lisp/emacs-lisp/comp.el b/lisp/emacs-lisp/comp.el
index 6c56fd78859..2844e89c661 100644
--- a/lisp/emacs-lisp/comp.el
+++ b/lisp/emacs-lisp/comp.el
@@ -2792,7 +2792,7 @@ Return t if something was changed."
                   finally
                   (when (= i 100)
                     (display-warning
-                     'comp
+                     'native-compiler
                      (format "fwprop pass jammed into %s?" (comp-func-name f))))
                   (comp-log (format "Propagation run %d times\n" i) 2))
                  (comp--rewrite-non-locals)
diff --git a/src/comp.c b/src/comp.c
index df7fa3a5199..3b372145d07 100644
--- a/src/comp.c
+++ b/src/comp.c
@@ -5756,7 +5756,7 @@ natively-compiled one.  */);
   DEFSYM (Qd_ephemeral, "d-ephemeral");
 
   /* Others.  */
-  DEFSYM (Qcomp, "comp");
+  DEFSYM (Qnative_compiler, "native-compiler");
   DEFSYM (Qfixnum, "fixnum");
   DEFSYM (Qscratch, "scratch");
   DEFSYM (Qlate, "late");
diff --git a/src/lread.c b/src/lread.c
index 1bc5b0c993d..3feb27eda46 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -1887,7 +1887,7 @@ maybe_swap_for_eln (bool no_native, Lisp_Object *filename, int *fd,
 		return;
 	      Vdelayed_warnings_list
 		= Fcons (list2
-			 (Qcomp,
+			 (Qnative_compiler,
 			  CALLN (Fformat,
 				 build_string ("Cannot look up .eln file "
 					       "for %s because no source "