From 138958df88ba67628a7128bb560baa47952b818b Mon Sep 17 00:00:00 2001
From: Jon Skeet <jonskeet@google.com>
Date: Fri, 24 Apr 2026 13:54:09 +0000
Subject: [PATCH 1/3] chore: remove api_shortname_override from librarian.yaml

Towards https://github.com/googleapis/librarian/issues/4175
---
 librarian.yaml | 47 -----------------------------------------------
 1 file changed, 47 deletions(-)

diff --git a/librarian.yaml b/librarian.yaml
index 4099f5c4366d..ed6eb53c6484 100644
--- a/librarian.yaml
+++ b/librarian.yaml
@@ -59,7 +59,6 @@ libraries:
       library_type: INTEGRATION
       name_pretty_override: A unified Python API in BigQuery
       product_documentation_override: https://cloud.google.com/bigquery
-      api_shortname_override: bigquery
       api_id_override: bigquery.googleapis.com
       client_documentation_override: https://cloud.google.com/python/docs/reference/bigframes/latest
       issue_tracker_override: https://github.com/googleapis/python-bigquery-dataframes/issues
@@ -88,7 +87,6 @@ libraries:
       library_type: INTEGRATION
       name_pretty_override: Cloud Spanner Django
       product_documentation_override: https://cloud.google.com/spanner/docs/
-      api_shortname_override: django-google-spanner
       issue_tracker_override: https://issuetracker.google.com/issues?q=componentid:190851%2B%20status:open
   - name: gapic-generator
     version: 1.30.14
@@ -147,7 +145,6 @@ libraries:
           - python-gapic-name=marketingplatform_admin
           - warehouse-package-name=google-ads-marketingplatform-admin
       name_pretty_override: Google Marketing Platform Admin API
-      api_shortname_override: marketingplatformadmin
       issue_tracker_override: https://github.com/googleapis/google-cloud-python/issues
       default_version: v1alpha
   - name: google-ai-generativelanguage
@@ -243,7 +240,6 @@ libraries:
           - python-gapic-name=card
           - warehouse-package-name=google-apps-card
       name_pretty_override: Google Apps Card Protos
-      api_shortname_override: card
       api_id_override: card.googleapis.com
       issue_tracker_override: https://github.com/googleapis/google-cloud-python/issues
       default_version: v1
@@ -279,7 +275,6 @@ libraries:
           - python-gapic-name=events_subscriptions
           - warehouse-package-name=google-apps-events-subscriptions
       name_pretty_override: Google Workspace Events API
-      api_shortname_override: subscriptions
       api_id_override: subscriptions.googleapis.com
       issue_tracker_override: https://github.com/googleapis/google-cloud-python/issues
       default_version: v1
@@ -356,7 +351,6 @@ libraries:
           - python-gapic-name=slides
           - warehouse-package-name=google-apps-script-type
       name_pretty_override: Google Apps Script Type Protos
-      api_shortname_override: type
       api_id_override: type.googleapis.com
       issue_tracker_override: https://github.com/googleapis/google-cloud-python/issues
       metadata_name_override: type
@@ -484,7 +478,6 @@ libraries:
           - python-gapic-namespace=google.cloud.alloydb
           - python-gapic-name=connectors
           - warehouse-package-name=google-cloud-alloydb-connectors
-      api_shortname_override: connectors
       metadata_name_override: connectors
       default_version: v1
   - name: google-cloud-api-gateway
@@ -708,7 +701,6 @@ libraries:
         - google/cloud/audit
       name_pretty_override: Audit Log API
       product_documentation_override: https://cloud.google.com/logging/docs/audit
-      api_shortname_override: auditlog
       client_documentation_override: https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-audit-log
       metadata_name_override: auditlog
       default_version: apiVersion
@@ -907,7 +899,6 @@ libraries:
       library_type: GAPIC_COMBO
       name_pretty_override: Google Cloud BigQuery
       product_documentation_override: https://cloud.google.com/bigquery
-      api_shortname_override: bigquery
       api_id_override: bigquery.googleapis.com
       issue_tracker_override: https://issuetracker.google.com/savedsearches/559654
       metadata_name_override: bigquery
@@ -1032,7 +1023,6 @@ libraries:
           - python-gapic-name=bigquery_logging
       name_pretty_override: BigQuery Logging Protos
       product_documentation_override: https://cloud.google.com/bigquery/docs/reference/auditlogs
-      api_shortname_override: bigquerylogging
       issue_tracker_override: https://github.com/googleapis/google-cloud-python/issues
       metadata_name_override: bigquerylogging
       default_version: v1
@@ -1323,7 +1313,6 @@ libraries:
           - warehouse-package-name=google-cloud-commerce-consumer-procurement
       name_pretty_override: Cloud Commerce Consumer Procurement API
       product_documentation_override: https://cloud.google.com/marketplace/docs/
-      api_shortname_override: procurement
       metadata_name_override: procurement
       default_version: v1
   - name: google-cloud-common
@@ -1401,7 +1390,6 @@ libraries:
           - warehouse-package-name=google-cloud-config
       name_pretty_override: Infrastructure Manager API
       product_documentation_override: https://cloud.google.com/infrastructure-manager/docs/overview
-      api_shortname_override: config
       metadata_name_override: config
       default_version: v1
   - name: google-cloud-configdelivery
@@ -1574,7 +1562,6 @@ libraries:
           - warehouse-package-name=google-cloud-datacatalog-lineage
       name_pretty_override: Data Lineage API
       product_documentation_override: https://cloud.google.com/data-catalog/docs/concepts/about-data-lineage
-      api_shortname_override: lineage
       issue_tracker_override: https://github.com/googleapis/google-cloud-python/issues
       metadata_name_override: lineage
       default_version: v1
@@ -1875,7 +1862,6 @@ libraries:
       library_type: REST
       name_pretty_override: Cloud DNS
       product_documentation_override: https://cloud.google.com/dns
-      api_shortname_override: dns
       issue_tracker_override: https://issuetracker.google.com/savedsearches/559772
       metadata_name_override: dns
   - name: google-cloud-documentai
@@ -2300,7 +2286,6 @@ libraries:
           - warehouse-package-name=google-cloud-iam
       name_pretty_override: Cloud Identity and Access Management
       product_documentation_override: https://cloud.google.com/iam/docs/
-      api_shortname_override: iamcredentials
       issue_tracker_override: https://issuetracker.google.com/savedsearches/559761
       metadata_name_override: iam
       default_version: v2
@@ -2391,7 +2376,6 @@ libraries:
           - warehouse-package-name=google-cloud-kms-inventory
       name_pretty_override: KMS Inventory API
       product_documentation_override: https://cloud.google.com/kms/docs/
-      api_shortname_override: inventory
       api_id_override: inventory.googleapis.com
       metadata_name_override: inventory
       default_version: v1
@@ -2510,7 +2494,6 @@ libraries:
           - warehouse-package-name=google-cloud-maintenance-api
       name_pretty_override: Maintenance API
       product_documentation_override: https://cloud.google.com/unified-maintenance/docs/overview
-      api_shortname_override: api
       api_id_override: api.googleapis.com
       default_version: v1
   - name: google-cloud-managed-identities
@@ -2551,7 +2534,6 @@ libraries:
           - python-gapic-namespace=google.cloud
           - warehouse-package-name=google-cloud-managedkafka-schemaregistry
       name_pretty_override: Managed Service for Apache Kafka API
