diff --git a/src/builder/command.rs b/src/builder/command.rs
index 26acde48182..0a52a645816 100644
--- a/src/builder/command.rs
+++ b/src/builder/command.rs
@@ -4373,7 +4373,7 @@ impl<'help> App<'help> {
                 .collect();
 
             assert!(args_missing_help.is_empty(),
-                    "AppSettings::HelpExpected is enabled for the Command {}, but at least one of its arguments does not have either `help` or `long_help` set. List of such arguments: {}",
+                    "Command::help_expected is enabled for the Command {}, but at least one of its arguments does not have either `help` or `long_help` set. List of such arguments: {}",
                     self.name,
                     args_missing_help.join(", ")
                 );
diff --git a/tests/builder/help.rs b/tests/builder/help.rs
index 6aaec5afee0..e95dfe4ef20 100644
--- a/tests/builder/help.rs
+++ b/tests/builder/help.rs
@@ -1997,7 +1997,7 @@ fn issue_1487() {
 
 #[cfg(debug_assertions)]
 #[test]
-#[should_panic = "AppSettings::HelpExpected is enabled for the Command"]
+#[should_panic = "Command::help_expected is enabled for the Command"]
 fn help_required_but_not_given() {
     Command::new("myapp")
         .help_expected(true)
@@ -2008,7 +2008,7 @@ fn help_required_but_not_given() {
 
 #[cfg(debug_assertions)]
 #[test]
-#[should_panic = "AppSettings::HelpExpected is enabled for the Command"]
+#[should_panic = "Command::help_expected is enabled for the Command"]
 fn help_required_but_not_given_settings_after_args() {
     Command::new("myapp")
         .arg(Arg::new("foo"))
@@ -2019,7 +2019,7 @@ fn help_required_but_not_given_settings_after_args() {
 
 #[cfg(debug_assertions)]
 #[test]
-#[should_panic = "AppSettings::HelpExpected is enabled for the Command"]
+#[should_panic = "Command::help_expected is enabled for the Command"]
 fn help_required_but_not_given_for_one_of_two_arguments() {
     Command::new("myapp")
         .help_expected(true)
@@ -2046,7 +2046,7 @@ fn help_required_globally() {
 
 #[cfg(debug_assertions)]
 #[test]
-#[should_panic = "AppSettings::HelpExpected is enabled for the Command"]
+#[should_panic = "Command::help_expected is enabled for the Command"]
 fn help_required_globally_but_not_given_for_subcommand() {
     Command::new("myapp")
         .help_expected(true)
diff --git a/tests/builder/legacy/help.rs b/tests/builder/legacy/help.rs
index 6701ed712fe..0a62007fd5d 100644
--- a/tests/builder/legacy/help.rs
+++ b/tests/builder/legacy/help.rs
@@ -1991,7 +1991,7 @@ fn issue_1487() {
 
 #[cfg(debug_assertions)]
 #[test]
-#[should_panic = "AppSettings::HelpExpected is enabled for the Command"]
+#[should_panic = "Command::help_expected is enabled for the Command"]
 fn help_required_but_not_given() {
     Command::new("myapp")
         .help_expected(true)
@@ -2002,7 +2002,7 @@ fn help_required_but_not_given() {
 
 #[cfg(debug_assertions)]
 #[test]
-#[should_panic = "AppSettings::HelpExpected is enabled for the Command"]
+#[should_panic = "Command::help_expected is enabled for the Command"]
 fn help_required_but_not_given_settings_after_args() {
     Command::new("myapp")
         .arg(Arg::new("foo"))
@@ -2013,7 +2013,7 @@ fn help_required_but_not_given_settings_after_args() {
 
 #[cfg(debug_assertions)]
 #[test]
-#[should_panic = "AppSettings::HelpExpected is enabled for the Command"]
+#[should_panic = "Command::help_expected is enabled for the Command"]
 fn help_required_but_not_given_for_one_of_two_arguments() {
     Command::new("myapp")
         .help_expected(true)
@@ -2040,7 +2040,7 @@ fn help_required_globally() {
 
 #[cfg(debug_assertions)]
 #[test]
-#[should_panic = "AppSettings::HelpExpected is enabled for the Command"]
+#[should_panic = "Command::help_expected is enabled for the Command"]
 fn help_required_globally_but_not_given_for_subcommand() {
     Command::new("myapp")
         .help_expected(true)