diff --git a/src/healthbot/azext_healthbot/generated/_help.py b/src/healthbot/azext_healthbot/generated/_help.py
index 14da801aca8..596971fecab 100644
--- a/src/healthbot/azext_healthbot/generated/_help.py
+++ b/src/healthbot/azext_healthbot/generated/_help.py
@@ -45,7 +45,7 @@
     examples:
       - name: BotCreate
         text: |-
-               az healthbot create --name "samplebotname" --location "East US" --sku "F0" --resource-group \
+               az healthbot create --bot-name "samplebotname" --location "East US" --name "F0" --resource-group \
 "healthbotClient"
 """
 
diff --git a/src/healthbot/azext_healthbot/generated/_params.py b/src/healthbot/azext_healthbot/generated/_params.py
index 71c4f46116c..280e8969587 100644
--- a/src/healthbot/azext_healthbot/generated/_params.py
+++ b/src/healthbot/azext_healthbot/generated/_params.py
@@ -31,18 +31,18 @@ def load_arguments(self, _):
 
     with self.argument_context('healthbot create') as c:
         c.argument('resource_group_name', resource_group_name_type)
-        c.argument('bot_name', options_list=['--name', '-n', '--bot-name'], type=str, help='The name of the Bot resource.')
+        c.argument('bot_name', type=str, help='The name of the Bot resource.')
         c.argument('tags', tags_type)
         c.argument('location', arg_type=get_location_type(self.cli_ctx), required=False,
                    validator=get_default_location_from_resource_group)
-        c.argument('sku', arg_type=get_enum_type(['F0', 'S1', 'C0']), help='The name of the HealthBot SKU',
+        c.argument('name', arg_type=get_enum_type(['F0', 'S1', 'C0']), help='The name of the HealthBot SKU',
                    arg_group='Sku')
 
     with self.argument_context('healthbot update') as c:
         c.argument('resource_group_name', resource_group_name_type)
-        c.argument('bot_name', options_list=['--name', '-n', '--bot-name'], type=str, help='The name of the Bot resource.', id_part='name')
+        c.argument('bot_name', type=str, help='The name of the Bot resource.', id_part='name')
         c.argument('tags', tags_type)
-        c.argument('sku', arg_type=get_enum_type(['F0', 'S1', 'C0']), help='The name of the HealthBot SKU',
+        c.argument('name', arg_type=get_enum_type(['F0', 'S1', 'C0']), help='The name of the HealthBot SKU',
                    arg_group='Sku')
 
     with self.argument_context('healthbot delete') as c:
diff --git a/src/healthbot/azext_healthbot/generated/custom.py b/src/healthbot/azext_healthbot/generated/custom.py
index 469d339e352..5588fdf7f66 100644
--- a/src/healthbot/azext_healthbot/generated/custom.py
+++ b/src/healthbot/azext_healthbot/generated/custom.py
@@ -30,14 +30,14 @@ def healthbot_create(client,
                      resource_group_name,
                      bot_name,
                      location,
-                     sku,
+                     name,
                      tags=None,
                      no_wait=False):
     parameters = {}
     parameters['tags'] = tags
     parameters['location'] = location
     parameters['sku'] = {}
-    parameters['sku']['name'] = sku
+    parameters['sku']['name'] = name
     return sdk_no_wait(no_wait,
                        client.begin_create,
                        resource_group_name=resource_group_name,
@@ -49,11 +49,11 @@ def healthbot_update(client,
                      resource_group_name,
                      bot_name,
                      tags=None,
-                     sku=None):
+                     name=None):
     parameters = {}
     parameters['tags'] = tags
     parameters['sku'] = {}
-    parameters['sku']['name'] = sku
+    parameters['sku']['name'] = name
     return client.update(resource_group_name=resource_group_name,
                          bot_name=bot_name,
                          parameters=parameters)
diff --git a/src/healthbot/azext_healthbot/tests/latest/example_steps.py b/src/healthbot/azext_healthbot/tests/latest/example_steps.py
index 51959a29e34..102678262d0 100644
--- a/src/healthbot/azext_healthbot/tests/latest/example_steps.py
+++ b/src/healthbot/azext_healthbot/tests/latest/example_steps.py
@@ -18,10 +18,10 @@ def step_create(test, rg, rg_2, checks=None):
     if checks is None:
         checks = []
     test.cmd('az healthbot create '
-             '--name "{myBot}" '
-             '--location "eastus" '
-             '--sku "F0" '
-             '--resource-group "{rg}"',
+             '--bot-name "{myBot}" '
+             '--location "East US" '
+             '--name "F0" '
+             '--resource-group "{rg_2}"',
              checks=checks)
 
 
@@ -52,7 +52,7 @@ def step_show(test, rg, rg_2, checks=None):
         checks = []
     test.cmd('az healthbot show '
              '--name "{myBot}" '
-             '--resource-group "{rg}"',
+             '--resource-group "{rg_2}"',
              checks=checks)
 
 
@@ -62,9 +62,9 @@ def step_update(test, rg, rg_2, checks=None):
     if checks is None:
         checks = []
     test.cmd('az healthbot update '
-             '--name "{myBot}" '
-             '--sku "F0" '
-             '--resource-group "{rg}"',
+             '--bot-name "{myBot}" '
+             '--name "F0" '
+             '--resource-group "{rg_2}"',
              checks=checks)
 
 
@@ -75,5 +75,6 @@ def step_delete(test, rg, rg_2, checks=None):
         checks = []
     test.cmd('az healthbot delete -y '
              '--name "{myBot}" '
-             '--resource-group "{rg}"',
+             '--resource-group "{rg_2}"',
              checks=checks)
+
diff --git a/src/healthbot/azext_healthbot/tests/latest/test_healthbot_scenario.py b/src/healthbot/azext_healthbot/tests/latest/test_healthbot_scenario.py
index 69218418e98..57816e19bb1 100644
--- a/src/healthbot/azext_healthbot/tests/latest/test_healthbot_scenario.py
+++ b/src/healthbot/azext_healthbot/tests/latest/test_healthbot_scenario.py
@@ -45,7 +45,7 @@ def call_scenario(test, rg, rg_2):
     setup_scenario(test, rg, rg_2)
     step_create(test, rg, rg_2, checks=[
         test.check("name", "{myBot}", case_sensitive=False),
-        test.check("location", "eastus", case_sensitive=False),
+        test.check("location", "East US", case_sensitive=False),
         test.check("sku.name", "F0", case_sensitive=False),
     ])
     step_list(test, rg, rg_2, checks=[])
@@ -54,12 +54,12 @@ def call_scenario(test, rg, rg_2):
     ])
     step_show(test, rg, rg_2, checks=[
         test.check("name", "{myBot}", case_sensitive=False),
-        test.check("location", "eastus", case_sensitive=False),
+        test.check("location", "East US", case_sensitive=False),
         test.check("sku.name", "F0", case_sensitive=False),
     ])
     step_update(test, rg, rg_2, checks=[
         test.check("name", "{myBot}", case_sensitive=False),
-        test.check("location", "eastus", case_sensitive=False),
+        test.check("location", "East US", case_sensitive=False),
         test.check("sku.name", "F0", case_sensitive=False),
     ])
     step_delete(test, rg, rg_2, checks=[])
@@ -76,9 +76,11 @@ def __init__(self, *args, **kwargs):
             'myBot': 'samplebotname',
         })
 
-    @ResourceGroupPreparer(name_prefix='clitest', random_name_length=20, key='rg', parameter_name='rg')
-    @ResourceGroupPreparer(name_prefix='clitest', random_name_length=20, key='rg_2', parameter_name='rg_2')
+
+    @ResourceGroupPreparer(name_prefix='clitesthealthbot_OneResourceGroupName'[:7], key='rg', parameter_name='rg')
+    @ResourceGroupPreparer(name_prefix='clitesthealthbot_healthbotClient'[:7], key='rg_2', parameter_name='rg_2')
     def test_healthbot_Scenario(self, rg, rg_2):
         call_scenario(self, rg, rg_2)
         calc_coverage(__file__)
         raise_if()
+
diff --git a/src/healthbot/report.md b/src/healthbot/report.md
index 9612fb1f423..f9406effe18 100644
--- a/src/healthbot/report.md
+++ b/src/healthbot/report.md
@@ -62,7 +62,7 @@ az healthbot show --name "samplebotname" --resource-group "healthbotClient"
 
 ##### <a name="ExamplesBotsCreate">Example</a>
 ```
-az healthbot create --name "samplebotname" --location "East US" --sku "F0" --resource-group "healthbotClient"
+az healthbot create --bot-name "samplebotname" --location "East US" --name "F0" --resource-group "healthbotClient"
 ```
 ##### <a name="ParametersBotsCreate">Parameters</a> 
 |Option|Type|Description|Path (SDK)|Swagger name|
@@ -70,14 +70,14 @@ az healthbot create --name "samplebotname" --location "East US" --sku "F0" --res
 |**--resource-group-name**|string|The name of the Bot resource group in the user subscription.|resource_group_name|resourceGroupName|
 |**--bot-name**|string|The name of the Bot resource.|bot_name|botName|
 |**--location**|string|The geo-location where the resource lives|location|location|
-|**--sku**|sealed-choice|The name of the HealthBot SKU|
+|**--name**|sealed-choice|The name of the HealthBot SKU|name|name|
 |**--tags**|dictionary|Resource tags.|tags|tags|
 
 #### <a name="BotsUpdate">Command `az healthbot update`</a>
 
 ##### <a name="ExamplesBotsUpdate">Example</a>
 ```
-az healthbot update --name "samplebotname" --sku "F0" --resource-group "healthbotClient"
+az healthbot update --bot-name "samplebotname" --name "F0" --resource-group "healthbotClient"
 ```
 ##### <a name="ParametersBotsUpdate">Parameters</a> 
 |Option|Type|Description|Path (SDK)|Swagger name|
@@ -85,7 +85,7 @@ az healthbot update --name "samplebotname" --sku "F0" --resource-group "healthbo
 |**--resource-group-name**|string|The name of the Bot resource group in the user subscription.|resource_group_name|resourceGroupName|
 |**--bot-name**|string|The name of the Bot resource.|bot_name|botName|
 |**--tags**|dictionary|Tags for a HealthBot.|tags|tags|
-|**--sku**|sealed-choice|The name of the HealthBot SKU|
+|**--name**|sealed-choice|The name of the HealthBot SKU|name|name|
 
 #### <a name="BotsDelete">Command `az healthbot delete`</a>