diff --git a/librarian.yaml b/librarian.yaml
index c885164b5869..4cd170ad4652 100644
--- a/librarian.yaml
+++ b/librarian.yaml
@@ -60,7 +60,6 @@ libraries:
       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
   - name: bigquery-magics
@@ -69,7 +68,6 @@ libraries:
       library_type: INTEGRATION
       name_pretty_override: Google BigQuery connector for Jupyter and IPython
       product_documentation_override: https://cloud.google.com/bigquery
-      api_id_override: bigquery.googleapis.com
       client_documentation_override: https://googleapis.dev/python/bigquery-magics/latest/
       issue_tracker_override: https://github.com/googleapis/python-bigquery-magics/issues
   - name: db-dtypes
@@ -79,7 +77,6 @@ libraries:
       library_type: INTEGRATION
       name_pretty_override: Pandas Data Types for SQL systems (BigQuery, Spanner)
       product_documentation_override: https://pandas.pydata.org/pandas-docs/stable/ecosystem.html#ecosystem-extensions
-      api_id_override: bigquery.googleapis.com
       client_documentation_override: https://googleapis.dev/python/db-dtypes/latest/index.html
   - name: django-google-spanner
     version: 4.0.3
@@ -244,7 +241,6 @@ libraries:
           - 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
   - name: google-apps-chat
@@ -280,7 +276,6 @@ libraries:
           - 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
   - name: google-apps-meet
@@ -357,7 +352,6 @@ libraries:
           - 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
       default_version: apiVersion
@@ -908,7 +902,6 @@ libraries:
       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
       default_version: v2
@@ -2411,7 +2404,6 @@ libraries:
       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
   - name: google-cloud-language
@@ -2479,7 +2471,6 @@ libraries:
           - warehouse-package-name=google-cloud-locationfinder
       name_pretty_override: Cloud Location Finder API
       product_documentation_override: https://issuetracker.google.com/issues/new?component=1569265&template=1988535
-      api_id_override: locationfinder.googleapis.com
       default_version: v1
   - name: google-cloud-logging
     version: 3.15.0
@@ -2530,7 +2521,6 @@ libraries:
       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
     version: 1.15.0
@@ -2571,7 +2561,6 @@ libraries:
           - 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
     version: 0.14.0
@@ -2659,7 +2648,6 @@ libraries:
       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
     version: 2.30.0
@@ -3210,7 +3198,6 @@ libraries:
       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
     version: 1.17.0
@@ -3272,7 +3259,6 @@ libraries:
       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
   - name: google-cloud-saasplatform-saasservicemgmt
@@ -3410,7 +3396,6 @@ libraries:
       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
   - name: google-cloud-service-control
@@ -3520,7 +3505,6 @@ libraries:
       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
       default_version: v1
@@ -4082,7 +4066,6 @@ libraries:
       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
   - name: google-cloud-workflows
@@ -4176,7 +4159,6 @@ libraries:
           - warehouse-package-name=google-geo-type
       name_pretty_override: Geo Type Protos
       product_documentation_override: https://mapsplatform.google.com/maps-products
-      api_id_override: type.googleapis.com
       issue_tracker_override: https://github.com/googleapis/google-cloud-python/issues
       metadata_name_override: geotype
       default_version: apiVersion
@@ -4336,7 +4318,6 @@ libraries:
           - 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
       default_version: v2
@@ -4393,7 +4374,6 @@ libraries:
           - 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
   - name: google-shopping-merchant-conversions
@@ -4436,7 +4416,6 @@ libraries:
           - 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
   - name: google-shopping-merchant-inventories
@@ -4459,7 +4438,6 @@ libraries:
           - 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
     version: 1.3.0
@@ -4481,7 +4459,6 @@ libraries:
           - 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
     version: 1.3.0
@@ -4546,7 +4523,6 @@ libraries:
           - 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
     version: 1.5.0
@@ -4568,7 +4544,6 @@ libraries:
           - 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
   - name: google-shopping-merchant-productstudio
