diff --git a/lisp/simple.el b/lisp/simple.el
index 1555b376a36..e4958de113e 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -199,7 +199,7 @@ rejected, and the function returns nil."
 	   (and extra-test-inclusive
 		(funcall extra-test-inclusive))))))
 
-(defcustom next-error-find-buffer-function #'next-error-no-navigation-try-current
+(defcustom next-error-find-buffer-function #'next-error-buffer-unnavigated-current
   "Function called to find a `next-error' capable buffer.
 This functions takes the same three arguments as the function
 `next-error-find-buffer', and should return the buffer to be
@@ -212,7 +212,7 @@ all other buffers."
                  (const :tag "Single next-error capable buffer on selected frame"
                         next-error-buffer-on-selected-frame)
                  (const :tag "Current buffer if next-error capable and outside navigation"
-                        next-error-no-navigation-try-current)
+                        next-error-buffer-unnavigated-current)
                  (function :tag "Other function"))
   :group 'next-error
   :version "27.1")
@@ -242,10 +242,9 @@ from which next-error navigated, and a target buffer TO-BUFFER."
     (if (eq (length window-buffers) 1)
         (car window-buffers))))
 
-(defun next-error-no-navigation-try-current (&optional
-                                             avoid-current
-                                             extra-test-inclusive
-                                             extra-test-exclusive)
+(defun next-error-buffer-unnavigated-current (&optional avoid-current
+                                                        extra-test-inclusive
+                                                        extra-test-exclusive)
   "Try the current buffer when outside navigation.
 But return nil if we navigated to the current buffer by the means
 of `next-error' command.  Othewise, return it if it's next-error