4 files changed, 12 insertions, 7 deletions
diff --git a/lisp/eshell/em-unix.el b/lisp/eshell/em-unix.el
index c27c18c52ba..e40dbded60b 100644
--- a/lisp/eshell/em-unix.el
+++ b/lisp/eshell/em-unix.el
@@ -748,7 +748,12 @@ external command."
 	     (cmd (progn
 		    (set-text-properties 0 (length args)
 					 '(invisible t) args)
-		    (format "%s -n %s" command args)))
+		    (format "%s -n %s"
+			    (pcase command
+			      ("egrep" "grep -E")
+			      ("fgrep" "grep -F")
+			      (x x))
+			    args)))
 	     compilation-scroll-output)
 	(grep cmd)))))
 
@@ -757,11 +762,11 @@ external command."
   (eshell-grep "grep" args t))
 
 (defun eshell/egrep (&rest args)
-  "Use Emacs grep facility instead of calling external egrep."
+  "Use Emacs grep facility instead of calling external grep -E."
   (eshell-grep "egrep" args t))
 
 (defun eshell/fgrep (&rest args)
-  "Use Emacs grep facility instead of calling external fgrep."
+  "Use Emacs grep facility instead of calling external grep -F."
   (eshell-grep "fgrep" args t))
 
 (defun eshell/agrep (&rest args)
diff --git a/lisp/eshell/esh-mode.el b/lisp/eshell/esh-mode.el
index 388bc747367..074b94cc75d 100644
--- a/lisp/eshell/esh-mode.el
+++ b/lisp/eshell/esh-mode.el
@@ -296,7 +296,7 @@ and the hook `eshell-exit-hook'."
   (run-hooks 'eshell-exit-hook))
 
 ;;;###autoload
-(define-derived-mode eshell-mode fundamental-mode "EShell"
+(define-derived-mode eshell-mode fundamental-mode "Eshell"
   "Emacs shell interactive mode."
   (setq-local eshell-mode t)
 
diff --git a/lisp/eshell/esh-var.el b/lisp/eshell/esh-var.el
index 7213ad70e84..5915efbac1e 100644
--- a/lisp/eshell/esh-var.el
+++ b/lisp/eshell/esh-var.el
@@ -530,7 +530,7 @@ Integers imply a direct index, and names, an associate lookup using
 For example, to retrieve the second element of a user's record in
 '/etc/passwd', the variable reference would look like:
 
-  ${egrep johnw /etc/passwd}[: 2]"
+  ${grep johnw /etc/passwd}[: 2]"
   (while indices
     (let ((refs (car indices)))
       (when (stringp value)
diff --git a/lisp/eshell/eshell.el b/lisp/eshell/eshell.el
index 8b21730ef33..54281a72c7a 100644
--- a/lisp/eshell/eshell.el
+++ b/lisp/eshell/eshell.el
@@ -308,9 +308,9 @@ With prefix ARG, insert output into the current buffer at point."
 			  (eshell-parse-command command))))
 	     intr
 	     (bufname (if (and proc (listp proc))
-			  "*EShell Async Command Output*"
+			  "*Eshell Async Command Output*"
 			(setq intr t)
-			"*EShell Command Output*")))
+			"*Eshell Command Output*")))
 	(if (buffer-live-p (get-buffer bufname))
 	    (kill-buffer bufname))
 	(rename-buffer bufname)