-      api_shortname_override: schemaregistry
       api_id_override: schemaregistry.googleapis.com
       default_version: v1
   - name: google-cloud-media-translation
@@ -2639,7 +2621,6 @@ libraries:
           - warehouse-package-name=google-cloud-modelarmor
       name_pretty_override: Model Armor API
       product_documentation_override: https://cloud.google.com/security-command-center/docs/model-armor-overview
-      api_shortname_override: securitycenter
       api_id_override: securitycenter.googleapis.com
       default_version: v1
   - name: google-cloud-monitoring
@@ -2692,7 +2673,6 @@ libraries:
     python:
       library_type: GAPIC_MANUAL
       name_pretty_override: NDB Client Library for Google Cloud Datastore
-      api_shortname_override: datastore
       client_documentation_override: https://googleapis.dev/python/python-ndb/latest
       issue_tracker_override: https://github.com/googleapis/python-ndb/issues
       metadata_name_override: python-ndb
@@ -3000,7 +2980,6 @@ libraries:
           - warehouse-package-name=google-cloud-policytroubleshooter-iam
       name_pretty_override: Policy Troubleshooter API
       product_documentation_override: https://cloud.google.com/policy-intelligence/docs/troubleshoot-access
-      api_shortname_override: iam
       metadata_name_override: policytroubleshooter-iam
       default_version: v3
   - name: google-cloud-private-ca
@@ -3187,7 +3166,6 @@ libraries:
           - warehouse-package-name=google-cloud-redis-cluster
       name_pretty_override: Google Cloud Memorystore for Redis API
       product_documentation_override: https://cloud.google.com/redis/docs
-      api_shortname_override: cluster
       api_id_override: cluster.googleapis.com
       default_version: v1
   - name: google-cloud-resource-manager
@@ -3249,7 +3227,6 @@ libraries:
       library_type: GAPIC_MANUAL
       name_pretty_override: Google Cloud Runtime Configurator
       product_documentation_override: https://cloud.google.com/deployment-manager/runtime-configurator/
-      api_shortname_override: runtimeconfig
       api_id_override: runtimeconfig.googleapis.com
       issue_tracker_override: https://issuetracker.google.com/savedsearches/559663
       metadata_name_override: runtimeconfig
@@ -3387,7 +3364,6 @@ libraries:
           - warehouse-package-name=google-cloud-securitycentermanagement
       name_pretty_override: Security Center Management API
       product_documentation_override: https://cloud.google.com/securitycentermanagement/docs/overview
-      api_shortname_override: securitycenter
       api_id_override: securitycenter.googleapis.com
       issue_tracker_override: https://github.com/googleapis/google-cloud-python/issues
       default_version: v1
@@ -3497,7 +3473,6 @@ libraries:
           - python-gapic-name=source_context
       name_pretty_override: Source Context
       product_documentation_override: https://cloud.google.com
-      api_shortname_override: source
       api_id_override: source.googleapis.com
       issue_tracker_override: https://github.com/googleapis/google-cloud-python/issues
       metadata_name_override: source
@@ -3659,7 +3634,6 @@ libraries:
           - warehouse-package-name=google-cloud-support
       name_pretty_override: Google Cloud Support API
       product_documentation_override: https://cloud.google.com/support/docs/reference/support-api
-      api_shortname_override: support
       issue_tracker_override: https://github.com/googleapis/google-cloud-python/issues
       metadata_name_override: support
       default_version: v2
@@ -4052,7 +4026,6 @@ libraries:
           - warehouse-package-name=google-cloud-websecurityscanner
       name_pretty_override: Cloud Security Scanner
       product_documentation_override: https://cloud.google.com/security-scanner/docs/
-      api_shortname_override: securitycenter
       api_id_override: securitycenter.googleapis.com
       metadata_name_override: websecurityscanner
       default_version: v1
@@ -4175,7 +4148,6 @@ libraries:
           - python-gapic-name=areainsights
           - warehouse-package-name=google-maps-areainsights
       name_pretty_override: Places Insights API
-      api_shortname_override: areainsights
       default_version: v1
   - name: google-maps-fleetengine
     version: 0.5.0
@@ -4206,7 +4178,6 @@ libraries:
           - proto-plus-deps=google.geo.type
           - warehouse-package-name=google-maps-fleetengine-delivery
       name_pretty_override: Last Mile Fleet Solution Delivery API
-      api_shortname_override: fleetengine
       issue_tracker_override: https://github.com/googleapis/google-cloud-python/issues
       metadata_name_override: fleetengine-delivery
       default_version: v1
@@ -4226,7 +4197,6 @@ libraries:
           - python-gapic-name=geocode
           - warehouse-package-name=google-maps-geocode
       name_pretty_override: Geocoding API
-      api_shortname_override: geocoding-backend
       client_documentation_override: https://cloud.google.com/python/docs/reference/google-maps-geocode/latest
       default_version: v4
   - name: google-maps-mapsplatformdatasets
@@ -4302,7 +4272,6 @@ libraries:
           - python-gapic-name=routing
           - warehouse-package-name=google-maps-routing
       name_pretty_override: Google Maps Routing
-      api_shortname_override: routing
       api_id_override: routing.googleapis.com
       issue_tracker_override: https://github.com/googleapis/google-cloud-python/issues
       metadata_name_override: routing
@@ -4359,7 +4328,6 @@ libraries:
           - python-gapic-namespace=google.shopping
           - warehouse-package-name=google-shopping-merchant-accounts
       name_pretty_override: Merchant API
-      api_shortname_override: accounts
       api_id_override: accounts.googleapis.com
       issue_tracker_override: https://github.com/googleapis/google-cloud-python/issues
       default_version: v1
@@ -4380,7 +4348,6 @@ libraries:
           - python-gapic-namespace=google.shopping
           - warehouse-package-name=google-shopping-merchant-conversions
       name_pretty_override: Merchant API
-      api_shortname_override: conversions
       issue_tracker_override: https://github.com/googleapis/google-cloud-python/issues
       default_version: v1
   - name: google-shopping-merchant-datasources
@@ -4402,7 +4369,6 @@ libraries:
           - python-gapic-namespace=google.shopping
           - warehouse-package-name=google-shopping-merchant-datasources
       name_pretty_override: Merchant API
-      api_shortname_override: datasources
       api_id_override: datasources.googleapis.com
       issue_tracker_override: https://github.com/googleapis/google-cloud-python/issues
       default_version: v1
@@ -4425,7 +4391,6 @@ libraries:
           - python-gapic-name=merchant_inventories
           - warehouse-package-name=google-shopping-merchant-inventories
       name_pretty_override: Merchant Inventories API
-      api_shortname_override: inventories
       api_id_override: inventories.googleapis.com
       default_version: v1
   - name: google-shopping-merchant-issueresolution
@@ -4447,7 +4412,6 @@ libraries:
           - python-gapic-name=merchant_issueresolution
           - warehouse-package-name=google-shopping-merchant-issueresolution
       name_pretty_override: Merchant API
-      api_shortname_override: issueresolution
       api_id_override: issueresolution.googleapis.com
       default_version: v1
   - name: google-shopping-merchant-lfp
@@ -4469,7 +4433,6 @@ libraries:
           - python-gapic-namespace=google.shopping
           - warehouse-package-name=google-shopping-merchant-lfp
       name_pretty_override: Merchant API
-      api_shortname_override: lfp
       issue_tracker_override: https://github.com/googleapis/google-cloud-python/issues
       default_version: v1
   - name: google-shopping-merchant-notifications
