diff --git a/config/main.py b/config/main.py
index f987c8774db9..820d4085e690 100755
--- a/config/main.py
+++ b/config/main.py
@@ -641,7 +641,7 @@ def reload(filename, yes, load_sysinfo):
     log_info("'reload' restarting services...")
     _restart_services()
 
-@config.command()
+@config.command("load_mgmt_config")
 @click.option('-y', '--yes', is_flag=True, callback=_abort_if_false,
                 expose_value=False, prompt='Reload mgmt config?')
 @click.argument('filename', default='/etc/sonic/device_desc.xml', type=click.Path(exists=True))
@@ -665,7 +665,7 @@ def load_mgmt_config(filename):
     run_command(command, display_cmd=True, ignore_error=True)
     click.echo("Please note loaded setting will be lost after system reboot. To preserve setting, run `config save`.")
 
-@config.command()
+@config.command("load_minigraph")
 @click.option('-y', '--yes', is_flag=True, callback=_abort_if_false,
                 expose_value=False, prompt='Reload config from minigraph?')
 def load_minigraph():
diff --git a/pfcwd/main.py b/pfcwd/main.py
index 880a5f33f8ac..3a27e993a863 100644
--- a/pfcwd/main.py
+++ b/pfcwd/main.py
@@ -221,7 +221,7 @@ def stop(ports):
         configdb.mod_entry(CONFIG_DB_PFC_WD_TABLE_NAME, port, None)
 
 # Set WD default configuration on server facing ports when enable flag is on
-@cli.command()
+@cli.command("start_default")
 def start_default():
     """ Start PFC WD by default configurations  """
     if os.geteuid() != 0: