diff --git a/‎awscli/argparser.py‎
Lines changed: 2 additions & 2 deletions b/‎awscli/argparser.py‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎tests/integration/test_cli.py‎
Lines changed: 7 additions & 7 deletions b/‎tests/integration/test_cli.py‎
Lines changed: 7 additions & 7 deletions
@@ -75,7 +75,7 @@ def _build(self, command_table, version_string, argument_table):
 
 class ServiceArgParser(CLIArgParser):
 
-    Usage = ("aws [options] <service_name> <operation> [parameters]")
+    Usage = ("aws [options] <command> <subcommand> [parameters]")
 
     def __init__(self, operations_table, service_name):
         super(ServiceArgParser, self).__init__(
@@ -92,7 +92,7 @@ def _build(self, operations_table):
 
 class OperationArgParser(CLIArgParser):
     Formatter = argparse.RawTextHelpFormatter
-    Usage = ("aws [options] <service_name> <operation> [parameters]")
+    Usage = ("aws [options] <command> <subcommand> [parameters]")
 
     type_map = {
         'structure': str,
 
@@ -56,7 +56,7 @@ def test_help_output(self):
         p = aws('help')
         self.assertEqual(p.rc, 1)
         self.assertIn('AWS', p.stdout)
-        self.assertRegexpMatches(p.stdout, 'The\s+AWS\s+Command Line Interface')
+        self.assertRegexpMatches(p.stdout, 'The\s+AWS\s+Command\s+Line\s+Interface')
 
     def test_service_help_output(self):
         p = aws('ec2 help')
@@ -156,20 +156,20 @@ def test_make_requests_to_other_region(self):
 
     def test_help_usage_top_level(self):
         p = aws('')
-        self.assertIn('usage: aws [options] <service_name> '
-                      '<operation> [parameters]', p.stderr)
+        self.assertIn('usage: aws [options] <command> '
+                      '<subcommand> [parameters]', p.stderr)
         self.assertIn('too few arguments', p.stderr)
 
     def test_help_usage_service_level(self):
         p = aws('ec2')
-        self.assertIn('usage: aws [options] <service_name> '
-                      '<operation> [parameters]', p.stderr)
+        self.assertIn('usage: aws [options] <command> '
+                      '<subcommand> [parameters]', p.stderr)
         self.assertIn('too few arguments', p.stderr)
 
     def test_help_usage_operation_level(self):
         p = aws('ec2 run-instances')
-        self.assertIn('usage: aws [options] <service_name> '
-                      '<operation> [parameters]', p.stderr)
+        self.assertIn('usage: aws [options] <command> '
+                      '<subcommand> [parameters]', p.stderr)
 
     def test_unknown_argument(self):
         p = aws('ec2 describe-instances --filterss')