@@ -4490,7 +4453,6 @@ libraries:
           - python-gapic-name=merchant_notifications
           - warehouse-package-name=google-shopping-merchant-notifications
       name_pretty_override: Merchant API
-      api_shortname_override: notifications
       issue_tracker_override: https://github.com/googleapis/google-cloud-python/issues
       default_version: v1
   - name: google-shopping-merchant-ordertracking
@@ -4512,7 +4474,6 @@ libraries:
           - python-gapic-name=merchant_ordertracking
           - warehouse-package-name=google-shopping-merchant-ordertracking
       name_pretty_override: Merchant API
-      api_shortname_override: ordertracking
       api_id_override: ordertracking.googleapis.com
       default_version: v1
   - name: google-shopping-merchant-products
@@ -4534,7 +4495,6 @@ libraries:
           - python-gapic-name=merchant_products
           - warehouse-package-name=google-shopping-merchant-products
       name_pretty_override: Merchant API
-      api_shortname_override: products
       api_id_override: products.googleapis.com
       issue_tracker_override: https://github.com/googleapis/google-cloud-python/issues
       default_version: v1
@@ -4550,7 +4510,6 @@ libraries:
           - python-gapic-namespace=google.shopping
           - warehouse-package-name=google-shopping-merchant-productstudio
       name_pretty_override: Merchant ProductStudio API
-      api_shortname_override: productstudio
       api_id_override: productstudio.googleapis.com
       issue_tracker_override: https://github.com/googleapis/google-cloud-python/issues
       default_version: v1alpha
@@ -4573,7 +4532,6 @@ libraries:
           - python-gapic-name=merchant_promotions
           - warehouse-package-name=google-shopping-merchant-promotions
       name_pretty_override: Merchant API
-      api_shortname_override: promotions
       api_id_override: promotions.googleapis.com
       issue_tracker_override: https://github.com/googleapis/google-cloud-python/issues
       default_version: v1
@@ -4620,7 +4578,6 @@ libraries:
           - python-gapic-namespace=google.shopping
           - warehouse-package-name=google-shopping-merchant-reports
       name_pretty_override: Merchant Reports API
-      api_shortname_override: reports
       api_id_override: reports.googleapis.com
       default_version: v1
   - name: google-shopping-merchant-reviews
@@ -4636,7 +4593,6 @@ libraries:
           - python-gapic-namespace=google.shopping
           - warehouse-package-name=google-shopping-merchant-reviews
       name_pretty_override: Merchant Reviews API
-      api_shortname_override: reviews
       api_id_override: reviews.googleapis.com
       issue_tracker_override: https://github.com/googleapis/google-cloud-python/issues
       default_version: v1beta
@@ -4654,7 +4610,6 @@ libraries:
           - warehouse-package-name=google-shopping-type
       name_pretty_override: Shopping Type Protos
       product_documentation_override: https://developers.google.com/merchant/api
-      api_shortname_override: type
       api_id_override: type.googleapis.com
       issue_tracker_override: https://github.com/googleapis/google-cloud-python/issues
       default_version: apiVersion
@@ -4706,7 +4661,6 @@ libraries:
         - google/iam/v1
       name_pretty_override: Cloud Identity and Access Management
       product_documentation_override: https://cloud.google.com/iam/docs/
-      api_shortname_override: iam
       api_id_override: iam.googleapis.com
       client_documentation_override: https://cloud.google.com/python/docs/reference/grpc-iam/latest
       metadata_name_override: grpc-iam
@@ -4741,7 +4695,6 @@ libraries:
       library_type: INTEGRATION
       name_pretty_override: Spanner dialect for SQLAlchemy
       product_documentation_override: https://cloud.google.com/spanner/docs
-      api_shortname_override: sqlalchemy-spanner
       client_documentation_override: https://github.com/googleapis/python-spanner-sqlalchemy
       issue_tracker_override: https://issuetracker.google.com/issues?q=componentid:190851%2B%20status:open
       skip_readme_copy: true

From 5a0c75c03e5946445b202919dae17d2843cb456d Mon Sep 17 00:00:00 2001
From: Jon Skeet <jonskeet@google.com>
Date: Fri, 24 Apr 2026 16:06:55 +0000
Subject: [PATCH 2/3] chore: regenerate all libraries with librarian

---
 packages/bigframes/.repo-metadata.json                          | 1 -
 packages/google-ads-marketingplatform-admin/.repo-metadata.json | 2 +-
 packages/google-apps-card/.repo-metadata.json                   | 1 -
 packages/google-apps-events-subscriptions/.repo-metadata.json   | 2 +-
 packages/google-apps-script-type/.repo-metadata.json            | 1 -
 packages/google-cloud-alloydb-connectors/.repo-metadata.json    | 2 +-
 packages/google-cloud-audit-log/.repo-metadata.json             | 2 +-
 packages/google-cloud-bigquery-logging/.repo-metadata.json      | 1 -
 packages/google-cloud-bigquery/.repo-metadata.json              | 1 -
 .../.repo-metadata.json                                         | 2 +-
 packages/google-cloud-config/.repo-metadata.json                | 2 +-
 packages/google-cloud-datacatalog-lineage/.repo-metadata.json   | 2 +-
 packages/google-cloud-dns/.repo-metadata.json                   | 1 -
 packages/google-cloud-iam/.repo-metadata.json                   | 2 +-
 packages/google-cloud-kms-inventory/.repo-metadata.json         | 2 +-
 packages/google-cloud-maintenance-api/.repo-metadata.json       | 2 +-
 .../.repo-metadata.json                                         | 2 +-
 packages/google-cloud-modelarmor/.repo-metadata.json            | 2 +-
 packages/google-cloud-ndb/.repo-metadata.json                   | 1 -
 .../google-cloud-policytroubleshooter-iam/.repo-metadata.json   | 2 +-
 packages/google-cloud-redis-cluster/.repo-metadata.json         | 2 +-
 packages/google-cloud-runtimeconfig/.repo-metadata.json         | 1 -
 .../google-cloud-securitycentermanagement/.repo-metadata.json   | 2 +-
 packages/google-cloud-source-context/.repo-metadata.json        | 1 -
 packages/google-cloud-support/.repo-metadata.json               | 2 +-
 packages/google-cloud-websecurityscanner/.repo-metadata.json    | 2 +-
 packages/google-maps-areainsights/.repo-metadata.json           | 2 +-
 packages/google-maps-fleetengine-delivery/.repo-metadata.json   | 2 +-
 packages/google-maps-geocode/.repo-metadata.json                | 2 +-
 packages/google-maps-routing/.repo-metadata.json                | 2 +-
 packages/google-shopping-merchant-accounts/.repo-metadata.json  | 2 +-
 .../google-shopping-merchant-conversions/.repo-metadata.json    | 2 +-
 .../google-shopping-merchant-datasources/.repo-metadata.json    | 2 +-
 .../google-shopping-merchant-inventories/.repo-metadata.json    | 2 +-
 .../.repo-metadata.json                                         | 2 +-
 packages/google-shopping-merchant-lfp/.repo-metadata.json       | 2 +-
 .../google-shopping-merchant-notifications/.repo-metadata.json  | 2 +-
 .../google-shopping-merchant-ordertracking/.repo-metadata.json  | 2 +-
 packages/google-shopping-merchant-products/.repo-metadata.json  | 2 +-
 .../google-shopping-merchant-productstudio/.repo-metadata.json  | 2 +-
 .../google-shopping-merchant-promotions/.repo-metadata.json     | 2 +-
 packages/google-shopping-merchant-reports/.repo-metadata.json   | 2 +-
 packages/google-shopping-merchant-reviews/.repo-metadata.json   | 2 +-
 packages/google-shopping-type/.repo-metadata.json               | 1 -
 packages/grpc-google-iam-v1/.repo-metadata.json                 | 2 +-
 packages/sqlalchemy-spanner/.repo-metadata.json                 | 1 -
 46 files changed, 35 insertions(+), 46 deletions(-)

