diff --git a/completions/bash/brew b/completions/bash/brew
index 5be0e1e481..b1e9758f49 100644
--- a/completions/bash/brew
+++ b/completions/bash/brew
@@ -1813,9 +1813,9 @@ _brew_style() {
       return
       ;;
   esac
+  __brew_complete_tapped
   __brew_complete_formulae
   __brew_complete_casks
-  __brew_complete_tapped
 }
 
 _brew_switch() {
diff --git a/docs/Manpage.md b/docs/Manpage.md
index e90d3de15a..eeb8de30cd 100644
--- a/docs/Manpage.md
+++ b/docs/Manpage.md
@@ -611,7 +611,7 @@ Fetch and reset Homebrew and all tap repositories (or any specified *`repository
 
 *Note:* this will destroy all your uncommitted or committed changes.
 
-### `upgrade` [*`options`*] [*`installed_formula`*|*`installed_cask`* ...]
+### `upgrade` [*`options`*] [*`outdated_formula`*|*`outdated_cask`* ...]
 
 Upgrade outdated casks and outdated, unpinned formulae using the same options they were originally
 installed with, plus any appended brew formula options. If *`cask`* or *`formula`* are specified,
diff --git a/manpages/brew.1 b/manpages/brew.1
index 40e71d44cd..d312238f6f 100644
--- a/manpages/brew.1
+++ b/manpages/brew.1
@@ -817,7 +817,7 @@ Fetch and reset Homebrew and all tap repositories (or any specified \fIrepositor
 .P
 \fINote:\fR this will destroy all your uncommitted or committed changes\.
 .
-.SS "\fBupgrade\fR [\fIoptions\fR] [\fIinstalled_formula\fR|\fIinstalled_cask\fR \.\.\.]"
+.SS "\fBupgrade\fR [\fIoptions\fR] [\fIoutdated_formula\fR|\fIoutdated_cask\fR \.\.\.]"
 Upgrade outdated casks and outdated, unpinned formulae using the same options they were originally installed with, plus any appended brew formula options\. If \fIcask\fR or \fIformula\fR are specified, upgrade only the given \fIcask\fR or \fIformula\fR kegs (unless they are pinned; see \fBpin\fR, \fBunpin\fR)\.
 .
 .P