@@ -4584,7 +4559,6 @@ libraries:
           - 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
   - name: google-shopping-merchant-promotions
@@ -4607,7 +4581,6 @@ libraries:
           - 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
   - name: google-shopping-merchant-quota
@@ -4654,7 +4627,6 @@ libraries:
           - 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
     version: 0.5.0
@@ -4670,7 +4642,6 @@ libraries:
           - 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
   - name: google-shopping-type
@@ -4688,7 +4659,6 @@ libraries:
       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
   - name: googleapis-common-protos
@@ -4740,7 +4710,6 @@ libraries:
       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
       default_version: apiVersion
@@ -4750,7 +4719,6 @@ libraries:
       library_type: INTEGRATION
       name_pretty_override: Google BigQuery connector for pandas
       product_documentation_override: https://cloud.google.com/bigquery
-      api_id_override: bigquery.googleapis.com
       client_documentation_override: https://googleapis.dev/python/pandas-gbq/latest/
       issue_tracker_override: https://github.com/googleapis/python-bigquery-pandas/issues
       skip_readme_copy: true
@@ -4766,7 +4734,6 @@ libraries:
     python:
       library_type: INTEGRATION
       name_pretty_override: SQLAlchemy dialect for BigQuery
-      api_id_override: bigquery.googleapis.com
       client_documentation_override: https://googleapis.dev/python/sqlalchemy-bigquery/latest/index.html
   - name: sqlalchemy-spanner
     version: 1.17.3