diff --git a/packages/bigframes/.repo-metadata.json b/packages/bigframes/.repo-metadata.json
index 4a1c7ed478e3..1c6a3d0abc4f 100644
--- a/packages/bigframes/.repo-metadata.json
+++ b/packages/bigframes/.repo-metadata.json
@@ -1,6 +1,5 @@
 {
     "api_id": "bigquery.googleapis.com",
-    "api_shortname": "bigquery",
     "client_documentation": "https://cloud.google.com/python/docs/reference/bigframes/latest",
     "distribution_name": "bigframes",
     "issue_tracker": "https://github.com/googleapis/python-bigquery-dataframes/issues",
diff --git a/packages/google-ads-marketingplatform-admin/.repo-metadata.json b/packages/google-ads-marketingplatform-admin/.repo-metadata.json
index 7c6135f3dade..5bbdf4a3b439 100644
--- a/packages/google-ads-marketingplatform-admin/.repo-metadata.json
+++ b/packages/google-ads-marketingplatform-admin/.repo-metadata.json
@@ -1,7 +1,7 @@
 {
     "api_description": "The Google Marketing Platform Admin API allows for programmatic access to the Google Marketing Platform configuration data. You can use the Google Marketing Platform Admin API to manage links between your Google Marketing Platform organization and Google Analytics accounts, and to set the service level of your GA4 properties.",
     "api_id": "marketingplatformadmin.googleapis.com",
-    "api_shortname": "marketingplatformadmin",
+    "api_shortname": "marketingplatformadminapi",
     "client_documentation": "https://googleapis.dev/python/google-ads-marketingplatform-admin/latest",
     "default_version": "v1alpha",
     "distribution_name": "google-ads-marketingplatform-admin",
diff --git a/packages/google-apps-card/.repo-metadata.json b/packages/google-apps-card/.repo-metadata.json
index e183b48c4acd..96d3a1a07bc6 100644
--- a/packages/google-apps-card/.repo-metadata.json
+++ b/packages/google-apps-card/.repo-metadata.json
@@ -1,7 +1,6 @@
 {
     "api_description": "Google Apps Card Protos",
     "api_id": "card.googleapis.com",
-    "api_shortname": "card",
     "client_documentation": "https://googleapis.dev/python/google-apps-card/latest",
     "default_version": "v1",
     "distribution_name": "google-apps-card",
diff --git a/packages/google-apps-events-subscriptions/.repo-metadata.json b/packages/google-apps-events-subscriptions/.repo-metadata.json
index 34f9205b3f87..aadfe797cbc0 100644
--- a/packages/google-apps-events-subscriptions/.repo-metadata.json
+++ b/packages/google-apps-events-subscriptions/.repo-metadata.json
@@ -1,7 +1,7 @@
 {
     "api_description": "The Google Workspace Events API lets you subscribe to events and manage change notifications across Google Workspace applications.",
     "api_id": "subscriptions.googleapis.com",
-    "api_shortname": "subscriptions",
+    "api_shortname": "workspaceevents",
     "client_documentation": "https://googleapis.dev/python/google-apps-events-subscriptions/latest",
     "default_version": "v1",
     "distribution_name": "google-apps-events-subscriptions",
diff --git a/packages/google-apps-script-type/.repo-metadata.json b/packages/google-apps-script-type/.repo-metadata.json
index a7876dfadbc7..2759f531fc7a 100644
--- a/packages/google-apps-script-type/.repo-metadata.json
+++ b/packages/google-apps-script-type/.repo-metadata.json
@@ -1,6 +1,5 @@
 {
     "api_id": "type.googleapis.com",
-    "api_shortname": "type",
     "client_documentation": "https://googleapis.dev/python/type/latest",
     "default_version": "apiVersion",
     "distribution_name": "google-apps-script-type",
diff --git a/packages/google-cloud-alloydb-connectors/.repo-metadata.json b/packages/google-cloud-alloydb-connectors/.repo-metadata.json
index 660c0d94de09..b334bdc9283f 100644
--- a/packages/google-cloud-alloydb-connectors/.repo-metadata.json
+++ b/packages/google-cloud-alloydb-connectors/.repo-metadata.json
@@ -1,7 +1,7 @@
 {
     "api_description": "provides enterprise-grade performance and availability while maintaining 100% compatibility with open-source PostgreSQL.",
     "api_id": "connectors.googleapis.com",
-    "api_shortname": "connectors",
+    "api_shortname": "alloydb",
     "client_documentation": "https://cloud.google.com/python/docs/reference/connectors/latest",
     "default_version": "v1",
     "distribution_name": "google-cloud-alloydb-connectors",
diff --git a/packages/google-cloud-audit-log/.repo-metadata.json b/packages/google-cloud-audit-log/.repo-metadata.json
index 8d4f3100c37d..ed509ab4d9d2 100644
--- a/packages/google-cloud-audit-log/.repo-metadata.json
+++ b/packages/google-cloud-audit-log/.repo-metadata.json
@@ -1,6 +1,6 @@
 {
     "api_id": "cloudaudit.googleapis.com",
-    "api_shortname": "auditlog",
+    "api_shortname": "cloudaudit",
     "client_documentation": "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-audit-log",
     "default_version": "apiVersion",
     "distribution_name": "google-cloud-audit-log",
diff --git a/packages/google-cloud-bigquery-logging/.repo-metadata.json b/packages/google-cloud-bigquery-logging/.repo-metadata.json
index 6f38e8ed2f30..2f9dd50d7f7f 100644
--- a/packages/google-cloud-bigquery-logging/.repo-metadata.json
+++ b/packages/google-cloud-bigquery-logging/.repo-metadata.json
@@ -1,5 +1,4 @@
 {
-    "api_shortname": "bigquerylogging",
     "client_documentation": "https://cloud.google.com/python/docs/reference/bigquerylogging/latest",
     "default_version": "v1",
     "distribution_name": "google-cloud-bigquery-logging",
diff --git a/packages/google-cloud-bigquery/.repo-metadata.json b/packages/google-cloud-bigquery/.repo-metadata.json
index 6b55ebc67f39..1048b45d46e7 100644
--- a/packages/google-cloud-bigquery/.repo-metadata.json
+++ b/packages/google-cloud-bigquery/.repo-metadata.json
@@ -1,6 +1,5 @@
 {
     "api_id": "bigquery.googleapis.com",
-    "api_shortname": "bigquery",
     "client_documentation": "https://cloud.google.com/python/docs/reference/bigquery/latest",
     "default_version": "v2",
     "distribution_name": "google-cloud-bigquery",
diff --git a/packages/google-cloud-commerce-consumer-procurement/.repo-metadata.json b/packages/google-cloud-commerce-consumer-procurement/.repo-metadata.json
index fa0f3ffaada8..75038d21c3db 100644
--- a/packages/google-cloud-commerce-consumer-procurement/.repo-metadata.json
+++ b/packages/google-cloud-commerce-consumer-procurement/.repo-metadata.json
@@ -1,7 +1,7 @@
 {
     "api_description": "Cloud Commerce Consumer Procurement API",
     "api_id": "cloudcommerceconsumerprocurement.googleapis.com",
-    "api_shortname": "procurement",
+    "api_shortname": "cloudcommerceconsumerprocurement",
     "client_documentation": "https://cloud.google.com/python/docs/reference/procurement/latest",
     "default_version": "v1",
     "distribution_name": "google-cloud-commerce-consumer-procurement",
diff --git a/packages/google-cloud-config/.repo-metadata.json b/packages/google-cloud-config/.repo-metadata.json
index 5210406c4cda..618cf0b4aa87 100644
--- a/packages/google-cloud-config/.repo-metadata.json
+++ b/packages/google-cloud-config/.repo-metadata.json
@@ -1,7 +1,7 @@
 {
     "api_description": "Infrastructure Manager API",
     "api_id": "config.googleapis.com",
-    "api_shortname": "config",
+    "api_shortname": "infra-manager",
     "client_documentation": "https://cloud.google.com/python/docs/reference/config/latest",
     "default_version": "v1",
     "distribution_name": "google-cloud-config",
diff --git a/packages/google-cloud-datacatalog-lineage/.repo-metadata.json b/packages/google-cloud-datacatalog-lineage/.repo-metadata.json
index 3846352d44e9..41d767221e51 100644
--- a/packages/google-cloud-datacatalog-lineage/.repo-metadata.json
+++ b/packages/google-cloud-datacatalog-lineage/.repo-metadata.json
@@ -1,7 +1,7 @@
 {
     "api_description": "Data lineage is a Dataplex feature that lets you track how data moves through your systems: where it comes from, where it is passed to, and what transformations are applied to it.",
     "api_id": "datalineage.googleapis.com",
-    "api_shortname": "lineage",
+    "api_shortname": "datalineage",
     "client_documentation": "https://cloud.google.com/python/docs/reference/lineage/latest",
     "default_version": "v1",
     "distribution_name": "google-cloud-datacatalog-lineage",
diff --git a/packages/google-cloud-dns/.repo-metadata.json b/packages/google-cloud-dns/.repo-metadata.json
index 3bc0184c2a3f..f1b89fd8afc1 100644
--- a/packages/google-cloud-dns/.repo-metadata.json
+++ b/packages/google-cloud-dns/.repo-metadata.json
@@ -1,5 +1,4 @@
 {
-    "api_shortname": "dns",
     "client_documentation": "https://cloud.google.com/python/docs/reference/dns/latest",
     "distribution_name": "google-cloud-dns",
     "issue_tracker": "https://issuetracker.google.com/savedsearches/559772",
diff --git a/packages/google-cloud-iam/.repo-metadata.json b/packages/google-cloud-iam/.repo-metadata.json
index 34310210ce10..9b2ff4f65e71 100644
--- a/packages/google-cloud-iam/.repo-metadata.json
+++ b/packages/google-cloud-iam/.repo-metadata.json
@@ -1,7 +1,7 @@
 {
     "api_description": "Manages identity and access control for Google Cloud Platform resources, including the creation of service accounts, which you can use to authenticate to Google and make API calls.",
     "api_id": "iam.googleapis.com",
-    "api_shortname": "iamcredentials",
+    "api_shortname": "iam",
     "client_documentation": "https://cloud.google.com/python/docs/reference/iam/latest",
     "default_version": "v2",
     "distribution_name": "google-cloud-iam",
diff --git a/packages/google-cloud-kms-inventory/.repo-metadata.json b/packages/google-cloud-kms-inventory/.repo-metadata.json
index d248429a1498..c4f86c649d78 100644
--- a/packages/google-cloud-kms-inventory/.repo-metadata.json
+++ b/packages/google-cloud-kms-inventory/.repo-metadata.json
@@ -1,7 +1,7 @@
 {
     "api_description": "KMS Inventory API",
     "api_id": "inventory.googleapis.com",
-    "api_shortname": "inventory",
+    "api_shortname": "kmsinventory",
     "client_documentation": "https://cloud.google.com/python/docs/reference/inventory/latest",
     "default_version": "v1",
     "distribution_name": "google-cloud-kms-inventory",
diff --git a/packages/google-cloud-maintenance-api/.repo-metadata.json b/packages/google-cloud-maintenance-api/.repo-metadata.json
index 0581237885fc..3e01bd40bc91 100644
--- a/packages/google-cloud-maintenance-api/.repo-metadata.json
+++ b/packages/google-cloud-maintenance-api/.repo-metadata.json
@@ -1,7 +1,7 @@
 {
     "api_description": "The Maintenance API provides a centralized view of planned disruptive maintenance events across supported Google Cloud products. It offers users visibility into upcoming, ongoing, and completed maintenance, along with controls to manage certain maintenance activities, such as mainteance windows, rescheduling, and on-demand updates.",
     "api_id": "api.googleapis.com",
-    "api_shortname": "api",
+    "api_shortname": "maintenance",
     "client_documentation": "https://cloud.google.com/python/docs/reference/google-cloud-maintenance-api/latest",
     "default_version": "v1",
     "distribution_name": "google-cloud-maintenance-api",
diff --git a/packages/google-cloud-managedkafka-schemaregistry/.repo-metadata.json b/packages/google-cloud-managedkafka-schemaregistry/.repo-metadata.json
index 0ecbb22dae8d..56da7129c068 100644
--- a/packages/google-cloud-managedkafka-schemaregistry/.repo-metadata.json
+++ b/packages/google-cloud-managedkafka-schemaregistry/.repo-metadata.json
@@ -1,7 +1,7 @@
 {
     "api_description": "Manage Apache Kafka clusters and resources. ",
     "api_id": "schemaregistry.googleapis.com",
-    "api_shortname": "schemaregistry",
+    "api_shortname": "managedkafka",
     "client_documentation": "https://cloud.google.com/python/docs/reference/google-cloud-managedkafka-schemaregistry/latest",
     "default_version": "v1",
     "distribution_name": "google-cloud-managedkafka-schemaregistry",
diff --git a/packages/google-cloud-modelarmor/.repo-metadata.json b/packages/google-cloud-modelarmor/.repo-metadata.json
index ca5dc54bfb35..f497a0c388b3 100644
--- a/packages/google-cloud-modelarmor/.repo-metadata.json
+++ b/packages/google-cloud-modelarmor/.repo-metadata.json
@@ -1,7 +1,7 @@
 {
     "api_description": "Model Armor helps you protect against risks like prompt injection, harmful content, and data leakage in generative AI applications by letting you define policies that filter user prompts and model responses.",
     "api_id": "securitycenter.googleapis.com",
-    "api_shortname": "securitycenter",
+    "api_shortname": "modelarmor",
     "client_documentation": "https://cloud.google.com/python/docs/reference/google-cloud-modelarmor/latest",
     "default_version": "v1",
     "distribution_name": "google-cloud-modelarmor",
diff --git a/packages/google-cloud-ndb/.repo-metadata.json b/packages/google-cloud-ndb/.repo-metadata.json
index e3073cad2e73..4e0a70453a09 100644
--- a/packages/google-cloud-ndb/.repo-metadata.json
+++ b/packages/google-cloud-ndb/.repo-metadata.json
@@ -1,5 +1,4 @@
 {
-    "api_shortname": "datastore",
     "client_documentation": "https://googleapis.dev/python/python-ndb/latest",
     "distribution_name": "google-cloud-ndb",
     "issue_tracker": "https://github.com/googleapis/python-ndb/issues",
diff --git a/packages/google-cloud-policytroubleshooter-iam/.repo-metadata.json b/packages/google-cloud-policytroubleshooter-iam/.repo-metadata.json
index e1b7fab5749c..2f6806ac120b 100644
--- a/packages/google-cloud-policytroubleshooter-iam/.repo-metadata.json
+++ b/packages/google-cloud-policytroubleshooter-iam/.repo-metadata.json
@@ -1,6 +1,6 @@
 {
     "api_id": "policytroubleshooter.googleapis.com",
-    "api_shortname": "iam",
+    "api_shortname": "policytroubleshooter",
     "client_documentation": "https://cloud.google.com/python/docs/reference/policytroubleshooter-iam/latest",
     "default_version": "v3",
     "distribution_name": "google-cloud-policytroubleshooter-iam",
diff --git a/packages/google-cloud-redis-cluster/.repo-metadata.json b/packages/google-cloud-redis-cluster/.repo-metadata.json
index e82db89ac1c8..4d3076606df5 100644
--- a/packages/google-cloud-redis-cluster/.repo-metadata.json
+++ b/packages/google-cloud-redis-cluster/.repo-metadata.json
@@ -1,7 +1,7 @@
 {
     "api_description": "Creates and manages Redis instances on the Google Cloud Platform.",
     "api_id": "cluster.googleapis.com",
-    "api_shortname": "cluster",
+    "api_shortname": "redis",
     "client_documentation": "https://cloud.google.com/python/docs/reference/google-cloud-redis-cluster/latest",
     "default_version": "v1",
     "distribution_name": "google-cloud-redis-cluster",
diff --git a/packages/google-cloud-runtimeconfig/.repo-metadata.json b/packages/google-cloud-runtimeconfig/.repo-metadata.json
index 7d491d04e02e..04e1c8e0cd06 100644
--- a/packages/google-cloud-runtimeconfig/.repo-metadata.json
+++ b/packages/google-cloud-runtimeconfig/.repo-metadata.json
@@ -1,6 +1,5 @@
 {
     "api_id": "runtimeconfig.googleapis.com",
-    "api_shortname": "runtimeconfig",
     "client_documentation": "https://cloud.google.com/python/docs/reference/runtimeconfig/latest",
     "distribution_name": "google-cloud-runtimeconfig",
     "issue_tracker": "https://issuetracker.google.com/savedsearches/559663",
diff --git a/packages/google-cloud-securitycentermanagement/.repo-metadata.json b/packages/google-cloud-securitycentermanagement/.repo-metadata.json
index 38d04533fc8f..6ec728a42e44 100644
--- a/packages/google-cloud-securitycentermanagement/.repo-metadata.json
+++ b/packages/google-cloud-securitycentermanagement/.repo-metadata.json
@@ -1,7 +1,7 @@
 {
     "api_description": "Management API for Security Command Center, a built-in security and risk\nmanagement solution for Google Cloud. Use this API to programmatically\nupdate the settings and configuration of Security Command Center.",
     "api_id": "securitycenter.googleapis.com",
-    "api_shortname": "securitycenter",
+    "api_shortname": "securitycentermanagement",
     "client_documentation": "https://cloud.google.com/python/docs/reference/google-cloud-securitycentermanagement/latest",
     "default_version": "v1",
     "distribution_name": "google-cloud-securitycentermanagement",
diff --git a/packages/google-cloud-source-context/.repo-metadata.json b/packages/google-cloud-source-context/.repo-metadata.json
index 50fe10fad697..8ce25623ff68 100644
--- a/packages/google-cloud-source-context/.repo-metadata.json
+++ b/packages/google-cloud-source-context/.repo-metadata.json
@@ -1,6 +1,5 @@
 {
     "api_id": "source.googleapis.com",
-    "api_shortname": "source",
     "client_documentation": "https://cloud.google.com/python/docs/reference/source/latest",
     "default_version": "v1",
     "distribution_name": "google-cloud-source-context",
diff --git a/packages/google-cloud-support/.repo-metadata.json b/packages/google-cloud-support/.repo-metadata.json
index 608712826a2f..bc1b9a4822c5 100644
--- a/packages/google-cloud-support/.repo-metadata.json
+++ b/packages/google-cloud-support/.repo-metadata.json
@@ -1,7 +1,7 @@
 {
     "api_description": "Manages Google Cloud technical support cases for Customer Care support offerings.",
     "api_id": "cloudsupport.googleapis.com",
-    "api_shortname": "support",
+    "api_shortname": "cloudsupport",
     "client_documentation": "https://cloud.google.com/python/docs/reference/support/latest",
     "default_version": "v2",
     "distribution_name": "google-cloud-support",
diff --git a/packages/google-cloud-websecurityscanner/.repo-metadata.json b/packages/google-cloud-websecurityscanner/.repo-metadata.json
index 82966e22f1d0..6f2d5d024d60 100644
--- a/packages/google-cloud-websecurityscanner/.repo-metadata.json
+++ b/packages/google-cloud-websecurityscanner/.repo-metadata.json
@@ -1,7 +1,7 @@
 {
     "api_description": "identifies security vulnerabilities in your App Engine, Compute Engine, and Google Kubernetes Engine web applications. It crawls your application, following all links within the scope of your starting URLs, and attempts to exercise as many user inputs and event handlers as possible.",
     "api_id": "securitycenter.googleapis.com",
-    "api_shortname": "securitycenter",
+    "api_shortname": "websecurityscanner",
     "client_documentation": "https://cloud.google.com/python/docs/reference/websecurityscanner/latest",
     "default_version": "v1",
     "distribution_name": "google-cloud-websecurityscanner",
diff --git a/packages/google-maps-areainsights/.repo-metadata.json b/packages/google-maps-areainsights/.repo-metadata.json
index 1f25f9d47caf..32ec88ba0071 100644
--- a/packages/google-maps-areainsights/.repo-metadata.json
+++ b/packages/google-maps-areainsights/.repo-metadata.json
@@ -1,7 +1,7 @@
 {
     "api_description": "Places Insights API. ",
     "api_id": "areainsights.googleapis.com",
-    "api_shortname": "areainsights",
+    "api_shortname": "area-insights",
     "client_documentation": "https://googleapis.dev/python/google-maps-areainsights/latest",
     "default_version": "v1",
     "distribution_name": "google-maps-areainsights",
diff --git a/packages/google-maps-fleetengine-delivery/.repo-metadata.json b/packages/google-maps-fleetengine-delivery/.repo-metadata.json
index cf9109b94414..a9feee521daf 100644
--- a/packages/google-maps-fleetengine-delivery/.repo-metadata.json
+++ b/packages/google-maps-fleetengine-delivery/.repo-metadata.json
@@ -1,7 +1,7 @@
 {
     "api_description": "Enables Fleet Engine for access to the On Demand Rides and Deliveries and Last Mile Fleet Solution APIs.  Customer's use of Google Maps Content in the Cloud Logging Services is subject to the Google Maps Platform Terms of Service located at https://cloud.google.com/maps-platform/terms.",
     "api_id": "fleetengine.googleapis.com",
-    "api_shortname": "fleetengine",
+    "api_shortname": "fleetengine-delivery",
     "client_documentation": "https://googleapis.dev/python/fleetengine-delivery/latest",
     "default_version": "v1",
     "distribution_name": "google-maps-fleetengine-delivery",
diff --git a/packages/google-maps-geocode/.repo-metadata.json b/packages/google-maps-geocode/.repo-metadata.json
index db8f46fb1eb8..18434f0cace9 100644
--- a/packages/google-maps-geocode/.repo-metadata.json
+++ b/packages/google-maps-geocode/.repo-metadata.json
@@ -1,7 +1,7 @@
 {
     "api_description": "Convert addresses into geographic coordinates (geocoding), which you can\nuse     to place markers or position the map. This API also allows you to\nconvert     geographic coordinates into an address (reverse geocoding).",
     "api_id": "geocoding-backend.googleapis.com",
-    "api_shortname": "geocoding-backend",
+    "api_shortname": "geocode",
     "client_documentation": "https://cloud.google.com/python/docs/reference/google-maps-geocode/latest",
     "default_version": "v4",
     "distribution_name": "google-maps-geocode",
diff --git a/packages/google-maps-routing/.repo-metadata.json b/packages/google-maps-routing/.repo-metadata.json
index faa378482197..7d92981152f7 100644
--- a/packages/google-maps-routing/.repo-metadata.json
+++ b/packages/google-maps-routing/.repo-metadata.json
@@ -1,7 +1,7 @@
 {
     "api_description": "Help your users find the ideal way to get from A to Z with comprehensive data and real-time traffic.",
     "api_id": "routing.googleapis.com",
-    "api_shortname": "routing",
+    "api_shortname": "routes",
     "client_documentation": "https://googleapis.dev/python/routing/latest",
     "default_version": "v2",
     "distribution_name": "google-maps-routing",
diff --git a/packages/google-shopping-merchant-accounts/.repo-metadata.json b/packages/google-shopping-merchant-accounts/.repo-metadata.json
index ac4d4243839c..8baa0cfbc890 100644
--- a/packages/google-shopping-merchant-accounts/.repo-metadata.json
+++ b/packages/google-shopping-merchant-accounts/.repo-metadata.json
@@ -1,7 +1,7 @@
 {
     "api_description": "Programmatically manage your Merchant Center accounts.",
     "api_id": "accounts.googleapis.com",
-    "api_shortname": "accounts",
+    "api_shortname": "merchantapi",
     "client_documentation": "https://googleapis.dev/python/google-shopping-merchant-accounts/latest",
     "default_version": "v1",
     "distribution_name": "google-shopping-merchant-accounts",
diff --git a/packages/google-shopping-merchant-conversions/.repo-metadata.json b/packages/google-shopping-merchant-conversions/.repo-metadata.json
index ad46ef99f142..31286250212c 100644
--- a/packages/google-shopping-merchant-conversions/.repo-metadata.json
+++ b/packages/google-shopping-merchant-conversions/.repo-metadata.json
@@ -1,7 +1,7 @@
 {
     "api_description": "Programmatically manage your Merchant Center accounts.",
     "api_id": "merchantapi.googleapis.com",
-    "api_shortname": "conversions",
+    "api_shortname": "merchantapi",
     "client_documentation": "https://googleapis.dev/python/google-shopping-merchant-conversions/latest",
     "default_version": "v1",
     "distribution_name": "google-shopping-merchant-conversions",
diff --git a/packages/google-shopping-merchant-datasources/.repo-metadata.json b/packages/google-shopping-merchant-datasources/.repo-metadata.json
index d65852216931..71167c1d5d67 100644
--- a/packages/google-shopping-merchant-datasources/.repo-metadata.json
+++ b/packages/google-shopping-merchant-datasources/.repo-metadata.json
@@ -1,7 +1,7 @@
 {
     "api_description": "Programmatically manage your Merchant Center accounts.",
     "api_id": "datasources.googleapis.com",
-    "api_shortname": "datasources",
+    "api_shortname": "merchantapi",
     "client_documentation": "https://googleapis.dev/python/google-shopping-merchant-datasources/latest",
     "default_version": "v1",
     "distribution_name": "google-shopping-merchant-datasources",
diff --git a/packages/google-shopping-merchant-inventories/.repo-metadata.json b/packages/google-shopping-merchant-inventories/.repo-metadata.json
index 20f3dcaca510..8578e4a0ec2d 100644
--- a/packages/google-shopping-merchant-inventories/.repo-metadata.json
+++ b/packages/google-shopping-merchant-inventories/.repo-metadata.json
@@ -1,7 +1,7 @@
 {
     "api_description": "Programmatically manage your Merchant Center accounts.",
     "api_id": "inventories.googleapis.com",
-    "api_shortname": "inventories",
+    "api_shortname": "merchantapi",
     "client_documentation": "https://googleapis.dev/python/google-shopping-merchant-inventories/latest",
     "default_version": "v1",
     "distribution_name": "google-shopping-merchant-inventories",
diff --git a/packages/google-shopping-merchant-issueresolution/.repo-metadata.json b/packages/google-shopping-merchant-issueresolution/.repo-metadata.json
index 2640c24c107b..9da6ad20507b 100644
--- a/packages/google-shopping-merchant-issueresolution/.repo-metadata.json
+++ b/packages/google-shopping-merchant-issueresolution/.repo-metadata.json
@@ -1,7 +1,7 @@
 {
     "api_description": "Programmatically manage your Merchant Center Accounts. ",
     "api_id": "issueresolution.googleapis.com",
-    "api_shortname": "issueresolution",
+    "api_shortname": "merchantapi",
     "client_documentation": "https://googleapis.dev/python/google-shopping-merchant-issueresolution/latest",
     "default_version": "v1",
     "distribution_name": "google-shopping-merchant-issueresolution",
diff --git a/packages/google-shopping-merchant-lfp/.repo-metadata.json b/packages/google-shopping-merchant-lfp/.repo-metadata.json
index 4d6293c99ad9..06730eba457b 100644
--- a/packages/google-shopping-merchant-lfp/.repo-metadata.json
+++ b/packages/google-shopping-merchant-lfp/.repo-metadata.json
@@ -1,7 +1,7 @@
 {
     "api_description": "Programmatically manage your Merchant Center accounts.",
     "api_id": "merchantapi.googleapis.com",
-    "api_shortname": "lfp",
+    "api_shortname": "merchantapi",
     "client_documentation": "https://googleapis.dev/python/google-shopping-merchant-lfp/latest",
     "default_version": "v1",
     "distribution_name": "google-shopping-merchant-lfp",
diff --git a/packages/google-shopping-merchant-notifications/.repo-metadata.json b/packages/google-shopping-merchant-notifications/.repo-metadata.json
index 4a9df3662c68..034e33e534a6 100644
--- a/packages/google-shopping-merchant-notifications/.repo-metadata.json
+++ b/packages/google-shopping-merchant-notifications/.repo-metadata.json
@@ -1,7 +1,7 @@
 {
     "api_description": "Programmatically manage your Merchant Center accounts.",
     "api_id": "merchantapi.googleapis.com",
-    "api_shortname": "notifications",
+    "api_shortname": "merchantapi",
     "client_documentation": "https://googleapis.dev/python/google-shopping-merchant-notifications/latest",
     "default_version": "v1",
     "distribution_name": "google-shopping-merchant-notifications",
diff --git a/packages/google-shopping-merchant-ordertracking/.repo-metadata.json b/packages/google-shopping-merchant-ordertracking/.repo-metadata.json
index 8f0648de46ce..8c30b05f1512 100644
--- a/packages/google-shopping-merchant-ordertracking/.repo-metadata.json
+++ b/packages/google-shopping-merchant-ordertracking/.repo-metadata.json
@@ -1,7 +1,7 @@
 {
     "api_description": "Programmatically manage your Merchant Center Accounts. ",
     "api_id": "ordertracking.googleapis.com",
-    "api_shortname": "ordertracking",
+    "api_shortname": "merchantapi",
     "client_documentation": "https://googleapis.dev/python/google-shopping-merchant-ordertracking/latest",
     "default_version": "v1",
     "distribution_name": "google-shopping-merchant-ordertracking",
diff --git a/packages/google-shopping-merchant-products/.repo-metadata.json b/packages/google-shopping-merchant-products/.repo-metadata.json
index e2a2a848d4ff..95e7f00546c2 100644
--- a/packages/google-shopping-merchant-products/.repo-metadata.json
+++ b/packages/google-shopping-merchant-products/.repo-metadata.json
@@ -1,7 +1,7 @@
 {
     "api_description": "Programmatically manage your Merchant Center accounts.",
     "api_id": "products.googleapis.com",
-    "api_shortname": "products",
+    "api_shortname": "merchantapi",
     "client_documentation": "https://googleapis.dev/python/google-shopping-merchant-products/latest",
     "default_version": "v1",
     "distribution_name": "google-shopping-merchant-products",
diff --git a/packages/google-shopping-merchant-productstudio/.repo-metadata.json b/packages/google-shopping-merchant-productstudio/.repo-metadata.json
index b275d79aada9..b18fd03cd5f0 100644
--- a/packages/google-shopping-merchant-productstudio/.repo-metadata.json
+++ b/packages/google-shopping-merchant-productstudio/.repo-metadata.json
@@ -1,7 +1,7 @@
 {
     "api_description": "Programmatically manage your Merchant Center accounts.",
     "api_id": "productstudio.googleapis.com",
-    "api_shortname": "productstudio",
+    "api_shortname": "merchantapi",
     "client_documentation": "https://googleapis.dev/python/google-shopping-merchant-productstudio/latest",
     "default_version": "v1alpha",
     "distribution_name": "google-shopping-merchant-productstudio",
diff --git a/packages/google-shopping-merchant-promotions/.repo-metadata.json b/packages/google-shopping-merchant-promotions/.repo-metadata.json
index 302876816854..1899e43760d2 100644
--- a/packages/google-shopping-merchant-promotions/.repo-metadata.json
+++ b/packages/google-shopping-merchant-promotions/.repo-metadata.json
@@ -1,7 +1,7 @@
 {
     "api_description": "Programmatically manage your Merchant Center accounts.",
     "api_id": "promotions.googleapis.com",
-    "api_shortname": "promotions",
+    "api_shortname": "merchantapi",
     "client_documentation": "https://googleapis.dev/python/google-shopping-merchant-promotions/latest",
     "default_version": "v1",
     "distribution_name": "google-shopping-merchant-promotions",
diff --git a/packages/google-shopping-merchant-reports/.repo-metadata.json b/packages/google-shopping-merchant-reports/.repo-metadata.json
index f93ddb2621a2..18a81baacf74 100644
--- a/packages/google-shopping-merchant-reports/.repo-metadata.json
+++ b/packages/google-shopping-merchant-reports/.repo-metadata.json
@@ -1,7 +1,7 @@
 {
     "api_description": "Programmatically manage your Merchant Center accounts",
     "api_id": "reports.googleapis.com",
-    "api_shortname": "reports",
+    "api_shortname": "merchantapi",
     "client_documentation": "https://googleapis.dev/python/google-shopping-merchant-reports/latest",
     "default_version": "v1",
     "distribution_name": "google-shopping-merchant-reports",
diff --git a/packages/google-shopping-merchant-reviews/.repo-metadata.json b/packages/google-shopping-merchant-reviews/.repo-metadata.json
index 68c0675a5f54..51eb8dae18d8 100644
--- a/packages/google-shopping-merchant-reviews/.repo-metadata.json
+++ b/packages/google-shopping-merchant-reviews/.repo-metadata.json
@@ -1,7 +1,7 @@
 {
     "api_description": "Programmatically manage your Merchant Center Accounts",
     "api_id": "reviews.googleapis.com",
-    "api_shortname": "reviews",
+    "api_shortname": "merchantapi",
     "client_documentation": "https://googleapis.dev/python/google-shopping-merchant-reviews/latest",
     "default_version": "v1beta",
     "distribution_name": "google-shopping-merchant-reviews",
diff --git a/packages/google-shopping-type/.repo-metadata.json b/packages/google-shopping-type/.repo-metadata.json
index 47d61649c3ea..502931b47292 100644
--- a/packages/google-shopping-type/.repo-metadata.json
+++ b/packages/google-shopping-type/.repo-metadata.json
@@ -1,6 +1,5 @@
 {
     "api_id": "type.googleapis.com",
-    "api_shortname": "type",
     "client_documentation": "https://googleapis.dev/python/google-shopping-type/latest",
     "default_version": "apiVersion",
     "distribution_name": "google-shopping-type",
diff --git a/packages/grpc-google-iam-v1/.repo-metadata.json b/packages/grpc-google-iam-v1/.repo-metadata.json
index 24305a941bc5..d83f67e11c97 100644
--- a/packages/grpc-google-iam-v1/.repo-metadata.json
+++ b/packages/grpc-google-iam-v1/.repo-metadata.json
@@ -1,7 +1,7 @@
 {
     "api_description": "Manages access control for Google Cloud Platform resources.",
     "api_id": "iam.googleapis.com",
-    "api_shortname": "iam",
+    "api_shortname": "iam-meta-api",
     "client_documentation": "https://cloud.google.com/python/docs/reference/grpc-iam/latest",
     "default_version": "apiVersion",
     "distribution_name": "grpc-google-iam-v1",
diff --git a/packages/sqlalchemy-spanner/.repo-metadata.json b/packages/sqlalchemy-spanner/.repo-metadata.json
index cea87992dc53..d87b49595fda 100644
--- a/packages/sqlalchemy-spanner/.repo-metadata.json
+++ b/packages/sqlalchemy-spanner/.repo-metadata.json
@@ -1,5 +1,4 @@
 {
-    "api_shortname": "sqlalchemy-spanner",
     "client_documentation": "https://github.com/googleapis/python-spanner-sqlalchemy",
     "distribution_name": "sqlalchemy-spanner",
     "issue_tracker": "https://issuetracker.google.com/issues?q=componentid:190851%2B%20status:open",

From 34bb50bfa84e19d1227ec436e9974f862ba6aaa6 Mon Sep 17 00:00:00 2001
From: Jon Skeet <jonskeet@google.com>
Date: Mon, 27 Apr 2026 09:47:58 +0000
Subject: [PATCH 3/3] chore: revert google-cloud-bigquery change temporarily

See #16811
---
 packages/google-cloud-bigquery/.repo-metadata.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/google-cloud-bigquery/.repo-metadata.json b/packages/google-cloud-bigquery/.repo-metadata.json
index 1048b45d46e7..6b55ebc67f39 100644
--- a/packages/google-cloud-bigquery/.repo-metadata.json
+++ b/packages/google-cloud-bigquery/.repo-metadata.json
@@ -1,5 +1,6 @@
 {
     "api_id": "bigquery.googleapis.com",
+    "api_shortname": "bigquery",
     "client_documentation": "https://cloud.google.com/python/docs/reference/bigquery/latest",
     "default_version": "v2",
     "distribution_name": "google-cloud-bigquery",