diff --git a/src/builtin.h b/src/builtin.h
index cffaa19de..e8aff3b68 100644
--- a/src/builtin.h
+++ b/src/builtin.h
@@ -60,10 +60,10 @@ struct builtin_data_t {
 #define BUILTIN_ERR_MAX_ARG_COUNT1 _(L"%ls: expected <= %d arguments; got %d\n")
 
 /// Error message for invalid variable name.
-#define BUILTIN_ERR_VARNAME _(L"%ls: %ls: invalid variable. See `help identifiers`\n")
+#define BUILTIN_ERR_VARNAME _(L"%ls: %ls: invalid variable name. See `help identifiers`\n")
 
 /// Error message for invalid bind mode name.
-#define BUILTIN_ERR_BIND_MODE _(L"%ls: %ls: invalid mode. See `help identifiers`\n")
+#define BUILTIN_ERR_BIND_MODE _(L"%ls: %ls: invalid mode name. See `help identifiers`\n")
 
 /// Error message when too many arguments are supplied to a builtin.
 #define BUILTIN_ERR_TOO_MANY_ARGUMENTS _(L"%ls: too many arguments\n")
diff --git a/tests/checks/bind.fish b/tests/checks/bind.fish
index a8e5158b0..b85165ad8 100644
--- a/tests/checks/bind.fish
+++ b/tests/checks/bind.fish
@@ -5,11 +5,11 @@
 
 # Verify that an invalid bind mode is rejected. >&2
 bind -m 'bad bind mode' \cX true
-# CHECKERR: bind: bad bind mode: invalid mode. See `help identifiers`
+# CHECKERR: bind: bad bind mode: invalid mode name. See `help identifiers`
 
 # Verify that an invalid bind mode target is rejected. >&2
 bind -M bind-mode \cX true
-# CHECKERR: bind: bind-mode: invalid mode. See `help identifiers`
+# CHECKERR: bind: bind-mode: invalid mode name. See `help identifiers`
 # CHECKERR: bind: No binding found for sequence '\t'
 
 # This should succeed and result in a success, zero, status.
diff --git a/tests/checks/set.fish b/tests/checks/set.fish
index 65cb9b1f5..d571a4a2a 100644
--- a/tests/checks/set.fish
+++ b/tests/checks/set.fish
@@ -471,7 +471,7 @@ env | grep __fish_empty_uvar
 for a,b in y 1 z 3
     echo $a,$b
 end
-# CHECKERR: {{.*}} for: a,b: invalid variable. See `help identifiers`
+# CHECKERR: {{.*}} for: a,b: invalid variable name. See `help identifiers`
 # CHECKERR: for a,b in y 1 z 3
 # CHECKERR:     ^
 
@@ -530,7 +530,7 @@ sh -c "EDITOR='vim -g' $FISH -c "'\'set -S EDITOR\'' | string match -r -e 'globa
 
 # Verify behavior of `set --show` given an invalid var name
 set --show 'argle bargle'
-#CHECKERR: set: argle bargle: invalid variable. See `help identifiers`
+#CHECKERR: set: argle bargle: invalid variable name. See `help identifiers`
 #CHECKERR: {{.*}}set.fish (line {{\d+}}):
 #CHECKERR: set --show 'argle bargle'
 #CHECKERR: ^
@@ -757,14 +757,14 @@ echo $status
 true
 
 set "" foo
-#CHECKERR: set: : invalid variable. See `help identifiers`
+#CHECKERR: set: : invalid variable name. See `help identifiers`
 #CHECKERR: {{.*}}set.fish (line {{\d+}}):
 #CHECKERR: set "" foo
 #CHECKERR: ^
 #CHECKERR: (Type 'help set' for related documentation)
 
 set --show ""
-#CHECKERR: set: : invalid variable. See `help identifiers`
+#CHECKERR: set: : invalid variable name. See `help identifiers`
 #CHECKERR: {{.*}}set.fish (line {{\d+}}):
 #CHECKERR: set --show ""
 #CHECKERR: ^