diff --git a/tutor/commands/cli.py b/tutor/commands/cli.py
index dec929c..7a23b10 100755
--- a/tutor/commands/cli.py
+++ b/tutor/commands/cli.py
@@ -38,8 +38,8 @@ def print_help():
 
 
 click_repl.register_repl(cli, name="ui")
-cli.add_command(images_command, name="images")
-cli.add_command(config_command, name="config")
+cli.add_command(images_command)
+cli.add_command(config_command)
 cli.add_command(local)
 cli.add_command(dev)
 cli.add_command(android)
diff --git a/tutor/commands/config.py b/tutor/commands/config.py
index ebddc2a..4cbb0f8 100644
--- a/tutor/commands/config.py
+++ b/tutor/commands/config.py
@@ -14,6 +14,7 @@ from ..__about__ import __version__
 
 
 @click.group(
+    name="config",
     short_help="Configure Open edX",
     help="""Configure Open edX and store configuration values in $TUTOR_ROOT/config.yml""",
 )
@@ -21,7 +22,7 @@ def config_command():
     pass
 
 
-@click.command(help="Create and save configuration interactively")
+@click.command(name="save", help="Create and save configuration interactively")
 @opts.root
 @click.option("-y", "--yes", "silent1", is_flag=True, help="Run non-interactively")
 @click.option("--silent", "silent2", is_flag=True, hidden=True)
@@ -376,6 +377,6 @@ def config_path(root):
     return os.path.join(root, "config.yml")
 
 
-config_command.add_command(save_command, name="save")
+config_command.add_command(save_command)
 config_command.add_command(printroot)
 config_command.add_command(printvalue)
diff --git a/tutor/commands/images.py b/tutor/commands/images.py
index eec5971..ae1fc38 100644
--- a/tutor/commands/images.py
+++ b/tutor/commands/images.py
@@ -7,7 +7,7 @@ from .. import opts
 from .. import utils
 
 
-@click.group(short_help="Manage docker images")
+@click.group(name="images", short_help="Manage docker images")
 def images_command():
     pass