diff --git a/packages/bigframes/.repo-metadata.json b/packages/bigframes/.repo-metadata.json
index 4a1c7ed478e3..002e58b74a0f 100644
--- a/packages/bigframes/.repo-metadata.json
+++ b/packages/bigframes/.repo-metadata.json
@@ -1,5 +1,4 @@
 {
-    "api_id": "bigquery.googleapis.com",
     "api_shortname": "bigquery",
     "client_documentation": "https://cloud.google.com/python/docs/reference/bigframes/latest",
     "distribution_name": "bigframes",
diff --git a/packages/bigquery-magics/.repo-metadata.json b/packages/bigquery-magics/.repo-metadata.json
index b30b6f137902..bed018c099db 100644
--- a/packages/bigquery-magics/.repo-metadata.json
+++ b/packages/bigquery-magics/.repo-metadata.json
@@ -1,5 +1,4 @@
 {
-    "api_id": "bigquery.googleapis.com",
     "client_documentation": "https://googleapis.dev/python/bigquery-magics/latest/",
     "distribution_name": "bigquery-magics",
     "issue_tracker": "https://github.com/googleapis/python-bigquery-magics/issues",
diff --git a/packages/db-dtypes/.repo-metadata.json b/packages/db-dtypes/.repo-metadata.json
index 6f8ee606655a..b92699b4dc06 100644
--- a/packages/db-dtypes/.repo-metadata.json
+++ b/packages/db-dtypes/.repo-metadata.json
@@ -1,5 +1,4 @@
 {
-    "api_id": "bigquery.googleapis.com",
     "client_documentation": "https://googleapis.dev/python/db-dtypes/latest/index.html",
     "distribution_name": "db-dtypes",
     "language": "python",
diff --git a/packages/google-apps-card/.repo-metadata.json b/packages/google-apps-card/.repo-metadata.json
index e183b48c4acd..4b2db0ab40e4 100644
--- a/packages/google-apps-card/.repo-metadata.json
+++ b/packages/google-apps-card/.repo-metadata.json
@@ -1,6 +1,5 @@
 {
     "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",
diff --git a/packages/google-apps-events-subscriptions/.repo-metadata.json b/packages/google-apps-events-subscriptions/.repo-metadata.json
index 34f9205b3f87..96e3f68c87db 100644
--- a/packages/google-apps-events-subscriptions/.repo-metadata.json
+++ b/packages/google-apps-events-subscriptions/.repo-metadata.json
@@ -1,6 +1,6 @@
 {
     "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_id": "workspaceevents.googleapis.com",
     "api_shortname": "subscriptions",
     "client_documentation": "https://googleapis.dev/python/google-apps-events-subscriptions/latest",
     "default_version": "v1",
diff --git a/packages/google-apps-script-type/.repo-metadata.json b/packages/google-apps-script-type/.repo-metadata.json
index a7876dfadbc7..f63f7128d36d 100644
--- a/packages/google-apps-script-type/.repo-metadata.json
+++ b/packages/google-apps-script-type/.repo-metadata.json
@@ -1,5 +1,4 @@
 {
-    "api_id": "type.googleapis.com",
     "api_shortname": "type",
     "client_documentation": "https://googleapis.dev/python/type/latest",
     "default_version": "apiVersion",
diff --git a/packages/google-cloud-bigquery/.repo-metadata.json b/packages/google-cloud-bigquery/.repo-metadata.json
index 6b55ebc67f39..3efabbc66c5f 100644
--- a/packages/google-cloud-bigquery/.repo-metadata.json
+++ b/packages/google-cloud-bigquery/.repo-metadata.json
@@ -1,5 +1,4 @@
 {
-    "api_id": "bigquery.googleapis.com",
     "api_shortname": "bigquery",
     "client_documentation": "https://cloud.google.com/python/docs/reference/bigquery/latest",
     "default_version": "v2",
diff --git a/packages/google-cloud-kms-inventory/.repo-metadata.json b/packages/google-cloud-kms-inventory/.repo-metadata.json
index d248429a1498..29845a31da82 100644
--- a/packages/google-cloud-kms-inventory/.repo-metadata.json
+++ b/packages/google-cloud-kms-inventory/.repo-metadata.json
@@ -1,6 +1,6 @@
 {
     "api_description": "KMS Inventory API",
-    "api_id": "inventory.googleapis.com",
+    "api_id": "kmsinventory.googleapis.com",
     "api_shortname": "inventory",
     "client_documentation": "https://cloud.google.com/python/docs/reference/inventory/latest",
     "default_version": "v1",
diff --git a/packages/google-cloud-locationfinder/.repo-metadata.json b/packages/google-cloud-locationfinder/.repo-metadata.json
index 6828855836d7..c8349b88699b 100644
--- a/packages/google-cloud-locationfinder/.repo-metadata.json
+++ b/packages/google-cloud-locationfinder/.repo-metadata.json
@@ -1,6 +1,6 @@
 {
     "api_description": "Cloud Location Finder lets you identify and filter cloud locations in regions and zones across Google Cloud, Google Distributed Cloud, Microsoft Azure, Amazon Web Services, and Oracle Cloud Infrastructure based on proximity, geographic location, and carbon footprint.",
-    "api_id": "locationfinder.googleapis.com",
+    "api_id": "cloudlocationfinder.googleapis.com",
     "api_shortname": "locationfinder",
     "client_documentation": "https://cloud.google.com/python/docs/reference/google-cloud-locationfinder/latest",
     "default_version": "v1",
diff --git a/packages/google-cloud-maintenance-api/.repo-metadata.json b/packages/google-cloud-maintenance-api/.repo-metadata.json
index 0581237885fc..be4d9d6e461d 100644
--- a/packages/google-cloud-maintenance-api/.repo-metadata.json
+++ b/packages/google-cloud-maintenance-api/.repo-metadata.json
@@ -1,6 +1,6 @@
 {
     "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_id": "maintenance.googleapis.com",
     "api_shortname": "api",
     "client_documentation": "https://cloud.google.com/python/docs/reference/google-cloud-maintenance-api/latest",
     "default_version": "v1",
diff --git a/packages/google-cloud-managedkafka-schemaregistry/.repo-metadata.json b/packages/google-cloud-managedkafka-schemaregistry/.repo-metadata.json
index 0ecbb22dae8d..fe6537d44290 100644
--- a/packages/google-cloud-managedkafka-schemaregistry/.repo-metadata.json
+++ b/packages/google-cloud-managedkafka-schemaregistry/.repo-metadata.json
@@ -1,6 +1,6 @@
 {
     "api_description": "Manage Apache Kafka clusters and resources. ",
-    "api_id": "schemaregistry.googleapis.com",
+    "api_id": "managedkafka.googleapis.com",
     "api_shortname": "schemaregistry",
     "client_documentation": "https://cloud.google.com/python/docs/reference/google-cloud-managedkafka-schemaregistry/latest",
     "default_version": "v1",
diff --git a/packages/google-cloud-modelarmor/.repo-metadata.json b/packages/google-cloud-modelarmor/.repo-metadata.json
index ca5dc54bfb35..d232f802f665 100644
--- a/packages/google-cloud-modelarmor/.repo-metadata.json
+++ b/packages/google-cloud-modelarmor/.repo-metadata.json
@@ -1,6 +1,6 @@
 {
     "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_id": "modelarmor.googleapis.com",
     "api_shortname": "securitycenter",
     "client_documentation": "https://cloud.google.com/python/docs/reference/google-cloud-modelarmor/latest",
     "default_version": "v1",
diff --git a/packages/google-cloud-redis-cluster/.repo-metadata.json b/packages/google-cloud-redis-cluster/.repo-metadata.json
index e82db89ac1c8..8038ce53a8a4 100644
--- a/packages/google-cloud-redis-cluster/.repo-metadata.json
+++ b/packages/google-cloud-redis-cluster/.repo-metadata.json
@@ -1,6 +1,6 @@
 {
     "api_description": "Creates and manages Redis instances on the Google Cloud Platform.",
-    "api_id": "cluster.googleapis.com",
+    "api_id": "redis.googleapis.com",
     "api_shortname": "cluster",
     "client_documentation": "https://cloud.google.com/python/docs/reference/google-cloud-redis-cluster/latest",
     "default_version": "v1",
diff --git a/packages/google-cloud-runtimeconfig/.repo-metadata.json b/packages/google-cloud-runtimeconfig/.repo-metadata.json
index 7d491d04e02e..f7a9d95d3970 100644
--- a/packages/google-cloud-runtimeconfig/.repo-metadata.json
+++ b/packages/google-cloud-runtimeconfig/.repo-metadata.json
@@ -1,5 +1,4 @@
 {
-    "api_id": "runtimeconfig.googleapis.com",
     "api_shortname": "runtimeconfig",
     "client_documentation": "https://cloud.google.com/python/docs/reference/runtimeconfig/latest",
     "distribution_name": "google-cloud-runtimeconfig",
diff --git a/packages/google-cloud-securitycentermanagement/.repo-metadata.json b/packages/google-cloud-securitycentermanagement/.repo-metadata.json
index 38d04533fc8f..92cb6c0ff056 100644
--- a/packages/google-cloud-securitycentermanagement/.repo-metadata.json
+++ b/packages/google-cloud-securitycentermanagement/.repo-metadata.json
@@ -1,6 +1,6 @@
 {
     "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_id": "securitycentermanagement.googleapis.com",
     "api_shortname": "securitycenter",
     "client_documentation": "https://cloud.google.com/python/docs/reference/google-cloud-securitycentermanagement/latest",
     "default_version": "v1",
diff --git a/packages/google-cloud-source-context/.repo-metadata.json b/packages/google-cloud-source-context/.repo-metadata.json
index 50fe10fad697..fb46eaa59782 100644
--- a/packages/google-cloud-source-context/.repo-metadata.json
+++ b/packages/google-cloud-source-context/.repo-metadata.json
@@ -1,5 +1,4 @@
 {
-    "api_id": "source.googleapis.com",
     "api_shortname": "source",
     "client_documentation": "https://cloud.google.com/python/docs/reference/source/latest",
     "default_version": "v1",
diff --git a/packages/google-cloud-websecurityscanner/.repo-metadata.json b/packages/google-cloud-websecurityscanner/.repo-metadata.json
index 82966e22f1d0..fbb8848d5cc6 100644
--- a/packages/google-cloud-websecurityscanner/.repo-metadata.json
+++ b/packages/google-cloud-websecurityscanner/.repo-metadata.json
@@ -1,6 +1,6 @@
 {
     "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_id": "websecurityscanner.googleapis.com",
     "api_shortname": "securitycenter",
     "client_documentation": "https://cloud.google.com/python/docs/reference/websecurityscanner/latest",
     "default_version": "v1",
diff --git a/packages/google-geo-type/.repo-metadata.json b/packages/google-geo-type/.repo-metadata.json
index 040c783e482d..a00065436712 100644
--- a/packages/google-geo-type/.repo-metadata.json
+++ b/packages/google-geo-type/.repo-metadata.json
@@ -1,6 +1,6 @@
 {
     "api_description": "Defines common types for Google Geo APIs.",
-    "api_id": "type.googleapis.com",
+    "api_id": "type.geo.googleapis.com",
     "api_shortname": "type",
     "client_documentation": "https://googleapis.dev/python/geotype/latest",
     "default_version": "apiVersion",
diff --git a/packages/google-maps-routing/.repo-metadata.json b/packages/google-maps-routing/.repo-metadata.json
index faa378482197..cbbf52866e5f 100644
--- a/packages/google-maps-routing/.repo-metadata.json
+++ b/packages/google-maps-routing/.repo-metadata.json
@@ -1,6 +1,6 @@
 {
     "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_id": "routes.googleapis.com",
     "api_shortname": "routing",
     "client_documentation": "https://googleapis.dev/python/routing/latest",
     "default_version": "v2",
diff --git a/packages/google-shopping-merchant-accounts/.repo-metadata.json b/packages/google-shopping-merchant-accounts/.repo-metadata.json
index ac4d4243839c..95f799869b30 100644
--- a/packages/google-shopping-merchant-accounts/.repo-metadata.json
+++ b/packages/google-shopping-merchant-accounts/.repo-metadata.json
@@ -1,6 +1,6 @@
 {
     "api_description": "Programmatically manage your Merchant Center accounts.",
-    "api_id": "accounts.googleapis.com",
+    "api_id": "merchantapi.googleapis.com",
     "api_shortname": "accounts",
     "client_documentation": "https://googleapis.dev/python/google-shopping-merchant-accounts/latest",
     "default_version": "v1",
diff --git a/packages/google-shopping-merchant-datasources/.repo-metadata.json b/packages/google-shopping-merchant-datasources/.repo-metadata.json
index d65852216931..d96603f134c7 100644
--- a/packages/google-shopping-merchant-datasources/.repo-metadata.json
+++ b/packages/google-shopping-merchant-datasources/.repo-metadata.json
@@ -1,6 +1,6 @@
 {
     "api_description": "Programmatically manage your Merchant Center accounts.",
-    "api_id": "datasources.googleapis.com",
+    "api_id": "merchantapi.googleapis.com",
     "api_shortname": "datasources",
     "client_documentation": "https://googleapis.dev/python/google-shopping-merchant-datasources/latest",
     "default_version": "v1",
diff --git a/packages/google-shopping-merchant-inventories/.repo-metadata.json b/packages/google-shopping-merchant-inventories/.repo-metadata.json
index 20f3dcaca510..35b3036b45a0 100644
--- a/packages/google-shopping-merchant-inventories/.repo-metadata.json
+++ b/packages/google-shopping-merchant-inventories/.repo-metadata.json
@@ -1,6 +1,6 @@
 {
     "api_description": "Programmatically manage your Merchant Center accounts.",
-    "api_id": "inventories.googleapis.com",
+    "api_id": "merchantapi.googleapis.com",
     "api_shortname": "inventories",
     "client_documentation": "https://googleapis.dev/python/google-shopping-merchant-inventories/latest",
     "default_version": "v1",
diff --git a/packages/google-shopping-merchant-issueresolution/.repo-metadata.json b/packages/google-shopping-merchant-issueresolution/.repo-metadata.json
index 2640c24c107b..ab329d40f7dd 100644
--- a/packages/google-shopping-merchant-issueresolution/.repo-metadata.json
+++ b/packages/google-shopping-merchant-issueresolution/.repo-metadata.json
@@ -1,6 +1,6 @@
 {
     "api_description": "Programmatically manage your Merchant Center Accounts. ",
-    "api_id": "issueresolution.googleapis.com",
+    "api_id": "merchantapi.googleapis.com",
     "api_shortname": "issueresolution",
     "client_documentation": "https://googleapis.dev/python/google-shopping-merchant-issueresolution/latest",
     "default_version": "v1",
diff --git a/packages/google-shopping-merchant-ordertracking/.repo-metadata.json b/packages/google-shopping-merchant-ordertracking/.repo-metadata.json
index 8f0648de46ce..ca4c235921cb 100644
--- a/packages/google-shopping-merchant-ordertracking/.repo-metadata.json
+++ b/packages/google-shopping-merchant-ordertracking/.repo-metadata.json
@@ -1,6 +1,6 @@
 {
     "api_description": "Programmatically manage your Merchant Center Accounts. ",
-    "api_id": "ordertracking.googleapis.com",
+    "api_id": "merchantapi.googleapis.com",
     "api_shortname": "ordertracking",
     "client_documentation": "https://googleapis.dev/python/google-shopping-merchant-ordertracking/latest",
     "default_version": "v1",
diff --git a/packages/google-shopping-merchant-products/.repo-metadata.json b/packages/google-shopping-merchant-products/.repo-metadata.json
index e2a2a848d4ff..9974051353f4 100644
--- a/packages/google-shopping-merchant-products/.repo-metadata.json
+++ b/packages/google-shopping-merchant-products/.repo-metadata.json
@@ -1,6 +1,6 @@
 {
     "api_description": "Programmatically manage your Merchant Center accounts.",
-    "api_id": "products.googleapis.com",
+    "api_id": "merchantapi.googleapis.com",
     "api_shortname": "products",
     "client_documentation": "https://googleapis.dev/python/google-shopping-merchant-products/latest",
     "default_version": "v1",
diff --git a/packages/google-shopping-merchant-productstudio/.repo-metadata.json b/packages/google-shopping-merchant-productstudio/.repo-metadata.json
index b275d79aada9..6f97edffeb7f 100644
--- a/packages/google-shopping-merchant-productstudio/.repo-metadata.json
+++ b/packages/google-shopping-merchant-productstudio/.repo-metadata.json
@@ -1,6 +1,6 @@
 {
     "api_description": "Programmatically manage your Merchant Center accounts.",
-    "api_id": "productstudio.googleapis.com",
+    "api_id": "merchantapi.googleapis.com",
     "api_shortname": "productstudio",
     "client_documentation": "https://googleapis.dev/python/google-shopping-merchant-productstudio/latest",
     "default_version": "v1alpha",
diff --git a/packages/google-shopping-merchant-promotions/.repo-metadata.json b/packages/google-shopping-merchant-promotions/.repo-metadata.json
index 302876816854..b8826627c78e 100644
--- a/packages/google-shopping-merchant-promotions/.repo-metadata.json
+++ b/packages/google-shopping-merchant-promotions/.repo-metadata.json
@@ -1,6 +1,6 @@
 {
     "api_description": "Programmatically manage your Merchant Center accounts.",
-    "api_id": "promotions.googleapis.com",
+    "api_id": "merchantapi.googleapis.com",
     "api_shortname": "promotions",
     "client_documentation": "https://googleapis.dev/python/google-shopping-merchant-promotions/latest",
     "default_version": "v1",
diff --git a/packages/google-shopping-merchant-reports/.repo-metadata.json b/packages/google-shopping-merchant-reports/.repo-metadata.json
index f93ddb2621a2..7824f695c41a 100644
--- a/packages/google-shopping-merchant-reports/.repo-metadata.json
+++ b/packages/google-shopping-merchant-reports/.repo-metadata.json
@@ -1,6 +1,6 @@
 {
     "api_description": "Programmatically manage your Merchant Center accounts",
-    "api_id": "reports.googleapis.com",
+    "api_id": "merchantapi.googleapis.com",
     "api_shortname": "reports",
     "client_documentation": "https://googleapis.dev/python/google-shopping-merchant-reports/latest",
     "default_version": "v1",
diff --git a/packages/google-shopping-merchant-reviews/.repo-metadata.json b/packages/google-shopping-merchant-reviews/.repo-metadata.json
index 68c0675a5f54..f73d11811f2a 100644
--- a/packages/google-shopping-merchant-reviews/.repo-metadata.json
+++ b/packages/google-shopping-merchant-reviews/.repo-metadata.json
@@ -1,6 +1,6 @@
 {
     "api_description": "Programmatically manage your Merchant Center Accounts",
-    "api_id": "reviews.googleapis.com",
+    "api_id": "merchantapi.googleapis.com",
     "api_shortname": "reviews",
     "client_documentation": "https://googleapis.dev/python/google-shopping-merchant-reviews/latest",
     "default_version": "v1beta",
diff --git a/packages/google-shopping-type/.repo-metadata.json b/packages/google-shopping-type/.repo-metadata.json
index 47d61649c3ea..4d8aec68be36 100644
--- a/packages/google-shopping-type/.repo-metadata.json
+++ b/packages/google-shopping-type/.repo-metadata.json
@@ -1,5 +1,4 @@
 {
-    "api_id": "type.googleapis.com",
     "api_shortname": "type",
     "client_documentation": "https://googleapis.dev/python/google-shopping-type/latest",
     "default_version": "apiVersion",
diff --git a/packages/grpc-google-iam-v1/.repo-metadata.json b/packages/grpc-google-iam-v1/.repo-metadata.json
index 24305a941bc5..436a193abf8b 100644
--- a/packages/grpc-google-iam-v1/.repo-metadata.json
+++ b/packages/grpc-google-iam-v1/.repo-metadata.json
@@ -1,6 +1,6 @@
 {
     "api_description": "Manages access control for Google Cloud Platform resources.",
-    "api_id": "iam.googleapis.com",
+    "api_id": "iam-meta-api.googleapis.com",
     "api_shortname": "iam",
     "client_documentation": "https://cloud.google.com/python/docs/reference/grpc-iam/latest",
     "default_version": "apiVersion",
diff --git a/packages/pandas-gbq/.repo-metadata.json b/packages/pandas-gbq/.repo-metadata.json
index c41ab50bbf48..dc2fa4102a78 100644
--- a/packages/pandas-gbq/.repo-metadata.json
+++ b/packages/pandas-gbq/.repo-metadata.json
@@ -1,5 +1,4 @@
 {
-    "api_id": "bigquery.googleapis.com",
     "client_documentation": "https://googleapis.dev/python/pandas-gbq/latest/",
     "distribution_name": "pandas-gbq",
     "issue_tracker": "https://github.com/googleapis/python-bigquery-pandas/issues",
diff --git a/packages/sqlalchemy-bigquery/.repo-metadata.json b/packages/sqlalchemy-bigquery/.repo-metadata.json
index 6246353b6cda..564f9b482839 100644
--- a/packages/sqlalchemy-bigquery/.repo-metadata.json
+++ b/packages/sqlalchemy-bigquery/.repo-metadata.json
@@ -1,5 +1,4 @@
 {
-    "api_id": "bigquery.googleapis.com",
     "client_documentation": "https://googleapis.dev/python/sqlalchemy-bigquery/latest/index.html",
     "distribution_name": "sqlalchemy-bigquery",
     "language": "python",