diff --git a/mailchimp/agent-harness/cli_anything/mailchimp/_codegen/generate.py b/mailchimp/agent-harness/cli_anything/mailchimp/_codegen/generate.py
index 78b64af24..135c6424f 100644
--- a/mailchimp/agent-harness/cli_anything/mailchimp/_codegen/generate.py
+++ b/mailchimp/agent-harness/cli_anything/mailchimp/_codegen/generate.py
@@ -162,6 +162,7 @@ def _generate_command_func(
     # I3: All query params (no arbitrary cap); --extra-params escape hatch
     for p in query_params:
         flag = _slugify(p["name"])
+        py_name = _safe_name(p["name"]).lower()
         ptype = _param_type_to_click(p)
         desc = p.get("description", "").replace('"', '\\"').split("\n")[0][:80]
         if ptype == "int":
@@ -171,7 +172,7 @@ def _generate_command_func(
         else:
             type_clause = ""
         decorators.append(
-            f'@click.option("--{flag}", default=None, {type_clause}help="{desc}")'
+            f'@click.option("--{flag}", "{py_name}", default=None, {type_clause}help="{desc}")'
         )
 
     # Escape hatch for extra/future query params
@@ -341,6 +342,10 @@ def _generate_module(tag: str, operations: list[tuple[str, str, dict]]) -> str:
             cmd_name, method, path, operation, path_params, query_params, body_param
         )
         body_parts.append(func_code)
+        if tag.lower() == "campaigns" and cmd_name == "list-campaigns-id-content":
+            body_parts.append('campaigns_group.add_command(_cmd_list_campaigns_id_content, "list-content")\n')
+        if tag.lower() == "campaigns" and cmd_name == "list-campaigns-id-send-checklist":
+            body_parts.append('campaigns_group.add_command(_cmd_list_campaigns_id_send_checklist, "list-send-checklist")\n')
         if tag.lower() == "lists" and cmd_name == "create-lists-id-members":
             body_parts.append('lists_group.add_command(_cmd_create_lists_id_members, "create-members")\n')
 
diff --git a/mailchimp/agent-harness/cli_anything/mailchimp/commands/account_export.py b/mailchimp/agent-harness/cli_anything/mailchimp/commands/account_export.py
index 01a42855d..b3d409c75 100644
--- a/mailchimp/agent-harness/cli_anything/mailchimp/commands/account_export.py
+++ b/mailchimp/agent-harness/cli_anything/mailchimp/commands/account_export.py
@@ -29,8 +29,8 @@ def account_export_group(ctx):
 
 @account_export_group.command("get")
 @click.argument("EXPORT_ID")
-@click.option("--fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
-@click.option("--exclude-fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
+@click.option("--fields", "fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
+@click.option("--exclude-fields", "exclude_fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
 @click.option("--extra-params", default=None, help="Extra query params as JSON object, e.g. '{\"key\":\"val\"}'")
 @click.pass_context
 def _cmd_get(ctx, export_id, fields, exclude_fields, extra_params):
diff --git a/mailchimp/agent-harness/cli_anything/mailchimp/commands/account_exports.py b/mailchimp/agent-harness/cli_anything/mailchimp/commands/account_exports.py
index 7cd929f6e..091b7a176 100644
--- a/mailchimp/agent-harness/cli_anything/mailchimp/commands/account_exports.py
+++ b/mailchimp/agent-harness/cli_anything/mailchimp/commands/account_exports.py
@@ -28,10 +28,10 @@ def account_exports_group(ctx):
     """account-exports resource commands."""
 
 @account_exports_group.command("list")
-@click.option("--fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
-@click.option("--exclude-fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
-@click.option("--count", default=None, type=int, help="The number of records to return. Default value is 10. Maximum value is 1000")
-@click.option("--offset", default=None, type=int, help="Used for [pagination](https://mailchimp.com/developer/marketing/docs/methods-par")
+@click.option("--fields", "fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
+@click.option("--exclude-fields", "exclude_fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
+@click.option("--count", "count", default=None, type=int, help="The number of records to return. Default value is 10. Maximum value is 1000")
+@click.option("--offset", "offset", default=None, type=int, help="Used for [pagination](https://mailchimp.com/developer/marketing/docs/methods-par")
 @click.option("--extra-params", default=None, help="Extra query params as JSON object, e.g. '{\"key\":\"val\"}'")
 @click.pass_context
 def _cmd_list_(ctx, fields, exclude_fields, count, offset, extra_params):
diff --git a/mailchimp/agent-harness/cli_anything/mailchimp/commands/activity_feed.py b/mailchimp/agent-harness/cli_anything/mailchimp/commands/activity_feed.py
index b8134dc34..e64552f44 100644
--- a/mailchimp/agent-harness/cli_anything/mailchimp/commands/activity_feed.py
+++ b/mailchimp/agent-harness/cli_anything/mailchimp/commands/activity_feed.py
@@ -28,8 +28,8 @@ def activity_feed_group(ctx):
     """activity-feed resource commands."""
 
 @activity_feed_group.command("list")
-@click.option("--count", default=None, type=int, help="The number of records to return. Default value is 10. Maximum value is 1000")
-@click.option("--offset", default=None, type=int, help="Used for [pagination](https://mailchimp.com/developer/marketing/docs/methods-par")
+@click.option("--count", "count", default=None, type=int, help="The number of records to return. Default value is 10. Maximum value is 1000")
+@click.option("--offset", "offset", default=None, type=int, help="Used for [pagination](https://mailchimp.com/developer/marketing/docs/methods-par")
 @click.option("--extra-params", default=None, help="Extra query params as JSON object, e.g. '{\"key\":\"val\"}'")
 @click.pass_context
 def _cmd_list_(ctx, count, offset, extra_params):
diff --git a/mailchimp/agent-harness/cli_anything/mailchimp/commands/audiences.py b/mailchimp/agent-harness/cli_anything/mailchimp/commands/audiences.py
index 978fb8e77..74e14ac0b 100644
--- a/mailchimp/agent-harness/cli_anything/mailchimp/commands/audiences.py
+++ b/mailchimp/agent-harness/cli_anything/mailchimp/commands/audiences.py
@@ -29,16 +29,16 @@ def audiences_group(ctx):
 
 @audiences_group.command("list")
 @click.argument("AUDIENCE_ID")
-@click.option("--fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
-@click.option("--exclude-fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
-@click.option("--count", default=None, type=int, help="The number of records to return. Default value is 10. Maximum value is 1000")
-@click.option("--cursor", default=None, help="Paginate through a collection of records by setting the `cursor` parameter to a ")
-@click.option("--created-before", default=None, help="Restricts the response to contacts created at or before the specified time (incl")
-@click.option("--created-since", default=None, help="Restricts the response to contacts created after the specified time (exclusive).")
-@click.option("--updated-before", default=None, help="Restricts the response to contacts updated at or before the specified time (incl")
-@click.option("--updated-since", default=None, help="Restricts the response to contacts updated after the specified time (exclusive).")
-@click.option("--sort-field", default=None, help="Specifies the field to sort the returned contacts by.")
-@click.option("--sort-dir", default=None, help="Determines the order direction for sorted results.")
+@click.option("--fields", "fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
+@click.option("--exclude-fields", "exclude_fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
+@click.option("--count", "count", default=None, type=int, help="The number of records to return. Default value is 10. Maximum value is 1000")
+@click.option("--cursor", "cursor", default=None, help="Paginate through a collection of records by setting the `cursor` parameter to a ")
+@click.option("--created-before", "created_before", default=None, help="Restricts the response to contacts created at or before the specified time (incl")
+@click.option("--created-since", "created_since", default=None, help="Restricts the response to contacts created after the specified time (exclusive).")
+@click.option("--updated-before", "updated_before", default=None, help="Restricts the response to contacts updated at or before the specified time (incl")
+@click.option("--updated-since", "updated_since", default=None, help="Restricts the response to contacts updated after the specified time (exclusive).")
+@click.option("--sort-field", "sort_field", default=None, help="Specifies the field to sort the returned contacts by.")
+@click.option("--sort-dir", "sort_dir", default=None, help="Determines the order direction for sorted results.")
 @click.option("--extra-params", default=None, help="Extra query params as JSON object, e.g. '{\"key\":\"val\"}'")
 @click.pass_context
 def _cmd_list_(ctx, audience_id, fields, exclude_fields, count, cursor, created_before, created_since, updated_before, updated_since, sort_field, sort_dir, extra_params):
@@ -71,8 +71,8 @@ def _cmd_list_(ctx, audience_id, fields, exclude_fields, count, cursor, created_
 @audiences_group.command("create")
 @click.argument("AUDIENCE_ID")
 @click.option("--data", default=None, help="Request body as JSON string.")
-@click.option("--merge-field-validation-mode", default=None, help="Defines how merge field validation is handled. When set to `ignore_required_chec")
-@click.option("--data-mode", default=None, help="Indicates the data processing mode. In `historical` mode, contact data changes d")
+@click.option("--merge-field-validation-mode", "merge_field_validation_mode", default=None, help="Defines how merge field validation is handled. When set to `ignore_required_chec")
+@click.option("--data-mode", "data_mode", default=None, help="Indicates the data processing mode. In `historical` mode, contact data changes d")
 @click.option("--extra-params", default=None, help="Extra query params as JSON object, e.g. '{\"key\":\"val\"}'")
 @click.pass_context
 def _cmd_create(ctx, audience_id, data, merge_field_validation_mode, data_mode, extra_params):
@@ -98,8 +98,8 @@ def _cmd_create(ctx, audience_id, data, merge_field_validation_mode, data_mode,
 @audiences_group.command("get")
 @click.argument("AUDIENCE_ID")
 @click.argument("CONTACT_ID")
-@click.option("--fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
-@click.option("--exclude-fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
+@click.option("--fields", "fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
+@click.option("--exclude-fields", "exclude_fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
 @click.option("--extra-params", default=None, help="Extra query params as JSON object, e.g. '{\"key\":\"val\"}'")
 @click.pass_context
 def _cmd_get(ctx, audience_id, contact_id, fields, exclude_fields, extra_params):
@@ -125,8 +125,8 @@ def _cmd_get(ctx, audience_id, contact_id, fields, exclude_fields, extra_params)
 @click.argument("AUDIENCE_ID")
 @click.argument("CONTACT_ID")
 @click.option("--data", default=None, help="Request body as JSON string.")
-@click.option("--merge-field-validation-mode", default=None, help="Defines how merge field validation is handled. When set to `ignore_required_chec")
-@click.option("--data-mode", default=None, help="Indicates the data processing mode. In `historical` mode, contact data changes d")
+@click.option("--merge-field-validation-mode", "merge_field_validation_mode", default=None, help="Defines how merge field validation is handled. When set to `ignore_required_chec")
+@click.option("--data-mode", "data_mode", default=None, help="Indicates the data processing mode. In `historical` mode, contact data changes d")
 @click.option("--extra-params", default=None, help="Extra query params as JSON object, e.g. '{\"key\":\"val\"}'")
 @click.pass_context
 def _cmd_update(ctx, audience_id, contact_id, data, merge_field_validation_mode, data_mode, extra_params):
diff --git a/mailchimp/agent-harness/cli_anything/mailchimp/commands/authorized_apps.py b/mailchimp/agent-harness/cli_anything/mailchimp/commands/authorized_apps.py
index 7fc334794..04d548bea 100644
--- a/mailchimp/agent-harness/cli_anything/mailchimp/commands/authorized_apps.py
+++ b/mailchimp/agent-harness/cli_anything/mailchimp/commands/authorized_apps.py
@@ -28,10 +28,10 @@ def authorized_apps_group(ctx):
     """authorized-apps resource commands."""
 
 @authorized_apps_group.command("list")
-@click.option("--fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
-@click.option("--exclude-fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
-@click.option("--count", default=None, type=int, help="The number of records to return. Default value is 10. Maximum value is 1000")
-@click.option("--offset", default=None, type=int, help="Used for [pagination](https://mailchimp.com/developer/marketing/docs/methods-par")
+@click.option("--fields", "fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
+@click.option("--exclude-fields", "exclude_fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
+@click.option("--count", "count", default=None, type=int, help="The number of records to return. Default value is 10. Maximum value is 1000")
+@click.option("--offset", "offset", default=None, type=int, help="Used for [pagination](https://mailchimp.com/developer/marketing/docs/methods-par")
 @click.option("--extra-params", default=None, help="Extra query params as JSON object, e.g. '{\"key\":\"val\"}'")
 @click.pass_context
 def _cmd_list_(ctx, fields, exclude_fields, count, offset, extra_params):
@@ -57,8 +57,8 @@ def _cmd_list_(ctx, fields, exclude_fields, count, offset, extra_params):
 
 @authorized_apps_group.command("get")
 @click.argument("APP_ID")
-@click.option("--fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
-@click.option("--exclude-fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
+@click.option("--fields", "fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
+@click.option("--exclude-fields", "exclude_fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
 @click.option("--extra-params", default=None, help="Extra query params as JSON object, e.g. '{\"key\":\"val\"}'")
 @click.pass_context
 def _cmd_get(ctx, app_id, fields, exclude_fields, extra_params):
diff --git a/mailchimp/agent-harness/cli_anything/mailchimp/commands/automations.py b/mailchimp/agent-harness/cli_anything/mailchimp/commands/automations.py
index c16fc928b..5c5c89704 100644
--- a/mailchimp/agent-harness/cli_anything/mailchimp/commands/automations.py
+++ b/mailchimp/agent-harness/cli_anything/mailchimp/commands/automations.py
@@ -28,15 +28,15 @@ def automations_group(ctx):
     """automations resource commands."""
 
 @automations_group.command("list")
-@click.option("--count", default=None, type=int, help="The number of records to return. Default value is 10. Maximum value is 1000")
-@click.option("--offset", default=None, type=int, help="Used for [pagination](https://mailchimp.com/developer/marketing/docs/methods-par")
-@click.option("--fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
-@click.option("--exclude-fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
-@click.option("--before-create-time", default=None, help="Restrict the response to automations created before this time. Uses the ISO 8601")
-@click.option("--since-create-time", default=None, help="Restrict the response to automations created after this time. Uses the ISO 8601 ")
-@click.option("--before-start-time", default=None, help="Restrict the response to automations started before this time. Uses the ISO 8601")
-@click.option("--since-start-time", default=None, help="Restrict the response to automations started after this time. Uses the ISO 8601 ")
-@click.option("--status", default=None, help="Restrict the results to automations with the specified status.")
+@click.option("--count", "count", default=None, type=int, help="The number of records to return. Default value is 10. Maximum value is 1000")
+@click.option("--offset", "offset", default=None, type=int, help="Used for [pagination](https://mailchimp.com/developer/marketing/docs/methods-par")
+@click.option("--fields", "fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
+@click.option("--exclude-fields", "exclude_fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
+@click.option("--before-create-time", "before_create_time", default=None, help="Restrict the response to automations created before this time. Uses the ISO 8601")
+@click.option("--since-create-time", "since_create_time", default=None, help="Restrict the response to automations created after this time. Uses the ISO 8601 ")
+@click.option("--before-start-time", "before_start_time", default=None, help="Restrict the response to automations started before this time. Uses the ISO 8601")
+@click.option("--since-start-time", "since_start_time", default=None, help="Restrict the response to automations started after this time. Uses the ISO 8601 ")
+@click.option("--status", "status", default=None, help="Restrict the results to automations with the specified status.")
 @click.option("--extra-params", default=None, help="Extra query params as JSON object, e.g. '{\"key\":\"val\"}'")
 @click.pass_context
 def _cmd_list_(ctx, count, offset, fields, exclude_fields, before_create_time, since_create_time, before_start_time, since_start_time, status, extra_params):
@@ -88,8 +88,8 @@ def _cmd_create(ctx, data, extra_params):
 
 @automations_group.command("get")
 @click.argument("WORKFLOW_ID")
-@click.option("--fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
-@click.option("--exclude-fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
+@click.option("--fields", "fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
+@click.option("--exclude-fields", "exclude_fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
 @click.option("--extra-params", default=None, help="Extra query params as JSON object, e.g. '{\"key\":\"val\"}'")
 @click.pass_context
 def _cmd_get(ctx, workflow_id, fields, exclude_fields, extra_params):
diff --git a/mailchimp/agent-harness/cli_anything/mailchimp/commands/batch_webhooks.py b/mailchimp/agent-harness/cli_anything/mailchimp/commands/batch_webhooks.py
index f5c3ce9ba..94f3a04b1 100644
--- a/mailchimp/agent-harness/cli_anything/mailchimp/commands/batch_webhooks.py
+++ b/mailchimp/agent-harness/cli_anything/mailchimp/commands/batch_webhooks.py
@@ -28,10 +28,10 @@ def batch_webhooks_group(ctx):
     """batch-webhooks resource commands."""
 
 @batch_webhooks_group.command("list")
-@click.option("--fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
-@click.option("--exclude-fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
-@click.option("--count", default=None, type=int, help="The number of records to return. Default value is 10. Maximum value is 1000")
-@click.option("--offset", default=None, type=int, help="Used for [pagination](https://mailchimp.com/developer/marketing/docs/methods-par")
+@click.option("--fields", "fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
+@click.option("--exclude-fields", "exclude_fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
+@click.option("--count", "count", default=None, type=int, help="The number of records to return. Default value is 10. Maximum value is 1000")
+@click.option("--offset", "offset", default=None, type=int, help="Used for [pagination](https://mailchimp.com/developer/marketing/docs/methods-par")
 @click.option("--extra-params", default=None, help="Extra query params as JSON object, e.g. '{\"key\":\"val\"}'")
 @click.pass_context
 def _cmd_list_(ctx, fields, exclude_fields, count, offset, extra_params):
@@ -98,8 +98,8 @@ def _cmd_delete(ctx, batch_webhook_id, extra_params):
 
 @batch_webhooks_group.command("get")
 @click.argument("BATCH_WEBHOOK_ID")
-@click.option("--fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
-@click.option("--exclude-fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
+@click.option("--fields", "fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
+@click.option("--exclude-fields", "exclude_fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
 @click.option("--extra-params", default=None, help="Extra query params as JSON object, e.g. '{\"key\":\"val\"}'")
 @click.pass_context
 def _cmd_get(ctx, batch_webhook_id, fields, exclude_fields, extra_params):
diff --git a/mailchimp/agent-harness/cli_anything/mailchimp/commands/batches.py b/mailchimp/agent-harness/cli_anything/mailchimp/commands/batches.py
index b41423623..ba9f482ed 100644
--- a/mailchimp/agent-harness/cli_anything/mailchimp/commands/batches.py
+++ b/mailchimp/agent-harness/cli_anything/mailchimp/commands/batches.py
@@ -28,10 +28,10 @@ def batches_group(ctx):
     """batches resource commands."""
 
 @batches_group.command("list")
-@click.option("--fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
-@click.option("--exclude-fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
-@click.option("--count", default=None, type=int, help="The number of records to return. Default value is 10. Maximum value is 1000")
-@click.option("--offset", default=None, type=int, help="Used for [pagination](https://mailchimp.com/developer/marketing/docs/methods-par")
+@click.option("--fields", "fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
+@click.option("--exclude-fields", "exclude_fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
+@click.option("--count", "count", default=None, type=int, help="The number of records to return. Default value is 10. Maximum value is 1000")
+@click.option("--offset", "offset", default=None, type=int, help="Used for [pagination](https://mailchimp.com/developer/marketing/docs/methods-par")
 @click.option("--extra-params", default=None, help="Extra query params as JSON object, e.g. '{\"key\":\"val\"}'")
 @click.pass_context
 def _cmd_list_(ctx, fields, exclude_fields, count, offset, extra_params):
@@ -98,8 +98,8 @@ def _cmd_delete(ctx, batch_id, extra_params):
 
 @batches_group.command("get")
 @click.argument("BATCH_ID")
-@click.option("--fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
-@click.option("--exclude-fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
+@click.option("--fields", "fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
+@click.option("--exclude-fields", "exclude_fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
 @click.option("--extra-params", default=None, help="Extra query params as JSON object, e.g. '{\"key\":\"val\"}'")
 @click.pass_context
 def _cmd_get(ctx, batch_id, fields, exclude_fields, extra_params):
diff --git a/mailchimp/agent-harness/cli_anything/mailchimp/commands/campaign_folders.py b/mailchimp/agent-harness/cli_anything/mailchimp/commands/campaign_folders.py
index 1945b154f..498dff10f 100644
--- a/mailchimp/agent-harness/cli_anything/mailchimp/commands/campaign_folders.py
+++ b/mailchimp/agent-harness/cli_anything/mailchimp/commands/campaign_folders.py
@@ -28,10 +28,10 @@ def campaign_folders_group(ctx):
     """campaign-folders resource commands."""
 
 @campaign_folders_group.command("list")
-@click.option("--fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
-@click.option("--exclude-fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
-@click.option("--count", default=None, type=int, help="The number of records to return. Default value is 10. Maximum value is 1000")
-@click.option("--offset", default=None, type=int, help="Used for [pagination](https://mailchimp.com/developer/marketing/docs/methods-par")
+@click.option("--fields", "fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
+@click.option("--exclude-fields", "exclude_fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
+@click.option("--count", "count", default=None, type=int, help="The number of records to return. Default value is 10. Maximum value is 1000")
+@click.option("--offset", "offset", default=None, type=int, help="Used for [pagination](https://mailchimp.com/developer/marketing/docs/methods-par")
 @click.option("--extra-params", default=None, help="Extra query params as JSON object, e.g. '{\"key\":\"val\"}'")
 @click.pass_context
 def _cmd_list_(ctx, fields, exclude_fields, count, offset, extra_params):
@@ -98,8 +98,8 @@ def _cmd_delete(ctx, folder_id, extra_params):
 
 @campaign_folders_group.command("get")
 @click.argument("FOLDER_ID")
-@click.option("--fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
-@click.option("--exclude-fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
+@click.option("--fields", "fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
+@click.option("--exclude-fields", "exclude_fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
 @click.option("--extra-params", default=None, help="Extra query params as JSON object, e.g. '{\"key\":\"val\"}'")
 @click.pass_context
 def _cmd_get(ctx, folder_id, fields, exclude_fields, extra_params):
diff --git a/mailchimp/agent-harness/cli_anything/mailchimp/commands/campaigns.py b/mailchimp/agent-harness/cli_anything/mailchimp/commands/campaigns.py
index 5ebaff2a1..21d7bf3dd 100644
--- a/mailchimp/agent-harness/cli_anything/mailchimp/commands/campaigns.py
+++ b/mailchimp/agent-harness/cli_anything/mailchimp/commands/campaigns.py
@@ -28,23 +28,23 @@ def campaigns_group(ctx):
     """campaigns resource commands."""
 
 @campaigns_group.command("list")
-@click.option("--fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
-@click.option("--exclude-fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
-@click.option("--count", default=None, type=int, help="The number of records to return. Default value is 10. Maximum value is 1000")
-@click.option("--offset", default=None, type=int, help="Used for [pagination](https://mailchimp.com/developer/marketing/docs/methods-par")
-@click.option("--type", default=None, help="The campaign type.")
-@click.option("--status", default=None, help="The status of the campaign.")
-@click.option("--before-send-time", default=None, help="Restrict the response to campaigns sent before the set time. Uses ISO 8601 time ")
-@click.option("--since-send-time", default=None, help="Restrict the response to campaigns sent after the set time. Uses ISO 8601 time f")
-@click.option("--before-create-time", default=None, help="Restrict the response to campaigns created before the set time. Uses ISO 8601 ti")
-@click.option("--since-create-time", default=None, help="Restrict the response to campaigns created after the set time. Uses ISO 8601 tim")
-@click.option("--list-id", default=None, help="The unique id for the list.")
-@click.option("--folder-id", default=None, help="The unique folder id.")
-@click.option("--member-id", default=None, help="Retrieve campaigns sent to a particular list member. Member ID is The MD5 hash o")
-@click.option("--sort-field", default=None, help="Returns files sorted by the specified field.")
-@click.option("--sort-dir", default=None, help="Determines the order direction for sorted results.")
-@click.option("--include-resend-shortcut-eligibility", default=None, type=bool, help="Return the `resend_shortcut_eligibility` field in the response, which tells you ")
-@click.option("--include-resend-shortcut-usage", default=None, type=bool, help="Return the `resend_shortcut_usage` field in the response.  This includes informa")
+@click.option("--fields", "fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
+@click.option("--exclude-fields", "exclude_fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
+@click.option("--count", "count", default=None, type=int, help="The number of records to return. Default value is 10. Maximum value is 1000")
+@click.option("--offset", "offset", default=None, type=int, help="Used for [pagination](https://mailchimp.com/developer/marketing/docs/methods-par")
+@click.option("--type", "type_", default=None, help="The campaign type.")
+@click.option("--status", "status", default=None, help="The status of the campaign.")
+@click.option("--before-send-time", "before_send_time", default=None, help="Restrict the response to campaigns sent before the set time. Uses ISO 8601 time ")
+@click.option("--since-send-time", "since_send_time", default=None, help="Restrict the response to campaigns sent after the set time. Uses ISO 8601 time f")
+@click.option("--before-create-time", "before_create_time", default=None, help="Restrict the response to campaigns created before the set time. Uses ISO 8601 ti")
+@click.option("--since-create-time", "since_create_time", default=None, help="Restrict the response to campaigns created after the set time. Uses ISO 8601 tim")
+@click.option("--list-id", "list_id", default=None, help="The unique id for the list.")
+@click.option("--folder-id", "folder_id", default=None, help="The unique folder id.")
+@click.option("--member-id", "member_id", default=None, help="Retrieve campaigns sent to a particular list member. Member ID is The MD5 hash o")
+@click.option("--sort-field", "sort_field", default=None, help="Returns files sorted by the specified field.")
+@click.option("--sort-dir", "sort_dir", default=None, help="Determines the order direction for sorted results.")
+@click.option("--include-resend-shortcut-eligibility", "include_resend_shortcut_eligibility", default=None, type=bool, help="Return the `resend_shortcut_eligibility` field in the response, which tells you ")
+@click.option("--include-resend-shortcut-usage", "include_resend_shortcut_usage", default=None, type=bool, help="Return the `resend_shortcut_usage` field in the response.  This includes informa")
 @click.option("--extra-params", default=None, help="Extra query params as JSON object, e.g. '{\"key\":\"val\"}'")
 @click.pass_context
 def _cmd_list_(ctx, fields, exclude_fields, count, offset, type_, status, before_send_time, since_send_time, before_create_time, since_create_time, list_id, folder_id, member_id, sort_field, sort_dir, include_resend_shortcut_eligibility, include_resend_shortcut_usage, extra_params):
@@ -124,10 +124,10 @@ def _cmd_delete(ctx, campaign_id, extra_params):
 
 @campaigns_group.command("get")
 @click.argument("CAMPAIGN_ID")
-@click.option("--fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
-@click.option("--exclude-fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
-@click.option("--include-resend-shortcut-eligibility", default=None, type=bool, help="Return the `resend_shortcut_eligibility` field in the response, which tells you ")
-@click.option("--include-resend-shortcut-usage", default=None, type=bool, help="Return the `resend_shortcut_usage` field in the response.  This includes informa")
+@click.option("--fields", "fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
+@click.option("--exclude-fields", "exclude_fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
+@click.option("--include-resend-shortcut-eligibility", "include_resend_shortcut_eligibility", default=None, type=bool, help="Return the `resend_shortcut_eligibility` field in the response, which tells you ")
+@click.option("--include-resend-shortcut-usage", "include_resend_shortcut_usage", default=None, type=bool, help="Return the `resend_shortcut_usage` field in the response.  This includes informa")
 @click.option("--extra-params", default=None, help="Extra query params as JSON object, e.g. '{\"key\":\"val\"}'")
 @click.pass_context
 def _cmd_get(ctx, campaign_id, fields, exclude_fields, include_resend_shortcut_eligibility, include_resend_shortcut_usage, extra_params):
@@ -361,8 +361,8 @@ def _cmd_unschedule(ctx, campaign_id, extra_params):
 
 @campaigns_group.command("list-campaigns-id-content")
 @click.argument("CAMPAIGN_ID")
-@click.option("--fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
-@click.option("--exclude-fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
+@click.option("--fields", "fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
+@click.option("--exclude-fields", "exclude_fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
 @click.option("--extra-params", default=None, help="Extra query params as JSON object, e.g. '{\"key\":\"val\"}'")
 @click.pass_context
 def _cmd_list_campaigns_id_content(ctx, campaign_id, fields, exclude_fields, extra_params):
@@ -384,6 +384,8 @@ def _cmd_list_campaigns_id_content(ctx, campaign_id, fields, exclude_fields, ext
         return
     _out(result)
 
+campaigns_group.add_command(_cmd_list_campaigns_id_content, "list-content")
+
 @campaigns_group.command("update-campaigns-id-content")
 @click.argument("CAMPAIGN_ID")
 @click.option("--data", default=None, help="Request body as JSON string.")
@@ -408,8 +410,8 @@ def _cmd_update_campaigns_id_content(ctx, campaign_id, data, extra_params):
 
 @campaigns_group.command("list-campaigns-id-feedback")
 @click.argument("CAMPAIGN_ID")
-@click.option("--fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
-@click.option("--exclude-fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
+@click.option("--fields", "fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
+@click.option("--exclude-fields", "exclude_fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
 @click.option("--extra-params", default=None, help="Extra query params as JSON object, e.g. '{\"key\":\"val\"}'")
 @click.pass_context
 def _cmd_list_campaigns_id_feedback(ctx, campaign_id, fields, exclude_fields, extra_params):
@@ -477,8 +479,8 @@ def _cmd_delete_campaigns_id_feedback_id(ctx, campaign_id, feedback_id, extra_pa
 @campaigns_group.command("get-campaigns-id-feedback-id")
 @click.argument("CAMPAIGN_ID")
 @click.argument("FEEDBACK_ID")
-@click.option("--fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
-@click.option("--exclude-fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
+@click.option("--fields", "fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
+@click.option("--exclude-fields", "exclude_fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
 @click.option("--extra-params", default=None, help="Extra query params as JSON object, e.g. '{\"key\":\"val\"}'")
 @click.pass_context
 def _cmd_get_campaigns_id_feedback_id(ctx, campaign_id, feedback_id, fields, exclude_fields, extra_params):
@@ -525,8 +527,8 @@ def _cmd_update_campaigns_id_feedback_id(ctx, campaign_id, feedback_id, data, ex
 
 @campaigns_group.command("list-campaigns-id-send-checklist")
 @click.argument("CAMPAIGN_ID")
-@click.option("--fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
-@click.option("--exclude-fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
+@click.option("--fields", "fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
+@click.option("--exclude-fields", "exclude_fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
 @click.option("--extra-params", default=None, help="Extra query params as JSON object, e.g. '{\"key\":\"val\"}'")
 @click.pass_context
 def _cmd_list_campaigns_id_send_checklist(ctx, campaign_id, fields, exclude_fields, extra_params):
@@ -547,3 +549,5 @@ def _cmd_list_campaigns_id_send_checklist(ctx, campaign_id, fields, exclude_fiel
         _out_err(e.status, e.title, e.detail, e.raw)
         return
     _out(result)
+
+campaigns_group.add_command(_cmd_list_campaigns_id_send_checklist, "list-send-checklist")
diff --git a/mailchimp/agent-harness/cli_anything/mailchimp/commands/connected_sites.py b/mailchimp/agent-harness/cli_anything/mailchimp/commands/connected_sites.py
index df67bd539..72194f5ac 100644
--- a/mailchimp/agent-harness/cli_anything/mailchimp/commands/connected_sites.py
+++ b/mailchimp/agent-harness/cli_anything/mailchimp/commands/connected_sites.py
@@ -28,10 +28,10 @@ def connected_sites_group(ctx):
     """connected-sites resource commands."""
 
 @connected_sites_group.command("list")
-@click.option("--fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
-@click.option("--exclude-fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
-@click.option("--count", default=None, type=int, help="The number of records to return. Default value is 10. Maximum value is 1000")
-@click.option("--offset", default=None, type=int, help="Used for [pagination](https://mailchimp.com/developer/marketing/docs/methods-par")
+@click.option("--fields", "fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
+@click.option("--exclude-fields", "exclude_fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
+@click.option("--count", "count", default=None, type=int, help="The number of records to return. Default value is 10. Maximum value is 1000")
+@click.option("--offset", "offset", default=None, type=int, help="Used for [pagination](https://mailchimp.com/developer/marketing/docs/methods-par")
 @click.option("--extra-params", default=None, help="Extra query params as JSON object, e.g. '{\"key\":\"val\"}'")
 @click.pass_context
 def _cmd_list_(ctx, fields, exclude_fields, count, offset, extra_params):
@@ -98,8 +98,8 @@ def _cmd_delete(ctx, connected_site_id, extra_params):
 
 @connected_sites_group.command("get")
 @click.argument("CONNECTED_SITE_ID")
-@click.option("--fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
-@click.option("--exclude-fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
+@click.option("--fields", "fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
+@click.option("--exclude-fields", "exclude_fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
 @click.option("--extra-params", default=None, help="Extra query params as JSON object, e.g. '{\"key\":\"val\"}'")
 @click.pass_context
 def _cmd_get(ctx, connected_site_id, fields, exclude_fields, extra_params):
diff --git a/mailchimp/agent-harness/cli_anything/mailchimp/commands/contacts.py b/mailchimp/agent-harness/cli_anything/mailchimp/commands/contacts.py
index 7d020e413..4c01f1330 100644
--- a/mailchimp/agent-harness/cli_anything/mailchimp/commands/contacts.py
+++ b/mailchimp/agent-harness/cli_anything/mailchimp/commands/contacts.py
@@ -28,10 +28,10 @@ def contacts_group(ctx):
     """contacts resource commands."""
 
 @contacts_group.command("list")
-@click.option("--fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
-@click.option("--exclude-fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
-@click.option("--count", default=None, type=int, help="The number of records to return. Default value is 10. Maximum value is 1000")
-@click.option("--offset", default=None, type=int, help="Used for [pagination](https://mailchimp.com/developer/marketing/docs/methods-par")
+@click.option("--fields", "fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
+@click.option("--exclude-fields", "exclude_fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
+@click.option("--count", "count", default=None, type=int, help="The number of records to return. Default value is 10. Maximum value is 1000")
+@click.option("--offset", "offset", default=None, type=int, help="Used for [pagination](https://mailchimp.com/developer/marketing/docs/methods-par")
 @click.option("--extra-params", default=None, help="Extra query params as JSON object, e.g. '{\"key\":\"val\"}'")
 @click.pass_context
 def _cmd_list_(ctx, fields, exclude_fields, count, offset, extra_params):
@@ -57,8 +57,8 @@ def _cmd_list_(ctx, fields, exclude_fields, count, offset, extra_params):
 
 @contacts_group.command("get")
 @click.argument("AUDIENCE_ID")
-@click.option("--fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
-@click.option("--exclude-fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
+@click.option("--fields", "fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
+@click.option("--exclude-fields", "exclude_fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
 @click.option("--extra-params", default=None, help="Extra query params as JSON object, e.g. '{\"key\":\"val\"}'")
 @click.pass_context
 def _cmd_get(ctx, audience_id, fields, exclude_fields, extra_params):
diff --git a/mailchimp/agent-harness/cli_anything/mailchimp/commands/conversations.py b/mailchimp/agent-harness/cli_anything/mailchimp/commands/conversations.py
index c774c18fd..08c20b939 100644
--- a/mailchimp/agent-harness/cli_anything/mailchimp/commands/conversations.py
+++ b/mailchimp/agent-harness/cli_anything/mailchimp/commands/conversations.py
@@ -28,13 +28,13 @@ def conversations_group(ctx):
     """conversations resource commands."""
 
 @conversations_group.command("list")
-@click.option("--fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
-@click.option("--exclude-fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
-@click.option("--count", default=None, type=int, help="The number of records to return. Default value is 10. Maximum value is 1000")
-@click.option("--offset", default=None, type=int, help="Used for [pagination](https://mailchimp.com/developer/marketing/docs/methods-par")
-@click.option("--has-unread-messages", default=None, help="Whether the conversation has any unread messages.")
-@click.option("--list-id", default=None, help="The unique id for the list.")
-@click.option("--campaign-id", default=None, help="The unique id for the campaign.")
+@click.option("--fields", "fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
+@click.option("--exclude-fields", "exclude_fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
+@click.option("--count", "count", default=None, type=int, help="The number of records to return. Default value is 10. Maximum value is 1000")
+@click.option("--offset", "offset", default=None, type=int, help="Used for [pagination](https://mailchimp.com/developer/marketing/docs/methods-par")
+@click.option("--has-unread-messages", "has_unread_messages", default=None, help="Whether the conversation has any unread messages.")
+@click.option("--list-id", "list_id", default=None, help="The unique id for the list.")
+@click.option("--campaign-id", "campaign_id", default=None, help="The unique id for the campaign.")
 @click.option("--extra-params", default=None, help="Extra query params as JSON object, e.g. '{\"key\":\"val\"}'")
 @click.pass_context
 def _cmd_list_(ctx, fields, exclude_fields, count, offset, has_unread_messages, list_id, campaign_id, extra_params):
@@ -63,8 +63,8 @@ def _cmd_list_(ctx, fields, exclude_fields, count, offset, has_unread_messages,
 
 @conversations_group.command("get")
 @click.argument("CONVERSATION_ID")
-@click.option("--fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
-@click.option("--exclude-fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
+@click.option("--fields", "fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
+@click.option("--exclude-fields", "exclude_fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
 @click.option("--extra-params", default=None, help="Extra query params as JSON object, e.g. '{\"key\":\"val\"}'")
 @click.pass_context
 def _cmd_get(ctx, conversation_id, fields, exclude_fields, extra_params):
@@ -88,11 +88,11 @@ def _cmd_get(ctx, conversation_id, fields, exclude_fields, extra_params):
 
 @conversations_group.command("list-conversations-id-messages")
 @click.argument("CONVERSATION_ID")
-@click.option("--fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
-@click.option("--exclude-fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
-@click.option("--is-read", default=None, help="Whether a conversation message has been marked as read.")
-@click.option("--before-timestamp", default=None, help="Restrict the response to messages created before the set time. Uses ISO 8601 tim")
-@click.option("--since-timestamp", default=None, help="Restrict the response to messages created after the set time. Uses ISO 8601 time")
+@click.option("--fields", "fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
+@click.option("--exclude-fields", "exclude_fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
+@click.option("--is-read", "is_read", default=None, help="Whether a conversation message has been marked as read.")
+@click.option("--before-timestamp", "before_timestamp", default=None, help="Restrict the response to messages created before the set time. Uses ISO 8601 tim")
+@click.option("--since-timestamp", "since_timestamp", default=None, help="Restrict the response to messages created after the set time. Uses ISO 8601 time")
 @click.option("--extra-params", default=None, help="Extra query params as JSON object, e.g. '{\"key\":\"val\"}'")
 @click.pass_context
 def _cmd_list_conversations_id_messages(ctx, conversation_id, fields, exclude_fields, is_read, before_timestamp, since_timestamp, extra_params):
@@ -120,8 +120,8 @@ def _cmd_list_conversations_id_messages(ctx, conversation_id, fields, exclude_fi
 @conversations_group.command("get-conversations-id-messages-id")
 @click.argument("CONVERSATION_ID")
 @click.argument("MESSAGE_ID")
-@click.option("--fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
-@click.option("--exclude-fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
+@click.option("--fields", "fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
+@click.option("--exclude-fields", "exclude_fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
 @click.option("--extra-params", default=None, help="Extra query params as JSON object, e.g. '{\"key\":\"val\"}'")
 @click.pass_context
 def _cmd_get_conversations_id_messages_id(ctx, conversation_id, message_id, fields, exclude_fields, extra_params):
diff --git a/mailchimp/agent-harness/cli_anything/mailchimp/commands/ecommerce.py b/mailchimp/agent-harness/cli_anything/mailchimp/commands/ecommerce.py
index 9487dc019..6e1b54e42 100644
--- a/mailchimp/agent-harness/cli_anything/mailchimp/commands/ecommerce.py
+++ b/mailchimp/agent-harness/cli_anything/mailchimp/commands/ecommerce.py
@@ -28,14 +28,14 @@ def ecommerce_group(ctx):
     """ecommerce resource commands."""
 
 @ecommerce_group.command("list")
-@click.option("--fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
-@click.option("--exclude-fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
-@click.option("--count", default=None, type=int, help="The number of records to return. Default value is 10. Maximum value is 1000")
-@click.option("--offset", default=None, type=int, help="Used for [pagination](https://mailchimp.com/developer/marketing/docs/methods-par")
-@click.option("--campaign-id", default=None, help="Restrict results to orders with a specific `campaign_id` value.")
-@click.option("--outreach-id", default=None, help="Restrict results to orders with a specific `outreach_id` value.")
-@click.option("--customer-id", default=None, help="Restrict results to orders made by a specific customer.")
-@click.option("--has-outreach", default=None, type=bool, help="Restrict results to orders that have an outreach attached. For example, an email")
+@click.option("--fields", "fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
+@click.option("--exclude-fields", "exclude_fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
+@click.option("--count", "count", default=None, type=int, help="The number of records to return. Default value is 10. Maximum value is 1000")
+@click.option("--offset", "offset", default=None, type=int, help="Used for [pagination](https://mailchimp.com/developer/marketing/docs/methods-par")
+@click.option("--campaign-id", "campaign_id", default=None, help="Restrict results to orders with a specific `campaign_id` value.")
+@click.option("--outreach-id", "outreach_id", default=None, help="Restrict results to orders with a specific `outreach_id` value.")
+@click.option("--customer-id", "customer_id", default=None, help="Restrict results to orders made by a specific customer.")
+@click.option("--has-outreach", "has_outreach", default=None, type=bool, help="Restrict results to orders that have an outreach attached. For example, an email")
 @click.option("--extra-params", default=None, help="Extra query params as JSON object, e.g. '{\"key\":\"val\"}'")
 @click.pass_context
 def _cmd_list_(ctx, fields, exclude_fields, count, offset, campaign_id, outreach_id, customer_id, has_outreach, extra_params):
@@ -64,10 +64,10 @@ def _cmd_list_(ctx, fields, exclude_fields, count, offset, campaign_id, outreach
     _out(result)
 
 @ecommerce_group.command("list-ecommerce-stores")
-@click.option("--fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
-@click.option("--exclude-fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
-@click.option("--count", default=None, type=int, help="The number of records to return. Default value is 10. Maximum value is 1000")
-@click.option("--offset", default=None, type=int, help="Used for [pagination](https://mailchimp.com/developer/marketing/docs/methods-par")
+@click.option("--fields", "fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
+@click.option("--exclude-fields", "exclude_fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
+@click.option("--count", "count", default=None, type=int, help="The number of records to return. Default value is 10. Maximum value is 1000")
+@click.option("--offset", "offset", default=None, type=int, help="Used for [pagination](https://mailchimp.com/developer/marketing/docs/methods-par")
 @click.option("--extra-params", default=None, help="Extra query params as JSON object, e.g. '{\"key\":\"val\"}'")
 @click.pass_context
 def _cmd_list_ecommerce_stores(ctx, fields, exclude_fields, count, offset, extra_params):
@@ -134,8 +134,8 @@ def _cmd_delete(ctx, store_id, extra_params):
 
 @ecommerce_group.command("get")
 @click.argument("STORE_ID")
-@click.option("--fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
-@click.option("--exclude-fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
+@click.option("--fields", "fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
+@click.option("--exclude-fields", "exclude_fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
 @click.option("--extra-params", default=None, help="Extra query params as JSON object, e.g. '{\"key\":\"val\"}'")
 @click.pass_context
 def _cmd_get(ctx, store_id, fields, exclude_fields, extra_params):
@@ -181,10 +181,10 @@ def _cmd_update(ctx, store_id, data, extra_params):
 
 @ecommerce_group.command("list-ecommerce-stores-id-carts")
 @click.argument("STORE_ID")
-@click.option("--fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
-@click.option("--exclude-fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
-@click.option("--count", default=None, type=int, help="The number of records to return. Default value is 10. Maximum value is 1000")
-@click.option("--offset", default=None, type=int, help="Used for [pagination](https://mailchimp.com/developer/marketing/docs/methods-par")
+@click.option("--fields", "fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
+@click.option("--exclude-fields", "exclude_fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
+@click.option("--count", "count", default=None, type=int, help="The number of records to return. Default value is 10. Maximum value is 1000")
+@click.option("--offset", "offset", default=None, type=int, help="Used for [pagination](https://mailchimp.com/developer/marketing/docs/methods-par")
 @click.option("--extra-params", default=None, help="Extra query params as JSON object, e.g. '{\"key\":\"val\"}'")
 @click.pass_context
 def _cmd_list_ecommerce_stores_id_carts(ctx, store_id, fields, exclude_fields, count, offset, extra_params):
@@ -254,8 +254,8 @@ def _cmd_delete_ecommerce_stores_id_carts_id(ctx, store_id, cart_id, extra_param
 @ecommerce_group.command("get-ecommerce-stores-id-carts-id")
 @click.argument("STORE_ID")
 @click.argument("CART_ID")
-@click.option("--fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
-@click.option("--exclude-fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
+@click.option("--fields", "fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
+@click.option("--exclude-fields", "exclude_fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
 @click.option("--extra-params", default=None, help="Extra query params as JSON object, e.g. '{\"key\":\"val\"}'")
 @click.pass_context
 def _cmd_get_ecommerce_stores_id_carts_id(ctx, store_id, cart_id, fields, exclude_fields, extra_params):
@@ -303,10 +303,10 @@ def _cmd_update_ecommerce_stores_id_carts_id(ctx, store_id, cart_id, data, extra
 @ecommerce_group.command("list-ecommerce-stores-id-carts-id-lines")
 @click.argument("STORE_ID")
 @click.argument("CART_ID")
-@click.option("--fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
-@click.option("--exclude-fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
-@click.option("--count", default=None, type=int, help="The number of records to return. Default value is 10. Maximum value is 1000")
-@click.option("--offset", default=None, type=int, help="Used for [pagination](https://mailchimp.com/developer/marketing/docs/methods-par")
+@click.option("--fields", "fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
+@click.option("--exclude-fields", "exclude_fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
+@click.option("--count", "count", default=None, type=int, help="The number of records to return. Default value is 10. Maximum value is 1000")
+@click.option("--offset", "offset", default=None, type=int, help="Used for [pagination](https://mailchimp.com/developer/marketing/docs/methods-par")
 @click.option("--extra-params", default=None, help="Extra query params as JSON object, e.g. '{\"key\":\"val\"}'")
 @click.pass_context
 def _cmd_list_ecommerce_stores_id_carts_id_lines(ctx, store_id, cart_id, fields, exclude_fields, count, offset, extra_params):
@@ -379,8 +379,8 @@ def _cmd_delete_ecommerce_stores_id_carts_lines_id(ctx, store_id, cart_id, line_
 @click.argument("STORE_ID")
 @click.argument("CART_ID")
 @click.argument("LINE_ID")
-@click.option("--fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
-@click.option("--exclude-fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
+@click.option("--fields", "fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
+@click.option("--exclude-fields", "exclude_fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
 @click.option("--extra-params", default=None, help="Extra query params as JSON object, e.g. '{\"key\":\"val\"}'")
 @click.pass_context
 def _cmd_get_ecommerce_stores_id_carts_id_lines_id(ctx, store_id, cart_id, line_id, fields, exclude_fields, extra_params):
@@ -428,11 +428,11 @@ def _cmd_update_ecommerce_stores_id_carts_id_lines_id(ctx, store_id, cart_id, li
 
 @ecommerce_group.command("list-ecommerce-stores-id-customers")
 @click.argument("STORE_ID")
-@click.option("--fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
-@click.option("--exclude-fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
-@click.option("--count", default=None, type=int, help="The number of records to return. Default value is 10. Maximum value is 1000")
-@click.option("--offset", default=None, type=int, help="Used for [pagination](https://mailchimp.com/developer/marketing/docs/methods-par")
-@click.option("--email-address", default=None, help="Restrict the response to customers with the email address.")
+@click.option("--fields", "fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
+@click.option("--exclude-fields", "exclude_fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
+@click.option("--count", "count", default=None, type=int, help="The number of records to return. Default value is 10. Maximum value is 1000")
+@click.option("--offset", "offset", default=None, type=int, help="Used for [pagination](https://mailchimp.com/developer/marketing/docs/methods-par")
+@click.option("--email-address", "email_address", default=None, help="Restrict the response to customers with the email address.")
 @click.option("--extra-params", default=None, help="Extra query params as JSON object, e.g. '{\"key\":\"val\"}'")
 @click.pass_context
 def _cmd_list_ecommerce_stores_id_customers(ctx, store_id, fields, exclude_fields, count, offset, email_address, extra_params):
@@ -503,8 +503,8 @@ def _cmd_delete_ecommerce_stores_id_customers_id(ctx, store_id, customer_id, ext
 @ecommerce_group.command("get-ecommerce-stores-id-customers-id")
 @click.argument("STORE_ID")
 @click.argument("CUSTOMER_ID")
-@click.option("--fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
-@click.option("--exclude-fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
+@click.option("--fields", "fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
+@click.option("--exclude-fields", "exclude_fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
 @click.option("--extra-params", default=None, help="Extra query params as JSON object, e.g. '{\"key\":\"val\"}'")
 @click.pass_context
 def _cmd_get_ecommerce_stores_id_customers_id(ctx, store_id, customer_id, fields, exclude_fields, extra_params):
@@ -574,14 +574,14 @@ def _cmd_update_3(ctx, store_id, customer_id, data, extra_params):
 
 @ecommerce_group.command("list-ecommerce-stores-id-orders")
 @click.argument("STORE_ID")
-@click.option("--fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
-@click.option("--exclude-fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
-@click.option("--count", default=None, type=int, help="The number of records to return. Default value is 10. Maximum value is 1000")
-@click.option("--offset", default=None, type=int, help="Used for [pagination](https://mailchimp.com/developer/marketing/docs/methods-par")
-@click.option("--customer-id", default=None, help="Restrict results to orders made by a specific customer.")
-@click.option("--has-outreach", default=None, type=bool, help="Restrict results to orders that have an outreach attached. For example, an email")
-@click.option("--campaign-id", default=None, help="Restrict results to orders with a specific `campaign_id` value.")
-@click.option("--outreach-id", default=None, help="Restrict results to orders with a specific `outreach_id` value.")
+@click.option("--fields", "fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
+@click.option("--exclude-fields", "exclude_fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
+@click.option("--count", "count", default=None, type=int, help="The number of records to return. Default value is 10. Maximum value is 1000")
+@click.option("--offset", "offset", default=None, type=int, help="Used for [pagination](https://mailchimp.com/developer/marketing/docs/methods-par")
+@click.option("--customer-id", "customer_id", default=None, help="Restrict results to orders made by a specific customer.")
+@click.option("--has-outreach", "has_outreach", default=None, type=bool, help="Restrict results to orders that have an outreach attached. For example, an email")
+@click.option("--campaign-id", "campaign_id", default=None, help="Restrict results to orders with a specific `campaign_id` value.")
+@click.option("--outreach-id", "outreach_id", default=None, help="Restrict results to orders with a specific `outreach_id` value.")
 @click.option("--extra-params", default=None, help="Extra query params as JSON object, e.g. '{\"key\":\"val\"}'")
 @click.pass_context
 def _cmd_list_ecommerce_stores_id_orders(ctx, store_id, fields, exclude_fields, count, offset, customer_id, has_outreach, campaign_id, outreach_id, extra_params):
@@ -655,8 +655,8 @@ def _cmd_delete_ecommerce_stores_id_orders_id(ctx, store_id, order_id, extra_par
 @ecommerce_group.command("get-ecommerce-stores-id-orders-id")
 @click.argument("STORE_ID")
 @click.argument("ORDER_ID")
-@click.option("--fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
-@click.option("--exclude-fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
+@click.option("--fields", "fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
+@click.option("--exclude-fields", "exclude_fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
 @click.option("--extra-params", default=None, help="Extra query params as JSON object, e.g. '{\"key\":\"val\"}'")
 @click.pass_context
 def _cmd_get_ecommerce_stores_id_orders_id(ctx, store_id, order_id, fields, exclude_fields, extra_params):
@@ -727,10 +727,10 @@ def _cmd_update_4(ctx, store_id, order_id, data, extra_params):
 @ecommerce_group.command("list-ecommerce-stores-id-orders-id-lines")
 @click.argument("STORE_ID")
 @click.argument("ORDER_ID")
-@click.option("--fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
-@click.option("--exclude-fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
-@click.option("--count", default=None, type=int, help="The number of records to return. Default value is 10. Maximum value is 1000")
-@click.option("--offset", default=None, type=int, help="Used for [pagination](https://mailchimp.com/developer/marketing/docs/methods-par")
+@click.option("--fields", "fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
+@click.option("--exclude-fields", "exclude_fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
+@click.option("--count", "count", default=None, type=int, help="The number of records to return. Default value is 10. Maximum value is 1000")
+@click.option("--offset", "offset", default=None, type=int, help="Used for [pagination](https://mailchimp.com/developer/marketing/docs/methods-par")
 @click.option("--extra-params", default=None, help="Extra query params as JSON object, e.g. '{\"key\":\"val\"}'")
 @click.pass_context
 def _cmd_list_ecommerce_stores_id_orders_id_lines(ctx, store_id, order_id, fields, exclude_fields, count, offset, extra_params):
@@ -803,8 +803,8 @@ def _cmd_delete_ecommerce_stores_id_orders_id_lines_id(ctx, store_id, order_id,
 @click.argument("STORE_ID")
 @click.argument("ORDER_ID")
 @click.argument("LINE_ID")
-@click.option("--fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
-@click.option("--exclude-fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
+@click.option("--fields", "fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
+@click.option("--exclude-fields", "exclude_fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
 @click.option("--extra-params", default=None, help="Extra query params as JSON object, e.g. '{\"key\":\"val\"}'")
 @click.pass_context
 def _cmd_get_ecommerce_stores_id_orders_id_lines_id(ctx, store_id, order_id, line_id, fields, exclude_fields, extra_params):
@@ -852,10 +852,10 @@ def _cmd_update_ecommerce_stores_id_orders_id_lines_id(ctx, store_id, order_id,
 
 @ecommerce_group.command("list-ecommerce-stores-id-products")
 @click.argument("STORE_ID")
-@click.option("--fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
-@click.option("--exclude-fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
-@click.option("--count", default=None, type=int, help="The number of records to return. Default value is 10. Maximum value is 1000")
-@click.option("--offset", default=None, type=int, help="Used for [pagination](https://mailchimp.com/developer/marketing/docs/methods-par")
+@click.option("--fields", "fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
+@click.option("--exclude-fields", "exclude_fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
+@click.option("--count", "count", default=None, type=int, help="The number of records to return. Default value is 10. Maximum value is 1000")
+@click.option("--offset", "offset", default=None, type=int, help="Used for [pagination](https://mailchimp.com/developer/marketing/docs/methods-par")
 @click.option("--extra-params", default=None, help="Extra query params as JSON object, e.g. '{\"key\":\"val\"}'")
 @click.pass_context
 def _cmd_list_ecommerce_stores_id_products(ctx, store_id, fields, exclude_fields, count, offset, extra_params):
@@ -925,8 +925,8 @@ def _cmd_delete_ecommerce_stores_id_products_id(ctx, store_id, product_id, extra
 @ecommerce_group.command("get-ecommerce-stores-id-products-id")
 @click.argument("STORE_ID")
 @click.argument("PRODUCT_ID")
-@click.option("--fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
-@click.option("--exclude-fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
+@click.option("--fields", "fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
+@click.option("--exclude-fields", "exclude_fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
 @click.option("--extra-params", default=None, help="Extra query params as JSON object, e.g. '{\"key\":\"val\"}'")
 @click.pass_context
 def _cmd_get_ecommerce_stores_id_products_id(ctx, store_id, product_id, fields, exclude_fields, extra_params):
@@ -997,10 +997,10 @@ def _cmd_update_5(ctx, store_id, product_id, data, extra_params):
 @ecommerce_group.command("list-ecommerce-stores-id-products-id-images")
 @click.argument("STORE_ID")
 @click.argument("PRODUCT_ID")
-@click.option("--fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
-@click.option("--exclude-fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
-@click.option("--count", default=None, type=int, help="The number of records to return. Default value is 10. Maximum value is 1000")
-@click.option("--offset", default=None, type=int, help="Used for [pagination](https://mailchimp.com/developer/marketing/docs/methods-par")
+@click.option("--fields", "fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
+@click.option("--exclude-fields", "exclude_fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
+@click.option("--count", "count", default=None, type=int, help="The number of records to return. Default value is 10. Maximum value is 1000")
+@click.option("--offset", "offset", default=None, type=int, help="Used for [pagination](https://mailchimp.com/developer/marketing/docs/methods-par")
 @click.option("--extra-params", default=None, help="Extra query params as JSON object, e.g. '{\"key\":\"val\"}'")
 @click.pass_context
 def _cmd_list_ecommerce_stores_id_products_id_images(ctx, store_id, product_id, fields, exclude_fields, count, offset, extra_params):
@@ -1073,8 +1073,8 @@ def _cmd_delete_ecommerce_stores_id_products_id_images_id(ctx, store_id, product
 @click.argument("STORE_ID")
 @click.argument("PRODUCT_ID")
 @click.argument("IMAGE_ID")
-@click.option("--fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
-@click.option("--exclude-fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
+@click.option("--fields", "fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
+@click.option("--exclude-fields", "exclude_fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
 @click.option("--extra-params", default=None, help="Extra query params as JSON object, e.g. '{\"key\":\"val\"}'")
 @click.pass_context
 def _cmd_get_ecommerce_stores_id_products_id_images_id(ctx, store_id, product_id, image_id, fields, exclude_fields, extra_params):
@@ -1123,10 +1123,10 @@ def _cmd_update_ecommerce_stores_id_products_id_images_id(ctx, store_id, product
 @ecommerce_group.command("list-ecommerce-stores-id-products-id-variants")
 @click.argument("STORE_ID")
 @click.argument("PRODUCT_ID")
-@click.option("--fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
-@click.option("--exclude-fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
-@click.option("--count", default=None, type=int, help="The number of records to return. Default value is 10. Maximum value is 1000")
-@click.option("--offset", default=None, type=int, help="Used for [pagination](https://mailchimp.com/developer/marketing/docs/methods-par")
+@click.option("--fields", "fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
+@click.option("--exclude-fields", "exclude_fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
+@click.option("--count", "count", default=None, type=int, help="The number of records to return. Default value is 10. Maximum value is 1000")
+@click.option("--offset", "offset", default=None, type=int, help="Used for [pagination](https://mailchimp.com/developer/marketing/docs/methods-par")
 @click.option("--extra-params", default=None, help="Extra query params as JSON object, e.g. '{\"key\":\"val\"}'")
 @click.pass_context
 def _cmd_list_ecommerce_stores_id_products_id_variants(ctx, store_id, product_id, fields, exclude_fields, count, offset, extra_params):
@@ -1199,8 +1199,8 @@ def _cmd_delete_ecommerce_stores_id_products_id_variants_id(ctx, store_id, produ
 @click.argument("STORE_ID")
 @click.argument("PRODUCT_ID")
 @click.argument("VARIANT_ID")
-@click.option("--fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
-@click.option("--exclude-fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
+@click.option("--fields", "fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
+@click.option("--exclude-fields", "exclude_fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
 @click.option("--extra-params", default=None, help="Extra query params as JSON object, e.g. '{\"key\":\"val\"}'")
 @click.pass_context
 def _cmd_get_ecommerce_stores_id_products_id_variants_id(ctx, store_id, product_id, variant_id, fields, exclude_fields, extra_params):
@@ -1272,10 +1272,10 @@ def _cmd_update_6(ctx, store_id, product_id, variant_id, data, extra_params):
 
 @ecommerce_group.command("list-ecommerce-stores-id-promorules")
 @click.argument("STORE_ID")
-@click.option("--fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
-@click.option("--exclude-fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
-@click.option("--count", default=None, type=int, help="The number of records to return. Default value is 10. Maximum value is 1000")
-@click.option("--offset", default=None, type=int, help="Used for [pagination](https://mailchimp.com/developer/marketing/docs/methods-par")
+@click.option("--fields", "fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
+@click.option("--exclude-fields", "exclude_fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
+@click.option("--count", "count", default=None, type=int, help="The number of records to return. Default value is 10. Maximum value is 1000")
+@click.option("--offset", "offset", default=None, type=int, help="Used for [pagination](https://mailchimp.com/developer/marketing/docs/methods-par")
 @click.option("--extra-params", default=None, help="Extra query params as JSON object, e.g. '{\"key\":\"val\"}'")
 @click.pass_context
 def _cmd_list_ecommerce_stores_id_promorules(ctx, store_id, fields, exclude_fields, count, offset, extra_params):
@@ -1345,8 +1345,8 @@ def _cmd_delete_ecommerce_stores_id_promorules_id(ctx, store_id, promo_rule_id,
 @ecommerce_group.command("get-ecommerce-stores-id-promorules-id")
 @click.argument("STORE_ID")
 @click.argument("PROMO_RULE_ID")
-@click.option("--fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
-@click.option("--exclude-fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
+@click.option("--fields", "fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
+@click.option("--exclude-fields", "exclude_fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
 @click.option("--extra-params", default=None, help="Extra query params as JSON object, e.g. '{\"key\":\"val\"}'")
 @click.pass_context
 def _cmd_get_ecommerce_stores_id_promorules_id(ctx, store_id, promo_rule_id, fields, exclude_fields, extra_params):
@@ -1394,10 +1394,10 @@ def _cmd_update_ecommerce_stores_id_promorules_id(ctx, store_id, promo_rule_id,
 @ecommerce_group.command("list-ecommerce-stores-id-promocodes")
 @click.argument("PROMO_RULE_ID")
 @click.argument("STORE_ID")
-@click.option("--fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
-@click.option("--exclude-fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
-@click.option("--count", default=None, type=int, help="The number of records to return. Default value is 10. Maximum value is 1000")
-@click.option("--offset", default=None, type=int, help="Used for [pagination](https://mailchimp.com/developer/marketing/docs/methods-par")
+@click.option("--fields", "fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
+@click.option("--exclude-fields", "exclude_fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
+@click.option("--count", "count", default=None, type=int, help="The number of records to return. Default value is 10. Maximum value is 1000")
+@click.option("--offset", "offset", default=None, type=int, help="Used for [pagination](https://mailchimp.com/developer/marketing/docs/methods-par")
 @click.option("--extra-params", default=None, help="Extra query params as JSON object, e.g. '{\"key\":\"val\"}'")
 @click.pass_context
 def _cmd_list_ecommerce_stores_id_promocodes(ctx, promo_rule_id, store_id, fields, exclude_fields, count, offset, extra_params):
@@ -1470,8 +1470,8 @@ def _cmd_delete_ecommerce_stores_id_promocodes_id(ctx, store_id, promo_rule_id,
 @click.argument("STORE_ID")
 @click.argument("PROMO_RULE_ID")
 @click.argument("PROMO_CODE_ID")
-@click.option("--fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
-@click.option("--exclude-fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
+@click.option("--fields", "fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
+@click.option("--exclude-fields", "exclude_fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
 @click.option("--extra-params", default=None, help="Extra query params as JSON object, e.g. '{\"key\":\"val\"}'")
 @click.pass_context
 def _cmd_get_ecommerce_stores_id_promocodes_id(ctx, store_id, promo_rule_id, promo_code_id, fields, exclude_fields, extra_params):
diff --git a/mailchimp/agent-harness/cli_anything/mailchimp/commands/facebook_ads.py b/mailchimp/agent-harness/cli_anything/mailchimp/commands/facebook_ads.py
index 1938bc009..0f1eff207 100644
--- a/mailchimp/agent-harness/cli_anything/mailchimp/commands/facebook_ads.py
+++ b/mailchimp/agent-harness/cli_anything/mailchimp/commands/facebook_ads.py
@@ -28,12 +28,12 @@ def facebook_ads_group(ctx):
     """facebook-ads resource commands."""
 
 @facebook_ads_group.command("list")
-@click.option("--fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
-@click.option("--exclude-fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
-@click.option("--count", default=None, type=int, help="The number of records to return. Default value is 10. Maximum value is 1000")
-@click.option("--offset", default=None, type=int, help="Used for [pagination](https://mailchimp.com/developer/marketing/docs/methods-par")
-@click.option("--sort-field", default=None, help="Returns files sorted by the specified field.")
-@click.option("--sort-dir", default=None, help="Determines the order direction for sorted results.")
+@click.option("--fields", "fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
+@click.option("--exclude-fields", "exclude_fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
+@click.option("--count", "count", default=None, type=int, help="The number of records to return. Default value is 10. Maximum value is 1000")
+@click.option("--offset", "offset", default=None, type=int, help="Used for [pagination](https://mailchimp.com/developer/marketing/docs/methods-par")
+@click.option("--sort-field", "sort_field", default=None, help="Returns files sorted by the specified field.")
+@click.option("--sort-dir", "sort_dir", default=None, help="Determines the order direction for sorted results.")
 @click.option("--extra-params", default=None, help="Extra query params as JSON object, e.g. '{\"key\":\"val\"}'")
 @click.pass_context
 def _cmd_list_(ctx, fields, exclude_fields, count, offset, sort_field, sort_dir, extra_params):
@@ -61,8 +61,8 @@ def _cmd_list_(ctx, fields, exclude_fields, count, offset, sort_field, sort_dir,
 
 @facebook_ads_group.command("get")
 @click.argument("OUTREACH_ID")
-@click.option("--fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
-@click.option("--exclude-fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
+@click.option("--fields", "fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
+@click.option("--exclude-fields", "exclude_fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
 @click.option("--extra-params", default=None, help="Extra query params as JSON object, e.g. '{\"key\":\"val\"}'")
 @click.pass_context
 def _cmd_get(ctx, outreach_id, fields, exclude_fields, extra_params):
diff --git a/mailchimp/agent-harness/cli_anything/mailchimp/commands/file_manager.py b/mailchimp/agent-harness/cli_anything/mailchimp/commands/file_manager.py
index 32f2adf42..723f41b5e 100644
--- a/mailchimp/agent-harness/cli_anything/mailchimp/commands/file_manager.py
+++ b/mailchimp/agent-harness/cli_anything/mailchimp/commands/file_manager.py
@@ -28,16 +28,16 @@ def file_manager_group(ctx):
     """file-manager resource commands."""
 
 @file_manager_group.command("list")
-@click.option("--fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
-@click.option("--exclude-fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
-@click.option("--count", default=None, type=int, help="The number of records to return. Default value is 10. Maximum value is 1000")
-@click.option("--offset", default=None, type=int, help="Used for [pagination](https://mailchimp.com/developer/marketing/docs/methods-par")
-@click.option("--type", default=None, help="The file type for the File Manager file.")
-@click.option("--created-by", default=None, help="The Mailchimp account user who created the File Manager file.")
-@click.option("--before-created-at", default=None, help="Restrict the response to files created before the set date. Uses ISO 8601 time f")
-@click.option("--since-created-at", default=None, help="Restrict the response to files created after the set date. Uses ISO 8601 time fo")
-@click.option("--sort-field", default=None, help="Returns files sorted by the specified field.")
-@click.option("--sort-dir", default=None, help="Determines the order direction for sorted results.")
+@click.option("--fields", "fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
+@click.option("--exclude-fields", "exclude_fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
+@click.option("--count", "count", default=None, type=int, help="The number of records to return. Default value is 10. Maximum value is 1000")
+@click.option("--offset", "offset", default=None, type=int, help="Used for [pagination](https://mailchimp.com/developer/marketing/docs/methods-par")
+@click.option("--type", "type_", default=None, help="The file type for the File Manager file.")
+@click.option("--created-by", "created_by", default=None, help="The Mailchimp account user who created the File Manager file.")
+@click.option("--before-created-at", "before_created_at", default=None, help="Restrict the response to files created before the set date. Uses ISO 8601 time f")
+@click.option("--since-created-at", "since_created_at", default=None, help="Restrict the response to files created after the set date. Uses ISO 8601 time fo")
+@click.option("--sort-field", "sort_field", default=None, help="Returns files sorted by the specified field.")
+@click.option("--sort-dir", "sort_dir", default=None, help="Determines the order direction for sorted results.")
 @click.option("--extra-params", default=None, help="Extra query params as JSON object, e.g. '{\"key\":\"val\"}'")
 @click.pass_context
 def _cmd_list_(ctx, fields, exclude_fields, count, offset, type_, created_by, before_created_at, since_created_at, sort_field, sort_dir, extra_params):
@@ -110,8 +110,8 @@ def _cmd_delete(ctx, file_id, extra_params):
 
 @file_manager_group.command("get")
 @click.argument("FILE_ID")
-@click.option("--fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
-@click.option("--exclude-fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
+@click.option("--fields", "fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
+@click.option("--exclude-fields", "exclude_fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
 @click.option("--extra-params", default=None, help="Extra query params as JSON object, e.g. '{\"key\":\"val\"}'")
 @click.pass_context
 def _cmd_get(ctx, file_id, fields, exclude_fields, extra_params):
@@ -156,13 +156,13 @@ def _cmd_update(ctx, file_id, data, extra_params):
     _out(result)
 
 @file_manager_group.command("list-file-manager-folders")
-@click.option("--fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
-@click.option("--exclude-fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
-@click.option("--count", default=None, type=int, help="The number of records to return. Default value is 10. Maximum value is 1000")
-@click.option("--offset", default=None, type=int, help="Used for [pagination](https://mailchimp.com/developer/marketing/docs/methods-par")
-@click.option("--created-by", default=None, help="The Mailchimp account user who created the File Manager file.")
-@click.option("--before-created-at", default=None, help="Restrict the response to files created before the set date. Uses ISO 8601 time f")
-@click.option("--since-created-at", default=None, help="Restrict the response to files created after the set date. Uses ISO 8601 time fo")
+@click.option("--fields", "fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
+@click.option("--exclude-fields", "exclude_fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
+@click.option("--count", "count", default=None, type=int, help="The number of records to return. Default value is 10. Maximum value is 1000")
+@click.option("--offset", "offset", default=None, type=int, help="Used for [pagination](https://mailchimp.com/developer/marketing/docs/methods-par")
+@click.option("--created-by", "created_by", default=None, help="The Mailchimp account user who created the File Manager file.")
+@click.option("--before-created-at", "before_created_at", default=None, help="Restrict the response to files created before the set date. Uses ISO 8601 time f")
+@click.option("--since-created-at", "since_created_at", default=None, help="Restrict the response to files created after the set date. Uses ISO 8601 time fo")
 @click.option("--extra-params", default=None, help="Extra query params as JSON object, e.g. '{\"key\":\"val\"}'")
 @click.pass_context
 def _cmd_list_file_manager_folders(ctx, fields, exclude_fields, count, offset, created_by, before_created_at, since_created_at, extra_params):
@@ -232,8 +232,8 @@ def _cmd_delete_file_manager_folders_id(ctx, folder_id, extra_params):
 
 @file_manager_group.command("get-file-manager-folders-id")
 @click.argument("FOLDER_ID")
-@click.option("--fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
-@click.option("--exclude-fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
+@click.option("--fields", "fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
+@click.option("--exclude-fields", "exclude_fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
 @click.option("--extra-params", default=None, help="Extra query params as JSON object, e.g. '{\"key\":\"val\"}'")
 @click.pass_context
 def _cmd_get_file_manager_folders_id(ctx, folder_id, fields, exclude_fields, extra_params):
@@ -279,16 +279,16 @@ def _cmd_update_file_manager_folders_id(ctx, folder_id, data, extra_params):
 
 @file_manager_group.command("list-file-manager-folders-files")
 @click.argument("FOLDER_ID")
-@click.option("--fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
-@click.option("--exclude-fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
-@click.option("--count", default=None, type=int, help="The number of records to return. Default value is 10. Maximum value is 1000")
-@click.option("--offset", default=None, type=int, help="Used for [pagination](https://mailchimp.com/developer/marketing/docs/methods-par")
-@click.option("--type", default=None, help="The file type for the File Manager file.")
-@click.option("--created-by", default=None, help="The Mailchimp account user who created the File Manager file.")
-@click.option("--before-created-at", default=None, help="Restrict the response to files created before the set date. Uses ISO 8601 time f")
-@click.option("--since-created-at", default=None, help="Restrict the response to files created after the set date. Uses ISO 8601 time fo")
-@click.option("--sort-field", default=None, help="Returns files sorted by the specified field.")
-@click.option("--sort-dir", default=None, help="Determines the order direction for sorted results.")
+@click.option("--fields", "fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
+@click.option("--exclude-fields", "exclude_fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
+@click.option("--count", "count", default=None, type=int, help="The number of records to return. Default value is 10. Maximum value is 1000")
+@click.option("--offset", "offset", default=None, type=int, help="Used for [pagination](https://mailchimp.com/developer/marketing/docs/methods-par")
+@click.option("--type", "type_", default=None, help="The file type for the File Manager file.")
+@click.option("--created-by", "created_by", default=None, help="The Mailchimp account user who created the File Manager file.")
+@click.option("--before-created-at", "before_created_at", default=None, help="Restrict the response to files created before the set date. Uses ISO 8601 time f")
+@click.option("--since-created-at", "since_created_at", default=None, help="Restrict the response to files created after the set date. Uses ISO 8601 time fo")
+@click.option("--sort-field", "sort_field", default=None, help="Returns files sorted by the specified field.")
+@click.option("--sort-dir", "sort_dir", default=None, help="Determines the order direction for sorted results.")
 @click.option("--extra-params", default=None, help="Extra query params as JSON object, e.g. '{\"key\":\"val\"}'")
 @click.pass_context
 def _cmd_list_file_manager_folders_files(ctx, folder_id, fields, exclude_fields, count, offset, type_, created_by, before_created_at, since_created_at, sort_field, sort_dir, extra_params):
diff --git a/mailchimp/agent-harness/cli_anything/mailchimp/commands/landing_pages.py b/mailchimp/agent-harness/cli_anything/mailchimp/commands/landing_pages.py
index 3c1a591e7..afa67803d 100644
--- a/mailchimp/agent-harness/cli_anything/mailchimp/commands/landing_pages.py
+++ b/mailchimp/agent-harness/cli_anything/mailchimp/commands/landing_pages.py
@@ -28,11 +28,11 @@ def landing_pages_group(ctx):
     """landing-pages resource commands."""
 
 @landing_pages_group.command("list")
-@click.option("--sort-dir", default=None, help="Determines the order direction for sorted results.")
-@click.option("--sort-field", default=None, help="Returns files sorted by the specified field.")
-@click.option("--fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
-@click.option("--exclude-fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
-@click.option("--count", default=None, type=int, help="The number of records to return. Default value is 10. Maximum value is 1000")
+@click.option("--sort-dir", "sort_dir", default=None, help="Determines the order direction for sorted results.")
+@click.option("--sort-field", "sort_field", default=None, help="Returns files sorted by the specified field.")
+@click.option("--fields", "fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
+@click.option("--exclude-fields", "exclude_fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
+@click.option("--count", "count", default=None, type=int, help="The number of records to return. Default value is 10. Maximum value is 1000")
 @click.option("--extra-params", default=None, help="Extra query params as JSON object, e.g. '{\"key\":\"val\"}'")
 @click.pass_context
 def _cmd_list_(ctx, sort_dir, sort_field, fields, exclude_fields, count, extra_params):
@@ -59,7 +59,7 @@ def _cmd_list_(ctx, sort_dir, sort_field, fields, exclude_fields, count, extra_p
 
 @landing_pages_group.command("create")
 @click.option("--data", default=None, help="Request body as JSON string.")
-@click.option("--use-default-list", default=None, type=bool, help="Will create the Landing Page using the account's Default List instead of requiri")
+@click.option("--use-default-list", "use_default_list", default=None, type=bool, help="Will create the Landing Page using the account's Default List instead of requiri")
 @click.option("--extra-params", default=None, help="Extra query params as JSON object, e.g. '{\"key\":\"val\"}'")
 @click.pass_context
 def _cmd_create(ctx, data, use_default_list, extra_params):
@@ -103,8 +103,8 @@ def _cmd_delete(ctx, page_id, extra_params):
 
 @landing_pages_group.command("get")
 @click.argument("PAGE_ID")
-@click.option("--fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
-@click.option("--exclude-fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
+@click.option("--fields", "fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
+@click.option("--exclude-fields", "exclude_fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
 @click.option("--extra-params", default=None, help="Extra query params as JSON object, e.g. '{\"key\":\"val\"}'")
 @click.pass_context
 def _cmd_get(ctx, page_id, fields, exclude_fields, extra_params):
@@ -190,8 +190,8 @@ def _cmd_unpublish(ctx, page_id, extra_params):
 
 @landing_pages_group.command("list-landing-page-id-content")
 @click.argument("PAGE_ID")
-@click.option("--fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
-@click.option("--exclude-fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
+@click.option("--fields", "fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
+@click.option("--exclude-fields", "exclude_fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
 @click.option("--extra-params", default=None, help="Extra query params as JSON object, e.g. '{\"key\":\"val\"}'")
 @click.pass_context
 def _cmd_list_landing_page_id_content(ctx, page_id, fields, exclude_fields, extra_params):
diff --git a/mailchimp/agent-harness/cli_anything/mailchimp/commands/lists.py b/mailchimp/agent-harness/cli_anything/mailchimp/commands/lists.py
index a5ca99cc3..739197540 100644
--- a/mailchimp/agent-harness/cli_anything/mailchimp/commands/lists.py
+++ b/mailchimp/agent-harness/cli_anything/mailchimp/commands/lists.py
@@ -28,19 +28,19 @@ def lists_group(ctx):
     """lists resource commands."""
 
 @lists_group.command("list")
-@click.option("--fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
-@click.option("--exclude-fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
-@click.option("--count", default=None, type=int, help="The number of records to return. Default value is 10. Maximum value is 1000")
-@click.option("--offset", default=None, type=int, help="Used for [pagination](https://mailchimp.com/developer/marketing/docs/methods-par")
-@click.option("--before-date-created", default=None, help="Restrict response to lists created before the set date. Uses ISO 8601 time forma")
-@click.option("--since-date-created", default=None, help="Restrict results to lists created after the set date. Uses ISO 8601 time format:")
-@click.option("--before-campaign-last-sent", default=None, help="Restrict results to lists created before the last campaign send date. Uses ISO 8")
-@click.option("--since-campaign-last-sent", default=None, help="Restrict results to lists created after the last campaign send date. Uses ISO 86")
-@click.option("--email", default=None, help="Restrict results to lists that include a specific subscriber's email address.")
-@click.option("--sort-field", default=None, help="Returns files sorted by the specified field.")
-@click.option("--sort-dir", default=None, help="Determines the order direction for sorted results.")
-@click.option("--has-ecommerce-store", default=None, type=bool, help="Restrict results to lists that contain an active, connected, undeleted ecommerce")
-@click.option("--include-total-contacts", default=None, type=bool, help="Return the total_contacts field in the stats response, which contains an approxi")
+@click.option("--fields", "fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
+@click.option("--exclude-fields", "exclude_fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
+@click.option("--count", "count", default=None, type=int, help="The number of records to return. Default value is 10. Maximum value is 1000")
+@click.option("--offset", "offset", default=None, type=int, help="Used for [pagination](https://mailchimp.com/developer/marketing/docs/methods-par")
+@click.option("--before-date-created", "before_date_created", default=None, help="Restrict response to lists created before the set date. Uses ISO 8601 time forma")
+@click.option("--since-date-created", "since_date_created", default=None, help="Restrict results to lists created after the set date. Uses ISO 8601 time format:")
+@click.option("--before-campaign-last-sent", "before_campaign_last_sent", default=None, help="Restrict results to lists created before the last campaign send date. Uses ISO 8")
+@click.option("--since-campaign-last-sent", "since_campaign_last_sent", default=None, help="Restrict results to lists created after the last campaign send date. Uses ISO 86")
+@click.option("--email", "email", default=None, help="Restrict results to lists that include a specific subscriber's email address.")
+@click.option("--sort-field", "sort_field", default=None, help="Returns files sorted by the specified field.")
+@click.option("--sort-dir", "sort_dir", default=None, help="Determines the order direction for sorted results.")
+@click.option("--has-ecommerce-store", "has_ecommerce_store", default=None, type=bool, help="Restrict results to lists that contain an active, connected, undeleted ecommerce")
+@click.option("--include-total-contacts", "include_total_contacts", default=None, type=bool, help="Return the total_contacts field in the stats response, which contains an approxi")
 @click.option("--extra-params", default=None, help="Extra query params as JSON object, e.g. '{\"key\":\"val\"}'")
 @click.pass_context
 def _cmd_list_(ctx, fields, exclude_fields, count, offset, before_date_created, since_date_created, before_campaign_last_sent, since_campaign_last_sent, email, sort_field, sort_dir, has_ecommerce_store, include_total_contacts, extra_params):
@@ -116,9 +116,9 @@ def _cmd_delete(ctx, list_id, extra_params):
 
 @lists_group.command("get")
 @click.argument("LIST_ID")
-@click.option("--fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
-@click.option("--exclude-fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
-@click.option("--include-total-contacts", default=None, type=bool, help="Return the total_contacts field in the stats response, which contains an approxi")
+@click.option("--fields", "fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
+@click.option("--exclude-fields", "exclude_fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
+@click.option("--include-total-contacts", "include_total_contacts", default=None, type=bool, help="Return the total_contacts field in the stats response, which contains an approxi")
 @click.option("--extra-params", default=None, help="Extra query params as JSON object, e.g. '{\"key\":\"val\"}'")
 @click.pass_context
 def _cmd_get(ctx, list_id, fields, exclude_fields, include_total_contacts, extra_params):
@@ -166,8 +166,8 @@ def _cmd_update(ctx, list_id, data, extra_params):
 @lists_group.command("create-lists-id")
 @click.argument("LIST_ID")
 @click.option("--data", default=None, help="Request body as JSON string.")
-@click.option("--skip-merge-validation", default=None, type=bool, help="If skip_merge_validation is true, member data will be accepted without merge fie")
-@click.option("--skip-duplicate-check", default=None, type=bool, help="If skip_duplicate_check is true, we will ignore duplicates sent in the request w")
+@click.option("--skip-merge-validation", "skip_merge_validation", default=None, type=bool, help="If skip_merge_validation is true, member data will be accepted without merge fie")
+@click.option("--skip-duplicate-check", "skip_duplicate_check", default=None, type=bool, help="If skip_duplicate_check is true, we will ignore duplicates sent in the request w")
 @click.option("--extra-params", default=None, help="Extra query params as JSON object, e.g. '{\"key\":\"val\"}'")
 @click.pass_context
 def _cmd_create_lists_id(ctx, list_id, data, skip_merge_validation, skip_duplicate_check, extra_params):
@@ -192,10 +192,10 @@ def _cmd_create_lists_id(ctx, list_id, data, skip_merge_validation, skip_duplica
 
 @lists_group.command("list-lists-id-abuse-reports")
 @click.argument("LIST_ID")
-@click.option("--fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
-@click.option("--exclude-fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
-@click.option("--count", default=None, type=int, help="The number of records to return. Default value is 10. Maximum value is 1000")
-@click.option("--offset", default=None, type=int, help="Used for [pagination](https://mailchimp.com/developer/marketing/docs/methods-par")
+@click.option("--fields", "fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
+@click.option("--exclude-fields", "exclude_fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
+@click.option("--count", "count", default=None, type=int, help="The number of records to return. Default value is 10. Maximum value is 1000")
+@click.option("--offset", "offset", default=None, type=int, help="Used for [pagination](https://mailchimp.com/developer/marketing/docs/methods-par")
 @click.option("--extra-params", default=None, help="Extra query params as JSON object, e.g. '{\"key\":\"val\"}'")
 @click.pass_context
 def _cmd_list_lists_id_abuse_reports(ctx, list_id, fields, exclude_fields, count, offset, extra_params):
@@ -222,10 +222,10 @@ def _cmd_list_lists_id_abuse_reports(ctx, list_id, fields, exclude_fields, count
 @lists_group.command("get-lists-id-abuse-reports-id")
 @click.argument("LIST_ID")
 @click.argument("REPORT_ID")
-@click.option("--fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
-@click.option("--exclude-fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
-@click.option("--count", default=None, type=int, help="The number of records to return. Default value is 10. Maximum value is 1000")
-@click.option("--offset", default=None, type=int, help="Used for [pagination](https://mailchimp.com/developer/marketing/docs/methods-par")
+@click.option("--fields", "fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
+@click.option("--exclude-fields", "exclude_fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
+@click.option("--count", "count", default=None, type=int, help="The number of records to return. Default value is 10. Maximum value is 1000")
+@click.option("--offset", "offset", default=None, type=int, help="Used for [pagination](https://mailchimp.com/developer/marketing/docs/methods-par")
 @click.option("--extra-params", default=None, help="Extra query params as JSON object, e.g. '{\"key\":\"val\"}'")
 @click.pass_context
 def _cmd_get_lists_id_abuse_reports_id(ctx, list_id, report_id, fields, exclude_fields, count, offset, extra_params):
@@ -251,10 +251,10 @@ def _cmd_get_lists_id_abuse_reports_id(ctx, list_id, report_id, fields, exclude_
 
 @lists_group.command("list-lists-id-activity")
 @click.argument("LIST_ID")
-@click.option("--count", default=None, type=int, help="The number of records to return. Default value is 10. Maximum value is 1000")
-@click.option("--offset", default=None, type=int, help="Used for [pagination](https://mailchimp.com/developer/marketing/docs/methods-par")
-@click.option("--fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
-@click.option("--exclude-fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
+@click.option("--count", "count", default=None, type=int, help="The number of records to return. Default value is 10. Maximum value is 1000")
+@click.option("--offset", "offset", default=None, type=int, help="Used for [pagination](https://mailchimp.com/developer/marketing/docs/methods-par")
+@click.option("--fields", "fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
+@click.option("--exclude-fields", "exclude_fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
 @click.option("--extra-params", default=None, help="Extra query params as JSON object, e.g. '{\"key\":\"val\"}'")
 @click.pass_context
 def _cmd_list_lists_id_activity(ctx, list_id, count, offset, fields, exclude_fields, extra_params):
@@ -280,8 +280,8 @@ def _cmd_list_lists_id_activity(ctx, list_id, count, offset, fields, exclude_fie
 
 @lists_group.command("list-lists-id-clients")
 @click.argument("LIST_ID")
-@click.option("--fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
-@click.option("--exclude-fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
+@click.option("--fields", "fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
+@click.option("--exclude-fields", "exclude_fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
 @click.option("--extra-params", default=None, help="Extra query params as JSON object, e.g. '{\"key\":\"val\"}'")
 @click.pass_context
 def _cmd_list_lists_id_clients(ctx, list_id, fields, exclude_fields, extra_params):
@@ -305,12 +305,12 @@ def _cmd_list_lists_id_clients(ctx, list_id, fields, exclude_fields, extra_param
 
 @lists_group.command("list-lists-id-growth-history")
 @click.argument("LIST_ID")
-@click.option("--fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
-@click.option("--exclude-fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
-@click.option("--count", default=None, type=int, help="The number of records to return. Default value is 10. Maximum value is 1000")
-@click.option("--offset", default=None, type=int, help="Used for [pagination](https://mailchimp.com/developer/marketing/docs/methods-par")
-@click.option("--sort-field", default=None, help="Returns files sorted by the specified field.")
-@click.option("--sort-dir", default=None, help="Determines the order direction for sorted results.")
+@click.option("--fields", "fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
+@click.option("--exclude-fields", "exclude_fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
+@click.option("--count", "count", default=None, type=int, help="The number of records to return. Default value is 10. Maximum value is 1000")
+@click.option("--offset", "offset", default=None, type=int, help="Used for [pagination](https://mailchimp.com/developer/marketing/docs/methods-par")
+@click.option("--sort-field", "sort_field", default=None, help="Returns files sorted by the specified field.")
+@click.option("--sort-dir", "sort_dir", default=None, help="Determines the order direction for sorted results.")
 @click.option("--extra-params", default=None, help="Extra query params as JSON object, e.g. '{\"key\":\"val\"}'")
 @click.pass_context
 def _cmd_list_lists_id_growth_history(ctx, list_id, fields, exclude_fields, count, offset, sort_field, sort_dir, extra_params):
@@ -339,8 +339,8 @@ def _cmd_list_lists_id_growth_history(ctx, list_id, fields, exclude_fields, coun
 @lists_group.command("get-lists-id-growth-history-id")
 @click.argument("LIST_ID")
 @click.argument("MONTH")
-@click.option("--fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
-@click.option("--exclude-fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
+@click.option("--fields", "fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
+@click.option("--exclude-fields", "exclude_fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
 @click.option("--extra-params", default=None, help="Extra query params as JSON object, e.g. '{\"key\":\"val\"}'")
 @click.pass_context
 def _cmd_get_lists_id_growth_history_id(ctx, list_id, month, fields, exclude_fields, extra_params):
@@ -364,13 +364,13 @@ def _cmd_get_lists_id_growth_history_id(ctx, list_id, month, fields, exclude_fie
 
 @lists_group.command("list-lists-id-interest-categories")
 @click.argument("LIST_ID")
-@click.option("--fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
-@click.option("--exclude-fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
-@click.option("--count", default=None, type=int, help="The number of records to return. Default value is 10. Maximum value is 1000")
-@click.option("--offset", default=None, type=int, help="Used for [pagination](https://mailchimp.com/developer/marketing/docs/methods-par")
-@click.option("--type", default=None, help="Restrict results a type of interest group")
-@click.option("--sort-field", default=None, help="Returns interest categories sorted by the specified field. Defaults to display_o")
-@click.option("--sort-dir", default=None, help="Determines the order direction for sorted results.")
+@click.option("--fields", "fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
+@click.option("--exclude-fields", "exclude_fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
+@click.option("--count", "count", default=None, type=int, help="The number of records to return. Default value is 10. Maximum value is 1000")
+@click.option("--offset", "offset", default=None, type=int, help="Used for [pagination](https://mailchimp.com/developer/marketing/docs/methods-par")
+@click.option("--type", "type_", default=None, help="Restrict results a type of interest group")
+@click.option("--sort-field", "sort_field", default=None, help="Returns interest categories sorted by the specified field. Defaults to display_o")
+@click.option("--sort-dir", "sort_dir", default=None, help="Determines the order direction for sorted results.")
 @click.option("--extra-params", default=None, help="Extra query params as JSON object, e.g. '{\"key\":\"val\"}'")
 @click.pass_context
 def _cmd_list_lists_id_interest_categories(ctx, list_id, fields, exclude_fields, count, offset, type_, sort_field, sort_dir, extra_params):
@@ -443,8 +443,8 @@ def _cmd_delete_lists_id_interest_categories_id(ctx, list_id, interest_category_
 @lists_group.command("get-lists-id-interest-categories-id")
 @click.argument("LIST_ID")
 @click.argument("INTEREST_CATEGORY_ID")
-@click.option("--fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
-@click.option("--exclude-fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
+@click.option("--fields", "fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
+@click.option("--exclude-fields", "exclude_fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
 @click.option("--extra-params", default=None, help="Extra query params as JSON object, e.g. '{\"key\":\"val\"}'")
 @click.pass_context
 def _cmd_get_lists_id_interest_categories_id(ctx, list_id, interest_category_id, fields, exclude_fields, extra_params):
@@ -492,10 +492,10 @@ def _cmd_update_lists_id_interest_categories_id(ctx, list_id, interest_category_
 @lists_group.command("list-lists-id-interest-categories-id-interests")
 @click.argument("LIST_ID")
 @click.argument("INTEREST_CATEGORY_ID")
-@click.option("--fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
-@click.option("--exclude-fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
-@click.option("--count", default=None, type=int, help="The number of records to return. Default value is 10. Maximum value is 1000")
-@click.option("--offset", default=None, type=int, help="Used for [pagination](https://mailchimp.com/developer/marketing/docs/methods-par")
+@click.option("--fields", "fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
+@click.option("--exclude-fields", "exclude_fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
+@click.option("--count", "count", default=None, type=int, help="The number of records to return. Default value is 10. Maximum value is 1000")
+@click.option("--offset", "offset", default=None, type=int, help="Used for [pagination](https://mailchimp.com/developer/marketing/docs/methods-par")
 @click.option("--extra-params", default=None, help="Extra query params as JSON object, e.g. '{\"key\":\"val\"}'")
 @click.pass_context
 def _cmd_list_lists_id_interest_categories_id_interests(ctx, list_id, interest_category_id, fields, exclude_fields, count, offset, extra_params):
@@ -568,8 +568,8 @@ def _cmd_delete_lists_id_interest_categories_id_interests_id(ctx, list_id, inter
 @click.argument("LIST_ID")
 @click.argument("INTEREST_CATEGORY_ID")
 @click.argument("INTEREST_ID")
-@click.option("--fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
-@click.option("--exclude-fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
+@click.option("--fields", "fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
+@click.option("--exclude-fields", "exclude_fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
 @click.option("--extra-params", default=None, help="Extra query params as JSON object, e.g. '{\"key\":\"val\"}'")
 @click.pass_context
 def _cmd_get_lists_id_interest_categories_id_interests_id(ctx, list_id, interest_category_id, interest_id, fields, exclude_fields, extra_params):
@@ -617,8 +617,8 @@ def _cmd_update_lists_id_interest_categories_id_interests_id(ctx, list_id, inter
 
 @lists_group.command("list-lists-id-locations")
 @click.argument("LIST_ID")
-@click.option("--fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
-@click.option("--exclude-fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
+@click.option("--fields", "fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
+@click.option("--exclude-fields", "exclude_fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
 @click.option("--extra-params", default=None, help="Extra query params as JSON object, e.g. '{\"key\":\"val\"}'")
 @click.pass_context
 def _cmd_list_lists_id_locations(ctx, list_id, fields, exclude_fields, extra_params):
@@ -642,25 +642,25 @@ def _cmd_list_lists_id_locations(ctx, list_id, fields, exclude_fields, extra_par
 
 @lists_group.command("list-lists-id-members")
 @click.argument("LIST_ID")
-@click.option("--fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
-@click.option("--exclude-fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
-@click.option("--count", default=None, type=int, help="The number of records to return. Default value is 10. Maximum value is 1000")
-@click.option("--offset", default=None, type=int, help="Used for [pagination](https://mailchimp.com/developer/marketing/docs/methods-par")
-@click.option("--email-type", default=None, help="The email type.")
-@click.option("--status", default=None, help="The subscriber's status.")
-@click.option("--since-timestamp-opt", default=None, help="Restrict results to subscribers who opted-in after the set timeframe. Uses ISO 8")
-@click.option("--before-timestamp-opt", default=None, help="Restrict results to subscribers who opted-in before the set timeframe. Uses ISO ")
-@click.option("--since-last-changed", default=None, help="Restrict results to subscribers whose information changed after the set timefram")
-@click.option("--before-last-changed", default=None, help="Restrict results to subscribers whose information changed before the set timefra")
-@click.option("--unique-email-id", default=None, help="A unique identifier for the email address across all Mailchimp lists.")
-@click.option("--vip-only", default=None, type=bool, help="A filter to return only the list's VIP members. Passing `true` will restrict res")
-@click.option("--interest-category-id", default=None, help="The unique id for the interest category.")
-@click.option("--interest-ids", default=None, help="Used to filter list members by interests. Must be accompanied by interest_catego")
-@click.option("--interest-match", default=None, help="Used to filter list members by interests. Must be accompanied by interest_catego")
-@click.option("--sort-field", default=None, help="Returns files sorted by the specified field.")
-@click.option("--sort-dir", default=None, help="Determines the order direction for sorted results.")
-@click.option("--since-last-campaign", default=None, type=bool, help="Filter subscribers by those subscribed/unsubscribed/pending/cleaned since last e")
-@click.option("--unsubscribed-since", default=None, help="Filter subscribers by those unsubscribed since a specific date. Using any status")
+@click.option("--fields", "fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
+@click.option("--exclude-fields", "exclude_fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
+@click.option("--count", "count", default=None, type=int, help="The number of records to return. Default value is 10. Maximum value is 1000")
+@click.option("--offset", "offset", default=None, type=int, help="Used for [pagination](https://mailchimp.com/developer/marketing/docs/methods-par")
+@click.option("--email-type", "email_type", default=None, help="The email type.")
+@click.option("--status", "status", default=None, help="The subscriber's status.")
+@click.option("--since-timestamp-opt", "since_timestamp_opt", default=None, help="Restrict results to subscribers who opted-in after the set timeframe. Uses ISO 8")
+@click.option("--before-timestamp-opt", "before_timestamp_opt", default=None, help="Restrict results to subscribers who opted-in before the set timeframe. Uses ISO ")
+@click.option("--since-last-changed", "since_last_changed", default=None, help="Restrict results to subscribers whose information changed after the set timefram")
+@click.option("--before-last-changed", "before_last_changed", default=None, help="Restrict results to subscribers whose information changed before the set timefra")
+@click.option("--unique-email-id", "unique_email_id", default=None, help="A unique identifier for the email address across all Mailchimp lists.")
+@click.option("--vip-only", "vip_only", default=None, type=bool, help="A filter to return only the list's VIP members. Passing `true` will restrict res")
+@click.option("--interest-category-id", "interest_category_id", default=None, help="The unique id for the interest category.")
+@click.option("--interest-ids", "interest_ids", default=None, help="Used to filter list members by interests. Must be accompanied by interest_catego")
+@click.option("--interest-match", "interest_match", default=None, help="Used to filter list members by interests. Must be accompanied by interest_catego")
+@click.option("--sort-field", "sort_field", default=None, help="Returns files sorted by the specified field.")
+@click.option("--sort-dir", "sort_dir", default=None, help="Determines the order direction for sorted results.")
+@click.option("--since-last-campaign", "since_last_campaign", default=None, type=bool, help="Filter subscribers by those subscribed/unsubscribed/pending/cleaned since last e")
+@click.option("--unsubscribed-since", "unsubscribed_since", default=None, help="Filter subscribers by those unsubscribed since a specific date. Using any status")
 @click.option("--extra-params", default=None, help="Extra query params as JSON object, e.g. '{\"key\":\"val\"}'")
 @click.pass_context
 def _cmd_list_lists_id_members(ctx, list_id, fields, exclude_fields, count, offset, email_type, status, since_timestamp_opt, before_timestamp_opt, since_last_changed, before_last_changed, unique_email_id, vip_only, interest_category_id, interest_ids, interest_match, sort_field, sort_dir, since_last_campaign, unsubscribed_since, extra_params):
@@ -702,7 +702,7 @@ def _cmd_list_lists_id_members(ctx, list_id, fields, exclude_fields, count, offs
 @lists_group.command("create-lists-id-members")
 @click.argument("LIST_ID")
 @click.option("--data", default=None, help="Request body as JSON string.")
-@click.option("--skip-merge-validation", default=None, type=bool, help="If skip_merge_validation is true, member data will be accepted without merge fie")
+@click.option("--skip-merge-validation", "skip_merge_validation", default=None, type=bool, help="If skip_merge_validation is true, member data will be accepted without merge fie")
 @click.option("--extra-params", default=None, help="Extra query params as JSON object, e.g. '{\"key\":\"val\"}'")
 @click.pass_context
 def _cmd_create_lists_id_members(ctx, list_id, data, skip_merge_validation, extra_params):
@@ -750,8 +750,8 @@ def _cmd_delete_lists_id_members_id(ctx, list_id, subscriber_hash, extra_params)
 @lists_group.command("get-lists-id-members-id")
 @click.argument("LIST_ID")
 @click.argument("SUBSCRIBER_HASH")
-@click.option("--fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
-@click.option("--exclude-fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
+@click.option("--fields", "fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
+@click.option("--exclude-fields", "exclude_fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
 @click.option("--extra-params", default=None, help="Extra query params as JSON object, e.g. '{\"key\":\"val\"}'")
 @click.pass_context
 def _cmd_get_lists_id_members_id(ctx, list_id, subscriber_hash, fields, exclude_fields, extra_params):
@@ -777,7 +777,7 @@ def _cmd_get_lists_id_members_id(ctx, list_id, subscriber_hash, fields, exclude_
 @click.argument("LIST_ID")
 @click.argument("SUBSCRIBER_HASH")
 @click.option("--data", default=None, help="Request body as JSON string.")
-@click.option("--skip-merge-validation", default=None, type=bool, help="If skip_merge_validation is true, member data will be accepted without merge fie")
+@click.option("--skip-merge-validation", "skip_merge_validation", default=None, type=bool, help="If skip_merge_validation is true, member data will be accepted without merge fie")
 @click.option("--extra-params", default=None, help="Extra query params as JSON object, e.g. '{\"key\":\"val\"}'")
 @click.pass_context
 def _cmd_update_lists_id_members_id(ctx, list_id, subscriber_hash, data, skip_merge_validation, extra_params):
@@ -803,7 +803,7 @@ def _cmd_update_lists_id_members_id(ctx, list_id, subscriber_hash, data, skip_me
 @click.argument("LIST_ID")
 @click.argument("SUBSCRIBER_HASH")
 @click.option("--data", default=None, help="Request body as JSON string.")
-@click.option("--skip-merge-validation", default=None, type=bool, help="If skip_merge_validation is true, member data will be accepted without merge fie")
+@click.option("--skip-merge-validation", "skip_merge_validation", default=None, type=bool, help="If skip_merge_validation is true, member data will be accepted without merge fie")
 @click.option("--extra-params", default=None, help="Extra query params as JSON object, e.g. '{\"key\":\"val\"}'")
 @click.pass_context
 def _cmd_update_3(ctx, list_id, subscriber_hash, data, skip_merge_validation, extra_params):
@@ -849,9 +849,9 @@ def _cmd_delete_permanent(ctx, list_id, subscriber_hash, extra_params):
 @lists_group.command("list-lists-id-members-id-activity")
 @click.argument("LIST_ID")
 @click.argument("SUBSCRIBER_HASH")
-@click.option("--fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
-@click.option("--exclude-fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
-@click.option("--action", default=None, help="A comma seperated list of actions to return.")
+@click.option("--fields", "fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
+@click.option("--exclude-fields", "exclude_fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
+@click.option("--action", "action", default=None, help="A comma seperated list of actions to return.")
 @click.option("--extra-params", default=None, help="Extra query params as JSON object, e.g. '{\"key\":\"val\"}'")
 @click.pass_context
 def _cmd_list_lists_id_members_id_activity(ctx, list_id, subscriber_hash, fields, exclude_fields, action, extra_params):
@@ -877,11 +877,11 @@ def _cmd_list_lists_id_members_id_activity(ctx, list_id, subscriber_hash, fields
 @lists_group.command("list-lists-id-members-id-activity-feed")
 @click.argument("LIST_ID")
 @click.argument("SUBSCRIBER_HASH")
-@click.option("--fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
-@click.option("--exclude-fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
-@click.option("--count", default=None, type=int, help="The number of records to return. Default value is 10. Maximum value is 1000")
-@click.option("--offset", default=None, type=int, help="Used for [pagination](https://mailchimp.com/developer/marketing/docs/methods-par")
-@click.option("--activity-filters", default=None, help="A comma-separated list of activity filters that correspond to a set of activity ")
+@click.option("--fields", "fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
+@click.option("--exclude-fields", "exclude_fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
+@click.option("--count", "count", default=None, type=int, help="The number of records to return. Default value is 10. Maximum value is 1000")
+@click.option("--offset", "offset", default=None, type=int, help="Used for [pagination](https://mailchimp.com/developer/marketing/docs/methods-par")
+@click.option("--activity-filters", "activity_filters", default=None, help="A comma-separated list of activity filters that correspond to a set of activity ")
 @click.option("--extra-params", default=None, help="Extra query params as JSON object, e.g. '{\"key\":\"val\"}'")
 @click.pass_context
 def _cmd_list_lists_id_members_id_activity_feed(ctx, list_id, subscriber_hash, fields, exclude_fields, count, offset, activity_filters, extra_params):
@@ -909,10 +909,10 @@ def _cmd_list_lists_id_members_id_activity_feed(ctx, list_id, subscriber_hash, f
 @lists_group.command("list-lists-id-members-id-events")
 @click.argument("LIST_ID")
 @click.argument("SUBSCRIBER_HASH")
-@click.option("--count", default=None, type=int, help="The number of records to return. Default value is 10. Maximum value is 1000")
-@click.option("--offset", default=None, type=int, help="Used for [pagination](https://mailchimp.com/developer/marketing/docs/methods-par")
-@click.option("--fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
-@click.option("--exclude-fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
+@click.option("--count", "count", default=None, type=int, help="The number of records to return. Default value is 10. Maximum value is 1000")
+@click.option("--offset", "offset", default=None, type=int, help="Used for [pagination](https://mailchimp.com/developer/marketing/docs/methods-par")
+@click.option("--fields", "fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
+@click.option("--exclude-fields", "exclude_fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
 @click.option("--extra-params", default=None, help="Extra query params as JSON object, e.g. '{\"key\":\"val\"}'")
 @click.pass_context
 def _cmd_list_lists_id_members_id_events(ctx, list_id, subscriber_hash, count, offset, fields, exclude_fields, extra_params):
@@ -962,8 +962,8 @@ def _cmd_create_list_member_events(ctx, list_id, subscriber_hash, data, extra_pa
 @lists_group.command("list-lists-id-members-id-goals")
 @click.argument("LIST_ID")
 @click.argument("SUBSCRIBER_HASH")
-@click.option("--fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
-@click.option("--exclude-fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
+@click.option("--fields", "fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
+@click.option("--exclude-fields", "exclude_fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
 @click.option("--extra-params", default=None, help="Extra query params as JSON object, e.g. '{\"key\":\"val\"}'")
 @click.pass_context
 def _cmd_list_lists_id_members_id_goals(ctx, list_id, subscriber_hash, fields, exclude_fields, extra_params):
@@ -988,12 +988,12 @@ def _cmd_list_lists_id_members_id_goals(ctx, list_id, subscriber_hash, fields, e
 @lists_group.command("list-lists-id-members-id-notes")
 @click.argument("LIST_ID")
 @click.argument("SUBSCRIBER_HASH")
-@click.option("--sort-field", default=None, help="Returns notes sorted by the specified field.")
-@click.option("--sort-dir", default=None, help="Determines the order direction for sorted results.")
-@click.option("--fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
-@click.option("--exclude-fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
-@click.option("--count", default=None, type=int, help="The number of records to return. Default value is 10. Maximum value is 1000")
-@click.option("--offset", default=None, type=int, help="Used for [pagination](https://mailchimp.com/developer/marketing/docs/methods-par")
+@click.option("--sort-field", "sort_field", default=None, help="Returns notes sorted by the specified field.")
+@click.option("--sort-dir", "sort_dir", default=None, help="Determines the order direction for sorted results.")
+@click.option("--fields", "fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
+@click.option("--exclude-fields", "exclude_fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
+@click.option("--count", "count", default=None, type=int, help="The number of records to return. Default value is 10. Maximum value is 1000")
+@click.option("--offset", "offset", default=None, type=int, help="Used for [pagination](https://mailchimp.com/developer/marketing/docs/methods-par")
 @click.option("--extra-params", default=None, help="Extra query params as JSON object, e.g. '{\"key\":\"val\"}'")
 @click.pass_context
 def _cmd_list_lists_id_members_id_notes(ctx, list_id, subscriber_hash, sort_field, sort_dir, fields, exclude_fields, count, offset, extra_params):
@@ -1068,8 +1068,8 @@ def _cmd_delete_lists_id_members_id_notes_id(ctx, list_id, subscriber_hash, note
 @click.argument("LIST_ID")
 @click.argument("SUBSCRIBER_HASH")
 @click.argument("NOTE_ID")
-@click.option("--fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
-@click.option("--exclude-fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
+@click.option("--fields", "fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
+@click.option("--exclude-fields", "exclude_fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
 @click.option("--extra-params", default=None, help="Extra query params as JSON object, e.g. '{\"key\":\"val\"}'")
 @click.pass_context
 def _cmd_get_lists_id_members_id_notes_id(ctx, list_id, subscriber_hash, note_id, fields, exclude_fields, extra_params):
@@ -1118,10 +1118,10 @@ def _cmd_update_lists_id_members_id_notes_id(ctx, list_id, subscriber_hash, note
 @lists_group.command("list-list-member-tags")
 @click.argument("LIST_ID")
 @click.argument("SUBSCRIBER_HASH")
-@click.option("--fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
-@click.option("--exclude-fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
-@click.option("--count", default=None, type=int, help="The number of records to return. Default value is 10. Maximum value is 1000")
-@click.option("--offset", default=None, type=int, help="Used for [pagination](https://mailchimp.com/developer/marketing/docs/methods-par")
+@click.option("--fields", "fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
+@click.option("--exclude-fields", "exclude_fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
+@click.option("--count", "count", default=None, type=int, help="The number of records to return. Default value is 10. Maximum value is 1000")
+@click.option("--offset", "offset", default=None, type=int, help="Used for [pagination](https://mailchimp.com/developer/marketing/docs/methods-par")
 @click.option("--extra-params", default=None, help="Extra query params as JSON object, e.g. '{\"key\":\"val\"}'")
 @click.pass_context
 def _cmd_list_list_member_tags(ctx, list_id, subscriber_hash, fields, exclude_fields, count, offset, extra_params):
@@ -1170,12 +1170,12 @@ def _cmd_create_list_member_tags(ctx, list_id, subscriber_hash, data, extra_para
 
 @lists_group.command("list-lists-id-merge-fields")
 @click.argument("LIST_ID")
-@click.option("--fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
-@click.option("--exclude-fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
-@click.option("--count", default=None, type=int, help="The number of records to return. Default value is 10. Maximum value is 1000")
-@click.option("--offset", default=None, type=int, help="Used for [pagination](https://mailchimp.com/developer/marketing/docs/methods-par")
-@click.option("--type", default=None, help="The merge field type.")
-@click.option("--required", default=None, type=bool, help="Whether it's a required merge field.")
+@click.option("--fields", "fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
+@click.option("--exclude-fields", "exclude_fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
+@click.option("--count", "count", default=None, type=int, help="The number of records to return. Default value is 10. Maximum value is 1000")
+@click.option("--offset", "offset", default=None, type=int, help="Used for [pagination](https://mailchimp.com/developer/marketing/docs/methods-par")
+@click.option("--type", "type_", default=None, help="The merge field type.")
+@click.option("--required", "required", default=None, type=bool, help="Whether it's a required merge field.")
 @click.option("--extra-params", default=None, help="Extra query params as JSON object, e.g. '{\"key\":\"val\"}'")
 @click.pass_context
 def _cmd_list_lists_id_merge_fields(ctx, list_id, fields, exclude_fields, count, offset, type_, required, extra_params):
@@ -1247,8 +1247,8 @@ def _cmd_delete_lists_id_merge_fields_id(ctx, list_id, merge_id, extra_params):
 @lists_group.command("get-lists-id-merge-fields-id")
 @click.argument("LIST_ID")
 @click.argument("MERGE_ID")
-@click.option("--exclude-fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
-@click.option("--fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
+@click.option("--exclude-fields", "exclude_fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
+@click.option("--fields", "fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
 @click.option("--extra-params", default=None, help="Extra query params as JSON object, e.g. '{\"key\":\"val\"}'")
 @click.pass_context
 def _cmd_get_lists_id_merge_fields_id(ctx, list_id, merge_id, exclude_fields, fields, extra_params):
@@ -1295,19 +1295,19 @@ def _cmd_update_lists_id_merge_fields_id(ctx, list_id, merge_id, data, extra_par
 
 @lists_group.command("list-preview-a-segment")
 @click.argument("LIST_ID")
-@click.option("--fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
-@click.option("--exclude-fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
-@click.option("--count", default=None, type=int, help="The number of records to return. Default value is 10. Maximum value is 1000")
-@click.option("--offset", default=None, type=int, help="Used for [pagination](https://mailchimp.com/developer/marketing/docs/methods-par")
-@click.option("--type", default=None, help="Limit results based on segment type.")
-@click.option("--since-created-at", default=None, help="Restrict results to segments created after the set time. Uses ISO 8601 time form")
-@click.option("--before-created-at", default=None, help="Restrict results to segments created before the set time. Uses ISO 8601 time for")
-@click.option("--include-cleaned", default=None, type=bool, help="Include cleaned members in response")
-@click.option("--include-transactional", default=None, type=bool, help="Include transactional members in response")
-@click.option("--include-unsubscribed", default=None, type=bool, help="Include unsubscribed members in response")
-@click.option("--since-updated-at", default=None, help="Restrict results to segments update after the set time. Uses ISO 8601 time forma")
-@click.option("--before-updated-at", default=None, help="Restrict results to segments update before the set time. Uses ISO 8601 time form")
-@click.option("--exclude-type", default=None, help="Exclude results based on segment type. For example, use `exclude_type=static` to")
+@click.option("--fields", "fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
+@click.option("--exclude-fields", "exclude_fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
+@click.option("--count", "count", default=None, type=int, help="The number of records to return. Default value is 10. Maximum value is 1000")
+@click.option("--offset", "offset", default=None, type=int, help="Used for [pagination](https://mailchimp.com/developer/marketing/docs/methods-par")
+@click.option("--type", "type_", default=None, help="Limit results based on segment type.")
+@click.option("--since-created-at", "since_created_at", default=None, help="Restrict results to segments created after the set time. Uses ISO 8601 time form")
+@click.option("--before-created-at", "before_created_at", default=None, help="Restrict results to segments created before the set time. Uses ISO 8601 time for")
+@click.option("--include-cleaned", "include_cleaned", default=None, type=bool, help="Include cleaned members in response")
+@click.option("--include-transactional", "include_transactional", default=None, type=bool, help="Include transactional members in response")
+@click.option("--include-unsubscribed", "include_unsubscribed", default=None, type=bool, help="Include unsubscribed members in response")
+@click.option("--since-updated-at", "since_updated_at", default=None, help="Restrict results to segments update after the set time. Uses ISO 8601 time forma")
+@click.option("--before-updated-at", "before_updated_at", default=None, help="Restrict results to segments update before the set time. Uses ISO 8601 time form")
+@click.option("--exclude-type", "exclude_type", default=None, help="Exclude results based on segment type. For example, use `exclude_type=static` to")
 @click.option("--extra-params", default=None, help="Extra query params as JSON object, e.g. '{\"key\":\"val\"}'")
 @click.pass_context
 def _cmd_list_preview_a_segment(ctx, list_id, fields, exclude_fields, count, offset, type_, since_created_at, before_created_at, include_cleaned, include_transactional, include_unsubscribed, since_updated_at, before_updated_at, exclude_type, extra_params):
@@ -1386,11 +1386,11 @@ def _cmd_delete_lists_id_segments_id(ctx, list_id, segment_id, extra_params):
 @lists_group.command("get-lists-id-segments-id")
 @click.argument("LIST_ID")
 @click.argument("SEGMENT_ID")
-@click.option("--fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
-@click.option("--exclude-fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
-@click.option("--include-cleaned", default=None, type=bool, help="Include cleaned members in response")
-@click.option("--include-transactional", default=None, type=bool, help="Include transactional members in response")
-@click.option("--include-unsubscribed", default=None, type=bool, help="Include unsubscribed members in response")
+@click.option("--fields", "fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
+@click.option("--exclude-fields", "exclude_fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
+@click.option("--include-cleaned", "include_cleaned", default=None, type=bool, help="Include cleaned members in response")
+@click.option("--include-transactional", "include_transactional", default=None, type=bool, help="Include transactional members in response")
+@click.option("--include-unsubscribed", "include_unsubscribed", default=None, type=bool, help="Include unsubscribed members in response")
 @click.option("--extra-params", default=None, help="Extra query params as JSON object, e.g. '{\"key\":\"val\"}'")
 @click.pass_context
 def _cmd_get_lists_id_segments_id(ctx, list_id, segment_id, fields, exclude_fields, include_cleaned, include_transactional, include_unsubscribed, extra_params):
@@ -1464,13 +1464,13 @@ def _cmd_create_lists_id_segments_id(ctx, list_id, segment_id, data, extra_param
 @lists_group.command("list-lists-id-segments-id-members")
 @click.argument("LIST_ID")
 @click.argument("SEGMENT_ID")
-@click.option("--fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
-@click.option("--exclude-fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
-@click.option("--count", default=None, type=int, help="The number of records to return. Default value is 10. Maximum value is 1000")
-@click.option("--offset", default=None, type=int, help="Used for [pagination](https://mailchimp.com/developer/marketing/docs/methods-par")
-@click.option("--include-cleaned", default=None, type=bool, help="Include cleaned members in response")
-@click.option("--include-transactional", default=None, type=bool, help="Include transactional members in response")
-@click.option("--include-unsubscribed", default=None, type=bool, help="Include unsubscribed members in response")
+@click.option("--fields", "fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
+@click.option("--exclude-fields", "exclude_fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
+@click.option("--count", "count", default=None, type=int, help="The number of records to return. Default value is 10. Maximum value is 1000")
+@click.option("--offset", "offset", default=None, type=int, help="Used for [pagination](https://mailchimp.com/developer/marketing/docs/methods-par")
+@click.option("--include-cleaned", "include_cleaned", default=None, type=bool, help="Include cleaned members in response")
+@click.option("--include-transactional", "include_transactional", default=None, type=bool, help="Include transactional members in response")
+@click.option("--include-unsubscribed", "include_unsubscribed", default=None, type=bool, help="Include unsubscribed members in response")
 @click.option("--extra-params", default=None, help="Extra query params as JSON object, e.g. '{\"key\":\"val\"}'")
 @click.pass_context
 def _cmd_list_lists_id_segments_id_members(ctx, list_id, segment_id, fields, exclude_fields, count, offset, include_cleaned, include_transactional, include_unsubscribed, extra_params):
@@ -1627,7 +1627,7 @@ def _cmd_get_lists_id_surveys_id(ctx, list_id, survey_id, extra_params):
 
 @lists_group.command("list-search-tags-by-name")
 @click.argument("LIST_ID")
-@click.option("--name", default=None, help="The search query used to filter tags.  The search query will be compared to each")
+@click.option("--name", "name", default=None, help="The search query used to filter tags.  The search query will be compared to each")
 @click.option("--extra-params", default=None, help="Extra query params as JSON object, e.g. '{\"key\":\"val\"}'")
 @click.pass_context
 def _cmd_list_search_tags_by_name(ctx, list_id, name, extra_params):
diff --git a/mailchimp/agent-harness/cli_anything/mailchimp/commands/reporting.py b/mailchimp/agent-harness/cli_anything/mailchimp/commands/reporting.py
index c8b530b34..3f76ed264 100644
--- a/mailchimp/agent-harness/cli_anything/mailchimp/commands/reporting.py
+++ b/mailchimp/agent-harness/cli_anything/mailchimp/commands/reporting.py
@@ -28,12 +28,12 @@ def reporting_group(ctx):
     """reporting resource commands."""
 
 @reporting_group.command("list")
-@click.option("--fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
-@click.option("--exclude-fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
-@click.option("--count", default=None, type=int, help="The number of records to return. Default value is 10. Maximum value is 1000")
-@click.option("--offset", default=None, type=int, help="Used for [pagination](https://mailchimp.com/developer/marketing/docs/methods-par")
-@click.option("--sort-field", default=None, help="Returns files sorted by the specified field.")
-@click.option("--sort-dir", default=None, help="Determines the order direction for sorted results.")
+@click.option("--fields", "fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
+@click.option("--exclude-fields", "exclude_fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
+@click.option("--count", "count", default=None, type=int, help="The number of records to return. Default value is 10. Maximum value is 1000")
+@click.option("--offset", "offset", default=None, type=int, help="Used for [pagination](https://mailchimp.com/developer/marketing/docs/methods-par")
+@click.option("--sort-field", "sort_field", default=None, help="Returns files sorted by the specified field.")
+@click.option("--sort-dir", "sort_dir", default=None, help="Determines the order direction for sorted results.")
 @click.option("--extra-params", default=None, help="Extra query params as JSON object, e.g. '{\"key\":\"val\"}'")
 @click.pass_context
 def _cmd_list_(ctx, fields, exclude_fields, count, offset, sort_field, sort_dir, extra_params):
@@ -61,8 +61,8 @@ def _cmd_list_(ctx, fields, exclude_fields, count, offset, sort_field, sort_dir,
 
 @reporting_group.command("get")
 @click.argument("OUTREACH_ID")
-@click.option("--fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
-@click.option("--exclude-fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
+@click.option("--fields", "fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
+@click.option("--exclude-fields", "exclude_fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
 @click.option("--extra-params", default=None, help="Extra query params as JSON object, e.g. '{\"key\":\"val\"}'")
 @click.pass_context
 def _cmd_get(ctx, outreach_id, fields, exclude_fields, extra_params):
@@ -86,11 +86,11 @@ def _cmd_get(ctx, outreach_id, fields, exclude_fields, extra_params):
 
 @reporting_group.command("list-reporting-facebook-ads-id-ecommerce-product-activity")
 @click.argument("OUTREACH_ID")
-@click.option("--fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
-@click.option("--exclude-fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
-@click.option("--count", default=None, type=int, help="The number of records to return. Default value is 10. Maximum value is 1000")
-@click.option("--offset", default=None, type=int, help="Used for [pagination](https://mailchimp.com/developer/marketing/docs/methods-par")
-@click.option("--sort-field", default=None, help="Returns files sorted by the specified field.")
+@click.option("--fields", "fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
+@click.option("--exclude-fields", "exclude_fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
+@click.option("--count", "count", default=None, type=int, help="The number of records to return. Default value is 10. Maximum value is 1000")
+@click.option("--offset", "offset", default=None, type=int, help="Used for [pagination](https://mailchimp.com/developer/marketing/docs/methods-par")
+@click.option("--sort-field", "sort_field", default=None, help="Returns files sorted by the specified field.")
 @click.option("--extra-params", default=None, help="Extra query params as JSON object, e.g. '{\"key\":\"val\"}'")
 @click.pass_context
 def _cmd_list_reporting_facebook_ads_id_ecommerce_product_activity(ctx, outreach_id, fields, exclude_fields, count, offset, sort_field, extra_params):
@@ -116,10 +116,10 @@ def _cmd_list_reporting_facebook_ads_id_ecommerce_product_activity(ctx, outreach
     _out(result)
 
 @reporting_group.command("list-reporting-landing-pages")
-@click.option("--fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
-@click.option("--exclude-fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
-@click.option("--count", default=None, type=int, help="The number of records to return. Default value is 10. Maximum value is 1000")
-@click.option("--offset", default=None, type=int, help="Used for [pagination](https://mailchimp.com/developer/marketing/docs/methods-par")
+@click.option("--fields", "fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
+@click.option("--exclude-fields", "exclude_fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
+@click.option("--count", "count", default=None, type=int, help="The number of records to return. Default value is 10. Maximum value is 1000")
+@click.option("--offset", "offset", default=None, type=int, help="Used for [pagination](https://mailchimp.com/developer/marketing/docs/methods-par")
 @click.option("--extra-params", default=None, help="Extra query params as JSON object, e.g. '{\"key\":\"val\"}'")
 @click.pass_context
 def _cmd_list_reporting_landing_pages(ctx, fields, exclude_fields, count, offset, extra_params):
@@ -145,8 +145,8 @@ def _cmd_list_reporting_landing_pages(ctx, fields, exclude_fields, count, offset
 
 @reporting_group.command("get-reporting-landing-pages-id")
 @click.argument("OUTREACH_ID")
-@click.option("--fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
-@click.option("--exclude-fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
+@click.option("--fields", "fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
+@click.option("--exclude-fields", "exclude_fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
 @click.option("--extra-params", default=None, help="Extra query params as JSON object, e.g. '{\"key\":\"val\"}'")
 @click.pass_context
 def _cmd_get_reporting_landing_pages_id(ctx, outreach_id, fields, exclude_fields, extra_params):
@@ -169,10 +169,10 @@ def _cmd_get_reporting_landing_pages_id(ctx, outreach_id, fields, exclude_fields
     _out(result)
 
 @reporting_group.command("list-reporting-surveys")
-@click.option("--fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
-@click.option("--exclude-fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
-@click.option("--count", default=None, type=int, help="The number of records to return. Default value is 10. Maximum value is 1000")
-@click.option("--offset", default=None, type=int, help="Used for [pagination](https://mailchimp.com/developer/marketing/docs/methods-par")
+@click.option("--fields", "fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
+@click.option("--exclude-fields", "exclude_fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
+@click.option("--count", "count", default=None, type=int, help="The number of records to return. Default value is 10. Maximum value is 1000")
+@click.option("--offset", "offset", default=None, type=int, help="Used for [pagination](https://mailchimp.com/developer/marketing/docs/methods-par")
 @click.option("--extra-params", default=None, help="Extra query params as JSON object, e.g. '{\"key\":\"val\"}'")
 @click.pass_context
 def _cmd_list_reporting_surveys(ctx, fields, exclude_fields, count, offset, extra_params):
@@ -198,8 +198,8 @@ def _cmd_list_reporting_surveys(ctx, fields, exclude_fields, count, offset, extr
 
 @reporting_group.command("get-reporting-surveys-id")
 @click.argument("SURVEY_ID")
-@click.option("--fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
-@click.option("--exclude-fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
+@click.option("--fields", "fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
+@click.option("--exclude-fields", "exclude_fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
 @click.option("--extra-params", default=None, help="Extra query params as JSON object, e.g. '{\"key\":\"val\"}'")
 @click.pass_context
 def _cmd_get_reporting_surveys_id(ctx, survey_id, fields, exclude_fields, extra_params):
@@ -223,8 +223,8 @@ def _cmd_get_reporting_surveys_id(ctx, survey_id, fields, exclude_fields, extra_
 
 @reporting_group.command("list-reporting-surveys-id-questions")
 @click.argument("SURVEY_ID")
-@click.option("--fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
-@click.option("--exclude-fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
+@click.option("--fields", "fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
+@click.option("--exclude-fields", "exclude_fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
 @click.option("--extra-params", default=None, help="Extra query params as JSON object, e.g. '{\"key\":\"val\"}'")
 @click.pass_context
 def _cmd_list_reporting_surveys_id_questions(ctx, survey_id, fields, exclude_fields, extra_params):
@@ -249,8 +249,8 @@ def _cmd_list_reporting_surveys_id_questions(ctx, survey_id, fields, exclude_fie
 @reporting_group.command("get-reporting-surveys-id-questions-id")
 @click.argument("SURVEY_ID")
 @click.argument("QUESTION_ID")
-@click.option("--fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
-@click.option("--exclude-fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
+@click.option("--fields", "fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
+@click.option("--exclude-fields", "exclude_fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
 @click.option("--extra-params", default=None, help="Extra query params as JSON object, e.g. '{\"key\":\"val\"}'")
 @click.pass_context
 def _cmd_get_reporting_surveys_id_questions_id(ctx, survey_id, question_id, fields, exclude_fields, extra_params):
@@ -275,9 +275,9 @@ def _cmd_get_reporting_surveys_id_questions_id(ctx, survey_id, question_id, fiel
 @reporting_group.command("list-reporting-surveys-id-questions-id-answers")
 @click.argument("SURVEY_ID")
 @click.argument("QUESTION_ID")
-@click.option("--fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
-@click.option("--exclude-fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
-@click.option("--respondent-familiarity-is", default=None, help="Filter survey responses by familiarity of the respondents.")
+@click.option("--fields", "fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
+@click.option("--exclude-fields", "exclude_fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
+@click.option("--respondent-familiarity-is", "respondent_familiarity_is", default=None, help="Filter survey responses by familiarity of the respondents.")
 @click.option("--extra-params", default=None, help="Extra query params as JSON object, e.g. '{\"key\":\"val\"}'")
 @click.pass_context
 def _cmd_list_reporting_surveys_id_questions_id_answers(ctx, survey_id, question_id, fields, exclude_fields, respondent_familiarity_is, extra_params):
@@ -302,11 +302,11 @@ def _cmd_list_reporting_surveys_id_questions_id_answers(ctx, survey_id, question
 
 @reporting_group.command("list-reporting-surveys-id-responses")
 @click.argument("SURVEY_ID")
-@click.option("--fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
-@click.option("--exclude-fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
-@click.option("--answered-question", default=None, type=int, help="The ID of the question that was answered.")
-@click.option("--chose-answer", default=None, help="The ID of the option chosen to filter responses on.")
-@click.option("--respondent-familiarity-is", default=None, help="Filter survey responses by familiarity of the respondents.")
+@click.option("--fields", "fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
+@click.option("--exclude-fields", "exclude_fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
+@click.option("--answered-question", "answered_question", default=None, type=int, help="The ID of the question that was answered.")
+@click.option("--chose-answer", "chose_answer", default=None, help="The ID of the option chosen to filter responses on.")
+@click.option("--respondent-familiarity-is", "respondent_familiarity_is", default=None, help="Filter survey responses by familiarity of the respondents.")
 @click.option("--extra-params", default=None, help="Extra query params as JSON object, e.g. '{\"key\":\"val\"}'")
 @click.pass_context
 def _cmd_list_reporting_surveys_id_responses(ctx, survey_id, fields, exclude_fields, answered_question, chose_answer, respondent_familiarity_is, extra_params):
diff --git a/mailchimp/agent-harness/cli_anything/mailchimp/commands/reports.py b/mailchimp/agent-harness/cli_anything/mailchimp/commands/reports.py
index 5079f9765..3d7f29e33 100644
--- a/mailchimp/agent-harness/cli_anything/mailchimp/commands/reports.py
+++ b/mailchimp/agent-harness/cli_anything/mailchimp/commands/reports.py
@@ -28,13 +28,13 @@ def reports_group(ctx):
     """reports resource commands."""
 
 @reports_group.command("list")
-@click.option("--fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
-@click.option("--exclude-fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
-@click.option("--count", default=None, type=int, help="The number of records to return. Default value is 10. Maximum value is 1000")
-@click.option("--offset", default=None, type=int, help="Used for [pagination](https://mailchimp.com/developer/marketing/docs/methods-par")
-@click.option("--type", default=None, help="The campaign type.")
-@click.option("--before-send-time", default=None, help="Restrict the response to campaigns sent before the set time. Uses ISO 8601 time ")
-@click.option("--since-send-time", default=None, help="Restrict the response to campaigns sent after the set time. Uses ISO 8601 time f")
+@click.option("--fields", "fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
+@click.option("--exclude-fields", "exclude_fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
+@click.option("--count", "count", default=None, type=int, help="The number of records to return. Default value is 10. Maximum value is 1000")
+@click.option("--offset", "offset", default=None, type=int, help="Used for [pagination](https://mailchimp.com/developer/marketing/docs/methods-par")
+@click.option("--type", "type_", default=None, help="The campaign type.")
+@click.option("--before-send-time", "before_send_time", default=None, help="Restrict the response to campaigns sent before the set time. Uses ISO 8601 time ")
+@click.option("--since-send-time", "since_send_time", default=None, help="Restrict the response to campaigns sent after the set time. Uses ISO 8601 time f")
 @click.option("--extra-params", default=None, help="Extra query params as JSON object, e.g. '{\"key\":\"val\"}'")
 @click.pass_context
 def _cmd_list_(ctx, fields, exclude_fields, count, offset, type_, before_send_time, since_send_time, extra_params):
@@ -63,8 +63,8 @@ def _cmd_list_(ctx, fields, exclude_fields, count, offset, type_, before_send_ti
 
 @reports_group.command("get")
 @click.argument("CAMPAIGN_ID")
-@click.option("--fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
-@click.option("--exclude-fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
+@click.option("--fields", "fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
+@click.option("--exclude-fields", "exclude_fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
 @click.option("--extra-params", default=None, help="Extra query params as JSON object, e.g. '{\"key\":\"val\"}'")
 @click.pass_context
 def _cmd_get(ctx, campaign_id, fields, exclude_fields, extra_params):
@@ -88,8 +88,8 @@ def _cmd_get(ctx, campaign_id, fields, exclude_fields, extra_params):
 
 @reports_group.command("list-reports-id-abuse-reports-id")
 @click.argument("CAMPAIGN_ID")
-@click.option("--fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
-@click.option("--exclude-fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
+@click.option("--fields", "fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
+@click.option("--exclude-fields", "exclude_fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
 @click.option("--extra-params", default=None, help="Extra query params as JSON object, e.g. '{\"key\":\"val\"}'")
 @click.pass_context
 def _cmd_list_reports_id_abuse_reports_id(ctx, campaign_id, fields, exclude_fields, extra_params):
@@ -114,8 +114,8 @@ def _cmd_list_reports_id_abuse_reports_id(ctx, campaign_id, fields, exclude_fiel
 @reports_group.command("get-reports-id-abuse-reports-id-id")
 @click.argument("CAMPAIGN_ID")
 @click.argument("REPORT_ID")
-@click.option("--fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
-@click.option("--exclude-fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
+@click.option("--fields", "fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
+@click.option("--exclude-fields", "exclude_fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
 @click.option("--extra-params", default=None, help="Extra query params as JSON object, e.g. '{\"key\":\"val\"}'")
 @click.pass_context
 def _cmd_get_reports_id_abuse_reports_id_id(ctx, campaign_id, report_id, fields, exclude_fields, extra_params):
@@ -139,8 +139,8 @@ def _cmd_get_reports_id_abuse_reports_id_id(ctx, campaign_id, report_id, fields,
 
 @reports_group.command("list-reports-id-advice")
 @click.argument("CAMPAIGN_ID")
-@click.option("--fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
-@click.option("--exclude-fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
+@click.option("--fields", "fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
+@click.option("--exclude-fields", "exclude_fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
 @click.option("--extra-params", default=None, help="Extra query params as JSON object, e.g. '{\"key\":\"val\"}'")
 @click.pass_context
 def _cmd_list_reports_id_advice(ctx, campaign_id, fields, exclude_fields, extra_params):
@@ -164,12 +164,12 @@ def _cmd_list_reports_id_advice(ctx, campaign_id, fields, exclude_fields, extra_
 
 @reports_group.command("list-reports-id-click-details")
 @click.argument("CAMPAIGN_ID")
-@click.option("--fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
-@click.option("--exclude-fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
-@click.option("--count", default=None, type=int, help="The number of records to return. Default value is 10. Maximum value is 1000")
-@click.option("--offset", default=None, type=int, help="Used for [pagination](https://mailchimp.com/developer/marketing/docs/methods-par")
-@click.option("--sort-field", default=None, help="Returns click reports sorted by the specified field.")
-@click.option("--sort-dir", default=None, help="Determines the order direction for sorted results.")
+@click.option("--fields", "fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
+@click.option("--exclude-fields", "exclude_fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
+@click.option("--count", "count", default=None, type=int, help="The number of records to return. Default value is 10. Maximum value is 1000")
+@click.option("--offset", "offset", default=None, type=int, help="Used for [pagination](https://mailchimp.com/developer/marketing/docs/methods-par")
+@click.option("--sort-field", "sort_field", default=None, help="Returns click reports sorted by the specified field.")
+@click.option("--sort-dir", "sort_dir", default=None, help="Determines the order direction for sorted results.")
 @click.option("--extra-params", default=None, help="Extra query params as JSON object, e.g. '{\"key\":\"val\"}'")
 @click.pass_context
 def _cmd_list_reports_id_click_details(ctx, campaign_id, fields, exclude_fields, count, offset, sort_field, sort_dir, extra_params):
@@ -198,8 +198,8 @@ def _cmd_list_reports_id_click_details(ctx, campaign_id, fields, exclude_fields,
 @reports_group.command("get-reports-id-click-details-id")
 @click.argument("CAMPAIGN_ID")
 @click.argument("LINK_ID")
-@click.option("--fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
-@click.option("--exclude-fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
+@click.option("--fields", "fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
+@click.option("--exclude-fields", "exclude_fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
 @click.option("--extra-params", default=None, help="Extra query params as JSON object, e.g. '{\"key\":\"val\"}'")
 @click.pass_context
 def _cmd_get_reports_id_click_details_id(ctx, campaign_id, link_id, fields, exclude_fields, extra_params):
@@ -224,10 +224,10 @@ def _cmd_get_reports_id_click_details_id(ctx, campaign_id, link_id, fields, excl
 @reports_group.command("list-reports-id-click-details-id-members")
 @click.argument("CAMPAIGN_ID")
 @click.argument("LINK_ID")
-@click.option("--fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
-@click.option("--exclude-fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
-@click.option("--count", default=None, type=int, help="The number of records to return. Default value is 10. Maximum value is 1000")
-@click.option("--offset", default=None, type=int, help="Used for [pagination](https://mailchimp.com/developer/marketing/docs/methods-par")
+@click.option("--fields", "fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
+@click.option("--exclude-fields", "exclude_fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
+@click.option("--count", "count", default=None, type=int, help="The number of records to return. Default value is 10. Maximum value is 1000")
+@click.option("--offset", "offset", default=None, type=int, help="Used for [pagination](https://mailchimp.com/developer/marketing/docs/methods-par")
 @click.option("--extra-params", default=None, help="Extra query params as JSON object, e.g. '{\"key\":\"val\"}'")
 @click.pass_context
 def _cmd_list_reports_id_click_details_id_members(ctx, campaign_id, link_id, fields, exclude_fields, count, offset, extra_params):
@@ -255,8 +255,8 @@ def _cmd_list_reports_id_click_details_id_members(ctx, campaign_id, link_id, fie
 @click.argument("CAMPAIGN_ID")
 @click.argument("LINK_ID")
 @click.argument("SUBSCRIBER_HASH")
-@click.option("--fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
-@click.option("--exclude-fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
+@click.option("--fields", "fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
+@click.option("--exclude-fields", "exclude_fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
 @click.option("--extra-params", default=None, help="Extra query params as JSON object, e.g. '{\"key\":\"val\"}'")
 @click.pass_context
 def _cmd_get_reports_id_click_details_id_members_id(ctx, campaign_id, link_id, subscriber_hash, fields, exclude_fields, extra_params):
@@ -280,8 +280,8 @@ def _cmd_get_reports_id_click_details_id_members_id(ctx, campaign_id, link_id, s
 
 @reports_group.command("list-reports-id-domain-performance")
 @click.argument("CAMPAIGN_ID")
-@click.option("--fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
-@click.option("--exclude-fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
+@click.option("--fields", "fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
+@click.option("--exclude-fields", "exclude_fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
 @click.option("--extra-params", default=None, help="Extra query params as JSON object, e.g. '{\"key\":\"val\"}'")
 @click.pass_context
 def _cmd_list_reports_id_domain_performance(ctx, campaign_id, fields, exclude_fields, extra_params):
@@ -305,11 +305,11 @@ def _cmd_list_reports_id_domain_performance(ctx, campaign_id, fields, exclude_fi
 
 @reports_group.command("list-reports-id-ecommerce-product-activity")
 @click.argument("CAMPAIGN_ID")
-@click.option("--fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
-@click.option("--exclude-fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
-@click.option("--count", default=None, type=int, help="The number of records to return. Default value is 10. Maximum value is 1000")
-@click.option("--offset", default=None, type=int, help="Used for [pagination](https://mailchimp.com/developer/marketing/docs/methods-par")
-@click.option("--sort-field", default=None, help="Returns files sorted by the specified field.")
+@click.option("--fields", "fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
+@click.option("--exclude-fields", "exclude_fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
+@click.option("--count", "count", default=None, type=int, help="The number of records to return. Default value is 10. Maximum value is 1000")
+@click.option("--offset", "offset", default=None, type=int, help="Used for [pagination](https://mailchimp.com/developer/marketing/docs/methods-par")
+@click.option("--sort-field", "sort_field", default=None, help="Returns files sorted by the specified field.")
 @click.option("--extra-params", default=None, help="Extra query params as JSON object, e.g. '{\"key\":\"val\"}'")
 @click.pass_context
 def _cmd_list_reports_id_ecommerce_product_activity(ctx, campaign_id, fields, exclude_fields, count, offset, sort_field, extra_params):
@@ -336,8 +336,8 @@ def _cmd_list_reports_id_ecommerce_product_activity(ctx, campaign_id, fields, ex
 
 @reports_group.command("list-reports-id-eepurl")
 @click.argument("CAMPAIGN_ID")
-@click.option("--fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
-@click.option("--exclude-fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
+@click.option("--fields", "fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
+@click.option("--exclude-fields", "exclude_fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
 @click.option("--extra-params", default=None, help="Extra query params as JSON object, e.g. '{\"key\":\"val\"}'")
 @click.pass_context
 def _cmd_list_reports_id_eepurl(ctx, campaign_id, fields, exclude_fields, extra_params):
@@ -361,11 +361,11 @@ def _cmd_list_reports_id_eepurl(ctx, campaign_id, fields, exclude_fields, extra_
 
 @reports_group.command("list-reports-id-email-activity")
 @click.argument("CAMPAIGN_ID")
-@click.option("--fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
-@click.option("--exclude-fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
-@click.option("--count", default=None, type=int, help="The number of records to return. Default value is 10. Maximum value is 1000")
-@click.option("--offset", default=None, type=int, help="Used for [pagination](https://mailchimp.com/developer/marketing/docs/methods-par")
-@click.option("--since", default=None, help="Restrict results to email activity events that occur after a specific time. Uses")
+@click.option("--fields", "fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
+@click.option("--exclude-fields", "exclude_fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
+@click.option("--count", "count", default=None, type=int, help="The number of records to return. Default value is 10. Maximum value is 1000")
+@click.option("--offset", "offset", default=None, type=int, help="Used for [pagination](https://mailchimp.com/developer/marketing/docs/methods-par")
+@click.option("--since", "since", default=None, help="Restrict results to email activity events that occur after a specific time. Uses")
 @click.option("--extra-params", default=None, help="Extra query params as JSON object, e.g. '{\"key\":\"val\"}'")
 @click.pass_context
 def _cmd_list_reports_id_email_activity(ctx, campaign_id, fields, exclude_fields, count, offset, since, extra_params):
@@ -393,9 +393,9 @@ def _cmd_list_reports_id_email_activity(ctx, campaign_id, fields, exclude_fields
 @reports_group.command("get-reports-id-email-activity-id")
 @click.argument("CAMPAIGN_ID")
 @click.argument("SUBSCRIBER_HASH")
-@click.option("--fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
-@click.option("--exclude-fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
-@click.option("--since", default=None, help="Restrict results to email activity events that occur after a specific time. Uses")
+@click.option("--fields", "fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
+@click.option("--exclude-fields", "exclude_fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
+@click.option("--since", "since", default=None, help="Restrict results to email activity events that occur after a specific time. Uses")
 @click.option("--extra-params", default=None, help="Extra query params as JSON object, e.g. '{\"key\":\"val\"}'")
 @click.pass_context
 def _cmd_get_reports_id_email_activity_id(ctx, campaign_id, subscriber_hash, fields, exclude_fields, since, extra_params):
@@ -420,10 +420,10 @@ def _cmd_get_reports_id_email_activity_id(ctx, campaign_id, subscriber_hash, fie
 
 @reports_group.command("list-reports-id-locations")
 @click.argument("CAMPAIGN_ID")
-@click.option("--fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
-@click.option("--exclude-fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
-@click.option("--count", default=None, type=int, help="The number of records to return. Default value is 10. Maximum value is 1000")
-@click.option("--offset", default=None, type=int, help="Used for [pagination](https://mailchimp.com/developer/marketing/docs/methods-par")
+@click.option("--fields", "fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
+@click.option("--exclude-fields", "exclude_fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
+@click.option("--count", "count", default=None, type=int, help="The number of records to return. Default value is 10. Maximum value is 1000")
+@click.option("--offset", "offset", default=None, type=int, help="Used for [pagination](https://mailchimp.com/developer/marketing/docs/methods-par")
 @click.option("--extra-params", default=None, help="Extra query params as JSON object, e.g. '{\"key\":\"val\"}'")
 @click.pass_context
 def _cmd_list_reports_id_locations(ctx, campaign_id, fields, exclude_fields, count, offset, extra_params):
@@ -449,13 +449,13 @@ def _cmd_list_reports_id_locations(ctx, campaign_id, fields, exclude_fields, cou
 
 @reports_group.command("list-reports-id-open-details")
 @click.argument("CAMPAIGN_ID")
-@click.option("--fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
-@click.option("--exclude-fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
-@click.option("--count", default=None, type=int, help="The number of records to return. Default value is 10. Maximum value is 1000")
-@click.option("--offset", default=None, type=int, help="Used for [pagination](https://mailchimp.com/developer/marketing/docs/methods-par")
-@click.option("--since", default=None, help="Restrict results to campaign open events that occur after a specific time. Uses ")
-@click.option("--sort-field", default=None, help="Returns open reports sorted by the specified field.")
-@click.option("--sort-dir", default=None, help="Determines the order direction for sorted results.")
+@click.option("--fields", "fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
+@click.option("--exclude-fields", "exclude_fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
+@click.option("--count", "count", default=None, type=int, help="The number of records to return. Default value is 10. Maximum value is 1000")
+@click.option("--offset", "offset", default=None, type=int, help="Used for [pagination](https://mailchimp.com/developer/marketing/docs/methods-par")
+@click.option("--since", "since", default=None, help="Restrict results to campaign open events that occur after a specific time. Uses ")
+@click.option("--sort-field", "sort_field", default=None, help="Returns open reports sorted by the specified field.")
+@click.option("--sort-dir", "sort_dir", default=None, help="Determines the order direction for sorted results.")
 @click.option("--extra-params", default=None, help="Extra query params as JSON object, e.g. '{\"key\":\"val\"}'")
 @click.pass_context
 def _cmd_list_reports_id_open_details(ctx, campaign_id, fields, exclude_fields, count, offset, since, sort_field, sort_dir, extra_params):
@@ -485,8 +485,8 @@ def _cmd_list_reports_id_open_details(ctx, campaign_id, fields, exclude_fields,
 @reports_group.command("get-reports-id-open-details-id-members-id")
 @click.argument("CAMPAIGN_ID")
 @click.argument("SUBSCRIBER_HASH")
-@click.option("--fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
-@click.option("--exclude-fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
+@click.option("--fields", "fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
+@click.option("--exclude-fields", "exclude_fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
 @click.option("--extra-params", default=None, help="Extra query params as JSON object, e.g. '{\"key\":\"val\"}'")
 @click.pass_context
 def _cmd_get_reports_id_open_details_id_members_id(ctx, campaign_id, subscriber_hash, fields, exclude_fields, extra_params):
@@ -510,10 +510,10 @@ def _cmd_get_reports_id_open_details_id_members_id(ctx, campaign_id, subscriber_
 
 @reports_group.command("list-reports-id-sent-to")
 @click.argument("CAMPAIGN_ID")
-@click.option("--fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
-@click.option("--exclude-fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
-@click.option("--count", default=None, type=int, help="The number of records to return. Default value is 10. Maximum value is 1000")
-@click.option("--offset", default=None, type=int, help="Used for [pagination](https://mailchimp.com/developer/marketing/docs/methods-par")
+@click.option("--fields", "fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
+@click.option("--exclude-fields", "exclude_fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
+@click.option("--count", "count", default=None, type=int, help="The number of records to return. Default value is 10. Maximum value is 1000")
+@click.option("--offset", "offset", default=None, type=int, help="Used for [pagination](https://mailchimp.com/developer/marketing/docs/methods-par")
 @click.option("--extra-params", default=None, help="Extra query params as JSON object, e.g. '{\"key\":\"val\"}'")
 @click.pass_context
 def _cmd_list_reports_id_sent_to(ctx, campaign_id, fields, exclude_fields, count, offset, extra_params):
@@ -540,8 +540,8 @@ def _cmd_list_reports_id_sent_to(ctx, campaign_id, fields, exclude_fields, count
 @reports_group.command("get-reports-id-sent-to-id")
 @click.argument("CAMPAIGN_ID")
 @click.argument("SUBSCRIBER_HASH")
-@click.option("--fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
-@click.option("--exclude-fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
+@click.option("--fields", "fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
+@click.option("--exclude-fields", "exclude_fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
 @click.option("--extra-params", default=None, help="Extra query params as JSON object, e.g. '{\"key\":\"val\"}'")
 @click.pass_context
 def _cmd_get_reports_id_sent_to_id(ctx, campaign_id, subscriber_hash, fields, exclude_fields, extra_params):
@@ -565,8 +565,8 @@ def _cmd_get_reports_id_sent_to_id(ctx, campaign_id, subscriber_hash, fields, ex
 
 @reports_group.command("list-reports-id-sub-reports-id")
 @click.argument("CAMPAIGN_ID")
-@click.option("--fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
-@click.option("--exclude-fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
+@click.option("--fields", "fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
+@click.option("--exclude-fields", "exclude_fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
 @click.option("--extra-params", default=None, help="Extra query params as JSON object, e.g. '{\"key\":\"val\"}'")
 @click.pass_context
 def _cmd_list_reports_id_sub_reports_id(ctx, campaign_id, fields, exclude_fields, extra_params):
@@ -590,10 +590,10 @@ def _cmd_list_reports_id_sub_reports_id(ctx, campaign_id, fields, exclude_fields
 
 @reports_group.command("list-reports-id-unsubscribed")
 @click.argument("CAMPAIGN_ID")
-@click.option("--fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
-@click.option("--exclude-fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
-@click.option("--count", default=None, type=int, help="The number of records to return. Default value is 10. Maximum value is 1000")
-@click.option("--offset", default=None, type=int, help="Used for [pagination](https://mailchimp.com/developer/marketing/docs/methods-par")
+@click.option("--fields", "fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
+@click.option("--exclude-fields", "exclude_fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
+@click.option("--count", "count", default=None, type=int, help="The number of records to return. Default value is 10. Maximum value is 1000")
+@click.option("--offset", "offset", default=None, type=int, help="Used for [pagination](https://mailchimp.com/developer/marketing/docs/methods-par")
 @click.option("--extra-params", default=None, help="Extra query params as JSON object, e.g. '{\"key\":\"val\"}'")
 @click.pass_context
 def _cmd_list_reports_id_unsubscribed(ctx, campaign_id, fields, exclude_fields, count, offset, extra_params):
@@ -620,8 +620,8 @@ def _cmd_list_reports_id_unsubscribed(ctx, campaign_id, fields, exclude_fields,
 @reports_group.command("get-reports-id-unsubscribed-id")
 @click.argument("CAMPAIGN_ID")
 @click.argument("SUBSCRIBER_HASH")
-@click.option("--fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
-@click.option("--exclude-fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
+@click.option("--fields", "fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
+@click.option("--exclude-fields", "exclude_fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
 @click.option("--extra-params", default=None, help="Extra query params as JSON object, e.g. '{\"key\":\"val\"}'")
 @click.pass_context
 def _cmd_get_reports_id_unsubscribed_id(ctx, campaign_id, subscriber_hash, fields, exclude_fields, extra_params):
diff --git a/mailchimp/agent-harness/cli_anything/mailchimp/commands/root.py b/mailchimp/agent-harness/cli_anything/mailchimp/commands/root.py
index e997c67d9..f7bb8ec35 100644
--- a/mailchimp/agent-harness/cli_anything/mailchimp/commands/root.py
+++ b/mailchimp/agent-harness/cli_anything/mailchimp/commands/root.py
@@ -28,8 +28,8 @@ def root_group(ctx):
     """root resource commands."""
 
 @root_group.command("list")
-@click.option("--fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
-@click.option("--exclude-fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
+@click.option("--fields", "fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
+@click.option("--exclude-fields", "exclude_fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
 @click.option("--extra-params", default=None, help="Extra query params as JSON object, e.g. '{\"key\":\"val\"}'")
 @click.pass_context
 def _cmd_list_(ctx, fields, exclude_fields, extra_params):
diff --git a/mailchimp/agent-harness/cli_anything/mailchimp/commands/search_campaigns.py b/mailchimp/agent-harness/cli_anything/mailchimp/commands/search_campaigns.py
index c87a199d5..742fc12ee 100644
--- a/mailchimp/agent-harness/cli_anything/mailchimp/commands/search_campaigns.py
+++ b/mailchimp/agent-harness/cli_anything/mailchimp/commands/search_campaigns.py
@@ -28,9 +28,9 @@ def search_campaigns_group(ctx):
     """search-campaigns resource commands."""
 
 @search_campaigns_group.command("list")
-@click.option("--fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
-@click.option("--exclude-fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
-@click.option("--query", default=None, help="The search query used to filter results.")
+@click.option("--fields", "fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
+@click.option("--exclude-fields", "exclude_fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
+@click.option("--query", "query", default=None, help="The search query used to filter results.")
 @click.option("--extra-params", default=None, help="Extra query params as JSON object, e.g. '{\"key\":\"val\"}'")
 @click.pass_context
 def _cmd_list_(ctx, fields, exclude_fields, query, extra_params):
diff --git a/mailchimp/agent-harness/cli_anything/mailchimp/commands/search_members.py b/mailchimp/agent-harness/cli_anything/mailchimp/commands/search_members.py
index be77832a7..6ec028d0c 100644
--- a/mailchimp/agent-harness/cli_anything/mailchimp/commands/search_members.py
+++ b/mailchimp/agent-harness/cli_anything/mailchimp/commands/search_members.py
@@ -28,10 +28,10 @@ def search_members_group(ctx):
     """search-members resource commands."""
 
 @search_members_group.command("list")
-@click.option("--fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
-@click.option("--exclude-fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
-@click.option("--query", default=None, help="The search query used to filter results. Query should be a valid email, or a str")
-@click.option("--list-id", default=None, help="The unique id for the list.")
+@click.option("--fields", "fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
+@click.option("--exclude-fields", "exclude_fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
+@click.option("--query", "query", default=None, help="The search query used to filter results. Query should be a valid email, or a str")
+@click.option("--list-id", "list_id", default=None, help="The unique id for the list.")
 @click.option("--extra-params", default=None, help="Extra query params as JSON object, e.g. '{\"key\":\"val\"}'")
 @click.pass_context
 def _cmd_list_(ctx, fields, exclude_fields, query, list_id, extra_params):
diff --git a/mailchimp/agent-harness/cli_anything/mailchimp/commands/sms_campaigns.py b/mailchimp/agent-harness/cli_anything/mailchimp/commands/sms_campaigns.py
index fa55cd9d0..85b33bfd0 100644
--- a/mailchimp/agent-harness/cli_anything/mailchimp/commands/sms_campaigns.py
+++ b/mailchimp/agent-harness/cli_anything/mailchimp/commands/sms_campaigns.py
@@ -28,10 +28,10 @@ def sms_campaigns_group(ctx):
     """sms-campaigns resource commands."""
 
 @sms_campaigns_group.command("list")
-@click.option("--fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
-@click.option("--exclude-fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
-@click.option("--count", default=None, type=int, help="The number of records to return. Default value is 10. Maximum value is 1000")
-@click.option("--offset", default=None, type=int, help="Used for [pagination](https://mailchimp.com/developer/marketing/docs/methods-par")
+@click.option("--fields", "fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
+@click.option("--exclude-fields", "exclude_fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
+@click.option("--count", "count", default=None, type=int, help="The number of records to return. Default value is 10. Maximum value is 1000")
+@click.option("--offset", "offset", default=None, type=int, help="Used for [pagination](https://mailchimp.com/developer/marketing/docs/methods-par")
 @click.option("--extra-params", default=None, help="Extra query params as JSON object, e.g. '{\"key\":\"val\"}'")
 @click.pass_context
 def _cmd_list_(ctx, fields, exclude_fields, count, offset, extra_params):
@@ -98,8 +98,8 @@ def _cmd_delete(ctx, sms_campaign_id, extra_params):
 
 @sms_campaigns_group.command("get")
 @click.argument("SMS_CAMPAIGN_ID")
-@click.option("--fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
-@click.option("--exclude-fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
+@click.option("--fields", "fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
+@click.option("--exclude-fields", "exclude_fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
 @click.option("--extra-params", default=None, help="Extra query params as JSON object, e.g. '{\"key\":\"val\"}'")
 @click.pass_context
 def _cmd_get(ctx, sms_campaign_id, fields, exclude_fields, extra_params):
@@ -207,8 +207,8 @@ def _cmd_send(ctx, sms_campaign_id, extra_params):
 
 @sms_campaigns_group.command("list-sms-campaigns-id-content")
 @click.argument("SMS_CAMPAIGN_ID")
-@click.option("--fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
-@click.option("--exclude-fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
+@click.option("--fields", "fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
+@click.option("--exclude-fields", "exclude_fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
 @click.option("--extra-params", default=None, help="Extra query params as JSON object, e.g. '{\"key\":\"val\"}'")
 @click.pass_context
 def _cmd_list_sms_campaigns_id_content(ctx, sms_campaign_id, fields, exclude_fields, extra_params):
diff --git a/mailchimp/agent-harness/cli_anything/mailchimp/commands/template_folders.py b/mailchimp/agent-harness/cli_anything/mailchimp/commands/template_folders.py
index 5e0ae43aa..429e51762 100644
--- a/mailchimp/agent-harness/cli_anything/mailchimp/commands/template_folders.py
+++ b/mailchimp/agent-harness/cli_anything/mailchimp/commands/template_folders.py
@@ -28,10 +28,10 @@ def template_folders_group(ctx):
     """template-folders resource commands."""
 
 @template_folders_group.command("list")
-@click.option("--fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
-@click.option("--exclude-fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
-@click.option("--count", default=None, type=int, help="The number of records to return. Default value is 10. Maximum value is 1000")
-@click.option("--offset", default=None, type=int, help="Used for [pagination](https://mailchimp.com/developer/marketing/docs/methods-par")
+@click.option("--fields", "fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
+@click.option("--exclude-fields", "exclude_fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
+@click.option("--count", "count", default=None, type=int, help="The number of records to return. Default value is 10. Maximum value is 1000")
+@click.option("--offset", "offset", default=None, type=int, help="Used for [pagination](https://mailchimp.com/developer/marketing/docs/methods-par")
 @click.option("--extra-params", default=None, help="Extra query params as JSON object, e.g. '{\"key\":\"val\"}'")
 @click.pass_context
 def _cmd_list_(ctx, fields, exclude_fields, count, offset, extra_params):
@@ -98,8 +98,8 @@ def _cmd_delete(ctx, folder_id, extra_params):
 
 @template_folders_group.command("get")
 @click.argument("FOLDER_ID")
-@click.option("--fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
-@click.option("--exclude-fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
+@click.option("--fields", "fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
+@click.option("--exclude-fields", "exclude_fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
 @click.option("--extra-params", default=None, help="Extra query params as JSON object, e.g. '{\"key\":\"val\"}'")
 @click.pass_context
 def _cmd_get(ctx, folder_id, fields, exclude_fields, extra_params):
diff --git a/mailchimp/agent-harness/cli_anything/mailchimp/commands/templates.py b/mailchimp/agent-harness/cli_anything/mailchimp/commands/templates.py
index c0bbdfd19..098f98172 100644
--- a/mailchimp/agent-harness/cli_anything/mailchimp/commands/templates.py
+++ b/mailchimp/agent-harness/cli_anything/mailchimp/commands/templates.py
@@ -28,19 +28,19 @@ def templates_group(ctx):
     """templates resource commands."""
 
 @templates_group.command("list")
-@click.option("--fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
-@click.option("--exclude-fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
-@click.option("--count", default=None, type=int, help="The number of records to return. Default value is 10. Maximum value is 1000")
-@click.option("--offset", default=None, type=int, help="Used for [pagination](https://mailchimp.com/developer/marketing/docs/methods-par")
-@click.option("--created-by", default=None, help="The Mailchimp account user who created the template.")
-@click.option("--since-date-created", default=None, help="Restrict the response to templates created after the set date. Uses ISO 8601 tim")
-@click.option("--before-date-created", default=None, help="Restrict the response to templates created before the set date. Uses ISO 8601 ti")
-@click.option("--type", default=None, help="Limit results based on template type.")
-@click.option("--category", default=None, help="Limit results based on category.")
-@click.option("--folder-id", default=None, help="The unique folder id.")
-@click.option("--sort-field", default=None, help="Returns user templates sorted by the specified field.")
-@click.option("--content-type", default=None, help="Limit results based on how the template's content is put together. Only template")
-@click.option("--sort-dir", default=None, help="Determines the order direction for sorted results.")
+@click.option("--fields", "fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
+@click.option("--exclude-fields", "exclude_fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
+@click.option("--count", "count", default=None, type=int, help="The number of records to return. Default value is 10. Maximum value is 1000")
+@click.option("--offset", "offset", default=None, type=int, help="Used for [pagination](https://mailchimp.com/developer/marketing/docs/methods-par")
+@click.option("--created-by", "created_by", default=None, help="The Mailchimp account user who created the template.")
+@click.option("--since-date-created", "since_date_created", default=None, help="Restrict the response to templates created after the set date. Uses ISO 8601 tim")
+@click.option("--before-date-created", "before_date_created", default=None, help="Restrict the response to templates created before the set date. Uses ISO 8601 ti")
+@click.option("--type", "type_", default=None, help="Limit results based on template type.")
+@click.option("--category", "category", default=None, help="Limit results based on category.")
+@click.option("--folder-id", "folder_id", default=None, help="The unique folder id.")
+@click.option("--sort-field", "sort_field", default=None, help="Returns user templates sorted by the specified field.")
+@click.option("--content-type", "content_type", default=None, help="Limit results based on how the template's content is put together. Only template")
+@click.option("--sort-dir", "sort_dir", default=None, help="Determines the order direction for sorted results.")
 @click.option("--extra-params", default=None, help="Extra query params as JSON object, e.g. '{\"key\":\"val\"}'")
 @click.pass_context
 def _cmd_list_(ctx, fields, exclude_fields, count, offset, created_by, since_date_created, before_date_created, type_, category, folder_id, sort_field, content_type, sort_dir, extra_params):
@@ -116,8 +116,8 @@ def _cmd_delete(ctx, template_id, extra_params):
 
 @templates_group.command("get")
 @click.argument("TEMPLATE_ID")
-@click.option("--fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
-@click.option("--exclude-fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
+@click.option("--fields", "fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
+@click.option("--exclude-fields", "exclude_fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
 @click.option("--extra-params", default=None, help="Extra query params as JSON object, e.g. '{\"key\":\"val\"}'")
 @click.pass_context
 def _cmd_get(ctx, template_id, fields, exclude_fields, extra_params):
@@ -163,8 +163,8 @@ def _cmd_update(ctx, template_id, data, extra_params):
 
 @templates_group.command("list-templates-id-default-content")
 @click.argument("TEMPLATE_ID")
-@click.option("--fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
-@click.option("--exclude-fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
+@click.option("--fields", "fields", default=None, help="A comma-separated list of fields to return. Reference parameters of sub-objects ")
+@click.option("--exclude-fields", "exclude_fields", default=None, help="A comma-separated list of fields to exclude. Reference parameters of sub-objects")
 @click.option("--extra-params", default=None, help="Extra query params as JSON object, e.g. '{\"key\":\"val\"}'")
 @click.pass_context
 def _cmd_list_templates_id_default_content(ctx, template_id, fields, exclude_fields, extra_params):
diff --git a/mailchimp/agent-harness/cli_anything/mailchimp/skills/SKILL.md b/mailchimp/agent-harness/cli_anything/mailchimp/skills/SKILL.md
index 9880b0abf..4448fdbd2 100644
--- a/mailchimp/agent-harness/cli_anything/mailchimp/skills/SKILL.md
+++ b/mailchimp/agent-harness/cli_anything/mailchimp/skills/SKILL.md
@@ -111,14 +111,14 @@ cd mailchimp/agent-harness && pip install -e .
 
 | Command | Description |
 |---|---|
-| `ecommerce list` | List stores |
+| `ecommerce list-ecommerce-stores` | List stores |
 | `ecommerce get <STORE_ID>` | Get store info |
 | `ecommerce create --data '<json>'` | Add store |
-| `ecommerce list-orders <STORE_ID>` | List orders |
-| `ecommerce list-products <STORE_ID>` | List products |
-| `ecommerce list-customers <STORE_ID>` | List customers |
-| `ecommerce list-carts <STORE_ID>` | List carts |
-| `ecommerce list-promo-codes <STORE_ID> <PROMO_RULE_ID>` | List promo codes |
+| `ecommerce list-ecommerce-stores-id-orders <STORE_ID>` | List orders |
+| `ecommerce list-ecommerce-stores-id-products <STORE_ID>` | List products |
+| `ecommerce list-ecommerce-stores-id-customers <STORE_ID>` | List customers |
+| `ecommerce list-ecommerce-stores-id-carts <STORE_ID>` | List carts |
+| `ecommerce list-ecommerce-stores-id-promocodes <PROMO_RULE_ID> <STORE_ID>` | List promo codes |
 
 ### Other Resources
 
diff --git a/mailchimp/agent-harness/cli_anything/mailchimp/tests/TEST.md b/mailchimp/agent-harness/cli_anything/mailchimp/tests/TEST.md
index 8cb661fad..06cb3bda9 100644
--- a/mailchimp/agent-harness/cli_anything/mailchimp/tests/TEST.md
+++ b/mailchimp/agent-harness/cli_anything/mailchimp/tests/TEST.md
@@ -14,7 +14,7 @@ cd mailchimp/agent-harness
 pytest cli_anything/mailchimp/tests/test_core.py -v
 ```
 
-Expected: 17 tests, all green. Runtime < 5 seconds.
+Expected: all collected tests pass. Runtime < 5 seconds.
 
 ## Live E2E tests (requires MAILCHIMP_API_KEY)
 
diff --git a/mailchimp/agent-harness/cli_anything/mailchimp/tests/test_core.py b/mailchimp/agent-harness/cli_anything/mailchimp/tests/test_core.py
index d1ed9195a..673a289bf 100644
--- a/mailchimp/agent-harness/cli_anything/mailchimp/tests/test_core.py
+++ b/mailchimp/agent-harness/cli_anything/mailchimp/tests/test_core.py
@@ -405,6 +405,35 @@ class TestGeneratedCommandsImport(unittest.TestCase):
             params={"skip_merge_validation": True},
         )
 
+    def test_generated_keyword_query_option_uses_safe_callback_name(self):
+        from click.testing import CliRunner
+        from cli_anything.mailchimp.commands.templates import templates_group
+
+        client = MagicMock()
+        client.get.return_value = {"templates": []}
+
+        with patch("cli_anything.mailchimp.core.client.get_client", return_value=client):
+            result = CliRunner().invoke(templates_group, ["list", "--type", "user"])
+
+        assert result.exit_code == 0, result.output
+        client.get.assert_called_once_with("/templates", params={"type": "user"})
+
+    def test_campaign_shortcut_aliases_match_generated_commands(self):
+        from click.testing import CliRunner
+        from cli_anything.mailchimp.commands.campaigns import campaigns_group
+
+        client = MagicMock()
+        client.get.return_value = {"items": []}
+
+        with patch("cli_anything.mailchimp.core.client.get_client", return_value=client):
+            content = CliRunner().invoke(campaigns_group, ["list-content", "campaign-1"])
+            checklist = CliRunner().invoke(campaigns_group, ["list-send-checklist", "campaign-1"])
+
+        assert content.exit_code == 0, content.output
+        assert checklist.exit_code == 0, checklist.output
+        client.get.assert_any_call("/campaigns/campaign-1/content", params=None)
+        client.get.assert_any_call("/campaigns/campaign-1/send-checklist", params=None)
+
     def test_ping_group_invokes_health_check_without_list_subcommand(self):
         from click.testing import CliRunner
         from cli_anything.mailchimp.mailchimp_cli import cli
diff --git a/skills/cli-anything-mailchimp/SKILL.md b/skills/cli-anything-mailchimp/SKILL.md
index 9880b0abf..4448fdbd2 100644
--- a/skills/cli-anything-mailchimp/SKILL.md
+++ b/skills/cli-anything-mailchimp/SKILL.md
@@ -111,14 +111,14 @@ cd mailchimp/agent-harness && pip install -e .
 
 | Command | Description |
 |---|---|
-| `ecommerce list` | List stores |
+| `ecommerce list-ecommerce-stores` | List stores |
 | `ecommerce get <STORE_ID>` | Get store info |
 | `ecommerce create --data '<json>'` | Add store |
-| `ecommerce list-orders <STORE_ID>` | List orders |
-| `ecommerce list-products <STORE_ID>` | List products |
-| `ecommerce list-customers <STORE_ID>` | List customers |
-| `ecommerce list-carts <STORE_ID>` | List carts |
-| `ecommerce list-promo-codes <STORE_ID> <PROMO_RULE_ID>` | List promo codes |
+| `ecommerce list-ecommerce-stores-id-orders <STORE_ID>` | List orders |
+| `ecommerce list-ecommerce-stores-id-products <STORE_ID>` | List products |
+| `ecommerce list-ecommerce-stores-id-customers <STORE_ID>` | List customers |
+| `ecommerce list-ecommerce-stores-id-carts <STORE_ID>` | List carts |
+| `ecommerce list-ecommerce-stores-id-promocodes <PROMO_RULE_ID> <STORE_ID>` | List promo codes |
 
 ### Other Resources