diff --git a/ChangeLog b/ChangeLog
index 3823c39a0..2b628312e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@ Easy-RSA 3 ChangeLog
 
 3.2.5 (TBD)
 
+   * Add '-b' alias for --batch (575a964) (#1411)
    * Introduce peer-fingerprint inline lists (94c3690) (#1410)
    * Create new inline file type 'pfp', peer-fingerprint (353adc5) (#1407)
    * export_pkcs(), PKCS12 inline: Respect $EASYRSA_NO_INLINE (35d7ad3) (#1407)
diff --git a/easyrsa3/easyrsa b/easyrsa3/easyrsa
index 447f7de76..683964b3a 100755
--- a/easyrsa3/easyrsa
+++ b/easyrsa3/easyrsa
@@ -22,22 +22,21 @@ Global options:
 
 --version       : Prints EasyRSA version and build information
 --verbose|-v    : Enable verbose output
---batch         : Set automatic (no-prompts when possible) mode
+--batch|-b      : Set automatic (no-prompts when possible) mode
 --silent|-s     : Disable all warnings, notices and information
---sbatch        : Combined --silent and --batch operating mode
 --silent-ssl|-S : Silence SSL output (Requires batch mode)
 
 --nopass|no-pass: Do not use passwords
                   Can NOT be used with --passin or --passout
 --passin=ARG    : Set -passin ARG for openssl (eg: pass:xEasyRSAy)
 --passout=ARG   : Set -passout ARG for openssl (eg: pass:xEasyRSAy)
---raw-ca        : Build CA with password via RAW SSL input
+--rawca|raw-ca  : Build CA with password via RAW SSL input
 
---vars=FILE     : Define a specific 'vars' file to use for Easy-RSA config
-                  (Default vars file is in the current working directory)
 --pki=DIR       : Declare the PKI directory
                   (Default PKI directory is sub-directory 'pki')
                   See Advanced.md for in depth usage.
+--vars=FILE     : Define a specific 'vars' file to use for Easy-RSA config
+                  (Default vars file is in the current working PKI)
 
 --umask=ARG     : Define a UMASK (Default 077)
 --no-umask      : Do not use a UMASK, fall back to file system default.
@@ -129,8 +128,8 @@ Command list:
   expire <file_name_base>
   renew-ca
   renew <file_name_base>
-  revoke <file_name_base> [ cmd-opts ] #(DEPRECATED)
-  revoke-issued <file_name_base> [ cmd-opts ] #(REPLACEMENT)
+  revoke <file_name_base> [ cmd-opts ]          # DEPRECATED
+  revoke-issued <file_name_base> [ cmd-opts ]   # REPLACEMENT
   revoke-expired <file_name_base> [ cmd-opts ]
   revoke-renewed <file_name_base> [ cmd-opts ]
   gen-crl
@@ -150,11 +149,11 @@ Command list:
   export-p12 <file_name_base> [ cmd-opts ]
   set-pass <file_name_base> [ cmd-opts ]
   gen-tls-auth-key / gen-tls-crypt-key
-  write <type>
+  write <TYPE>
   serial|check-serial <SERIAL>
-  display-dn <form> <DIR/FILE_NAME>
+  display-dn <FORM> <DIR/FILE_NAME>
   show-eku <file_name_base>|<DIR/FILE_NAME>
-  rand <decimal_number>
+  rand <Decimal-Number>
 "
 } # => usage()
 
@@ -6851,7 +6850,7 @@ while :; do
 			empty_ok=1
 			export EASYRSA_NS_COMMENT="$val"
 			;;
-		--batch)
+		-b|--batch)
 			empty_ok=1
 			export EASYRSA_BATCH=1
 			;;
@@ -6962,7 +6961,7 @@ while :; do
 		-*)
 			user_error "\
 Unknown option '$opt'.
-Run 'easyrsa help options' for option help."
+Run 'easyrsa help' for option help."
 			;;
 		*)
 			break
@@ -7004,6 +7003,7 @@ fi
 # Set cmd now
 cmd="$1"
 [ "$1" ] && shift # scrape off command
+fn_name="$cmd"
 
 # Hand off to the function responsible
 # ONLY verify_working_env() for valid commands