BREAKING: drop the `Api` from `Resource` types

It's cleaner.
diff --git a/generated/googleapis/lib/abusiveexperiencereport/v1.dart b/generated/googleapis/lib/abusiveexperiencereport/v1.dart
index 7877f4a..e389feb 100644
--- a/generated/googleapis/lib/abusiveexperiencereport/v1.dart
+++ b/generated/googleapis/lib/abusiveexperiencereport/v1.dart
@@ -26,8 +26,8 @@
 /// Create an instance of [AbusiveExperienceReportApi] to access these
 /// resources:
 ///
-/// - [SitesResourceApi]
-/// - [ViolatingSitesResourceApi]
+/// - [SitesResource]
+/// - [ViolatingSitesResource]
 library abusiveexperiencereport.v1;
 
 import 'dart:async' as async;
@@ -46,9 +46,9 @@
 class AbusiveExperienceReportApi {
   final commons.ApiRequester _requester;
 
-  SitesResourceApi get sites => SitesResourceApi(_requester);
-  ViolatingSitesResourceApi get violatingSites =>
-      ViolatingSitesResourceApi(_requester);
+  SitesResource get sites => SitesResource(_requester);
+  ViolatingSitesResource get violatingSites =>
+      ViolatingSitesResource(_requester);
 
   AbusiveExperienceReportApi(http.Client client,
       {core.String rootUrl = 'https://abusiveexperiencereport.googleapis.com/',
@@ -57,10 +57,10 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class SitesResourceApi {
+class SitesResource {
   final commons.ApiRequester _requester;
 
-  SitesResourceApi(commons.ApiRequester client) : _requester = client;
+  SitesResource(commons.ApiRequester client) : _requester = client;
 
   /// Gets a site's Abusive Experience Report summary.
   ///
@@ -116,10 +116,10 @@
   }
 }
 
-class ViolatingSitesResourceApi {
+class ViolatingSitesResource {
   final commons.ApiRequester _requester;
 
-  ViolatingSitesResourceApi(commons.ApiRequester client) : _requester = client;
+  ViolatingSitesResource(commons.ApiRequester client) : _requester = client;
 
   /// Lists sites that are failing in the Abusive Experience Report.
   ///
diff --git a/generated/googleapis/lib/acceleratedmobilepageurl/v1.dart b/generated/googleapis/lib/acceleratedmobilepageurl/v1.dart
index ae47352..c8d83aa 100644
--- a/generated/googleapis/lib/acceleratedmobilepageurl/v1.dart
+++ b/generated/googleapis/lib/acceleratedmobilepageurl/v1.dart
@@ -25,7 +25,7 @@
 /// Create an instance of [AcceleratedmobilepageurlApi] to access these
 /// resources:
 ///
-/// - [AmpUrlsResourceApi]
+/// - [AmpUrlsResource]
 library acceleratedmobilepageurl.v1;
 
 import 'dart:async' as async;
@@ -45,7 +45,7 @@
 class AcceleratedmobilepageurlApi {
   final commons.ApiRequester _requester;
 
-  AmpUrlsResourceApi get ampUrls => AmpUrlsResourceApi(_requester);
+  AmpUrlsResource get ampUrls => AmpUrlsResource(_requester);
 
   AcceleratedmobilepageurlApi(http.Client client,
       {core.String rootUrl = 'https://acceleratedmobilepageurl.googleapis.com/',
@@ -54,10 +54,10 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class AmpUrlsResourceApi {
+class AmpUrlsResource {
   final commons.ApiRequester _requester;
 
-  AmpUrlsResourceApi(commons.ApiRequester client) : _requester = client;
+  AmpUrlsResource(commons.ApiRequester client) : _requester = client;
 
   /// Returns AMP URL(s) and equivalent [AMP Cache
   /// URL(s)](/amp/cache/overview#amp-cache-url-format).
diff --git a/generated/googleapis/lib/accessapproval/v1.dart b/generated/googleapis/lib/accessapproval/v1.dart
index 308aec8..6a208cd 100644
--- a/generated/googleapis/lib/accessapproval/v1.dart
+++ b/generated/googleapis/lib/accessapproval/v1.dart
@@ -23,12 +23,12 @@
 ///
 /// Create an instance of [AccessApprovalApi] to access these resources:
 ///
-/// - [FoldersResourceApi]
-///   - [FoldersApprovalRequestsResourceApi]
-/// - [OrganizationsResourceApi]
-///   - [OrganizationsApprovalRequestsResourceApi]
-/// - [ProjectsResourceApi]
-///   - [ProjectsApprovalRequestsResourceApi]
+/// - [FoldersResource]
+///   - [FoldersApprovalRequestsResource]
+/// - [OrganizationsResource]
+///   - [OrganizationsApprovalRequestsResource]
+/// - [ProjectsResource]
+///   - [ProjectsApprovalRequestsResource]
 library accessapproval.v1;
 
 import 'dart:async' as async;
@@ -51,10 +51,9 @@
 
   final commons.ApiRequester _requester;
 
-  FoldersResourceApi get folders => FoldersResourceApi(_requester);
-  OrganizationsResourceApi get organizations =>
-      OrganizationsResourceApi(_requester);
-  ProjectsResourceApi get projects => ProjectsResourceApi(_requester);
+  FoldersResource get folders => FoldersResource(_requester);
+  OrganizationsResource get organizations => OrganizationsResource(_requester);
+  ProjectsResource get projects => ProjectsResource(_requester);
 
   AccessApprovalApi(http.Client client,
       {core.String rootUrl = 'https://accessapproval.googleapis.com/',
@@ -63,13 +62,13 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class FoldersResourceApi {
+class FoldersResource {
   final commons.ApiRequester _requester;
 
-  FoldersApprovalRequestsResourceApi get approvalRequests =>
-      FoldersApprovalRequestsResourceApi(_requester);
+  FoldersApprovalRequestsResource get approvalRequests =>
+      FoldersApprovalRequestsResource(_requester);
 
-  FoldersResourceApi(commons.ApiRequester client) : _requester = client;
+  FoldersResource(commons.ApiRequester client) : _requester = client;
 
   /// Deletes the settings associated with a project, folder, or organization.
   /// This will have the effect of disabling Access Approval for the project,
@@ -255,10 +254,10 @@
   }
 }
 
-class FoldersApprovalRequestsResourceApi {
+class FoldersApprovalRequestsResource {
   final commons.ApiRequester _requester;
 
-  FoldersApprovalRequestsResourceApi(commons.ApiRequester client)
+  FoldersApprovalRequestsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Approves a request and returns the updated ApprovalRequest. Returns
@@ -516,13 +515,13 @@
   }
 }
 
-class OrganizationsResourceApi {
+class OrganizationsResource {
   final commons.ApiRequester _requester;
 
-  OrganizationsApprovalRequestsResourceApi get approvalRequests =>
-      OrganizationsApprovalRequestsResourceApi(_requester);
+  OrganizationsApprovalRequestsResource get approvalRequests =>
+      OrganizationsApprovalRequestsResource(_requester);
 
-  OrganizationsResourceApi(commons.ApiRequester client) : _requester = client;
+  OrganizationsResource(commons.ApiRequester client) : _requester = client;
 
   /// Deletes the settings associated with a project, folder, or organization.
   /// This will have the effect of disabling Access Approval for the project,
@@ -708,10 +707,10 @@
   }
 }
 
-class OrganizationsApprovalRequestsResourceApi {
+class OrganizationsApprovalRequestsResource {
   final commons.ApiRequester _requester;
 
-  OrganizationsApprovalRequestsResourceApi(commons.ApiRequester client)
+  OrganizationsApprovalRequestsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Approves a request and returns the updated ApprovalRequest. Returns
@@ -969,13 +968,13 @@
   }
 }
 
-class ProjectsResourceApi {
+class ProjectsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsApprovalRequestsResourceApi get approvalRequests =>
-      ProjectsApprovalRequestsResourceApi(_requester);
+  ProjectsApprovalRequestsResource get approvalRequests =>
+      ProjectsApprovalRequestsResource(_requester);
 
-  ProjectsResourceApi(commons.ApiRequester client) : _requester = client;
+  ProjectsResource(commons.ApiRequester client) : _requester = client;
 
   /// Deletes the settings associated with a project, folder, or organization.
   /// This will have the effect of disabling Access Approval for the project,
@@ -1161,10 +1160,10 @@
   }
 }
 
-class ProjectsApprovalRequestsResourceApi {
+class ProjectsApprovalRequestsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsApprovalRequestsResourceApi(commons.ApiRequester client)
+  ProjectsApprovalRequestsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Approves a request and returns the updated ApprovalRequest. Returns
diff --git a/generated/googleapis/lib/accesscontextmanager/v1.dart b/generated/googleapis/lib/accesscontextmanager/v1.dart
index 8b7f173..4c06a7a 100644
--- a/generated/googleapis/lib/accesscontextmanager/v1.dart
+++ b/generated/googleapis/lib/accesscontextmanager/v1.dart
@@ -25,12 +25,12 @@
 ///
 /// Create an instance of [AccessContextManagerApi] to access these resources:
 ///
-/// - [AccessPoliciesResourceApi]
-///   - [AccessPoliciesAccessLevelsResourceApi]
-///   - [AccessPoliciesServicePerimetersResourceApi]
-/// - [OperationsResourceApi]
-/// - [OrganizationsResourceApi]
-///   - [OrganizationsGcpUserAccessBindingsResourceApi]
+/// - [AccessPoliciesResource]
+///   - [AccessPoliciesAccessLevelsResource]
+///   - [AccessPoliciesServicePerimetersResource]
+/// - [OperationsResource]
+/// - [OrganizationsResource]
+///   - [OrganizationsGcpUserAccessBindingsResource]
 library accesscontextmanager.v1;
 
 import 'dart:async' as async;
@@ -54,11 +54,10 @@
 
   final commons.ApiRequester _requester;
 
-  AccessPoliciesResourceApi get accessPolicies =>
-      AccessPoliciesResourceApi(_requester);
-  OperationsResourceApi get operations => OperationsResourceApi(_requester);
-  OrganizationsResourceApi get organizations =>
-      OrganizationsResourceApi(_requester);
+  AccessPoliciesResource get accessPolicies =>
+      AccessPoliciesResource(_requester);
+  OperationsResource get operations => OperationsResource(_requester);
+  OrganizationsResource get organizations => OrganizationsResource(_requester);
 
   AccessContextManagerApi(http.Client client,
       {core.String rootUrl = 'https://accesscontextmanager.googleapis.com/',
@@ -67,15 +66,15 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class AccessPoliciesResourceApi {
+class AccessPoliciesResource {
   final commons.ApiRequester _requester;
 
-  AccessPoliciesAccessLevelsResourceApi get accessLevels =>
-      AccessPoliciesAccessLevelsResourceApi(_requester);
-  AccessPoliciesServicePerimetersResourceApi get servicePerimeters =>
-      AccessPoliciesServicePerimetersResourceApi(_requester);
+  AccessPoliciesAccessLevelsResource get accessLevels =>
+      AccessPoliciesAccessLevelsResource(_requester);
+  AccessPoliciesServicePerimetersResource get servicePerimeters =>
+      AccessPoliciesServicePerimetersResource(_requester);
 
-  AccessPoliciesResourceApi(commons.ApiRequester client) : _requester = client;
+  AccessPoliciesResource(commons.ApiRequester client) : _requester = client;
 
   /// Create an `AccessPolicy`. Fails if this organization already has a
   /// `AccessPolicy`. The longrunning Operation will have a successful status
@@ -373,10 +372,10 @@
   }
 }
 
-class AccessPoliciesAccessLevelsResourceApi {
+class AccessPoliciesAccessLevelsResource {
   final commons.ApiRequester _requester;
 
-  AccessPoliciesAccessLevelsResourceApi(commons.ApiRequester client)
+  AccessPoliciesAccessLevelsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Create an Access Level. The longrunning operation from this RPC will have
@@ -787,10 +786,10 @@
   }
 }
 
-class AccessPoliciesServicePerimetersResourceApi {
+class AccessPoliciesServicePerimetersResource {
   final commons.ApiRequester _requester;
 
-  AccessPoliciesServicePerimetersResourceApi(commons.ApiRequester client)
+  AccessPoliciesServicePerimetersResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Commit the dry-run spec for all the Service Perimeters in an Access
@@ -1241,10 +1240,10 @@
   }
 }
 
-class OperationsResourceApi {
+class OperationsResource {
   final commons.ApiRequester _requester;
 
-  OperationsResourceApi(commons.ApiRequester client) : _requester = client;
+  OperationsResource(commons.ApiRequester client) : _requester = client;
 
   /// Starts asynchronous cancellation on a long-running operation. The server
   /// makes a best effort to cancel the operation, but success is not
@@ -1497,19 +1496,19 @@
   }
 }
 
-class OrganizationsResourceApi {
+class OrganizationsResource {
   final commons.ApiRequester _requester;
 
-  OrganizationsGcpUserAccessBindingsResourceApi get gcpUserAccessBindings =>
-      OrganizationsGcpUserAccessBindingsResourceApi(_requester);
+  OrganizationsGcpUserAccessBindingsResource get gcpUserAccessBindings =>
+      OrganizationsGcpUserAccessBindingsResource(_requester);
 
-  OrganizationsResourceApi(commons.ApiRequester client) : _requester = client;
+  OrganizationsResource(commons.ApiRequester client) : _requester = client;
 }
 
-class OrganizationsGcpUserAccessBindingsResourceApi {
+class OrganizationsGcpUserAccessBindingsResource {
   final commons.ApiRequester _requester;
 
-  OrganizationsGcpUserAccessBindingsResourceApi(commons.ApiRequester client)
+  OrganizationsGcpUserAccessBindingsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Creates a GcpUserAccessBinding. If the client specifies a name, the server
diff --git a/generated/googleapis/lib/adexchangebuyer/v1_3.dart b/generated/googleapis/lib/adexchangebuyer/v1_3.dart
index ff6879c..266863f 100644
--- a/generated/googleapis/lib/adexchangebuyer/v1_3.dart
+++ b/generated/googleapis/lib/adexchangebuyer/v1_3.dart
@@ -25,13 +25,13 @@
 ///
 /// Create an instance of [AdExchangeBuyerApi] to access these resources:
 ///
-/// - [AccountsResourceApi]
-/// - [BillingInfoResourceApi]
-/// - [BudgetResourceApi]
-/// - [CreativesResourceApi]
-/// - [DirectDealsResourceApi]
-/// - [PerformanceReportResourceApi]
-/// - [PretargetingConfigResourceApi]
+/// - [AccountsResource]
+/// - [BillingInfoResource]
+/// - [BudgetResource]
+/// - [CreativesResource]
+/// - [DirectDealsResource]
+/// - [PerformanceReportResource]
+/// - [PretargetingConfigResource]
 library adexchangebuyer.v1_3;
 
 import 'dart:async' as async;
@@ -55,15 +55,15 @@
 
   final commons.ApiRequester _requester;
 
-  AccountsResourceApi get accounts => AccountsResourceApi(_requester);
-  BillingInfoResourceApi get billingInfo => BillingInfoResourceApi(_requester);
-  BudgetResourceApi get budget => BudgetResourceApi(_requester);
-  CreativesResourceApi get creatives => CreativesResourceApi(_requester);
-  DirectDealsResourceApi get directDeals => DirectDealsResourceApi(_requester);
-  PerformanceReportResourceApi get performanceReport =>
-      PerformanceReportResourceApi(_requester);
-  PretargetingConfigResourceApi get pretargetingConfig =>
-      PretargetingConfigResourceApi(_requester);
+  AccountsResource get accounts => AccountsResource(_requester);
+  BillingInfoResource get billingInfo => BillingInfoResource(_requester);
+  BudgetResource get budget => BudgetResource(_requester);
+  CreativesResource get creatives => CreativesResource(_requester);
+  DirectDealsResource get directDeals => DirectDealsResource(_requester);
+  PerformanceReportResource get performanceReport =>
+      PerformanceReportResource(_requester);
+  PretargetingConfigResource get pretargetingConfig =>
+      PretargetingConfigResource(_requester);
 
   AdExchangeBuyerApi(http.Client client,
       {core.String rootUrl = 'https://www.googleapis.com/',
@@ -72,10 +72,10 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class AccountsResourceApi {
+class AccountsResource {
   final commons.ApiRequester _requester;
 
-  AccountsResourceApi(commons.ApiRequester client) : _requester = client;
+  AccountsResource(commons.ApiRequester client) : _requester = client;
 
   /// Gets one account by ID.
   ///
@@ -285,10 +285,10 @@
   }
 }
 
-class BillingInfoResourceApi {
+class BillingInfoResource {
   final commons.ApiRequester _requester;
 
-  BillingInfoResourceApi(commons.ApiRequester client) : _requester = client;
+  BillingInfoResource(commons.ApiRequester client) : _requester = client;
 
   /// Returns the billing information for one account specified by account ID.
   ///
@@ -388,10 +388,10 @@
   }
 }
 
-class BudgetResourceApi {
+class BudgetResource {
   final commons.ApiRequester _requester;
 
-  BudgetResourceApi(commons.ApiRequester client) : _requester = client;
+  BudgetResource(commons.ApiRequester client) : _requester = client;
 
   /// Returns the budget information for the adgroup specified by the accountId
   /// and billingId.
@@ -587,10 +587,10 @@
   }
 }
 
-class CreativesResourceApi {
+class CreativesResource {
   final commons.ApiRequester _requester;
 
-  CreativesResourceApi(commons.ApiRequester client) : _requester = client;
+  CreativesResource(commons.ApiRequester client) : _requester = client;
 
   /// Gets the status for a single creative. A creative will be available 30-40
   /// minutes after submission.
@@ -790,10 +790,10 @@
   }
 }
 
-class DirectDealsResourceApi {
+class DirectDealsResource {
   final commons.ApiRequester _requester;
 
-  DirectDealsResourceApi(commons.ApiRequester client) : _requester = client;
+  DirectDealsResource(commons.ApiRequester client) : _requester = client;
 
   /// Gets one direct deal by ID.
   ///
@@ -892,11 +892,10 @@
   }
 }
 
-class PerformanceReportResourceApi {
+class PerformanceReportResource {
   final commons.ApiRequester _requester;
 
-  PerformanceReportResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  PerformanceReportResource(commons.ApiRequester client) : _requester = client;
 
   /// Retrieves the authenticated user's list of performance metrics.
   ///
@@ -983,11 +982,10 @@
   }
 }
 
-class PretargetingConfigResourceApi {
+class PretargetingConfigResource {
   final commons.ApiRequester _requester;
 
-  PretargetingConfigResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  PretargetingConfigResource(commons.ApiRequester client) : _requester = client;
 
   /// Deletes an existing pretargeting config.
   ///
diff --git a/generated/googleapis/lib/adexchangebuyer/v1_4.dart b/generated/googleapis/lib/adexchangebuyer/v1_4.dart
index 22f9be1..48b33ff 100644
--- a/generated/googleapis/lib/adexchangebuyer/v1_4.dart
+++ b/generated/googleapis/lib/adexchangebuyer/v1_4.dart
@@ -25,18 +25,18 @@
 ///
 /// Create an instance of [AdExchangeBuyerApi] to access these resources:
 ///
-/// - [AccountsResourceApi]
-/// - [BillingInfoResourceApi]
-/// - [BudgetResourceApi]
-/// - [CreativesResourceApi]
-/// - [MarketplacedealsResourceApi]
-/// - [MarketplacenotesResourceApi]
-/// - [MarketplaceprivateauctionResourceApi]
-/// - [PerformanceReportResourceApi]
-/// - [PretargetingConfigResourceApi]
-/// - [ProductsResourceApi]
-/// - [ProposalsResourceApi]
-/// - [PubprofilesResourceApi]
+/// - [AccountsResource]
+/// - [BillingInfoResource]
+/// - [BudgetResource]
+/// - [CreativesResource]
+/// - [MarketplacedealsResource]
+/// - [MarketplacenotesResource]
+/// - [MarketplaceprivateauctionResource]
+/// - [PerformanceReportResource]
+/// - [PretargetingConfigResource]
+/// - [ProductsResource]
+/// - [ProposalsResource]
+/// - [PubprofilesResource]
 library adexchangebuyer.v1_4;
 
 import 'dart:async' as async;
@@ -60,23 +60,23 @@
 
   final commons.ApiRequester _requester;
 
-  AccountsResourceApi get accounts => AccountsResourceApi(_requester);
-  BillingInfoResourceApi get billingInfo => BillingInfoResourceApi(_requester);
-  BudgetResourceApi get budget => BudgetResourceApi(_requester);
-  CreativesResourceApi get creatives => CreativesResourceApi(_requester);
-  MarketplacedealsResourceApi get marketplacedeals =>
-      MarketplacedealsResourceApi(_requester);
-  MarketplacenotesResourceApi get marketplacenotes =>
-      MarketplacenotesResourceApi(_requester);
-  MarketplaceprivateauctionResourceApi get marketplaceprivateauction =>
-      MarketplaceprivateauctionResourceApi(_requester);
-  PerformanceReportResourceApi get performanceReport =>
-      PerformanceReportResourceApi(_requester);
-  PretargetingConfigResourceApi get pretargetingConfig =>
-      PretargetingConfigResourceApi(_requester);
-  ProductsResourceApi get products => ProductsResourceApi(_requester);
-  ProposalsResourceApi get proposals => ProposalsResourceApi(_requester);
-  PubprofilesResourceApi get pubprofiles => PubprofilesResourceApi(_requester);
+  AccountsResource get accounts => AccountsResource(_requester);
+  BillingInfoResource get billingInfo => BillingInfoResource(_requester);
+  BudgetResource get budget => BudgetResource(_requester);
+  CreativesResource get creatives => CreativesResource(_requester);
+  MarketplacedealsResource get marketplacedeals =>
+      MarketplacedealsResource(_requester);
+  MarketplacenotesResource get marketplacenotes =>
+      MarketplacenotesResource(_requester);
+  MarketplaceprivateauctionResource get marketplaceprivateauction =>
+      MarketplaceprivateauctionResource(_requester);
+  PerformanceReportResource get performanceReport =>
+      PerformanceReportResource(_requester);
+  PretargetingConfigResource get pretargetingConfig =>
+      PretargetingConfigResource(_requester);
+  ProductsResource get products => ProductsResource(_requester);
+  ProposalsResource get proposals => ProposalsResource(_requester);
+  PubprofilesResource get pubprofiles => PubprofilesResource(_requester);
 
   AdExchangeBuyerApi(http.Client client,
       {core.String rootUrl = 'https://www.googleapis.com/',
@@ -85,10 +85,10 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class AccountsResourceApi {
+class AccountsResource {
   final commons.ApiRequester _requester;
 
-  AccountsResourceApi(commons.ApiRequester client) : _requester = client;
+  AccountsResource(commons.ApiRequester client) : _requester = client;
 
   /// Gets one account by ID.
   ///
@@ -316,10 +316,10 @@
   }
 }
 
-class BillingInfoResourceApi {
+class BillingInfoResource {
   final commons.ApiRequester _requester;
 
-  BillingInfoResourceApi(commons.ApiRequester client) : _requester = client;
+  BillingInfoResource(commons.ApiRequester client) : _requester = client;
 
   /// Returns the billing information for one account specified by account ID.
   ///
@@ -419,10 +419,10 @@
   }
 }
 
-class BudgetResourceApi {
+class BudgetResource {
   final commons.ApiRequester _requester;
 
-  BudgetResourceApi(commons.ApiRequester client) : _requester = client;
+  BudgetResource(commons.ApiRequester client) : _requester = client;
 
   /// Returns the budget information for the adgroup specified by the accountId
   /// and billingId.
@@ -618,10 +618,10 @@
   }
 }
 
-class CreativesResourceApi {
+class CreativesResource {
   final commons.ApiRequester _requester;
 
-  CreativesResourceApi(commons.ApiRequester client) : _requester = client;
+  CreativesResource(commons.ApiRequester client) : _requester = client;
 
   /// Add a deal id association for the creative.
   ///
@@ -1034,11 +1034,10 @@
   }
 }
 
-class MarketplacedealsResourceApi {
+class MarketplacedealsResource {
   final commons.ApiRequester _requester;
 
-  MarketplacedealsResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  MarketplacedealsResource(commons.ApiRequester client) : _requester = client;
 
   /// Delete the specified deals from the proposal
   ///
@@ -1277,11 +1276,10 @@
   }
 }
 
-class MarketplacenotesResourceApi {
+class MarketplacenotesResource {
   final commons.ApiRequester _requester;
 
-  MarketplacenotesResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  MarketplacenotesResource(commons.ApiRequester client) : _requester = client;
 
   /// Add notes to the proposal
   ///
@@ -1404,10 +1402,10 @@
   }
 }
 
-class MarketplaceprivateauctionResourceApi {
+class MarketplaceprivateauctionResource {
   final commons.ApiRequester _requester;
 
-  MarketplaceprivateauctionResourceApi(commons.ApiRequester client)
+  MarketplaceprivateauctionResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Update a given private auction proposal
@@ -1469,11 +1467,10 @@
   }
 }
 
-class PerformanceReportResourceApi {
+class PerformanceReportResource {
   final commons.ApiRequester _requester;
 
-  PerformanceReportResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  PerformanceReportResource(commons.ApiRequester client) : _requester = client;
 
   /// Retrieves the authenticated user's list of performance metrics.
   ///
@@ -1560,11 +1557,10 @@
   }
 }
 
-class PretargetingConfigResourceApi {
+class PretargetingConfigResource {
   final commons.ApiRequester _requester;
 
-  PretargetingConfigResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  PretargetingConfigResource(commons.ApiRequester client) : _requester = client;
 
   /// Deletes an existing pretargeting config.
   ///
@@ -1927,10 +1923,10 @@
   }
 }
 
-class ProductsResourceApi {
+class ProductsResource {
   final commons.ApiRequester _requester;
 
-  ProductsResourceApi(commons.ApiRequester client) : _requester = client;
+  ProductsResource(commons.ApiRequester client) : _requester = client;
 
   /// Gets the requested product by id.
   ///
@@ -2034,10 +2030,10 @@
   }
 }
 
-class ProposalsResourceApi {
+class ProposalsResource {
   final commons.ApiRequester _requester;
 
-  ProposalsResourceApi(commons.ApiRequester client) : _requester = client;
+  ProposalsResource(commons.ApiRequester client) : _requester = client;
 
   /// Get a proposal given its id
   ///
@@ -2412,10 +2408,10 @@
   }
 }
 
-class PubprofilesResourceApi {
+class PubprofilesResource {
   final commons.ApiRequester _requester;
 
-  PubprofilesResourceApi(commons.ApiRequester client) : _requester = client;
+  PubprofilesResource(commons.ApiRequester client) : _requester = client;
 
   /// Gets the requested publisher profile(s) by publisher accountId.
   ///
diff --git a/generated/googleapis/lib/adexperiencereport/v1.dart b/generated/googleapis/lib/adexperiencereport/v1.dart
index f8b7ac7..792967f 100644
--- a/generated/googleapis/lib/adexperiencereport/v1.dart
+++ b/generated/googleapis/lib/adexperiencereport/v1.dart
@@ -25,8 +25,8 @@
 ///
 /// Create an instance of [AdExperienceReportApi] to access these resources:
 ///
-/// - [SitesResourceApi]
-/// - [ViolatingSitesResourceApi]
+/// - [SitesResource]
+/// - [ViolatingSitesResource]
 library adexperiencereport.v1;
 
 import 'dart:async' as async;
@@ -45,9 +45,9 @@
 class AdExperienceReportApi {
   final commons.ApiRequester _requester;
 
-  SitesResourceApi get sites => SitesResourceApi(_requester);
-  ViolatingSitesResourceApi get violatingSites =>
-      ViolatingSitesResourceApi(_requester);
+  SitesResource get sites => SitesResource(_requester);
+  ViolatingSitesResource get violatingSites =>
+      ViolatingSitesResource(_requester);
 
   AdExperienceReportApi(http.Client client,
       {core.String rootUrl = 'https://adexperiencereport.googleapis.com/',
@@ -56,10 +56,10 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class SitesResourceApi {
+class SitesResource {
   final commons.ApiRequester _requester;
 
-  SitesResourceApi(commons.ApiRequester client) : _requester = client;
+  SitesResource(commons.ApiRequester client) : _requester = client;
 
   /// Gets a site's Ad Experience Report summary.
   ///
@@ -115,10 +115,10 @@
   }
 }
 
-class ViolatingSitesResourceApi {
+class ViolatingSitesResource {
   final commons.ApiRequester _requester;
 
-  ViolatingSitesResourceApi(commons.ApiRequester client) : _requester = client;
+  ViolatingSitesResource(commons.ApiRequester client) : _requester = client;
 
   /// Lists sites that are failing in the Ad Experience Report on at least one
   /// platform.
diff --git a/generated/googleapis/lib/admin/datatransfer_v1.dart b/generated/googleapis/lib/admin/datatransfer_v1.dart
index fd6d0a8..893cfa5 100644
--- a/generated/googleapis/lib/admin/datatransfer_v1.dart
+++ b/generated/googleapis/lib/admin/datatransfer_v1.dart
@@ -25,8 +25,8 @@
 ///
 /// Create an instance of [DataTransferApi] to access these resources:
 ///
-/// - [ApplicationsResourceApi]
-/// - [TransfersResourceApi]
+/// - [ApplicationsResource]
+/// - [TransfersResource]
 library admin.datatransfer_v1;
 
 import 'dart:async' as async;
@@ -55,9 +55,8 @@
 
   final commons.ApiRequester _requester;
 
-  ApplicationsResourceApi get applications =>
-      ApplicationsResourceApi(_requester);
-  TransfersResourceApi get transfers => TransfersResourceApi(_requester);
+  ApplicationsResource get applications => ApplicationsResource(_requester);
+  TransfersResource get transfers => TransfersResource(_requester);
 
   DataTransferApi(http.Client client,
       {core.String rootUrl = 'https://www.googleapis.com/',
@@ -66,10 +65,10 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class ApplicationsResourceApi {
+class ApplicationsResource {
   final commons.ApiRequester _requester;
 
-  ApplicationsResourceApi(commons.ApiRequester client) : _requester = client;
+  ApplicationsResource(commons.ApiRequester client) : _requester = client;
 
   /// Retrieves information about an application for the given application ID.
   ///
@@ -188,10 +187,10 @@
   }
 }
 
-class TransfersResourceApi {
+class TransfersResource {
   final commons.ApiRequester _requester;
 
-  TransfersResourceApi(commons.ApiRequester client) : _requester = client;
+  TransfersResource(commons.ApiRequester client) : _requester = client;
 
   /// Retrieves a data transfer request by its resource ID.
   ///
diff --git a/generated/googleapis/lib/admin/directory_v1.dart b/generated/googleapis/lib/admin/directory_v1.dart
index 8b14886..b104f16 100644
--- a/generated/googleapis/lib/admin/directory_v1.dart
+++ b/generated/googleapis/lib/admin/directory_v1.dart
@@ -25,31 +25,31 @@
 ///
 /// Create an instance of [DirectoryApi] to access these resources:
 ///
-/// - [AspsResourceApi]
-/// - [ChannelsResourceApi]
-/// - [ChromeosdevicesResourceApi]
-/// - [CustomersResourceApi]
-/// - [DomainAliasesResourceApi]
-/// - [DomainsResourceApi]
-/// - [GroupsResourceApi]
-///   - [GroupsAliasesResourceApi]
-/// - [MembersResourceApi]
-/// - [MobiledevicesResourceApi]
-/// - [OrgunitsResourceApi]
-/// - [PrivilegesResourceApi]
-/// - [ResourcesResourceApi]
-///   - [ResourcesBuildingsResourceApi]
-///   - [ResourcesCalendarsResourceApi]
-///   - [ResourcesFeaturesResourceApi]
-/// - [RoleAssignmentsResourceApi]
-/// - [RolesResourceApi]
-/// - [SchemasResourceApi]
-/// - [TokensResourceApi]
-/// - [TwoStepVerificationResourceApi]
-/// - [UsersResourceApi]
-///   - [UsersAliasesResourceApi]
-///   - [UsersPhotosResourceApi]
-/// - [VerificationCodesResourceApi]
+/// - [AspsResource]
+/// - [ChannelsResource]
+/// - [ChromeosdevicesResource]
+/// - [CustomersResource]
+/// - [DomainAliasesResource]
+/// - [DomainsResource]
+/// - [GroupsResource]
+///   - [GroupsAliasesResource]
+/// - [MembersResource]
+/// - [MobiledevicesResource]
+/// - [OrgunitsResource]
+/// - [PrivilegesResource]
+/// - [ResourcesResource]
+///   - [ResourcesBuildingsResource]
+///   - [ResourcesCalendarsResource]
+///   - [ResourcesFeaturesResource]
+/// - [RoleAssignmentsResource]
+/// - [RolesResource]
+/// - [SchemasResource]
+/// - [TokensResource]
+/// - [TwoStepVerificationResource]
+/// - [UsersResource]
+///   - [UsersAliasesResource]
+///   - [UsersPhotosResource]
+/// - [VerificationCodesResource]
 library admin.directory_v1;
 
 import 'dart:async' as async;
@@ -179,31 +179,29 @@
 
   final commons.ApiRequester _requester;
 
-  AspsResourceApi get asps => AspsResourceApi(_requester);
-  ChannelsResourceApi get channels => ChannelsResourceApi(_requester);
-  ChromeosdevicesResourceApi get chromeosdevices =>
-      ChromeosdevicesResourceApi(_requester);
-  CustomersResourceApi get customers => CustomersResourceApi(_requester);
-  DomainAliasesResourceApi get domainAliases =>
-      DomainAliasesResourceApi(_requester);
-  DomainsResourceApi get domains => DomainsResourceApi(_requester);
-  GroupsResourceApi get groups => GroupsResourceApi(_requester);
-  MembersResourceApi get members => MembersResourceApi(_requester);
-  MobiledevicesResourceApi get mobiledevices =>
-      MobiledevicesResourceApi(_requester);
-  OrgunitsResourceApi get orgunits => OrgunitsResourceApi(_requester);
-  PrivilegesResourceApi get privileges => PrivilegesResourceApi(_requester);
-  ResourcesResourceApi get resources => ResourcesResourceApi(_requester);
-  RoleAssignmentsResourceApi get roleAssignments =>
-      RoleAssignmentsResourceApi(_requester);
-  RolesResourceApi get roles => RolesResourceApi(_requester);
-  SchemasResourceApi get schemas => SchemasResourceApi(_requester);
-  TokensResourceApi get tokens => TokensResourceApi(_requester);
-  TwoStepVerificationResourceApi get twoStepVerification =>
-      TwoStepVerificationResourceApi(_requester);
-  UsersResourceApi get users => UsersResourceApi(_requester);
-  VerificationCodesResourceApi get verificationCodes =>
-      VerificationCodesResourceApi(_requester);
+  AspsResource get asps => AspsResource(_requester);
+  ChannelsResource get channels => ChannelsResource(_requester);
+  ChromeosdevicesResource get chromeosdevices =>
+      ChromeosdevicesResource(_requester);
+  CustomersResource get customers => CustomersResource(_requester);
+  DomainAliasesResource get domainAliases => DomainAliasesResource(_requester);
+  DomainsResource get domains => DomainsResource(_requester);
+  GroupsResource get groups => GroupsResource(_requester);
+  MembersResource get members => MembersResource(_requester);
+  MobiledevicesResource get mobiledevices => MobiledevicesResource(_requester);
+  OrgunitsResource get orgunits => OrgunitsResource(_requester);
+  PrivilegesResource get privileges => PrivilegesResource(_requester);
+  ResourcesResource get resources => ResourcesResource(_requester);
+  RoleAssignmentsResource get roleAssignments =>
+      RoleAssignmentsResource(_requester);
+  RolesResource get roles => RolesResource(_requester);
+  SchemasResource get schemas => SchemasResource(_requester);
+  TokensResource get tokens => TokensResource(_requester);
+  TwoStepVerificationResource get twoStepVerification =>
+      TwoStepVerificationResource(_requester);
+  UsersResource get users => UsersResource(_requester);
+  VerificationCodesResource get verificationCodes =>
+      VerificationCodesResource(_requester);
 
   DirectoryApi(http.Client client,
       {core.String rootUrl = 'https://www.googleapis.com/',
@@ -212,10 +210,10 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class AspsResourceApi {
+class AspsResource {
   final commons.ApiRequester _requester;
 
-  AspsResourceApi(commons.ApiRequester client) : _requester = client;
+  AspsResource(commons.ApiRequester client) : _requester = client;
 
   /// Delete an ASP issued by a user.
   ///
@@ -391,10 +389,10 @@
   }
 }
 
-class ChannelsResourceApi {
+class ChannelsResource {
   final commons.ApiRequester _requester;
 
-  ChannelsResourceApi(commons.ApiRequester client) : _requester = client;
+  ChannelsResource(commons.ApiRequester client) : _requester = client;
 
   /// Stop watching resources through this channel.
   ///
@@ -447,10 +445,10 @@
   }
 }
 
-class ChromeosdevicesResourceApi {
+class ChromeosdevicesResource {
   final commons.ApiRequester _requester;
 
-  ChromeosdevicesResourceApi(commons.ApiRequester client) : _requester = client;
+  ChromeosdevicesResource(commons.ApiRequester client) : _requester = client;
 
   /// Take action on Chrome OS Device
   ///
@@ -925,10 +923,10 @@
   }
 }
 
-class CustomersResourceApi {
+class CustomersResource {
   final commons.ApiRequester _requester;
 
-  CustomersResourceApi(commons.ApiRequester client) : _requester = client;
+  CustomersResource(commons.ApiRequester client) : _requester = client;
 
   /// Retrieves a customer.
   ///
@@ -1096,10 +1094,10 @@
   }
 }
 
-class DomainAliasesResourceApi {
+class DomainAliasesResource {
   final commons.ApiRequester _requester;
 
-  DomainAliasesResourceApi(commons.ApiRequester client) : _requester = client;
+  DomainAliasesResource(commons.ApiRequester client) : _requester = client;
 
   /// Deletes a domain Alias of the customer.
   ///
@@ -1340,10 +1338,10 @@
   }
 }
 
-class DomainsResourceApi {
+class DomainsResource {
   final commons.ApiRequester _requester;
 
-  DomainsResourceApi(commons.ApiRequester client) : _requester = client;
+  DomainsResource(commons.ApiRequester client) : _requester = client;
 
   /// Deletes a domain of the customer.
   ///
@@ -1574,12 +1572,12 @@
   }
 }
 
-class GroupsResourceApi {
+class GroupsResource {
   final commons.ApiRequester _requester;
 
-  GroupsAliasesResourceApi get aliases => GroupsAliasesResourceApi(_requester);
+  GroupsAliasesResource get aliases => GroupsAliasesResource(_requester);
 
-  GroupsResourceApi(commons.ApiRequester client) : _requester = client;
+  GroupsResource(commons.ApiRequester client) : _requester = client;
 
   /// Delete Group
   ///
@@ -1958,10 +1956,10 @@
   }
 }
 
-class GroupsAliasesResourceApi {
+class GroupsAliasesResource {
   final commons.ApiRequester _requester;
 
-  GroupsAliasesResourceApi(commons.ApiRequester client) : _requester = client;
+  GroupsAliasesResource(commons.ApiRequester client) : _requester = client;
 
   /// Remove a alias for the group
   ///
@@ -2133,10 +2131,10 @@
   }
 }
 
-class MembersResourceApi {
+class MembersResource {
   final commons.ApiRequester _requester;
 
-  MembersResourceApi(commons.ApiRequester client) : _requester = client;
+  MembersResource(commons.ApiRequester client) : _requester = client;
 
   /// Remove membership.
   ///
@@ -2592,10 +2590,10 @@
   }
 }
 
-class MobiledevicesResourceApi {
+class MobiledevicesResource {
   final commons.ApiRequester _requester;
 
-  MobiledevicesResourceApi(commons.ApiRequester client) : _requester = client;
+  MobiledevicesResource(commons.ApiRequester client) : _requester = client;
 
   /// Take action on Mobile Device
   ///
@@ -2906,10 +2904,10 @@
   }
 }
 
-class OrgunitsResourceApi {
+class OrgunitsResource {
   final commons.ApiRequester _requester;
 
-  OrgunitsResourceApi(commons.ApiRequester client) : _requester = client;
+  OrgunitsResource(commons.ApiRequester client) : _requester = client;
 
   /// Remove organizational unit
   ///
@@ -3291,10 +3289,10 @@
   }
 }
 
-class PrivilegesResourceApi {
+class PrivilegesResource {
   final commons.ApiRequester _requester;
 
-  PrivilegesResourceApi(commons.ApiRequester client) : _requester = client;
+  PrivilegesResource(commons.ApiRequester client) : _requester = client;
 
   /// Retrieves a paginated list of all privileges for a customer.
   ///
@@ -3350,24 +3348,23 @@
   }
 }
 
-class ResourcesResourceApi {
+class ResourcesResource {
   final commons.ApiRequester _requester;
 
-  ResourcesBuildingsResourceApi get buildings =>
-      ResourcesBuildingsResourceApi(_requester);
-  ResourcesCalendarsResourceApi get calendars =>
-      ResourcesCalendarsResourceApi(_requester);
-  ResourcesFeaturesResourceApi get features =>
-      ResourcesFeaturesResourceApi(_requester);
+  ResourcesBuildingsResource get buildings =>
+      ResourcesBuildingsResource(_requester);
+  ResourcesCalendarsResource get calendars =>
+      ResourcesCalendarsResource(_requester);
+  ResourcesFeaturesResource get features =>
+      ResourcesFeaturesResource(_requester);
 
-  ResourcesResourceApi(commons.ApiRequester client) : _requester = client;
+  ResourcesResource(commons.ApiRequester client) : _requester = client;
 }
 
-class ResourcesBuildingsResourceApi {
+class ResourcesBuildingsResource {
   final commons.ApiRequester _requester;
 
-  ResourcesBuildingsResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  ResourcesBuildingsResource(commons.ApiRequester client) : _requester = client;
 
   /// Deletes a building.
   ///
@@ -3798,11 +3795,10 @@
   }
 }
 
-class ResourcesCalendarsResourceApi {
+class ResourcesCalendarsResource {
   final commons.ApiRequester _requester;
 
-  ResourcesCalendarsResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  ResourcesCalendarsResource(commons.ApiRequester client) : _requester = client;
 
   /// Deletes a calendar resource.
   ///
@@ -4221,11 +4217,10 @@
   }
 }
 
-class ResourcesFeaturesResourceApi {
+class ResourcesFeaturesResource {
   final commons.ApiRequester _requester;
 
-  ResourcesFeaturesResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  ResourcesFeaturesResource(commons.ApiRequester client) : _requester = client;
 
   /// Deletes a feature.
   ///
@@ -4679,10 +4674,10 @@
   }
 }
 
-class RoleAssignmentsResourceApi {
+class RoleAssignmentsResource {
   final commons.ApiRequester _requester;
 
-  RoleAssignmentsResourceApi(commons.ApiRequester client) : _requester = client;
+  RoleAssignmentsResource(commons.ApiRequester client) : _requester = client;
 
   /// Deletes a role assignment.
   ///
@@ -4944,10 +4939,10 @@
   }
 }
 
-class RolesResourceApi {
+class RolesResource {
   final commons.ApiRequester _requester;
 
-  RolesResourceApi(commons.ApiRequester client) : _requester = client;
+  RolesResource(commons.ApiRequester client) : _requester = client;
 
   /// Deletes a role.
   ///
@@ -5321,10 +5316,10 @@
   }
 }
 
-class SchemasResourceApi {
+class SchemasResource {
   final commons.ApiRequester _requester;
 
-  SchemasResourceApi(commons.ApiRequester client) : _requester = client;
+  SchemasResource(commons.ApiRequester client) : _requester = client;
 
   /// Delete schema
   ///
@@ -5685,10 +5680,10 @@
   }
 }
 
-class TokensResourceApi {
+class TokensResource {
   final commons.ApiRequester _requester;
 
-  TokensResourceApi(commons.ApiRequester client) : _requester = client;
+  TokensResource(commons.ApiRequester client) : _requester = client;
 
   /// Delete all access tokens issued by a user for an application.
   ///
@@ -5865,10 +5860,10 @@
   }
 }
 
-class TwoStepVerificationResourceApi {
+class TwoStepVerificationResource {
   final commons.ApiRequester _requester;
 
-  TwoStepVerificationResourceApi(commons.ApiRequester client)
+  TwoStepVerificationResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Turn off 2-Step Verification for user.
@@ -5925,13 +5920,13 @@
   }
 }
 
-class UsersResourceApi {
+class UsersResource {
   final commons.ApiRequester _requester;
 
-  UsersAliasesResourceApi get aliases => UsersAliasesResourceApi(_requester);
-  UsersPhotosResourceApi get photos => UsersPhotosResourceApi(_requester);
+  UsersAliasesResource get aliases => UsersAliasesResource(_requester);
+  UsersPhotosResource get photos => UsersPhotosResource(_requester);
 
-  UsersResourceApi(commons.ApiRequester client) : _requester = client;
+  UsersResource(commons.ApiRequester client) : _requester = client;
 
   /// Delete user
   ///
@@ -6696,10 +6691,10 @@
   }
 }
 
-class UsersAliasesResourceApi {
+class UsersAliasesResource {
   final commons.ApiRequester _requester;
 
-  UsersAliasesResourceApi(commons.ApiRequester client) : _requester = client;
+  UsersAliasesResource(commons.ApiRequester client) : _requester = client;
 
   /// Remove a alias for the user
   ///
@@ -6939,10 +6934,10 @@
   }
 }
 
-class UsersPhotosResourceApi {
+class UsersPhotosResource {
   final commons.ApiRequester _requester;
 
-  UsersPhotosResourceApi(commons.ApiRequester client) : _requester = client;
+  UsersPhotosResource(commons.ApiRequester client) : _requester = client;
 
   /// Remove photos for the user
   ///
@@ -7165,11 +7160,10 @@
   }
 }
 
-class VerificationCodesResourceApi {
+class VerificationCodesResource {
   final commons.ApiRequester _requester;
 
-  VerificationCodesResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  VerificationCodesResource(commons.ApiRequester client) : _requester = client;
 
   /// Generate new backup verification codes for the user.
   ///
diff --git a/generated/googleapis/lib/admin/reports_v1.dart b/generated/googleapis/lib/admin/reports_v1.dart
index d034487..280ea51 100644
--- a/generated/googleapis/lib/admin/reports_v1.dart
+++ b/generated/googleapis/lib/admin/reports_v1.dart
@@ -25,11 +25,11 @@
 ///
 /// Create an instance of [ReportsApi] to access these resources:
 ///
-/// - [ActivitiesResourceApi]
-/// - [ChannelsResourceApi]
-/// - [CustomerUsageReportsResourceApi]
-/// - [EntityUsageReportsResourceApi]
-/// - [UserUsageReportResourceApi]
+/// - [ActivitiesResource]
+/// - [ChannelsResource]
+/// - [CustomerUsageReportsResource]
+/// - [EntityUsageReportsResource]
+/// - [UserUsageReportResource]
 library admin.reports_v1;
 
 import 'dart:async' as async;
@@ -58,14 +58,14 @@
 
   final commons.ApiRequester _requester;
 
-  ActivitiesResourceApi get activities => ActivitiesResourceApi(_requester);
-  ChannelsResourceApi get channels => ChannelsResourceApi(_requester);
-  CustomerUsageReportsResourceApi get customerUsageReports =>
-      CustomerUsageReportsResourceApi(_requester);
-  EntityUsageReportsResourceApi get entityUsageReports =>
-      EntityUsageReportsResourceApi(_requester);
-  UserUsageReportResourceApi get userUsageReport =>
-      UserUsageReportResourceApi(_requester);
+  ActivitiesResource get activities => ActivitiesResource(_requester);
+  ChannelsResource get channels => ChannelsResource(_requester);
+  CustomerUsageReportsResource get customerUsageReports =>
+      CustomerUsageReportsResource(_requester);
+  EntityUsageReportsResource get entityUsageReports =>
+      EntityUsageReportsResource(_requester);
+  UserUsageReportResource get userUsageReport =>
+      UserUsageReportResource(_requester);
 
   ReportsApi(http.Client client,
       {core.String rootUrl = 'https://www.googleapis.com/',
@@ -74,10 +74,10 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class ActivitiesResourceApi {
+class ActivitiesResource {
   final commons.ApiRequester _requester;
 
-  ActivitiesResourceApi(commons.ApiRequester client) : _requester = client;
+  ActivitiesResource(commons.ApiRequester client) : _requester = client;
 
   /// Retrieves a list of activities for a specific customer's account and
   /// application such as the Admin console application or the Google Drive
@@ -577,10 +577,10 @@
   }
 }
 
-class ChannelsResourceApi {
+class ChannelsResource {
   final commons.ApiRequester _requester;
 
-  ChannelsResourceApi(commons.ApiRequester client) : _requester = client;
+  ChannelsResource(commons.ApiRequester client) : _requester = client;
 
   /// Stop watching resources through this channel.
   ///
@@ -633,10 +633,10 @@
   }
 }
 
-class CustomerUsageReportsResourceApi {
+class CustomerUsageReportsResource {
   final commons.ApiRequester _requester;
 
-  CustomerUsageReportsResourceApi(commons.ApiRequester client)
+  CustomerUsageReportsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Retrieves a report which is a collection of properties and statistics for
@@ -736,11 +736,10 @@
   }
 }
 
-class EntityUsageReportsResourceApi {
+class EntityUsageReportsResource {
   final commons.ApiRequester _requester;
 
-  EntityUsageReportsResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  EntityUsageReportsResource(commons.ApiRequester client) : _requester = client;
 
   /// Retrieves a report which is a collection of properties and statistics for
   /// entities used by users within the account. For more information, see the
@@ -895,10 +894,10 @@
   }
 }
 
-class UserUsageReportResourceApi {
+class UserUsageReportResource {
   final commons.ApiRequester _requester;
 
-  UserUsageReportResourceApi(commons.ApiRequester client) : _requester = client;
+  UserUsageReportResource(commons.ApiRequester client) : _requester = client;
 
   /// Retrieves a report which is a collection of properties and statistics for
   /// a set of users with the account. For more information, see the User Usage
diff --git a/generated/googleapis/lib/admob/v1.dart b/generated/googleapis/lib/admob/v1.dart
index 633a81d..5a54158 100644
--- a/generated/googleapis/lib/admob/v1.dart
+++ b/generated/googleapis/lib/admob/v1.dart
@@ -24,9 +24,9 @@
 ///
 /// Create an instance of [AdMobApi] to access these resources:
 ///
-/// - [AccountsResourceApi]
-///   - [AccountsMediationReportResourceApi]
-///   - [AccountsNetworkReportResourceApi]
+/// - [AccountsResource]
+///   - [AccountsMediationReportResource]
+///   - [AccountsNetworkReportResource]
 library admob.v1;
 
 import 'dart:async' as async;
@@ -50,7 +50,7 @@
 
   final commons.ApiRequester _requester;
 
-  AccountsResourceApi get accounts => AccountsResourceApi(_requester);
+  AccountsResource get accounts => AccountsResource(_requester);
 
   AdMobApi(http.Client client,
       {core.String rootUrl = 'https://admob.googleapis.com/',
@@ -59,15 +59,15 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class AccountsResourceApi {
+class AccountsResource {
   final commons.ApiRequester _requester;
 
-  AccountsMediationReportResourceApi get mediationReport =>
-      AccountsMediationReportResourceApi(_requester);
-  AccountsNetworkReportResourceApi get networkReport =>
-      AccountsNetworkReportResourceApi(_requester);
+  AccountsMediationReportResource get mediationReport =>
+      AccountsMediationReportResource(_requester);
+  AccountsNetworkReportResource get networkReport =>
+      AccountsNetworkReportResource(_requester);
 
-  AccountsResourceApi(commons.ApiRequester client) : _requester = client;
+  AccountsResource(commons.ApiRequester client) : _requester = client;
 
   /// Gets information about the specified AdMob publisher account.
   ///
@@ -184,10 +184,10 @@
   }
 }
 
-class AccountsMediationReportResourceApi {
+class AccountsMediationReportResource {
   final commons.ApiRequester _requester;
 
-  AccountsMediationReportResourceApi(commons.ApiRequester client)
+  AccountsMediationReportResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Generates an AdMob Mediation report based on the provided report
@@ -253,10 +253,10 @@
   }
 }
 
-class AccountsNetworkReportResourceApi {
+class AccountsNetworkReportResource {
   final commons.ApiRequester _requester;
 
-  AccountsNetworkReportResourceApi(commons.ApiRequester client)
+  AccountsNetworkReportResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Generates an AdMob Network report based on the provided report
diff --git a/generated/googleapis/lib/adsense/v1_4.dart b/generated/googleapis/lib/adsense/v1_4.dart
index ffb45e6..2f316e7 100644
--- a/generated/googleapis/lib/adsense/v1_4.dart
+++ b/generated/googleapis/lib/adsense/v1_4.dart
@@ -24,32 +24,32 @@
 ///
 /// Create an instance of [AdSenseApi] to access these resources:
 ///
-/// - [AccountsResourceApi]
-///   - [AccountsAdclientsResourceApi]
-///   - [AccountsAdunitsResourceApi]
-///     - [AccountsAdunitsCustomchannelsResourceApi]
-///   - [AccountsAlertsResourceApi]
-///   - [AccountsCustomchannelsResourceApi]
-///     - [AccountsCustomchannelsAdunitsResourceApi]
-///   - [AccountsPaymentsResourceApi]
-///   - [AccountsReportsResourceApi]
-///     - [AccountsReportsSavedResourceApi]
-///   - [AccountsSavedadstylesResourceApi]
-///   - [AccountsUrlchannelsResourceApi]
-/// - [AdclientsResourceApi]
-/// - [AdunitsResourceApi]
-///   - [AdunitsCustomchannelsResourceApi]
-/// - [AlertsResourceApi]
-/// - [CustomchannelsResourceApi]
-///   - [CustomchannelsAdunitsResourceApi]
-/// - [MetadataResourceApi]
-///   - [MetadataDimensionsResourceApi]
-///   - [MetadataMetricsResourceApi]
-/// - [PaymentsResourceApi]
-/// - [ReportsResourceApi]
-///   - [ReportsSavedResourceApi]
-/// - [SavedadstylesResourceApi]
-/// - [UrlchannelsResourceApi]
+/// - [AccountsResource]
+///   - [AccountsAdclientsResource]
+///   - [AccountsAdunitsResource]
+///     - [AccountsAdunitsCustomchannelsResource]
+///   - [AccountsAlertsResource]
+///   - [AccountsCustomchannelsResource]
+///     - [AccountsCustomchannelsAdunitsResource]
+///   - [AccountsPaymentsResource]
+///   - [AccountsReportsResource]
+///     - [AccountsReportsSavedResource]
+///   - [AccountsSavedadstylesResource]
+///   - [AccountsUrlchannelsResource]
+/// - [AdclientsResource]
+/// - [AdunitsResource]
+///   - [AdunitsCustomchannelsResource]
+/// - [AlertsResource]
+/// - [CustomchannelsResource]
+///   - [CustomchannelsAdunitsResource]
+/// - [MetadataResource]
+///   - [MetadataDimensionsResource]
+///   - [MetadataMetricsResource]
+/// - [PaymentsResource]
+/// - [ReportsResource]
+///   - [ReportsSavedResource]
+/// - [SavedadstylesResource]
+/// - [UrlchannelsResource]
 library adsense.v1_4;
 
 import 'dart:async' as async;
@@ -82,18 +82,17 @@
 
   final commons.ApiRequester _requester;
 
-  AccountsResourceApi get accounts => AccountsResourceApi(_requester);
-  AdclientsResourceApi get adclients => AdclientsResourceApi(_requester);
-  AdunitsResourceApi get adunits => AdunitsResourceApi(_requester);
-  AlertsResourceApi get alerts => AlertsResourceApi(_requester);
-  CustomchannelsResourceApi get customchannels =>
-      CustomchannelsResourceApi(_requester);
-  MetadataResourceApi get metadata => MetadataResourceApi(_requester);
-  PaymentsResourceApi get payments => PaymentsResourceApi(_requester);
-  ReportsResourceApi get reports => ReportsResourceApi(_requester);
-  SavedadstylesResourceApi get savedadstyles =>
-      SavedadstylesResourceApi(_requester);
-  UrlchannelsResourceApi get urlchannels => UrlchannelsResourceApi(_requester);
+  AccountsResource get accounts => AccountsResource(_requester);
+  AdclientsResource get adclients => AdclientsResource(_requester);
+  AdunitsResource get adunits => AdunitsResource(_requester);
+  AlertsResource get alerts => AlertsResource(_requester);
+  CustomchannelsResource get customchannels =>
+      CustomchannelsResource(_requester);
+  MetadataResource get metadata => MetadataResource(_requester);
+  PaymentsResource get payments => PaymentsResource(_requester);
+  ReportsResource get reports => ReportsResource(_requester);
+  SavedadstylesResource get savedadstyles => SavedadstylesResource(_requester);
+  UrlchannelsResource get urlchannels => UrlchannelsResource(_requester);
 
   AdSenseApi(http.Client client,
       {core.String rootUrl = 'https://www.googleapis.com/',
@@ -102,26 +101,23 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class AccountsResourceApi {
+class AccountsResource {
   final commons.ApiRequester _requester;
 
-  AccountsAdclientsResourceApi get adclients =>
-      AccountsAdclientsResourceApi(_requester);
-  AccountsAdunitsResourceApi get adunits =>
-      AccountsAdunitsResourceApi(_requester);
-  AccountsAlertsResourceApi get alerts => AccountsAlertsResourceApi(_requester);
-  AccountsCustomchannelsResourceApi get customchannels =>
-      AccountsCustomchannelsResourceApi(_requester);
-  AccountsPaymentsResourceApi get payments =>
-      AccountsPaymentsResourceApi(_requester);
-  AccountsReportsResourceApi get reports =>
-      AccountsReportsResourceApi(_requester);
-  AccountsSavedadstylesResourceApi get savedadstyles =>
-      AccountsSavedadstylesResourceApi(_requester);
-  AccountsUrlchannelsResourceApi get urlchannels =>
-      AccountsUrlchannelsResourceApi(_requester);
+  AccountsAdclientsResource get adclients =>
+      AccountsAdclientsResource(_requester);
+  AccountsAdunitsResource get adunits => AccountsAdunitsResource(_requester);
+  AccountsAlertsResource get alerts => AccountsAlertsResource(_requester);
+  AccountsCustomchannelsResource get customchannels =>
+      AccountsCustomchannelsResource(_requester);
+  AccountsPaymentsResource get payments => AccountsPaymentsResource(_requester);
+  AccountsReportsResource get reports => AccountsReportsResource(_requester);
+  AccountsSavedadstylesResource get savedadstyles =>
+      AccountsSavedadstylesResource(_requester);
+  AccountsUrlchannelsResource get urlchannels =>
+      AccountsUrlchannelsResource(_requester);
 
-  AccountsResourceApi(commons.ApiRequester client) : _requester = client;
+  AccountsResource(commons.ApiRequester client) : _requester = client;
 
   /// Get information about the selected AdSense account.
   ///
@@ -240,11 +236,10 @@
   }
 }
 
-class AccountsAdclientsResourceApi {
+class AccountsAdclientsResource {
   final commons.ApiRequester _requester;
 
-  AccountsAdclientsResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  AccountsAdclientsResource(commons.ApiRequester client) : _requester = client;
 
   /// Get Auto ad code for a given ad client.
   ///
@@ -381,13 +376,13 @@
   }
 }
 
-class AccountsAdunitsResourceApi {
+class AccountsAdunitsResource {
   final commons.ApiRequester _requester;
 
-  AccountsAdunitsCustomchannelsResourceApi get customchannels =>
-      AccountsAdunitsCustomchannelsResourceApi(_requester);
+  AccountsAdunitsCustomchannelsResource get customchannels =>
+      AccountsAdunitsCustomchannelsResource(_requester);
 
-  AccountsAdunitsResourceApi(commons.ApiRequester client) : _requester = client;
+  AccountsAdunitsResource(commons.ApiRequester client) : _requester = client;
 
   /// Gets the specified ad unit in the specified ad client for the specified
   /// account.
@@ -608,10 +603,10 @@
   }
 }
 
-class AccountsAdunitsCustomchannelsResourceApi {
+class AccountsAdunitsCustomchannelsResource {
   final commons.ApiRequester _requester;
 
-  AccountsAdunitsCustomchannelsResourceApi(commons.ApiRequester client)
+  AccountsAdunitsCustomchannelsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// List all custom channels which the specified ad unit belongs to.
@@ -700,10 +695,10 @@
   }
 }
 
-class AccountsAlertsResourceApi {
+class AccountsAlertsResource {
   final commons.ApiRequester _requester;
 
-  AccountsAlertsResourceApi(commons.ApiRequester client) : _requester = client;
+  AccountsAlertsResource(commons.ApiRequester client) : _requester = client;
 
   /// Dismiss (delete) the specified alert from the specified publisher AdSense
   /// account.
@@ -825,13 +820,13 @@
   }
 }
 
-class AccountsCustomchannelsResourceApi {
+class AccountsCustomchannelsResource {
   final commons.ApiRequester _requester;
 
-  AccountsCustomchannelsAdunitsResourceApi get adunits =>
-      AccountsCustomchannelsAdunitsResourceApi(_requester);
+  AccountsCustomchannelsAdunitsResource get adunits =>
+      AccountsCustomchannelsAdunitsResource(_requester);
 
-  AccountsCustomchannelsResourceApi(commons.ApiRequester client)
+  AccountsCustomchannelsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Get the specified custom channel from the specified ad client for the
@@ -982,10 +977,10 @@
   }
 }
 
-class AccountsCustomchannelsAdunitsResourceApi {
+class AccountsCustomchannelsAdunitsResource {
   final commons.ApiRequester _requester;
 
-  AccountsCustomchannelsAdunitsResourceApi(commons.ApiRequester client)
+  AccountsCustomchannelsAdunitsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// List all ad units in the specified custom channel.
@@ -1079,11 +1074,10 @@
   }
 }
 
-class AccountsPaymentsResourceApi {
+class AccountsPaymentsResource {
   final commons.ApiRequester _requester;
 
-  AccountsPaymentsResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  AccountsPaymentsResource(commons.ApiRequester client) : _requester = client;
 
   /// List the payments for the specified AdSense account.
   ///
@@ -1137,13 +1131,13 @@
   }
 }
 
-class AccountsReportsResourceApi {
+class AccountsReportsResource {
   final commons.ApiRequester _requester;
 
-  AccountsReportsSavedResourceApi get saved =>
-      AccountsReportsSavedResourceApi(_requester);
+  AccountsReportsSavedResource get saved =>
+      AccountsReportsSavedResource(_requester);
 
-  AccountsReportsResourceApi(commons.ApiRequester client) : _requester = client;
+  AccountsReportsResource(commons.ApiRequester client) : _requester = client;
 
   /// Generate an AdSense report based on the report request sent in the query
   /// parameters. Returns the result as JSON; to retrieve output in CSV format
@@ -1305,10 +1299,10 @@
   }
 }
 
-class AccountsReportsSavedResourceApi {
+class AccountsReportsSavedResource {
   final commons.ApiRequester _requester;
 
-  AccountsReportsSavedResourceApi(commons.ApiRequester client)
+  AccountsReportsSavedResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Generate an AdSense report based on the saved report ID sent in the query
@@ -1464,10 +1458,10 @@
   }
 }
 
-class AccountsSavedadstylesResourceApi {
+class AccountsSavedadstylesResource {
   final commons.ApiRequester _requester;
 
-  AccountsSavedadstylesResourceApi(commons.ApiRequester client)
+  AccountsSavedadstylesResource(commons.ApiRequester client)
       : _requester = client;
 
   /// List a specific saved ad style for the specified account.
@@ -1600,10 +1594,10 @@
   }
 }
 
-class AccountsUrlchannelsResourceApi {
+class AccountsUrlchannelsResource {
   final commons.ApiRequester _requester;
 
-  AccountsUrlchannelsResourceApi(commons.ApiRequester client)
+  AccountsUrlchannelsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// List all URL channels in the specified ad client for the specified
@@ -1685,10 +1679,10 @@
   }
 }
 
-class AdclientsResourceApi {
+class AdclientsResource {
   final commons.ApiRequester _requester;
 
-  AdclientsResourceApi(commons.ApiRequester client) : _requester = client;
+  AdclientsResource(commons.ApiRequester client) : _requester = client;
 
   /// List all ad clients in this AdSense account.
   ///
@@ -1751,13 +1745,13 @@
   }
 }
 
-class AdunitsResourceApi {
+class AdunitsResource {
   final commons.ApiRequester _requester;
 
-  AdunitsCustomchannelsResourceApi get customchannels =>
-      AdunitsCustomchannelsResourceApi(_requester);
+  AdunitsCustomchannelsResource get customchannels =>
+      AdunitsCustomchannelsResource(_requester);
 
-  AdunitsResourceApi(commons.ApiRequester client) : _requester = client;
+  AdunitsResource(commons.ApiRequester client) : _requester = client;
 
   /// Gets the specified ad unit in the specified ad client.
   ///
@@ -1953,10 +1947,10 @@
   }
 }
 
-class AdunitsCustomchannelsResourceApi {
+class AdunitsCustomchannelsResource {
   final commons.ApiRequester _requester;
 
-  AdunitsCustomchannelsResourceApi(commons.ApiRequester client)
+  AdunitsCustomchannelsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// List all custom channels which the specified ad unit belongs to.
@@ -2037,10 +2031,10 @@
   }
 }
 
-class AlertsResourceApi {
+class AlertsResource {
   final commons.ApiRequester _requester;
 
-  AlertsResourceApi(commons.ApiRequester client) : _requester = client;
+  AlertsResource(commons.ApiRequester client) : _requester = client;
 
   /// Dismiss (delete) the specified alert from the publisher's AdSense account.
   ///
@@ -2145,13 +2139,13 @@
   }
 }
 
-class CustomchannelsResourceApi {
+class CustomchannelsResource {
   final commons.ApiRequester _requester;
 
-  CustomchannelsAdunitsResourceApi get adunits =>
-      CustomchannelsAdunitsResourceApi(_requester);
+  CustomchannelsAdunitsResource get adunits =>
+      CustomchannelsAdunitsResource(_requester);
 
-  CustomchannelsResourceApi(commons.ApiRequester client) : _requester = client;
+  CustomchannelsResource(commons.ApiRequester client) : _requester = client;
 
   /// Get the specified custom channel from the specified ad client.
   ///
@@ -2284,10 +2278,10 @@
   }
 }
 
-class CustomchannelsAdunitsResourceApi {
+class CustomchannelsAdunitsResource {
   final commons.ApiRequester _requester;
 
-  CustomchannelsAdunitsResourceApi(commons.ApiRequester client)
+  CustomchannelsAdunitsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// List all ad units in the specified custom channel.
@@ -2373,22 +2367,20 @@
   }
 }
 
-class MetadataResourceApi {
+class MetadataResource {
   final commons.ApiRequester _requester;
 
-  MetadataDimensionsResourceApi get dimensions =>
-      MetadataDimensionsResourceApi(_requester);
-  MetadataMetricsResourceApi get metrics =>
-      MetadataMetricsResourceApi(_requester);
+  MetadataDimensionsResource get dimensions =>
+      MetadataDimensionsResource(_requester);
+  MetadataMetricsResource get metrics => MetadataMetricsResource(_requester);
 
-  MetadataResourceApi(commons.ApiRequester client) : _requester = client;
+  MetadataResource(commons.ApiRequester client) : _requester = client;
 }
 
-class MetadataDimensionsResourceApi {
+class MetadataDimensionsResource {
   final commons.ApiRequester _requester;
 
-  MetadataDimensionsResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  MetadataDimensionsResource(commons.ApiRequester client) : _requester = client;
 
   /// List the metadata for the dimensions available to this AdSense account.
   ///
@@ -2435,10 +2427,10 @@
   }
 }
 
-class MetadataMetricsResourceApi {
+class MetadataMetricsResource {
   final commons.ApiRequester _requester;
 
-  MetadataMetricsResourceApi(commons.ApiRequester client) : _requester = client;
+  MetadataMetricsResource(commons.ApiRequester client) : _requester = client;
 
   /// List the metadata for the metrics available to this AdSense account.
   ///
@@ -2485,10 +2477,10 @@
   }
 }
 
-class PaymentsResourceApi {
+class PaymentsResource {
   final commons.ApiRequester _requester;
 
-  PaymentsResourceApi(commons.ApiRequester client) : _requester = client;
+  PaymentsResource(commons.ApiRequester client) : _requester = client;
 
   /// List the payments for this AdSense account.
   ///
@@ -2535,12 +2527,12 @@
   }
 }
 
-class ReportsResourceApi {
+class ReportsResource {
   final commons.ApiRequester _requester;
 
-  ReportsSavedResourceApi get saved => ReportsSavedResourceApi(_requester);
+  ReportsSavedResource get saved => ReportsSavedResource(_requester);
 
-  ReportsResourceApi(commons.ApiRequester client) : _requester = client;
+  ReportsResource(commons.ApiRequester client) : _requester = client;
 
   /// Generate an AdSense report based on the report request sent in the query
   /// parameters. Returns the result as JSON; to retrieve output in CSV format
@@ -2701,10 +2693,10 @@
   }
 }
 
-class ReportsSavedResourceApi {
+class ReportsSavedResource {
   final commons.ApiRequester _requester;
 
-  ReportsSavedResourceApi(commons.ApiRequester client) : _requester = client;
+  ReportsSavedResource(commons.ApiRequester client) : _requester = client;
 
   /// Generate an AdSense report based on the saved report ID sent in the query
   /// parameters.
@@ -2842,10 +2834,10 @@
   }
 }
 
-class SavedadstylesResourceApi {
+class SavedadstylesResource {
   final commons.ApiRequester _requester;
 
-  SavedadstylesResourceApi(commons.ApiRequester client) : _requester = client;
+  SavedadstylesResource(commons.ApiRequester client) : _requester = client;
 
   /// Get a specific saved ad style from the user's account.
   ///
@@ -2960,10 +2952,10 @@
   }
 }
 
-class UrlchannelsResourceApi {
+class UrlchannelsResource {
   final commons.ApiRequester _requester;
 
-  UrlchannelsResourceApi(commons.ApiRequester client) : _requester = client;
+  UrlchannelsResource(commons.ApiRequester client) : _requester = client;
 
   /// List all URL channels in the specified ad client for this AdSense account.
   ///
diff --git a/generated/googleapis/lib/adsensehost/v4_1.dart b/generated/googleapis/lib/adsensehost/v4_1.dart
index ed8b1f1..430b2ec 100644
--- a/generated/googleapis/lib/adsensehost/v4_1.dart
+++ b/generated/googleapis/lib/adsensehost/v4_1.dart
@@ -24,15 +24,15 @@
 ///
 /// Create an instance of [AdSenseHostApi] to access these resources:
 ///
-/// - [AccountsResourceApi]
-///   - [AccountsAdclientsResourceApi]
-///   - [AccountsAdunitsResourceApi]
-///   - [AccountsReportsResourceApi]
-/// - [AdclientsResourceApi]
-/// - [AssociationsessionsResourceApi]
-/// - [CustomchannelsResourceApi]
-/// - [ReportsResourceApi]
-/// - [UrlchannelsResourceApi]
+/// - [AccountsResource]
+///   - [AccountsAdclientsResource]
+///   - [AccountsAdunitsResource]
+///   - [AccountsReportsResource]
+/// - [AdclientsResource]
+/// - [AssociationsessionsResource]
+/// - [CustomchannelsResource]
+/// - [ReportsResource]
+/// - [UrlchannelsResource]
 library adsensehost.v4_1;
 
 import 'dart:async' as async;
@@ -55,14 +55,14 @@
 
   final commons.ApiRequester _requester;
 
-  AccountsResourceApi get accounts => AccountsResourceApi(_requester);
-  AdclientsResourceApi get adclients => AdclientsResourceApi(_requester);
-  AssociationsessionsResourceApi get associationsessions =>
-      AssociationsessionsResourceApi(_requester);
-  CustomchannelsResourceApi get customchannels =>
-      CustomchannelsResourceApi(_requester);
-  ReportsResourceApi get reports => ReportsResourceApi(_requester);
-  UrlchannelsResourceApi get urlchannels => UrlchannelsResourceApi(_requester);
+  AccountsResource get accounts => AccountsResource(_requester);
+  AdclientsResource get adclients => AdclientsResource(_requester);
+  AssociationsessionsResource get associationsessions =>
+      AssociationsessionsResource(_requester);
+  CustomchannelsResource get customchannels =>
+      CustomchannelsResource(_requester);
+  ReportsResource get reports => ReportsResource(_requester);
+  UrlchannelsResource get urlchannels => UrlchannelsResource(_requester);
 
   AdSenseHostApi(http.Client client,
       {core.String rootUrl = 'https://www.googleapis.com/',
@@ -71,17 +71,15 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class AccountsResourceApi {
+class AccountsResource {
   final commons.ApiRequester _requester;
 
-  AccountsAdclientsResourceApi get adclients =>
-      AccountsAdclientsResourceApi(_requester);
-  AccountsAdunitsResourceApi get adunits =>
-      AccountsAdunitsResourceApi(_requester);
-  AccountsReportsResourceApi get reports =>
-      AccountsReportsResourceApi(_requester);
+  AccountsAdclientsResource get adclients =>
+      AccountsAdclientsResource(_requester);
+  AccountsAdunitsResource get adunits => AccountsAdunitsResource(_requester);
+  AccountsReportsResource get reports => AccountsReportsResource(_requester);
 
-  AccountsResourceApi(commons.ApiRequester client) : _requester = client;
+  AccountsResource(commons.ApiRequester client) : _requester = client;
 
   /// Get information about the selected associated AdSense account.
   ///
@@ -185,11 +183,10 @@
   }
 }
 
-class AccountsAdclientsResourceApi {
+class AccountsAdclientsResource {
   final commons.ApiRequester _requester;
 
-  AccountsAdclientsResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  AccountsAdclientsResource(commons.ApiRequester client) : _requester = client;
 
   /// Get information about one of the ad clients in the specified publisher's
   /// AdSense account.
@@ -320,10 +317,10 @@
   }
 }
 
-class AccountsAdunitsResourceApi {
+class AccountsAdunitsResource {
   final commons.ApiRequester _requester;
 
-  AccountsAdunitsResourceApi(commons.ApiRequester client) : _requester = client;
+  AccountsAdunitsResource(commons.ApiRequester client) : _requester = client;
 
   /// Delete the specified ad unit from the specified publisher AdSense account.
   ///
@@ -823,10 +820,10 @@
   }
 }
 
-class AccountsReportsResourceApi {
+class AccountsReportsResource {
   final commons.ApiRequester _requester;
 
-  AccountsReportsResourceApi(commons.ApiRequester client) : _requester = client;
+  AccountsReportsResource(commons.ApiRequester client) : _requester = client;
 
   /// Generate an AdSense report based on the report request sent in the query
   /// parameters. Returns the result as JSON; to retrieve output in CSV format
@@ -954,10 +951,10 @@
   }
 }
 
-class AdclientsResourceApi {
+class AdclientsResource {
   final commons.ApiRequester _requester;
 
-  AdclientsResourceApi(commons.ApiRequester client) : _requester = client;
+  AdclientsResource(commons.ApiRequester client) : _requester = client;
 
   /// Get information about one of the ad clients in the Host AdSense account.
   ///
@@ -1070,10 +1067,10 @@
   }
 }
 
-class AssociationsessionsResourceApi {
+class AssociationsessionsResource {
   final commons.ApiRequester _requester;
 
-  AssociationsessionsResourceApi(commons.ApiRequester client)
+  AssociationsessionsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Create an association session for initiating an association with an
@@ -1210,10 +1207,10 @@
   }
 }
 
-class CustomchannelsResourceApi {
+class CustomchannelsResource {
   final commons.ApiRequester _requester;
 
-  CustomchannelsResourceApi(commons.ApiRequester client) : _requester = client;
+  CustomchannelsResource(commons.ApiRequester client) : _requester = client;
 
   /// Delete a specific custom channel from the host AdSense account.
   ///
@@ -1590,10 +1587,10 @@
   }
 }
 
-class ReportsResourceApi {
+class ReportsResource {
   final commons.ApiRequester _requester;
 
-  ReportsResourceApi(commons.ApiRequester client) : _requester = client;
+  ReportsResource(commons.ApiRequester client) : _requester = client;
 
   /// Generate an AdSense report based on the report request sent in the query
   /// parameters. Returns the result as JSON; to retrieve output in CSV format
@@ -1714,10 +1711,10 @@
   }
 }
 
-class UrlchannelsResourceApi {
+class UrlchannelsResource {
   final commons.ApiRequester _requester;
 
-  UrlchannelsResourceApi(commons.ApiRequester client) : _requester = client;
+  UrlchannelsResource(commons.ApiRequester client) : _requester = client;
 
   /// Delete a URL channel from the host AdSense account.
   ///
diff --git a/generated/googleapis/lib/analytics/v3.dart b/generated/googleapis/lib/analytics/v3.dart
index 0d12daf..1e5d6df 100644
--- a/generated/googleapis/lib/analytics/v3.dart
+++ b/generated/googleapis/lib/analytics/v3.dart
@@ -23,36 +23,36 @@
 ///
 /// Create an instance of [AnalyticsApi] to access these resources:
 ///
-/// - [DataResourceApi]
-///   - [DataGaResourceApi]
-///   - [DataMcfResourceApi]
-///   - [DataRealtimeResourceApi]
-/// - [ManagementResourceApi]
-///   - [ManagementAccountSummariesResourceApi]
-///   - [ManagementAccountUserLinksResourceApi]
-///   - [ManagementAccountsResourceApi]
-///   - [ManagementClientIdResourceApi]
-///   - [ManagementCustomDataSourcesResourceApi]
-///   - [ManagementCustomDimensionsResourceApi]
-///   - [ManagementCustomMetricsResourceApi]
-///   - [ManagementExperimentsResourceApi]
-///   - [ManagementFiltersResourceApi]
-///   - [ManagementGoalsResourceApi]
-///   - [ManagementProfileFilterLinksResourceApi]
-///   - [ManagementProfileUserLinksResourceApi]
-///   - [ManagementProfilesResourceApi]
-///   - [ManagementRemarketingAudienceResourceApi]
-///   - [ManagementSegmentsResourceApi]
-///   - [ManagementUnsampledReportsResourceApi]
-///   - [ManagementUploadsResourceApi]
-///   - [ManagementWebPropertyAdWordsLinksResourceApi]
-///   - [ManagementWebpropertiesResourceApi]
-///   - [ManagementWebpropertyUserLinksResourceApi]
-/// - [MetadataResourceApi]
-///   - [MetadataColumnsResourceApi]
-/// - [ProvisioningResourceApi]
-/// - [UserDeletionResourceApi]
-///   - [UserDeletionUserDeletionRequestResourceApi]
+/// - [DataResource]
+///   - [DataGaResource]
+///   - [DataMcfResource]
+///   - [DataRealtimeResource]
+/// - [ManagementResource]
+///   - [ManagementAccountSummariesResource]
+///   - [ManagementAccountUserLinksResource]
+///   - [ManagementAccountsResource]
+///   - [ManagementClientIdResource]
+///   - [ManagementCustomDataSourcesResource]
+///   - [ManagementCustomDimensionsResource]
+///   - [ManagementCustomMetricsResource]
+///   - [ManagementExperimentsResource]
+///   - [ManagementFiltersResource]
+///   - [ManagementGoalsResource]
+///   - [ManagementProfileFilterLinksResource]
+///   - [ManagementProfileUserLinksResource]
+///   - [ManagementProfilesResource]
+///   - [ManagementRemarketingAudienceResource]
+///   - [ManagementSegmentsResource]
+///   - [ManagementUnsampledReportsResource]
+///   - [ManagementUploadsResource]
+///   - [ManagementWebPropertyAdWordsLinksResource]
+///   - [ManagementWebpropertiesResource]
+///   - [ManagementWebpropertyUserLinksResource]
+/// - [MetadataResource]
+///   - [MetadataColumnsResource]
+/// - [ProvisioningResource]
+/// - [UserDeletionResource]
+///   - [UserDeletionUserDeletionRequestResource]
 library analytics.v3;
 
 import 'dart:async' as async;
@@ -107,13 +107,11 @@
 
   final commons.ApiRequester _requester;
 
-  DataResourceApi get data => DataResourceApi(_requester);
-  ManagementResourceApi get management => ManagementResourceApi(_requester);
-  MetadataResourceApi get metadata => MetadataResourceApi(_requester);
-  ProvisioningResourceApi get provisioning =>
-      ProvisioningResourceApi(_requester);
-  UserDeletionResourceApi get userDeletion =>
-      UserDeletionResourceApi(_requester);
+  DataResource get data => DataResource(_requester);
+  ManagementResource get management => ManagementResource(_requester);
+  MetadataResource get metadata => MetadataResource(_requester);
+  ProvisioningResource get provisioning => ProvisioningResource(_requester);
+  UserDeletionResource get userDeletion => UserDeletionResource(_requester);
 
   AnalyticsApi(http.Client client,
       {core.String rootUrl = 'https://www.googleapis.com/',
@@ -122,20 +120,20 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class DataResourceApi {
+class DataResource {
   final commons.ApiRequester _requester;
 
-  DataGaResourceApi get ga => DataGaResourceApi(_requester);
-  DataMcfResourceApi get mcf => DataMcfResourceApi(_requester);
-  DataRealtimeResourceApi get realtime => DataRealtimeResourceApi(_requester);
+  DataGaResource get ga => DataGaResource(_requester);
+  DataMcfResource get mcf => DataMcfResource(_requester);
+  DataRealtimeResource get realtime => DataRealtimeResource(_requester);
 
-  DataResourceApi(commons.ApiRequester client) : _requester = client;
+  DataResource(commons.ApiRequester client) : _requester = client;
 }
 
-class DataGaResourceApi {
+class DataGaResource {
   final commons.ApiRequester _requester;
 
-  DataGaResourceApi(commons.ApiRequester client) : _requester = client;
+  DataGaResource(commons.ApiRequester client) : _requester = client;
 
   /// Returns Analytics data for a view (profile).
   ///
@@ -294,10 +292,10 @@
   }
 }
 
-class DataMcfResourceApi {
+class DataMcfResource {
   final commons.ApiRequester _requester;
 
-  DataMcfResourceApi(commons.ApiRequester client) : _requester = client;
+  DataMcfResource(commons.ApiRequester client) : _requester = client;
 
   /// Returns Analytics Multi-Channel Funnels data for a view (profile).
   ///
@@ -434,10 +432,10 @@
   }
 }
 
-class DataRealtimeResourceApi {
+class DataRealtimeResource {
   final commons.ApiRequester _requester;
 
-  DataRealtimeResourceApi(commons.ApiRequester client) : _requester = client;
+  DataRealtimeResource(commons.ApiRequester client) : _requester = client;
 
   /// Returns real time data for a view (profile).
   ///
@@ -533,57 +531,56 @@
   }
 }
 
-class ManagementResourceApi {
+class ManagementResource {
   final commons.ApiRequester _requester;
 
-  ManagementAccountSummariesResourceApi get accountSummaries =>
-      ManagementAccountSummariesResourceApi(_requester);
-  ManagementAccountUserLinksResourceApi get accountUserLinks =>
-      ManagementAccountUserLinksResourceApi(_requester);
-  ManagementAccountsResourceApi get accounts =>
-      ManagementAccountsResourceApi(_requester);
-  ManagementClientIdResourceApi get clientId =>
-      ManagementClientIdResourceApi(_requester);
-  ManagementCustomDataSourcesResourceApi get customDataSources =>
-      ManagementCustomDataSourcesResourceApi(_requester);
-  ManagementCustomDimensionsResourceApi get customDimensions =>
-      ManagementCustomDimensionsResourceApi(_requester);
-  ManagementCustomMetricsResourceApi get customMetrics =>
-      ManagementCustomMetricsResourceApi(_requester);
-  ManagementExperimentsResourceApi get experiments =>
-      ManagementExperimentsResourceApi(_requester);
-  ManagementFiltersResourceApi get filters =>
-      ManagementFiltersResourceApi(_requester);
-  ManagementGoalsResourceApi get goals =>
-      ManagementGoalsResourceApi(_requester);
-  ManagementProfileFilterLinksResourceApi get profileFilterLinks =>
-      ManagementProfileFilterLinksResourceApi(_requester);
-  ManagementProfileUserLinksResourceApi get profileUserLinks =>
-      ManagementProfileUserLinksResourceApi(_requester);
-  ManagementProfilesResourceApi get profiles =>
-      ManagementProfilesResourceApi(_requester);
-  ManagementRemarketingAudienceResourceApi get remarketingAudience =>
-      ManagementRemarketingAudienceResourceApi(_requester);
-  ManagementSegmentsResourceApi get segments =>
-      ManagementSegmentsResourceApi(_requester);
-  ManagementUnsampledReportsResourceApi get unsampledReports =>
-      ManagementUnsampledReportsResourceApi(_requester);
-  ManagementUploadsResourceApi get uploads =>
-      ManagementUploadsResourceApi(_requester);
-  ManagementWebPropertyAdWordsLinksResourceApi get webPropertyAdWordsLinks =>
-      ManagementWebPropertyAdWordsLinksResourceApi(_requester);
-  ManagementWebpropertiesResourceApi get webproperties =>
-      ManagementWebpropertiesResourceApi(_requester);
-  ManagementWebpropertyUserLinksResourceApi get webpropertyUserLinks =>
-      ManagementWebpropertyUserLinksResourceApi(_requester);
+  ManagementAccountSummariesResource get accountSummaries =>
+      ManagementAccountSummariesResource(_requester);
+  ManagementAccountUserLinksResource get accountUserLinks =>
+      ManagementAccountUserLinksResource(_requester);
+  ManagementAccountsResource get accounts =>
+      ManagementAccountsResource(_requester);
+  ManagementClientIdResource get clientId =>
+      ManagementClientIdResource(_requester);
+  ManagementCustomDataSourcesResource get customDataSources =>
+      ManagementCustomDataSourcesResource(_requester);
+  ManagementCustomDimensionsResource get customDimensions =>
+      ManagementCustomDimensionsResource(_requester);
+  ManagementCustomMetricsResource get customMetrics =>
+      ManagementCustomMetricsResource(_requester);
+  ManagementExperimentsResource get experiments =>
+      ManagementExperimentsResource(_requester);
+  ManagementFiltersResource get filters =>
+      ManagementFiltersResource(_requester);
+  ManagementGoalsResource get goals => ManagementGoalsResource(_requester);
+  ManagementProfileFilterLinksResource get profileFilterLinks =>
+      ManagementProfileFilterLinksResource(_requester);
+  ManagementProfileUserLinksResource get profileUserLinks =>
+      ManagementProfileUserLinksResource(_requester);
+  ManagementProfilesResource get profiles =>
+      ManagementProfilesResource(_requester);
+  ManagementRemarketingAudienceResource get remarketingAudience =>
+      ManagementRemarketingAudienceResource(_requester);
+  ManagementSegmentsResource get segments =>
+      ManagementSegmentsResource(_requester);
+  ManagementUnsampledReportsResource get unsampledReports =>
+      ManagementUnsampledReportsResource(_requester);
+  ManagementUploadsResource get uploads =>
+      ManagementUploadsResource(_requester);
+  ManagementWebPropertyAdWordsLinksResource get webPropertyAdWordsLinks =>
+      ManagementWebPropertyAdWordsLinksResource(_requester);
+  ManagementWebpropertiesResource get webproperties =>
+      ManagementWebpropertiesResource(_requester);
+  ManagementWebpropertyUserLinksResource get webpropertyUserLinks =>
+      ManagementWebpropertyUserLinksResource(_requester);
 
-  ManagementResourceApi(commons.ApiRequester client) : _requester = client;
+  ManagementResource(commons.ApiRequester client) : _requester = client;
 }
 
-class ManagementAccountSummariesResourceApi {
+class ManagementAccountSummariesResource {
   final commons.ApiRequester _requester;
 
-  ManagementAccountSummariesResourceApi(commons.ApiRequester client)
+  ManagementAccountSummariesResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Lists account summaries (lightweight tree comprised of
@@ -647,10 +644,10 @@
   }
 }
 
-class ManagementAccountUserLinksResourceApi {
+class ManagementAccountUserLinksResource {
   final commons.ApiRequester _requester;
 
-  ManagementAccountUserLinksResourceApi(commons.ApiRequester client)
+  ManagementAccountUserLinksResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Removes a user from the given account.
@@ -906,11 +903,10 @@
   }
 }
 
-class ManagementAccountsResourceApi {
+class ManagementAccountsResource {
   final commons.ApiRequester _requester;
 
-  ManagementAccountsResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  ManagementAccountsResource(commons.ApiRequester client) : _requester = client;
 
   /// Lists all accounts to which the user has access.
   ///
@@ -970,11 +966,10 @@
   }
 }
 
-class ManagementClientIdResourceApi {
+class ManagementClientIdResource {
   final commons.ApiRequester _requester;
 
-  ManagementClientIdResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  ManagementClientIdResource(commons.ApiRequester client) : _requester = client;
 
   /// Hashes the given Client ID.
   ///
@@ -1028,10 +1023,10 @@
   }
 }
 
-class ManagementCustomDataSourcesResourceApi {
+class ManagementCustomDataSourcesResource {
   final commons.ApiRequester _requester;
 
-  ManagementCustomDataSourcesResourceApi(commons.ApiRequester client)
+  ManagementCustomDataSourcesResource(commons.ApiRequester client)
       : _requester = client;
 
   /// List custom data sources to which the user has access.
@@ -1113,10 +1108,10 @@
   }
 }
 
-class ManagementCustomDimensionsResourceApi {
+class ManagementCustomDimensionsResource {
   final commons.ApiRequester _requester;
 
-  ManagementCustomDimensionsResourceApi(commons.ApiRequester client)
+  ManagementCustomDimensionsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Get a custom dimension to which the user has access.
@@ -1501,10 +1496,10 @@
   }
 }
 
-class ManagementCustomMetricsResourceApi {
+class ManagementCustomMetricsResource {
   final commons.ApiRequester _requester;
 
-  ManagementCustomMetricsResourceApi(commons.ApiRequester client)
+  ManagementCustomMetricsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Get a custom metric to which the user has access.
@@ -1886,10 +1881,10 @@
   }
 }
 
-class ManagementExperimentsResourceApi {
+class ManagementExperimentsResource {
   final commons.ApiRequester _requester;
 
-  ManagementExperimentsResourceApi(commons.ApiRequester client)
+  ManagementExperimentsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Delete an experiment.
@@ -2369,11 +2364,10 @@
   }
 }
 
-class ManagementFiltersResourceApi {
+class ManagementFiltersResource {
   final commons.ApiRequester _requester;
 
-  ManagementFiltersResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  ManagementFiltersResource(commons.ApiRequester client) : _requester = client;
 
   /// Delete a filter.
   ///
@@ -2748,10 +2742,10 @@
   }
 }
 
-class ManagementGoalsResourceApi {
+class ManagementGoalsResource {
   final commons.ApiRequester _requester;
 
-  ManagementGoalsResourceApi(commons.ApiRequester client) : _requester = client;
+  ManagementGoalsResource(commons.ApiRequester client) : _requester = client;
 
   /// Gets a goal to which the user has access.
   ///
@@ -3152,10 +3146,10 @@
   }
 }
 
-class ManagementProfileFilterLinksResourceApi {
+class ManagementProfileFilterLinksResource {
   final commons.ApiRequester _requester;
 
-  ManagementProfileFilterLinksResourceApi(commons.ApiRequester client)
+  ManagementProfileFilterLinksResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Delete a profile filter link.
@@ -3658,10 +3652,10 @@
   }
 }
 
-class ManagementProfileUserLinksResourceApi {
+class ManagementProfileUserLinksResource {
   final commons.ApiRequester _requester;
 
-  ManagementProfileUserLinksResourceApi(commons.ApiRequester client)
+  ManagementProfileUserLinksResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Removes a user from the given view (profile).
@@ -3985,11 +3979,10 @@
   }
 }
 
-class ManagementProfilesResourceApi {
+class ManagementProfilesResource {
   final commons.ApiRequester _requester;
 
-  ManagementProfilesResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  ManagementProfilesResource(commons.ApiRequester client) : _requester = client;
 
   /// Deletes a view (profile).
   ///
@@ -4419,10 +4412,10 @@
   }
 }
 
-class ManagementRemarketingAudienceResourceApi {
+class ManagementRemarketingAudienceResource {
   final commons.ApiRequester _requester;
 
-  ManagementRemarketingAudienceResourceApi(commons.ApiRequester client)
+  ManagementRemarketingAudienceResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Delete a remarketing audience.
@@ -4864,11 +4857,10 @@
   }
 }
 
-class ManagementSegmentsResourceApi {
+class ManagementSegmentsResource {
   final commons.ApiRequester _requester;
 
-  ManagementSegmentsResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  ManagementSegmentsResource(commons.ApiRequester client) : _requester = client;
 
   /// Lists segments to which the user has access.
   ///
@@ -4928,10 +4920,10 @@
   }
 }
 
-class ManagementUnsampledReportsResourceApi {
+class ManagementUnsampledReportsResource {
   final commons.ApiRequester _requester;
 
-  ManagementUnsampledReportsResourceApi(commons.ApiRequester client)
+  ManagementUnsampledReportsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Deletes an unsampled report.
@@ -5248,11 +5240,10 @@
   }
 }
 
-class ManagementUploadsResourceApi {
+class ManagementUploadsResource {
   final commons.ApiRequester _requester;
 
-  ManagementUploadsResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  ManagementUploadsResource(commons.ApiRequester client) : _requester = client;
 
   /// Delete data associated with a previous upload.
   ///
@@ -5596,10 +5587,10 @@
   }
 }
 
-class ManagementWebPropertyAdWordsLinksResourceApi {
+class ManagementWebPropertyAdWordsLinksResource {
   final commons.ApiRequester _requester;
 
-  ManagementWebPropertyAdWordsLinksResourceApi(commons.ApiRequester client)
+  ManagementWebPropertyAdWordsLinksResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Deletes a web property-Google Ads link.
@@ -6035,10 +6026,10 @@
   }
 }
 
-class ManagementWebpropertiesResourceApi {
+class ManagementWebpropertiesResource {
   final commons.ApiRequester _requester;
 
-  ManagementWebpropertiesResourceApi(commons.ApiRequester client)
+  ManagementWebpropertiesResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Gets a web property to which the user has access.
@@ -6366,10 +6357,10 @@
   }
 }
 
-class ManagementWebpropertyUserLinksResourceApi {
+class ManagementWebpropertyUserLinksResource {
   final commons.ApiRequester _requester;
 
-  ManagementWebpropertyUserLinksResourceApi(commons.ApiRequester client)
+  ManagementWebpropertyUserLinksResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Removes a user from the given web property.
@@ -6659,19 +6650,18 @@
   }
 }
 
-class MetadataResourceApi {
+class MetadataResource {
   final commons.ApiRequester _requester;
 
-  MetadataColumnsResourceApi get columns =>
-      MetadataColumnsResourceApi(_requester);
+  MetadataColumnsResource get columns => MetadataColumnsResource(_requester);
 
-  MetadataResourceApi(commons.ApiRequester client) : _requester = client;
+  MetadataResource(commons.ApiRequester client) : _requester = client;
 }
 
-class MetadataColumnsResourceApi {
+class MetadataColumnsResource {
   final commons.ApiRequester _requester;
 
-  MetadataColumnsResourceApi(commons.ApiRequester client) : _requester = client;
+  MetadataColumnsResource(commons.ApiRequester client) : _requester = client;
 
   /// Lists all columns for a report type
   ///
@@ -6727,10 +6717,10 @@
   }
 }
 
-class ProvisioningResourceApi {
+class ProvisioningResource {
   final commons.ApiRequester _requester;
 
-  ProvisioningResourceApi(commons.ApiRequester client) : _requester = client;
+  ProvisioningResource(commons.ApiRequester client) : _requester = client;
 
   /// Creates an account ticket.
   ///
@@ -6835,19 +6825,19 @@
   }
 }
 
-class UserDeletionResourceApi {
+class UserDeletionResource {
   final commons.ApiRequester _requester;
 
-  UserDeletionUserDeletionRequestResourceApi get userDeletionRequest =>
-      UserDeletionUserDeletionRequestResourceApi(_requester);
+  UserDeletionUserDeletionRequestResource get userDeletionRequest =>
+      UserDeletionUserDeletionRequestResource(_requester);
 
-  UserDeletionResourceApi(commons.ApiRequester client) : _requester = client;
+  UserDeletionResource(commons.ApiRequester client) : _requester = client;
 }
 
-class UserDeletionUserDeletionRequestResourceApi {
+class UserDeletionUserDeletionRequestResource {
   final commons.ApiRequester _requester;
 
-  UserDeletionUserDeletionRequestResourceApi(commons.ApiRequester client)
+  UserDeletionUserDeletionRequestResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Insert or update a user deletion requests.
diff --git a/generated/googleapis/lib/analyticsreporting/v4.dart b/generated/googleapis/lib/analyticsreporting/v4.dart
index c04d73d..6088419 100644
--- a/generated/googleapis/lib/analyticsreporting/v4.dart
+++ b/generated/googleapis/lib/analyticsreporting/v4.dart
@@ -24,8 +24,8 @@
 ///
 /// Create an instance of [AnalyticsReportingApi] to access these resources:
 ///
-/// - [ReportsResourceApi]
-/// - [UserActivityResourceApi]
+/// - [ReportsResource]
+/// - [UserActivityResource]
 library analyticsreporting.v4;
 
 import 'dart:async' as async;
@@ -51,9 +51,8 @@
 
   final commons.ApiRequester _requester;
 
-  ReportsResourceApi get reports => ReportsResourceApi(_requester);
-  UserActivityResourceApi get userActivity =>
-      UserActivityResourceApi(_requester);
+  ReportsResource get reports => ReportsResource(_requester);
+  UserActivityResource get userActivity => UserActivityResource(_requester);
 
   AnalyticsReportingApi(http.Client client,
       {core.String rootUrl = 'https://analyticsreporting.googleapis.com/',
@@ -62,10 +61,10 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class ReportsResourceApi {
+class ReportsResource {
   final commons.ApiRequester _requester;
 
-  ReportsResourceApi(commons.ApiRequester client) : _requester = client;
+  ReportsResource(commons.ApiRequester client) : _requester = client;
 
   /// Returns the Analytics data.
   ///
@@ -119,10 +118,10 @@
   }
 }
 
-class UserActivityResourceApi {
+class UserActivityResource {
   final commons.ApiRequester _requester;
 
-  UserActivityResourceApi(commons.ApiRequester client) : _requester = client;
+  UserActivityResource(commons.ApiRequester client) : _requester = client;
 
   /// Returns User Activity data.
   ///
diff --git a/generated/googleapis/lib/androiddeviceprovisioning/v1.dart b/generated/googleapis/lib/androiddeviceprovisioning/v1.dart
index 81218d5..fad4b24 100644
--- a/generated/googleapis/lib/androiddeviceprovisioning/v1.dart
+++ b/generated/googleapis/lib/androiddeviceprovisioning/v1.dart
@@ -25,16 +25,16 @@
 /// Create an instance of [AndroidProvisioningPartnerApi] to access these
 /// resources:
 ///
-/// - [CustomersResourceApi]
-///   - [CustomersConfigurationsResourceApi]
-///   - [CustomersDevicesResourceApi]
-///   - [CustomersDpcsResourceApi]
-/// - [OperationsResourceApi]
-/// - [PartnersResourceApi]
-///   - [PartnersCustomersResourceApi]
-///   - [PartnersDevicesResourceApi]
-///   - [PartnersVendorsResourceApi]
-///     - [PartnersVendorsCustomersResourceApi]
+/// - [CustomersResource]
+///   - [CustomersConfigurationsResource]
+///   - [CustomersDevicesResource]
+///   - [CustomersDpcsResource]
+/// - [OperationsResource]
+/// - [PartnersResource]
+///   - [PartnersCustomersResource]
+///   - [PartnersDevicesResource]
+///   - [PartnersVendorsResource]
+///     - [PartnersVendorsCustomersResource]
 library androiddeviceprovisioning.v1;
 
 import 'dart:async' as async;
@@ -54,9 +54,9 @@
 class AndroidProvisioningPartnerApi {
   final commons.ApiRequester _requester;
 
-  CustomersResourceApi get customers => CustomersResourceApi(_requester);
-  OperationsResourceApi get operations => OperationsResourceApi(_requester);
-  PartnersResourceApi get partners => PartnersResourceApi(_requester);
+  CustomersResource get customers => CustomersResource(_requester);
+  OperationsResource get operations => OperationsResource(_requester);
+  PartnersResource get partners => PartnersResource(_requester);
 
   AndroidProvisioningPartnerApi(http.Client client,
       {core.String rootUrl =
@@ -66,16 +66,15 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class CustomersResourceApi {
+class CustomersResource {
   final commons.ApiRequester _requester;
 
-  CustomersConfigurationsResourceApi get configurations =>
-      CustomersConfigurationsResourceApi(_requester);
-  CustomersDevicesResourceApi get devices =>
-      CustomersDevicesResourceApi(_requester);
-  CustomersDpcsResourceApi get dpcs => CustomersDpcsResourceApi(_requester);
+  CustomersConfigurationsResource get configurations =>
+      CustomersConfigurationsResource(_requester);
+  CustomersDevicesResource get devices => CustomersDevicesResource(_requester);
+  CustomersDpcsResource get dpcs => CustomersDpcsResource(_requester);
 
-  CustomersResourceApi(commons.ApiRequester client) : _requester = client;
+  CustomersResource(commons.ApiRequester client) : _requester = client;
 
   /// Lists the user's customer accounts.
   ///
@@ -136,10 +135,10 @@
   }
 }
 
-class CustomersConfigurationsResourceApi {
+class CustomersConfigurationsResource {
   final commons.ApiRequester _requester;
 
-  CustomersConfigurationsResourceApi(commons.ApiRequester client)
+  CustomersConfigurationsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Creates a new configuration. Once created, a customer can apply the
@@ -437,11 +436,10 @@
   }
 }
 
-class CustomersDevicesResourceApi {
+class CustomersDevicesResource {
   final commons.ApiRequester _requester;
 
-  CustomersDevicesResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  CustomersDevicesResource(commons.ApiRequester client) : _requester = client;
 
   /// Applies a Configuration to the device to register the device for
   /// zero-touch enrollment. After applying a configuration to a device, the
@@ -748,10 +746,10 @@
   }
 }
 
-class CustomersDpcsResourceApi {
+class CustomersDpcsResource {
   final commons.ApiRequester _requester;
 
-  CustomersDpcsResourceApi(commons.ApiRequester client) : _requester = client;
+  CustomersDpcsResource(commons.ApiRequester client) : _requester = client;
 
   /// Lists the DPCs (device policy controllers) that support zero-touch
   /// enrollment.
@@ -808,10 +806,10 @@
   }
 }
 
-class OperationsResourceApi {
+class OperationsResource {
   final commons.ApiRequester _requester;
 
-  OperationsResourceApi(commons.ApiRequester client) : _requester = client;
+  OperationsResource(commons.ApiRequester client) : _requester = client;
 
   /// Gets the latest state of a long-running operation. Clients can use this
   /// method to poll the operation result at intervals as recommended by the API
@@ -867,24 +865,21 @@
   }
 }
 
-class PartnersResourceApi {
+class PartnersResource {
   final commons.ApiRequester _requester;
 
-  PartnersCustomersResourceApi get customers =>
-      PartnersCustomersResourceApi(_requester);
-  PartnersDevicesResourceApi get devices =>
-      PartnersDevicesResourceApi(_requester);
-  PartnersVendorsResourceApi get vendors =>
-      PartnersVendorsResourceApi(_requester);
+  PartnersCustomersResource get customers =>
+      PartnersCustomersResource(_requester);
+  PartnersDevicesResource get devices => PartnersDevicesResource(_requester);
+  PartnersVendorsResource get vendors => PartnersVendorsResource(_requester);
 
-  PartnersResourceApi(commons.ApiRequester client) : _requester = client;
+  PartnersResource(commons.ApiRequester client) : _requester = client;
 }
 
-class PartnersCustomersResourceApi {
+class PartnersCustomersResource {
   final commons.ApiRequester _requester;
 
-  PartnersCustomersResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  PartnersCustomersResource(commons.ApiRequester client) : _requester = client;
 
   /// Creates a customer for zero-touch enrollment. After the method returns
   /// successfully, admin and owner roles can manage devices and EMM configs by
@@ -1020,10 +1015,10 @@
   }
 }
 
-class PartnersDevicesResourceApi {
+class PartnersDevicesResource {
   final commons.ApiRequester _requester;
 
-  PartnersDevicesResourceApi(commons.ApiRequester client) : _requester = client;
+  PartnersDevicesResource(commons.ApiRequester client) : _requester = client;
 
   /// Claims a device for a customer and adds it to zero-touch enrollment. If
   /// the device is already claimed by another customer, the call returns an
@@ -1577,13 +1572,13 @@
   }
 }
 
-class PartnersVendorsResourceApi {
+class PartnersVendorsResource {
   final commons.ApiRequester _requester;
 
-  PartnersVendorsCustomersResourceApi get customers =>
-      PartnersVendorsCustomersResourceApi(_requester);
+  PartnersVendorsCustomersResource get customers =>
+      PartnersVendorsCustomersResource(_requester);
 
-  PartnersVendorsResourceApi(commons.ApiRequester client) : _requester = client;
+  PartnersVendorsResource(commons.ApiRequester client) : _requester = client;
 
   /// Lists the vendors of the partner.
   ///
@@ -1653,10 +1648,10 @@
   }
 }
 
-class PartnersVendorsCustomersResourceApi {
+class PartnersVendorsCustomersResource {
   final commons.ApiRequester _requester;
 
-  PartnersVendorsCustomersResourceApi(commons.ApiRequester client)
+  PartnersVendorsCustomersResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Lists the customers of the vendor.
diff --git a/generated/googleapis/lib/androidenterprise/v1.dart b/generated/googleapis/lib/androidenterprise/v1.dart
index 7d7bcb6..5f611f3 100644
--- a/generated/googleapis/lib/androidenterprise/v1.dart
+++ b/generated/googleapis/lib/androidenterprise/v1.dart
@@ -24,22 +24,22 @@
 ///
 /// Create an instance of [AndroidEnterpriseApi] to access these resources:
 ///
-/// - [DevicesResourceApi]
-/// - [EnterprisesResourceApi]
-/// - [EntitlementsResourceApi]
-/// - [GrouplicensesResourceApi]
-/// - [GrouplicenseusersResourceApi]
-/// - [InstallsResourceApi]
-/// - [ManagedconfigurationsfordeviceResourceApi]
-/// - [ManagedconfigurationsforuserResourceApi]
-/// - [ManagedconfigurationssettingsResourceApi]
-/// - [PermissionsResourceApi]
-/// - [ProductsResourceApi]
-/// - [ServiceaccountkeysResourceApi]
-/// - [StorelayoutclustersResourceApi]
-/// - [StorelayoutpagesResourceApi]
-/// - [UsersResourceApi]
-/// - [WebappsResourceApi]
+/// - [DevicesResource]
+/// - [EnterprisesResource]
+/// - [EntitlementsResource]
+/// - [GrouplicensesResource]
+/// - [GrouplicenseusersResource]
+/// - [InstallsResource]
+/// - [ManagedconfigurationsfordeviceResource]
+/// - [ManagedconfigurationsforuserResource]
+/// - [ManagedconfigurationssettingsResource]
+/// - [PermissionsResource]
+/// - [ProductsResource]
+/// - [ServiceaccountkeysResource]
+/// - [StorelayoutclustersResource]
+/// - [StorelayoutpagesResource]
+/// - [UsersResource]
+/// - [WebappsResource]
 library androidenterprise.v1;
 
 import 'dart:async' as async;
@@ -62,32 +62,29 @@
 
   final commons.ApiRequester _requester;
 
-  DevicesResourceApi get devices => DevicesResourceApi(_requester);
-  EnterprisesResourceApi get enterprises => EnterprisesResourceApi(_requester);
-  EntitlementsResourceApi get entitlements =>
-      EntitlementsResourceApi(_requester);
-  GrouplicensesResourceApi get grouplicenses =>
-      GrouplicensesResourceApi(_requester);
-  GrouplicenseusersResourceApi get grouplicenseusers =>
-      GrouplicenseusersResourceApi(_requester);
-  InstallsResourceApi get installs => InstallsResourceApi(_requester);
-  ManagedconfigurationsfordeviceResourceApi
-      get managedconfigurationsfordevice =>
-          ManagedconfigurationsfordeviceResourceApi(_requester);
-  ManagedconfigurationsforuserResourceApi get managedconfigurationsforuser =>
-      ManagedconfigurationsforuserResourceApi(_requester);
-  ManagedconfigurationssettingsResourceApi get managedconfigurationssettings =>
-      ManagedconfigurationssettingsResourceApi(_requester);
-  PermissionsResourceApi get permissions => PermissionsResourceApi(_requester);
-  ProductsResourceApi get products => ProductsResourceApi(_requester);
-  ServiceaccountkeysResourceApi get serviceaccountkeys =>
-      ServiceaccountkeysResourceApi(_requester);
-  StorelayoutclustersResourceApi get storelayoutclusters =>
-      StorelayoutclustersResourceApi(_requester);
-  StorelayoutpagesResourceApi get storelayoutpages =>
-      StorelayoutpagesResourceApi(_requester);
-  UsersResourceApi get users => UsersResourceApi(_requester);
-  WebappsResourceApi get webapps => WebappsResourceApi(_requester);
+  DevicesResource get devices => DevicesResource(_requester);
+  EnterprisesResource get enterprises => EnterprisesResource(_requester);
+  EntitlementsResource get entitlements => EntitlementsResource(_requester);
+  GrouplicensesResource get grouplicenses => GrouplicensesResource(_requester);
+  GrouplicenseusersResource get grouplicenseusers =>
+      GrouplicenseusersResource(_requester);
+  InstallsResource get installs => InstallsResource(_requester);
+  ManagedconfigurationsfordeviceResource get managedconfigurationsfordevice =>
+      ManagedconfigurationsfordeviceResource(_requester);
+  ManagedconfigurationsforuserResource get managedconfigurationsforuser =>
+      ManagedconfigurationsforuserResource(_requester);
+  ManagedconfigurationssettingsResource get managedconfigurationssettings =>
+      ManagedconfigurationssettingsResource(_requester);
+  PermissionsResource get permissions => PermissionsResource(_requester);
+  ProductsResource get products => ProductsResource(_requester);
+  ServiceaccountkeysResource get serviceaccountkeys =>
+      ServiceaccountkeysResource(_requester);
+  StorelayoutclustersResource get storelayoutclusters =>
+      StorelayoutclustersResource(_requester);
+  StorelayoutpagesResource get storelayoutpages =>
+      StorelayoutpagesResource(_requester);
+  UsersResource get users => UsersResource(_requester);
+  WebappsResource get webapps => WebappsResource(_requester);
 
   AndroidEnterpriseApi(http.Client client,
       {core.String rootUrl = 'https://androidenterprise.googleapis.com/',
@@ -96,10 +93,10 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class DevicesResourceApi {
+class DevicesResource {
   final commons.ApiRequester _requester;
 
-  DevicesResourceApi(commons.ApiRequester client) : _requester = client;
+  DevicesResource(commons.ApiRequester client) : _requester = client;
 
   /// Uploads a report containing any changes in app states on the device since
   /// the last report was generated. You can call this method up to 3 times
@@ -534,10 +531,10 @@
   }
 }
 
-class EnterprisesResourceApi {
+class EnterprisesResource {
   final commons.ApiRequester _requester;
 
-  EnterprisesResourceApi(commons.ApiRequester client) : _requester = client;
+  EnterprisesResource(commons.ApiRequester client) : _requester = client;
 
   /// Acknowledges notifications that were received from
   /// Enterprises.PullNotificationSet to prevent subsequent calls from returning
@@ -1379,10 +1376,10 @@
   }
 }
 
-class EntitlementsResourceApi {
+class EntitlementsResource {
   final commons.ApiRequester _requester;
 
-  EntitlementsResourceApi(commons.ApiRequester client) : _requester = client;
+  EntitlementsResource(commons.ApiRequester client) : _requester = client;
 
   /// Removes an entitlement to an app for a user.
   ///
@@ -1667,10 +1664,10 @@
   }
 }
 
-class GrouplicensesResourceApi {
+class GrouplicensesResource {
   final commons.ApiRequester _requester;
 
-  GrouplicensesResourceApi(commons.ApiRequester client) : _requester = client;
+  GrouplicensesResource(commons.ApiRequester client) : _requester = client;
 
   /// Retrieves details of an enterprise's group license for a product.
   ///
@@ -1788,11 +1785,10 @@
   }
 }
 
-class GrouplicenseusersResourceApi {
+class GrouplicenseusersResource {
   final commons.ApiRequester _requester;
 
-  GrouplicenseusersResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  GrouplicenseusersResource(commons.ApiRequester client) : _requester = client;
 
   /// Retrieves the IDs of the users who have been granted entitlements under
   /// the license.
@@ -1858,10 +1854,10 @@
   }
 }
 
-class InstallsResourceApi {
+class InstallsResource {
   final commons.ApiRequester _requester;
 
-  InstallsResourceApi(commons.ApiRequester client) : _requester = client;
+  InstallsResource(commons.ApiRequester client) : _requester = client;
 
   /// Requests to remove an app from a device. A call to get or list will still
   /// show the app as installed on the device until it is actually removed.
@@ -2170,10 +2166,10 @@
   }
 }
 
-class ManagedconfigurationsfordeviceResourceApi {
+class ManagedconfigurationsfordeviceResource {
   final commons.ApiRequester _requester;
 
-  ManagedconfigurationsfordeviceResourceApi(commons.ApiRequester client)
+  ManagedconfigurationsfordeviceResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Removes a per-device managed configuration for an app for the specified
@@ -2488,10 +2484,10 @@
   }
 }
 
-class ManagedconfigurationsforuserResourceApi {
+class ManagedconfigurationsforuserResource {
   final commons.ApiRequester _requester;
 
-  ManagedconfigurationsforuserResourceApi(commons.ApiRequester client)
+  ManagedconfigurationsforuserResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Removes a per-user managed configuration for an app for the specified
@@ -2779,10 +2775,10 @@
   }
 }
 
-class ManagedconfigurationssettingsResourceApi {
+class ManagedconfigurationssettingsResource {
   final commons.ApiRequester _requester;
 
-  ManagedconfigurationssettingsResourceApi(commons.ApiRequester client)
+  ManagedconfigurationssettingsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Lists all the managed configurations settings for the specified app.
@@ -2848,10 +2844,10 @@
   }
 }
 
-class PermissionsResourceApi {
+class PermissionsResource {
   final commons.ApiRequester _requester;
 
-  PermissionsResourceApi(commons.ApiRequester client) : _requester = client;
+  PermissionsResource(commons.ApiRequester client) : _requester = client;
 
   /// Retrieves details of an Android app permission for display to an
   /// enterprise admin.
@@ -2914,10 +2910,10 @@
   }
 }
 
-class ProductsResourceApi {
+class ProductsResource {
   final commons.ApiRequester _requester;
 
-  ProductsResourceApi(commons.ApiRequester client) : _requester = client;
+  ProductsResource(commons.ApiRequester client) : _requester = client;
 
   /// Approves the specified product and the relevant app permissions, if any.
   /// The maximum number of products that you can approve per enterprise
@@ -3419,11 +3415,10 @@
   }
 }
 
-class ServiceaccountkeysResourceApi {
+class ServiceaccountkeysResource {
   final commons.ApiRequester _requester;
 
-  ServiceaccountkeysResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  ServiceaccountkeysResource(commons.ApiRequester client) : _requester = client;
 
   /// Removes and invalidates the specified credentials for the service account
   /// associated with this enterprise. The calling service account must have
@@ -3608,10 +3603,10 @@
   }
 }
 
-class StorelayoutclustersResourceApi {
+class StorelayoutclustersResource {
   final commons.ApiRequester _requester;
 
-  StorelayoutclustersResourceApi(commons.ApiRequester client)
+  StorelayoutclustersResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Deletes a cluster.
@@ -3952,11 +3947,10 @@
   }
 }
 
-class StorelayoutpagesResourceApi {
+class StorelayoutpagesResource {
   final commons.ApiRequester _requester;
 
-  StorelayoutpagesResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  StorelayoutpagesResource(commons.ApiRequester client) : _requester = client;
 
   /// Deletes a store page.
   ///
@@ -4253,10 +4247,10 @@
   }
 }
 
-class UsersResourceApi {
+class UsersResource {
   final commons.ApiRequester _requester;
 
-  UsersResourceApi(commons.ApiRequester client) : _requester = client;
+  UsersResource(commons.ApiRequester client) : _requester = client;
 
   /// Deleted an EMM-managed user.
   ///
@@ -4828,10 +4822,10 @@
   }
 }
 
-class WebappsResourceApi {
+class WebappsResource {
   final commons.ApiRequester _requester;
 
-  WebappsResourceApi(commons.ApiRequester client) : _requester = client;
+  WebappsResource(commons.ApiRequester client) : _requester = client;
 
   /// Deletes an existing web app.
   ///
diff --git a/generated/googleapis/lib/androidmanagement/v1.dart b/generated/googleapis/lib/androidmanagement/v1.dart
index f84d9fe..1502cbb 100644
--- a/generated/googleapis/lib/androidmanagement/v1.dart
+++ b/generated/googleapis/lib/androidmanagement/v1.dart
@@ -24,15 +24,15 @@
 ///
 /// Create an instance of [AndroidManagementApi] to access these resources:
 ///
-/// - [EnterprisesResourceApi]
-///   - [EnterprisesApplicationsResourceApi]
-///   - [EnterprisesDevicesResourceApi]
-///     - [EnterprisesDevicesOperationsResourceApi]
-///   - [EnterprisesEnrollmentTokensResourceApi]
-///   - [EnterprisesPoliciesResourceApi]
-///   - [EnterprisesWebAppsResourceApi]
-///   - [EnterprisesWebTokensResourceApi]
-/// - [SignupUrlsResourceApi]
+/// - [EnterprisesResource]
+///   - [EnterprisesApplicationsResource]
+///   - [EnterprisesDevicesResource]
+///     - [EnterprisesDevicesOperationsResource]
+///   - [EnterprisesEnrollmentTokensResource]
+///   - [EnterprisesPoliciesResource]
+///   - [EnterprisesWebAppsResource]
+///   - [EnterprisesWebTokensResource]
+/// - [SignupUrlsResource]
 library androidmanagement.v1;
 
 import 'dart:async' as async;
@@ -56,8 +56,8 @@
 
   final commons.ApiRequester _requester;
 
-  EnterprisesResourceApi get enterprises => EnterprisesResourceApi(_requester);
-  SignupUrlsResourceApi get signupUrls => SignupUrlsResourceApi(_requester);
+  EnterprisesResource get enterprises => EnterprisesResource(_requester);
+  SignupUrlsResource get signupUrls => SignupUrlsResource(_requester);
 
   AndroidManagementApi(http.Client client,
       {core.String rootUrl = 'https://androidmanagement.googleapis.com/',
@@ -66,23 +66,23 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class EnterprisesResourceApi {
+class EnterprisesResource {
   final commons.ApiRequester _requester;
 
-  EnterprisesApplicationsResourceApi get applications =>
-      EnterprisesApplicationsResourceApi(_requester);
-  EnterprisesDevicesResourceApi get devices =>
-      EnterprisesDevicesResourceApi(_requester);
-  EnterprisesEnrollmentTokensResourceApi get enrollmentTokens =>
-      EnterprisesEnrollmentTokensResourceApi(_requester);
-  EnterprisesPoliciesResourceApi get policies =>
-      EnterprisesPoliciesResourceApi(_requester);
-  EnterprisesWebAppsResourceApi get webApps =>
-      EnterprisesWebAppsResourceApi(_requester);
-  EnterprisesWebTokensResourceApi get webTokens =>
-      EnterprisesWebTokensResourceApi(_requester);
+  EnterprisesApplicationsResource get applications =>
+      EnterprisesApplicationsResource(_requester);
+  EnterprisesDevicesResource get devices =>
+      EnterprisesDevicesResource(_requester);
+  EnterprisesEnrollmentTokensResource get enrollmentTokens =>
+      EnterprisesEnrollmentTokensResource(_requester);
+  EnterprisesPoliciesResource get policies =>
+      EnterprisesPoliciesResource(_requester);
+  EnterprisesWebAppsResource get webApps =>
+      EnterprisesWebAppsResource(_requester);
+  EnterprisesWebTokensResource get webTokens =>
+      EnterprisesWebTokensResource(_requester);
 
-  EnterprisesResourceApi(commons.ApiRequester client) : _requester = client;
+  EnterprisesResource(commons.ApiRequester client) : _requester = client;
 
   /// Creates an enterprise. This is the last step in the enterprise signup
   /// flow.
@@ -276,10 +276,10 @@
   }
 }
 
-class EnterprisesApplicationsResourceApi {
+class EnterprisesApplicationsResource {
   final commons.ApiRequester _requester;
 
-  EnterprisesApplicationsResourceApi(commons.ApiRequester client)
+  EnterprisesApplicationsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Gets info about an application.
@@ -344,14 +344,13 @@
   }
 }
 
-class EnterprisesDevicesResourceApi {
+class EnterprisesDevicesResource {
   final commons.ApiRequester _requester;
 
-  EnterprisesDevicesOperationsResourceApi get operations =>
-      EnterprisesDevicesOperationsResourceApi(_requester);
+  EnterprisesDevicesOperationsResource get operations =>
+      EnterprisesDevicesOperationsResource(_requester);
 
-  EnterprisesDevicesResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  EnterprisesDevicesResource(commons.ApiRequester client) : _requester = client;
 
   /// Deletes a device. This operation wipes the device.
   ///
@@ -667,10 +666,10 @@
   }
 }
 
-class EnterprisesDevicesOperationsResourceApi {
+class EnterprisesDevicesOperationsResource {
   final commons.ApiRequester _requester;
 
-  EnterprisesDevicesOperationsResourceApi(commons.ApiRequester client)
+  EnterprisesDevicesOperationsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Starts asynchronous cancellation on a long-running operation. The server
@@ -921,10 +920,10 @@
   }
 }
 
-class EnterprisesEnrollmentTokensResourceApi {
+class EnterprisesEnrollmentTokensResource {
   final commons.ApiRequester _requester;
 
-  EnterprisesEnrollmentTokensResourceApi(commons.ApiRequester client)
+  EnterprisesEnrollmentTokensResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Creates an enrollment token for a given enterprise.
@@ -1042,10 +1041,10 @@
   }
 }
 
-class EnterprisesPoliciesResourceApi {
+class EnterprisesPoliciesResource {
   final commons.ApiRequester _requester;
 
-  EnterprisesPoliciesResourceApi(commons.ApiRequester client)
+  EnterprisesPoliciesResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Deletes a policy. This operation is only permitted if no devices are
@@ -1287,11 +1286,10 @@
   }
 }
 
-class EnterprisesWebAppsResourceApi {
+class EnterprisesWebAppsResource {
   final commons.ApiRequester _requester;
 
-  EnterprisesWebAppsResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  EnterprisesWebAppsResource(commons.ApiRequester client) : _requester = client;
 
   /// Creates a web app.
   ///
@@ -1590,10 +1588,10 @@
   }
 }
 
-class EnterprisesWebTokensResourceApi {
+class EnterprisesWebTokensResource {
   final commons.ApiRequester _requester;
 
-  EnterprisesWebTokensResourceApi(commons.ApiRequester client)
+  EnterprisesWebTokensResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Creates a web token to access an embeddable managed Google Play web UI for
@@ -1657,10 +1655,10 @@
   }
 }
 
-class SignupUrlsResourceApi {
+class SignupUrlsResource {
   final commons.ApiRequester _requester;
 
-  SignupUrlsResourceApi(commons.ApiRequester client) : _requester = client;
+  SignupUrlsResource(commons.ApiRequester client) : _requester = client;
 
   /// Creates an enterprise signup URL.
   ///
diff --git a/generated/googleapis/lib/androidpublisher/v3.dart b/generated/googleapis/lib/androidpublisher/v3.dart
index c9651a0..652f37e 100644
--- a/generated/googleapis/lib/androidpublisher/v3.dart
+++ b/generated/googleapis/lib/androidpublisher/v3.dart
@@ -23,26 +23,26 @@
 ///
 /// Create an instance of [AndroidPublisherApi] to access these resources:
 ///
-/// - [EditsResourceApi]
-///   - [EditsApksResourceApi]
-///   - [EditsBundlesResourceApi]
-///   - [EditsDeobfuscationfilesResourceApi]
-///   - [EditsDetailsResourceApi]
-///   - [EditsExpansionfilesResourceApi]
-///   - [EditsImagesResourceApi]
-///   - [EditsListingsResourceApi]
-///   - [EditsTestersResourceApi]
-///   - [EditsTracksResourceApi]
-/// - [InappproductsResourceApi]
-/// - [InternalappsharingartifactsResourceApi]
-/// - [OrdersResourceApi]
-/// - [PurchasesResourceApi]
-///   - [PurchasesProductsResourceApi]
-///   - [PurchasesSubscriptionsResourceApi]
-///   - [PurchasesVoidedpurchasesResourceApi]
-/// - [ReviewsResourceApi]
-/// - [SystemapksResourceApi]
-///   - [SystemapksVariantsResourceApi]
+/// - [EditsResource]
+///   - [EditsApksResource]
+///   - [EditsBundlesResource]
+///   - [EditsDeobfuscationfilesResource]
+///   - [EditsDetailsResource]
+///   - [EditsExpansionfilesResource]
+///   - [EditsImagesResource]
+///   - [EditsListingsResource]
+///   - [EditsTestersResource]
+///   - [EditsTracksResource]
+/// - [InappproductsResource]
+/// - [InternalappsharingartifactsResource]
+/// - [OrdersResource]
+/// - [PurchasesResource]
+///   - [PurchasesProductsResource]
+///   - [PurchasesSubscriptionsResource]
+///   - [PurchasesVoidedpurchasesResource]
+/// - [ReviewsResource]
+/// - [SystemapksResource]
+///   - [SystemapksVariantsResource]
 library androidpublisher.v3;
 
 import 'dart:async' as async;
@@ -73,15 +73,14 @@
 
   final commons.ApiRequester _requester;
 
-  EditsResourceApi get edits => EditsResourceApi(_requester);
-  InappproductsResourceApi get inappproducts =>
-      InappproductsResourceApi(_requester);
-  InternalappsharingartifactsResourceApi get internalappsharingartifacts =>
-      InternalappsharingartifactsResourceApi(_requester);
-  OrdersResourceApi get orders => OrdersResourceApi(_requester);
-  PurchasesResourceApi get purchases => PurchasesResourceApi(_requester);
-  ReviewsResourceApi get reviews => ReviewsResourceApi(_requester);
-  SystemapksResourceApi get systemapks => SystemapksResourceApi(_requester);
+  EditsResource get edits => EditsResource(_requester);
+  InappproductsResource get inappproducts => InappproductsResource(_requester);
+  InternalappsharingartifactsResource get internalappsharingartifacts =>
+      InternalappsharingartifactsResource(_requester);
+  OrdersResource get orders => OrdersResource(_requester);
+  PurchasesResource get purchases => PurchasesResource(_requester);
+  ReviewsResource get reviews => ReviewsResource(_requester);
+  SystemapksResource get systemapks => SystemapksResource(_requester);
 
   AndroidPublisherApi(http.Client client,
       {core.String rootUrl = 'https://androidpublisher.googleapis.com/',
@@ -90,22 +89,22 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class EditsResourceApi {
+class EditsResource {
   final commons.ApiRequester _requester;
 
-  EditsApksResourceApi get apks => EditsApksResourceApi(_requester);
-  EditsBundlesResourceApi get bundles => EditsBundlesResourceApi(_requester);
-  EditsDeobfuscationfilesResourceApi get deobfuscationfiles =>
-      EditsDeobfuscationfilesResourceApi(_requester);
-  EditsDetailsResourceApi get details => EditsDetailsResourceApi(_requester);
-  EditsExpansionfilesResourceApi get expansionfiles =>
-      EditsExpansionfilesResourceApi(_requester);
-  EditsImagesResourceApi get images => EditsImagesResourceApi(_requester);
-  EditsListingsResourceApi get listings => EditsListingsResourceApi(_requester);
-  EditsTestersResourceApi get testers => EditsTestersResourceApi(_requester);
-  EditsTracksResourceApi get tracks => EditsTracksResourceApi(_requester);
+  EditsApksResource get apks => EditsApksResource(_requester);
+  EditsBundlesResource get bundles => EditsBundlesResource(_requester);
+  EditsDeobfuscationfilesResource get deobfuscationfiles =>
+      EditsDeobfuscationfilesResource(_requester);
+  EditsDetailsResource get details => EditsDetailsResource(_requester);
+  EditsExpansionfilesResource get expansionfiles =>
+      EditsExpansionfilesResource(_requester);
+  EditsImagesResource get images => EditsImagesResource(_requester);
+  EditsListingsResource get listings => EditsListingsResource(_requester);
+  EditsTestersResource get testers => EditsTestersResource(_requester);
+  EditsTracksResource get tracks => EditsTracksResource(_requester);
 
-  EditsResourceApi(commons.ApiRequester client) : _requester = client;
+  EditsResource(commons.ApiRequester client) : _requester = client;
 
   /// Commits an app edit.
   ///
@@ -404,10 +403,10 @@
   }
 }
 
-class EditsApksResourceApi {
+class EditsApksResource {
   final commons.ApiRequester _requester;
 
-  EditsApksResourceApi(commons.ApiRequester client) : _requester = client;
+  EditsApksResource(commons.ApiRequester client) : _requester = client;
 
   /// Creates a new APK without uploading the APK itself to Google Play, instead
   /// hosting the APK at a specified URL. This function is only available to
@@ -626,10 +625,10 @@
   }
 }
 
-class EditsBundlesResourceApi {
+class EditsBundlesResource {
   final commons.ApiRequester _requester;
 
-  EditsBundlesResourceApi(commons.ApiRequester client) : _requester = client;
+  EditsBundlesResource(commons.ApiRequester client) : _requester = client;
 
   /// Lists all current Android App Bundles of the app and edit.
   ///
@@ -793,10 +792,10 @@
   }
 }
 
-class EditsDeobfuscationfilesResourceApi {
+class EditsDeobfuscationfilesResource {
   final commons.ApiRequester _requester;
 
-  EditsDeobfuscationfilesResourceApi(commons.ApiRequester client)
+  EditsDeobfuscationfilesResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Uploads a new deobfuscation file and attaches to the specified APK.
@@ -913,10 +912,10 @@
   }
 }
 
-class EditsDetailsResourceApi {
+class EditsDetailsResource {
   final commons.ApiRequester _requester;
 
-  EditsDetailsResourceApi(commons.ApiRequester client) : _requester = client;
+  EditsDetailsResource(commons.ApiRequester client) : _requester = client;
 
   /// Gets details of an app.
   ///
@@ -1114,10 +1113,10 @@
   }
 }
 
-class EditsExpansionfilesResourceApi {
+class EditsExpansionfilesResource {
   final commons.ApiRequester _requester;
 
-  EditsExpansionfilesResourceApi(commons.ApiRequester client)
+  EditsExpansionfilesResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Fetches the expansion file configuration for the specified APK.
@@ -1494,10 +1493,10 @@
   }
 }
 
-class EditsImagesResourceApi {
+class EditsImagesResource {
   final commons.ApiRequester _requester;
 
-  EditsImagesResourceApi(commons.ApiRequester client) : _requester = client;
+  EditsImagesResource(commons.ApiRequester client) : _requester = client;
 
   /// Deletes the image (specified by id) from the edit.
   ///
@@ -1894,10 +1893,10 @@
   }
 }
 
-class EditsListingsResourceApi {
+class EditsListingsResource {
   final commons.ApiRequester _requester;
 
-  EditsListingsResourceApi(commons.ApiRequester client) : _requester = client;
+  EditsListingsResource(commons.ApiRequester client) : _requester = client;
 
   /// Deletes a localized store listing.
   ///
@@ -2305,10 +2304,10 @@
   }
 }
 
-class EditsTestersResourceApi {
+class EditsTestersResource {
   final commons.ApiRequester _requester;
 
-  EditsTestersResourceApi(commons.ApiRequester client) : _requester = client;
+  EditsTestersResource(commons.ApiRequester client) : _requester = client;
 
   /// Gets testers.
   ///
@@ -2524,10 +2523,10 @@
   }
 }
 
-class EditsTracksResourceApi {
+class EditsTracksResource {
   final commons.ApiRequester _requester;
 
-  EditsTracksResourceApi(commons.ApiRequester client) : _requester = client;
+  EditsTracksResource(commons.ApiRequester client) : _requester = client;
 
   /// Gets a track.
   ///
@@ -2804,10 +2803,10 @@
   }
 }
 
-class InappproductsResourceApi {
+class InappproductsResource {
   final commons.ApiRequester _requester;
 
-  InappproductsResourceApi(commons.ApiRequester client) : _requester = client;
+  InappproductsResource(commons.ApiRequester client) : _requester = client;
 
   /// Deletes an in-app product (i.e. a managed product or a subscriptions).
   ///
@@ -3224,10 +3223,10 @@
   }
 }
 
-class InternalappsharingartifactsResourceApi {
+class InternalappsharingartifactsResource {
   final commons.ApiRequester _requester;
 
-  InternalappsharingartifactsResourceApi(commons.ApiRequester client)
+  InternalappsharingartifactsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Uploads an APK to internal app sharing. If you are using the Google API
@@ -3391,10 +3390,10 @@
   }
 }
 
-class OrdersResourceApi {
+class OrdersResource {
   final commons.ApiRequester _requester;
 
-  OrdersResourceApi(commons.ApiRequester client) : _requester = client;
+  OrdersResource(commons.ApiRequester client) : _requester = client;
 
   /// Refund a user's subscription or in-app purchase order.
   ///
@@ -3469,24 +3468,23 @@
   }
 }
 
-class PurchasesResourceApi {
+class PurchasesResource {
   final commons.ApiRequester _requester;
 
-  PurchasesProductsResourceApi get products =>
-      PurchasesProductsResourceApi(_requester);
-  PurchasesSubscriptionsResourceApi get subscriptions =>
-      PurchasesSubscriptionsResourceApi(_requester);
-  PurchasesVoidedpurchasesResourceApi get voidedpurchases =>
-      PurchasesVoidedpurchasesResourceApi(_requester);
+  PurchasesProductsResource get products =>
+      PurchasesProductsResource(_requester);
+  PurchasesSubscriptionsResource get subscriptions =>
+      PurchasesSubscriptionsResource(_requester);
+  PurchasesVoidedpurchasesResource get voidedpurchases =>
+      PurchasesVoidedpurchasesResource(_requester);
 
-  PurchasesResourceApi(commons.ApiRequester client) : _requester = client;
+  PurchasesResource(commons.ApiRequester client) : _requester = client;
 }
 
-class PurchasesProductsResourceApi {
+class PurchasesProductsResource {
   final commons.ApiRequester _requester;
 
-  PurchasesProductsResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  PurchasesProductsResource(commons.ApiRequester client) : _requester = client;
 
   /// Acknowledges a purchase of an inapp item.
   ///
@@ -3637,10 +3635,10 @@
   }
 }
 
-class PurchasesSubscriptionsResourceApi {
+class PurchasesSubscriptionsResource {
   final commons.ApiRequester _requester;
 
-  PurchasesSubscriptionsResourceApi(commons.ApiRequester client)
+  PurchasesSubscriptionsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Acknowledges a subscription purchase.
@@ -4080,10 +4078,10 @@
   }
 }
 
-class PurchasesVoidedpurchasesResourceApi {
+class PurchasesVoidedpurchasesResource {
   final commons.ApiRequester _requester;
 
-  PurchasesVoidedpurchasesResourceApi(commons.ApiRequester client)
+  PurchasesVoidedpurchasesResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Lists the purchases that were canceled, refunded or charged-back.
@@ -4198,10 +4196,10 @@
   }
 }
 
-class ReviewsResourceApi {
+class ReviewsResource {
   final commons.ApiRequester _requester;
 
-  ReviewsResourceApi(commons.ApiRequester client) : _requester = client;
+  ReviewsResource(commons.ApiRequester client) : _requester = client;
 
   /// Gets a single review.
   ///
@@ -4413,20 +4411,19 @@
   }
 }
 
-class SystemapksResourceApi {
+class SystemapksResource {
   final commons.ApiRequester _requester;
 
-  SystemapksVariantsResourceApi get variants =>
-      SystemapksVariantsResourceApi(_requester);
+  SystemapksVariantsResource get variants =>
+      SystemapksVariantsResource(_requester);
 
-  SystemapksResourceApi(commons.ApiRequester client) : _requester = client;
+  SystemapksResource(commons.ApiRequester client) : _requester = client;
 }
 
-class SystemapksVariantsResourceApi {
+class SystemapksVariantsResource {
   final commons.ApiRequester _requester;
 
-  SystemapksVariantsResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  SystemapksVariantsResource(commons.ApiRequester client) : _requester = client;
 
   /// Creates an APK which is suitable for inclusion in a system image from an
   /// already uploaded Android App Bundle.
diff --git a/generated/googleapis/lib/apigee/v1.dart b/generated/googleapis/lib/apigee/v1.dart
index 684d074..560bc99 100644
--- a/generated/googleapis/lib/apigee/v1.dart
+++ b/generated/googleapis/lib/apigee/v1.dart
@@ -27,66 +27,66 @@
 ///
 /// Create an instance of [ApigeeApi] to access these resources:
 ///
-/// - [HybridResourceApi]
-///   - [HybridIssuersResourceApi]
-/// - [OrganizationsResourceApi]
-///   - [OrganizationsAnalyticsResourceApi]
-///     - [OrganizationsAnalyticsDatastoresResourceApi]
-///   - [OrganizationsApiproductsResourceApi]
-///     - [OrganizationsApiproductsAttributesResourceApi]
-///   - [OrganizationsApisResourceApi]
-///     - [OrganizationsApisDeploymentsResourceApi]
-///     - [OrganizationsApisKeyvaluemapsResourceApi]
-///     - [OrganizationsApisRevisionsResourceApi]
-///       - [OrganizationsApisRevisionsDeploymentsResourceApi]
-///   - [OrganizationsAppsResourceApi]
-///   - [OrganizationsDeploymentsResourceApi]
-///   - [OrganizationsDevelopersResourceApi]
-///     - [OrganizationsDevelopersAppsResourceApi]
-///       - [OrganizationsDevelopersAppsAttributesResourceApi]
-///       - [OrganizationsDevelopersAppsKeysResourceApi]
-///         - [OrganizationsDevelopersAppsKeysApiproductsResourceApi]
-///         - [OrganizationsDevelopersAppsKeysCreateResourceApi]
-///     - [OrganizationsDevelopersAttributesResourceApi]
-///   - [OrganizationsEnvgroupsResourceApi]
-///     - [OrganizationsEnvgroupsAttachmentsResourceApi]
-///   - [OrganizationsEnvironmentsResourceApi]
-///     - [OrganizationsEnvironmentsAnalyticsResourceApi]
-///       - [OrganizationsEnvironmentsAnalyticsAdminResourceApi]
-///       - [OrganizationsEnvironmentsAnalyticsExportsResourceApi]
-///     - [OrganizationsEnvironmentsApisResourceApi]
-///       - [OrganizationsEnvironmentsApisDeploymentsResourceApi]
-///       - [OrganizationsEnvironmentsApisRevisionsResourceApi]
-///         - [OrganizationsEnvironmentsApisRevisionsDebugsessionsResourceApi]
-/// - [OrganizationsEnvironmentsApisRevisionsDebugsessionsDataResourceApi]
-///         - [OrganizationsEnvironmentsApisRevisionsDeploymentsResourceApi]
-///     - [OrganizationsEnvironmentsCachesResourceApi]
-///     - [OrganizationsEnvironmentsDeploymentsResourceApi]
-///     - [OrganizationsEnvironmentsFlowhooksResourceApi]
-///     - [OrganizationsEnvironmentsKeystoresResourceApi]
-///       - [OrganizationsEnvironmentsKeystoresAliasesResourceApi]
-///     - [OrganizationsEnvironmentsKeyvaluemapsResourceApi]
-///     - [OrganizationsEnvironmentsOptimizedStatsResourceApi]
-///     - [OrganizationsEnvironmentsQueriesResourceApi]
-///     - [OrganizationsEnvironmentsReferencesResourceApi]
-///     - [OrganizationsEnvironmentsResourcefilesResourceApi]
-///     - [OrganizationsEnvironmentsSharedflowsResourceApi]
-///       - [OrganizationsEnvironmentsSharedflowsDeploymentsResourceApi]
-///       - [OrganizationsEnvironmentsSharedflowsRevisionsResourceApi]
-///     - [OrganizationsEnvironmentsStatsResourceApi]
-///     - [OrganizationsEnvironmentsTargetserversResourceApi]
-///   - [OrganizationsInstancesResourceApi]
-///     - [OrganizationsInstancesAttachmentsResourceApi]
-///   - [OrganizationsKeyvaluemapsResourceApi]
-///   - [OrganizationsOperationsResourceApi]
-///   - [OrganizationsReportsResourceApi]
-///   - [OrganizationsSharedflowsResourceApi]
-///     - [OrganizationsSharedflowsDeploymentsResourceApi]
-///     - [OrganizationsSharedflowsRevisionsResourceApi]
-///       - [OrganizationsSharedflowsRevisionsDeploymentsResourceApi]
-///   - [OrganizationsSitesResourceApi]
-///     - [OrganizationsSitesApicategoriesResourceApi]
-/// - [ProjectsResourceApi]
+/// - [HybridResource]
+///   - [HybridIssuersResource]
+/// - [OrganizationsResource]
+///   - [OrganizationsAnalyticsResource]
+///     - [OrganizationsAnalyticsDatastoresResource]
+///   - [OrganizationsApiproductsResource]
+///     - [OrganizationsApiproductsAttributesResource]
+///   - [OrganizationsApisResource]
+///     - [OrganizationsApisDeploymentsResource]
+///     - [OrganizationsApisKeyvaluemapsResource]
+///     - [OrganizationsApisRevisionsResource]
+///       - [OrganizationsApisRevisionsDeploymentsResource]
+///   - [OrganizationsAppsResource]
+///   - [OrganizationsDeploymentsResource]
+///   - [OrganizationsDevelopersResource]
+///     - [OrganizationsDevelopersAppsResource]
+///       - [OrganizationsDevelopersAppsAttributesResource]
+///       - [OrganizationsDevelopersAppsKeysResource]
+///         - [OrganizationsDevelopersAppsKeysApiproductsResource]
+///         - [OrganizationsDevelopersAppsKeysCreateResource]
+///     - [OrganizationsDevelopersAttributesResource]
+///   - [OrganizationsEnvgroupsResource]
+///     - [OrganizationsEnvgroupsAttachmentsResource]
+///   - [OrganizationsEnvironmentsResource]
+///     - [OrganizationsEnvironmentsAnalyticsResource]
+///       - [OrganizationsEnvironmentsAnalyticsAdminResource]
+///       - [OrganizationsEnvironmentsAnalyticsExportsResource]
+///     - [OrganizationsEnvironmentsApisResource]
+///       - [OrganizationsEnvironmentsApisDeploymentsResource]
+///       - [OrganizationsEnvironmentsApisRevisionsResource]
+///         - [OrganizationsEnvironmentsApisRevisionsDebugsessionsResource]
+/// - [OrganizationsEnvironmentsApisRevisionsDebugsessionsDataResource]
+///         - [OrganizationsEnvironmentsApisRevisionsDeploymentsResource]
+///     - [OrganizationsEnvironmentsCachesResource]
+///     - [OrganizationsEnvironmentsDeploymentsResource]
+///     - [OrganizationsEnvironmentsFlowhooksResource]
+///     - [OrganizationsEnvironmentsKeystoresResource]
+///       - [OrganizationsEnvironmentsKeystoresAliasesResource]
+///     - [OrganizationsEnvironmentsKeyvaluemapsResource]
+///     - [OrganizationsEnvironmentsOptimizedStatsResource]
+///     - [OrganizationsEnvironmentsQueriesResource]
+///     - [OrganizationsEnvironmentsReferencesResource]
+///     - [OrganizationsEnvironmentsResourcefilesResource]
+///     - [OrganizationsEnvironmentsSharedflowsResource]
+///       - [OrganizationsEnvironmentsSharedflowsDeploymentsResource]
+///       - [OrganizationsEnvironmentsSharedflowsRevisionsResource]
+///     - [OrganizationsEnvironmentsStatsResource]
+///     - [OrganizationsEnvironmentsTargetserversResource]
+///   - [OrganizationsInstancesResource]
+///     - [OrganizationsInstancesAttachmentsResource]
+///   - [OrganizationsKeyvaluemapsResource]
+///   - [OrganizationsOperationsResource]
+///   - [OrganizationsReportsResource]
+///   - [OrganizationsSharedflowsResource]
+///     - [OrganizationsSharedflowsDeploymentsResource]
+///     - [OrganizationsSharedflowsRevisionsResource]
+///       - [OrganizationsSharedflowsRevisionsDeploymentsResource]
+///   - [OrganizationsSitesResource]
+///     - [OrganizationsSitesApicategoriesResource]
+/// - [ProjectsResource]
 library apigee.v1;
 
 import 'dart:async' as async;
@@ -113,10 +113,9 @@
 
   final commons.ApiRequester _requester;
 
-  HybridResourceApi get hybrid => HybridResourceApi(_requester);
-  OrganizationsResourceApi get organizations =>
-      OrganizationsResourceApi(_requester);
-  ProjectsResourceApi get projects => ProjectsResourceApi(_requester);
+  HybridResource get hybrid => HybridResource(_requester);
+  OrganizationsResource get organizations => OrganizationsResource(_requester);
+  ProjectsResource get projects => ProjectsResource(_requester);
 
   ApigeeApi(http.Client client,
       {core.String rootUrl = 'https://apigee.googleapis.com/',
@@ -125,18 +124,18 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class HybridResourceApi {
+class HybridResource {
   final commons.ApiRequester _requester;
 
-  HybridIssuersResourceApi get issuers => HybridIssuersResourceApi(_requester);
+  HybridIssuersResource get issuers => HybridIssuersResource(_requester);
 
-  HybridResourceApi(commons.ApiRequester client) : _requester = client;
+  HybridResource(commons.ApiRequester client) : _requester = client;
 }
 
-class HybridIssuersResourceApi {
+class HybridIssuersResource {
   final commons.ApiRequester _requester;
 
-  HybridIssuersResourceApi(commons.ApiRequester client) : _requester = client;
+  HybridIssuersResource(commons.ApiRequester client) : _requester = client;
 
   /// Lists hybrid services and its trusted issuers service account ids. This
   /// api is authenticated and unauthorized(allow all the users) and used by
@@ -194,39 +193,37 @@
   }
 }
 
-class OrganizationsResourceApi {
+class OrganizationsResource {
   final commons.ApiRequester _requester;
 
-  OrganizationsAnalyticsResourceApi get analytics =>
-      OrganizationsAnalyticsResourceApi(_requester);
-  OrganizationsApiproductsResourceApi get apiproducts =>
-      OrganizationsApiproductsResourceApi(_requester);
-  OrganizationsApisResourceApi get apis =>
-      OrganizationsApisResourceApi(_requester);
-  OrganizationsAppsResourceApi get apps =>
-      OrganizationsAppsResourceApi(_requester);
-  OrganizationsDeploymentsResourceApi get deployments =>
-      OrganizationsDeploymentsResourceApi(_requester);
-  OrganizationsDevelopersResourceApi get developers =>
-      OrganizationsDevelopersResourceApi(_requester);
-  OrganizationsEnvgroupsResourceApi get envgroups =>
-      OrganizationsEnvgroupsResourceApi(_requester);
-  OrganizationsEnvironmentsResourceApi get environments =>
-      OrganizationsEnvironmentsResourceApi(_requester);
-  OrganizationsInstancesResourceApi get instances =>
-      OrganizationsInstancesResourceApi(_requester);
-  OrganizationsKeyvaluemapsResourceApi get keyvaluemaps =>
-      OrganizationsKeyvaluemapsResourceApi(_requester);
-  OrganizationsOperationsResourceApi get operations =>
-      OrganizationsOperationsResourceApi(_requester);
-  OrganizationsReportsResourceApi get reports =>
-      OrganizationsReportsResourceApi(_requester);
-  OrganizationsSharedflowsResourceApi get sharedflows =>
-      OrganizationsSharedflowsResourceApi(_requester);
-  OrganizationsSitesResourceApi get sites =>
-      OrganizationsSitesResourceApi(_requester);
+  OrganizationsAnalyticsResource get analytics =>
+      OrganizationsAnalyticsResource(_requester);
+  OrganizationsApiproductsResource get apiproducts =>
+      OrganizationsApiproductsResource(_requester);
+  OrganizationsApisResource get apis => OrganizationsApisResource(_requester);
+  OrganizationsAppsResource get apps => OrganizationsAppsResource(_requester);
+  OrganizationsDeploymentsResource get deployments =>
+      OrganizationsDeploymentsResource(_requester);
+  OrganizationsDevelopersResource get developers =>
+      OrganizationsDevelopersResource(_requester);
+  OrganizationsEnvgroupsResource get envgroups =>
+      OrganizationsEnvgroupsResource(_requester);
+  OrganizationsEnvironmentsResource get environments =>
+      OrganizationsEnvironmentsResource(_requester);
+  OrganizationsInstancesResource get instances =>
+      OrganizationsInstancesResource(_requester);
+  OrganizationsKeyvaluemapsResource get keyvaluemaps =>
+      OrganizationsKeyvaluemapsResource(_requester);
+  OrganizationsOperationsResource get operations =>
+      OrganizationsOperationsResource(_requester);
+  OrganizationsReportsResource get reports =>
+      OrganizationsReportsResource(_requester);
+  OrganizationsSharedflowsResource get sharedflows =>
+      OrganizationsSharedflowsResource(_requester);
+  OrganizationsSitesResource get sites =>
+      OrganizationsSitesResource(_requester);
 
-  OrganizationsResourceApi(commons.ApiRequester client) : _requester = client;
+  OrganizationsResource(commons.ApiRequester client) : _requester = client;
 
   /// Creates an Apigee organization. See [Create an Apigee
   /// organization](https://cloud.google.com/apigee/docs/api-platform/get-started/create-org).
@@ -667,20 +664,20 @@
   }
 }
 
-class OrganizationsAnalyticsResourceApi {
+class OrganizationsAnalyticsResource {
   final commons.ApiRequester _requester;
 
-  OrganizationsAnalyticsDatastoresResourceApi get datastores =>
-      OrganizationsAnalyticsDatastoresResourceApi(_requester);
+  OrganizationsAnalyticsDatastoresResource get datastores =>
+      OrganizationsAnalyticsDatastoresResource(_requester);
 
-  OrganizationsAnalyticsResourceApi(commons.ApiRequester client)
+  OrganizationsAnalyticsResource(commons.ApiRequester client)
       : _requester = client;
 }
 
-class OrganizationsAnalyticsDatastoresResourceApi {
+class OrganizationsAnalyticsDatastoresResource {
   final commons.ApiRequester _requester;
 
-  OrganizationsAnalyticsDatastoresResourceApi(commons.ApiRequester client)
+  OrganizationsAnalyticsDatastoresResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Create a Datastore for an org
@@ -1038,13 +1035,13 @@
   }
 }
 
-class OrganizationsApiproductsResourceApi {
+class OrganizationsApiproductsResource {
   final commons.ApiRequester _requester;
 
-  OrganizationsApiproductsAttributesResourceApi get attributes_1 =>
-      OrganizationsApiproductsAttributesResourceApi(_requester);
+  OrganizationsApiproductsAttributesResource get attributes_1 =>
+      OrganizationsApiproductsAttributesResource(_requester);
 
-  OrganizationsApiproductsResourceApi(commons.ApiRequester client)
+  OrganizationsApiproductsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Updates or creates API product attributes. This API **replaces** the
@@ -1469,10 +1466,10 @@
   }
 }
 
-class OrganizationsApiproductsAttributesResourceApi {
+class OrganizationsApiproductsAttributesResource {
   final commons.ApiRequester _requester;
 
-  OrganizationsApiproductsAttributesResourceApi(commons.ApiRequester client)
+  OrganizationsApiproductsAttributesResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Deletes an API product attribute.
@@ -1705,18 +1702,17 @@
   }
 }
 
-class OrganizationsApisResourceApi {
+class OrganizationsApisResource {
   final commons.ApiRequester _requester;
 
-  OrganizationsApisDeploymentsResourceApi get deployments =>
-      OrganizationsApisDeploymentsResourceApi(_requester);
-  OrganizationsApisKeyvaluemapsResourceApi get keyvaluemaps =>
-      OrganizationsApisKeyvaluemapsResourceApi(_requester);
-  OrganizationsApisRevisionsResourceApi get revisions =>
-      OrganizationsApisRevisionsResourceApi(_requester);
+  OrganizationsApisDeploymentsResource get deployments =>
+      OrganizationsApisDeploymentsResource(_requester);
+  OrganizationsApisKeyvaluemapsResource get keyvaluemaps =>
+      OrganizationsApisKeyvaluemapsResource(_requester);
+  OrganizationsApisRevisionsResource get revisions =>
+      OrganizationsApisRevisionsResource(_requester);
 
-  OrganizationsApisResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  OrganizationsApisResource(commons.ApiRequester client) : _requester = client;
 
   /// Creates an API proxy. The API proxy created will not be accessible at
   /// runtime until it is deployed to an environment. Create a new API proxy by
@@ -1991,10 +1987,10 @@
   }
 }
 
-class OrganizationsApisDeploymentsResourceApi {
+class OrganizationsApisDeploymentsResource {
   final commons.ApiRequester _requester;
 
-  OrganizationsApisDeploymentsResourceApi(commons.ApiRequester client)
+  OrganizationsApisDeploymentsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Lists all deployments of an API proxy.
@@ -2053,10 +2049,10 @@
   }
 }
 
-class OrganizationsApisKeyvaluemapsResourceApi {
+class OrganizationsApisKeyvaluemapsResource {
   final commons.ApiRequester _requester;
 
-  OrganizationsApisKeyvaluemapsResourceApi(commons.ApiRequester client)
+  OrganizationsApisKeyvaluemapsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Creates a key value map in an api proxy.
@@ -2176,13 +2172,13 @@
   }
 }
 
-class OrganizationsApisRevisionsResourceApi {
+class OrganizationsApisRevisionsResource {
   final commons.ApiRequester _requester;
 
-  OrganizationsApisRevisionsDeploymentsResourceApi get deployments =>
-      OrganizationsApisRevisionsDeploymentsResourceApi(_requester);
+  OrganizationsApisRevisionsDeploymentsResource get deployments =>
+      OrganizationsApisRevisionsDeploymentsResource(_requester);
 
-  OrganizationsApisRevisionsResourceApi(commons.ApiRequester client)
+  OrganizationsApisRevisionsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Deletes an API proxy revision and all policies, resources, endpoints, and
@@ -2383,10 +2379,10 @@
   }
 }
 
-class OrganizationsApisRevisionsDeploymentsResourceApi {
+class OrganizationsApisRevisionsDeploymentsResource {
   final commons.ApiRequester _requester;
 
-  OrganizationsApisRevisionsDeploymentsResourceApi(commons.ApiRequester client)
+  OrganizationsApisRevisionsDeploymentsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Lists all deployments of an API proxy revision.
@@ -2447,11 +2443,10 @@
   }
 }
 
-class OrganizationsAppsResourceApi {
+class OrganizationsAppsResource {
   final commons.ApiRequester _requester;
 
-  OrganizationsAppsResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  OrganizationsAppsResource(commons.ApiRequester client) : _requester = client;
 
   /// Gets the app profile for the specified app ID.
   ///
@@ -2621,10 +2616,10 @@
   }
 }
 
-class OrganizationsDeploymentsResourceApi {
+class OrganizationsDeploymentsResource {
   final commons.ApiRequester _requester;
 
-  OrganizationsDeploymentsResourceApi(commons.ApiRequester client)
+  OrganizationsDeploymentsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Lists all deployments of API proxies or shared flows.
@@ -2692,15 +2687,15 @@
   }
 }
 
-class OrganizationsDevelopersResourceApi {
+class OrganizationsDevelopersResource {
   final commons.ApiRequester _requester;
 
-  OrganizationsDevelopersAppsResourceApi get apps =>
-      OrganizationsDevelopersAppsResourceApi(_requester);
-  OrganizationsDevelopersAttributesResourceApi get attributes_1 =>
-      OrganizationsDevelopersAttributesResourceApi(_requester);
+  OrganizationsDevelopersAppsResource get apps =>
+      OrganizationsDevelopersAppsResource(_requester);
+  OrganizationsDevelopersAttributesResource get attributes_1 =>
+      OrganizationsDevelopersAttributesResource(_requester);
 
-  OrganizationsDevelopersResourceApi(commons.ApiRequester client)
+  OrganizationsDevelopersResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Updates developer attributes. This API replaces the existing attributes
@@ -3198,15 +3193,15 @@
   }
 }
 
-class OrganizationsDevelopersAppsResourceApi {
+class OrganizationsDevelopersAppsResource {
   final commons.ApiRequester _requester;
 
-  OrganizationsDevelopersAppsAttributesResourceApi get attributes_1 =>
-      OrganizationsDevelopersAppsAttributesResourceApi(_requester);
-  OrganizationsDevelopersAppsKeysResourceApi get keys =>
-      OrganizationsDevelopersAppsKeysResourceApi(_requester);
+  OrganizationsDevelopersAppsAttributesResource get attributes_1 =>
+      OrganizationsDevelopersAppsAttributesResource(_requester);
+  OrganizationsDevelopersAppsKeysResource get keys =>
+      OrganizationsDevelopersAppsKeysResource(_requester);
 
-  OrganizationsDevelopersAppsResourceApi(commons.ApiRequester client)
+  OrganizationsDevelopersAppsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Updates attributes for a developer app. This API replaces the current
@@ -3720,10 +3715,10 @@
   }
 }
 
-class OrganizationsDevelopersAppsAttributesResourceApi {
+class OrganizationsDevelopersAppsAttributesResource {
   final commons.ApiRequester _requester;
 
-  OrganizationsDevelopersAppsAttributesResourceApi(commons.ApiRequester client)
+  OrganizationsDevelopersAppsAttributesResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Deletes a developer app attribute.
@@ -3960,15 +3955,15 @@
   }
 }
 
-class OrganizationsDevelopersAppsKeysResourceApi {
+class OrganizationsDevelopersAppsKeysResource {
   final commons.ApiRequester _requester;
 
-  OrganizationsDevelopersAppsKeysApiproductsResourceApi get apiproducts =>
-      OrganizationsDevelopersAppsKeysApiproductsResourceApi(_requester);
-  OrganizationsDevelopersAppsKeysCreateResourceApi get create_1 =>
-      OrganizationsDevelopersAppsKeysCreateResourceApi(_requester);
+  OrganizationsDevelopersAppsKeysApiproductsResource get apiproducts =>
+      OrganizationsDevelopersAppsKeysApiproductsResource(_requester);
+  OrganizationsDevelopersAppsKeysCreateResource get create_1 =>
+      OrganizationsDevelopersAppsKeysCreateResource(_requester);
 
-  OrganizationsDevelopersAppsKeysResourceApi(commons.ApiRequester client)
+  OrganizationsDevelopersAppsKeysResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Creates a custom consumer key and secret for a developer app. This is
@@ -4300,10 +4295,10 @@
   }
 }
 
-class OrganizationsDevelopersAppsKeysApiproductsResourceApi {
+class OrganizationsDevelopersAppsKeysApiproductsResource {
   final commons.ApiRequester _requester;
 
-  OrganizationsDevelopersAppsKeysApiproductsResourceApi(
+  OrganizationsDevelopersAppsKeysApiproductsResource(
       commons.ApiRequester client)
       : _requester = client;
 
@@ -4433,10 +4428,10 @@
   }
 }
 
-class OrganizationsDevelopersAppsKeysCreateResourceApi {
+class OrganizationsDevelopersAppsKeysCreateResource {
   final commons.ApiRequester _requester;
 
-  OrganizationsDevelopersAppsKeysCreateResourceApi(commons.ApiRequester client)
+  OrganizationsDevelopersAppsKeysCreateResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Creates a custom consumer key and secret for a developer app. This is
@@ -4513,10 +4508,10 @@
   }
 }
 
-class OrganizationsDevelopersAttributesResourceApi {
+class OrganizationsDevelopersAttributesResource {
   final commons.ApiRequester _requester;
 
-  OrganizationsDevelopersAttributesResourceApi(commons.ApiRequester client)
+  OrganizationsDevelopersAttributesResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Deletes a developer attribute.
@@ -4752,13 +4747,13 @@
   }
 }
 
-class OrganizationsEnvgroupsResourceApi {
+class OrganizationsEnvgroupsResource {
   final commons.ApiRequester _requester;
 
-  OrganizationsEnvgroupsAttachmentsResourceApi get attachments =>
-      OrganizationsEnvgroupsAttachmentsResourceApi(_requester);
+  OrganizationsEnvgroupsAttachmentsResource get attachments =>
+      OrganizationsEnvgroupsAttachmentsResource(_requester);
 
-  OrganizationsEnvgroupsResourceApi(commons.ApiRequester client)
+  OrganizationsEnvgroupsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Creates a new environment group.
@@ -5068,10 +5063,10 @@
   }
 }
 
-class OrganizationsEnvgroupsAttachmentsResourceApi {
+class OrganizationsEnvgroupsAttachmentsResource {
   final commons.ApiRequester _requester;
 
-  OrganizationsEnvgroupsAttachmentsResourceApi(commons.ApiRequester client)
+  OrganizationsEnvgroupsAttachmentsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Creates a new attachment of an environment to an environment group.
@@ -5318,39 +5313,39 @@
   }
 }
 
-class OrganizationsEnvironmentsResourceApi {
+class OrganizationsEnvironmentsResource {
   final commons.ApiRequester _requester;
 
-  OrganizationsEnvironmentsAnalyticsResourceApi get analytics =>
-      OrganizationsEnvironmentsAnalyticsResourceApi(_requester);
-  OrganizationsEnvironmentsApisResourceApi get apis =>
-      OrganizationsEnvironmentsApisResourceApi(_requester);
-  OrganizationsEnvironmentsCachesResourceApi get caches =>
-      OrganizationsEnvironmentsCachesResourceApi(_requester);
-  OrganizationsEnvironmentsDeploymentsResourceApi get deployments =>
-      OrganizationsEnvironmentsDeploymentsResourceApi(_requester);
-  OrganizationsEnvironmentsFlowhooksResourceApi get flowhooks =>
-      OrganizationsEnvironmentsFlowhooksResourceApi(_requester);
-  OrganizationsEnvironmentsKeystoresResourceApi get keystores =>
-      OrganizationsEnvironmentsKeystoresResourceApi(_requester);
-  OrganizationsEnvironmentsKeyvaluemapsResourceApi get keyvaluemaps =>
-      OrganizationsEnvironmentsKeyvaluemapsResourceApi(_requester);
-  OrganizationsEnvironmentsOptimizedStatsResourceApi get optimizedStats =>
-      OrganizationsEnvironmentsOptimizedStatsResourceApi(_requester);
-  OrganizationsEnvironmentsQueriesResourceApi get queries =>
-      OrganizationsEnvironmentsQueriesResourceApi(_requester);
-  OrganizationsEnvironmentsReferencesResourceApi get references =>
-      OrganizationsEnvironmentsReferencesResourceApi(_requester);
-  OrganizationsEnvironmentsResourcefilesResourceApi get resourcefiles =>
-      OrganizationsEnvironmentsResourcefilesResourceApi(_requester);
-  OrganizationsEnvironmentsSharedflowsResourceApi get sharedflows =>
-      OrganizationsEnvironmentsSharedflowsResourceApi(_requester);
-  OrganizationsEnvironmentsStatsResourceApi get stats =>
-      OrganizationsEnvironmentsStatsResourceApi(_requester);
-  OrganizationsEnvironmentsTargetserversResourceApi get targetservers =>
-      OrganizationsEnvironmentsTargetserversResourceApi(_requester);
+  OrganizationsEnvironmentsAnalyticsResource get analytics =>
+      OrganizationsEnvironmentsAnalyticsResource(_requester);
+  OrganizationsEnvironmentsApisResource get apis =>
+      OrganizationsEnvironmentsApisResource(_requester);
+  OrganizationsEnvironmentsCachesResource get caches =>
+      OrganizationsEnvironmentsCachesResource(_requester);
+  OrganizationsEnvironmentsDeploymentsResource get deployments =>
+      OrganizationsEnvironmentsDeploymentsResource(_requester);
+  OrganizationsEnvironmentsFlowhooksResource get flowhooks =>
+      OrganizationsEnvironmentsFlowhooksResource(_requester);
+  OrganizationsEnvironmentsKeystoresResource get keystores =>
+      OrganizationsEnvironmentsKeystoresResource(_requester);
+  OrganizationsEnvironmentsKeyvaluemapsResource get keyvaluemaps =>
+      OrganizationsEnvironmentsKeyvaluemapsResource(_requester);
+  OrganizationsEnvironmentsOptimizedStatsResource get optimizedStats =>
+      OrganizationsEnvironmentsOptimizedStatsResource(_requester);
+  OrganizationsEnvironmentsQueriesResource get queries =>
+      OrganizationsEnvironmentsQueriesResource(_requester);
+  OrganizationsEnvironmentsReferencesResource get references =>
+      OrganizationsEnvironmentsReferencesResource(_requester);
+  OrganizationsEnvironmentsResourcefilesResource get resourcefiles =>
+      OrganizationsEnvironmentsResourcefilesResource(_requester);
+  OrganizationsEnvironmentsSharedflowsResource get sharedflows =>
+      OrganizationsEnvironmentsSharedflowsResource(_requester);
+  OrganizationsEnvironmentsStatsResource get stats =>
+      OrganizationsEnvironmentsStatsResource(_requester);
+  OrganizationsEnvironmentsTargetserversResource get targetservers =>
+      OrganizationsEnvironmentsTargetserversResource(_requester);
 
-  OrganizationsEnvironmentsResourceApi(commons.ApiRequester client)
+  OrganizationsEnvironmentsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Creates an environment in an organization.
@@ -6161,23 +6156,22 @@
   }
 }
 
-class OrganizationsEnvironmentsAnalyticsResourceApi {
+class OrganizationsEnvironmentsAnalyticsResource {
   final commons.ApiRequester _requester;
 
-  OrganizationsEnvironmentsAnalyticsAdminResourceApi get admin =>
-      OrganizationsEnvironmentsAnalyticsAdminResourceApi(_requester);
-  OrganizationsEnvironmentsAnalyticsExportsResourceApi get exports =>
-      OrganizationsEnvironmentsAnalyticsExportsResourceApi(_requester);
+  OrganizationsEnvironmentsAnalyticsAdminResource get admin =>
+      OrganizationsEnvironmentsAnalyticsAdminResource(_requester);
+  OrganizationsEnvironmentsAnalyticsExportsResource get exports =>
+      OrganizationsEnvironmentsAnalyticsExportsResource(_requester);
 
-  OrganizationsEnvironmentsAnalyticsResourceApi(commons.ApiRequester client)
+  OrganizationsEnvironmentsAnalyticsResource(commons.ApiRequester client)
       : _requester = client;
 }
 
-class OrganizationsEnvironmentsAnalyticsAdminResourceApi {
+class OrganizationsEnvironmentsAnalyticsAdminResource {
   final commons.ApiRequester _requester;
 
-  OrganizationsEnvironmentsAnalyticsAdminResourceApi(
-      commons.ApiRequester client)
+  OrganizationsEnvironmentsAnalyticsAdminResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Get a list of metrics and dimensions which can be used for creating
@@ -6246,11 +6240,10 @@
   }
 }
 
-class OrganizationsEnvironmentsAnalyticsExportsResourceApi {
+class OrganizationsEnvironmentsAnalyticsExportsResource {
   final commons.ApiRequester _requester;
 
-  OrganizationsEnvironmentsAnalyticsExportsResourceApi(
-      commons.ApiRequester client)
+  OrganizationsEnvironmentsAnalyticsExportsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Submit a data export job to be processed in the background. If the request
@@ -6430,23 +6423,22 @@
   }
 }
 
-class OrganizationsEnvironmentsApisResourceApi {
+class OrganizationsEnvironmentsApisResource {
   final commons.ApiRequester _requester;
 
-  OrganizationsEnvironmentsApisDeploymentsResourceApi get deployments =>
-      OrganizationsEnvironmentsApisDeploymentsResourceApi(_requester);
-  OrganizationsEnvironmentsApisRevisionsResourceApi get revisions =>
-      OrganizationsEnvironmentsApisRevisionsResourceApi(_requester);
+  OrganizationsEnvironmentsApisDeploymentsResource get deployments =>
+      OrganizationsEnvironmentsApisDeploymentsResource(_requester);
+  OrganizationsEnvironmentsApisRevisionsResource get revisions =>
+      OrganizationsEnvironmentsApisRevisionsResource(_requester);
 
-  OrganizationsEnvironmentsApisResourceApi(commons.ApiRequester client)
+  OrganizationsEnvironmentsApisResource(commons.ApiRequester client)
       : _requester = client;
 }
 
-class OrganizationsEnvironmentsApisDeploymentsResourceApi {
+class OrganizationsEnvironmentsApisDeploymentsResource {
   final commons.ApiRequester _requester;
 
-  OrganizationsEnvironmentsApisDeploymentsResourceApi(
-      commons.ApiRequester client)
+  OrganizationsEnvironmentsApisDeploymentsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Lists all deployments of an API proxy in an environment.
@@ -6506,19 +6498,17 @@
   }
 }
 
-class OrganizationsEnvironmentsApisRevisionsResourceApi {
+class OrganizationsEnvironmentsApisRevisionsResource {
   final commons.ApiRequester _requester;
 
-  OrganizationsEnvironmentsApisRevisionsDebugsessionsResourceApi
+  OrganizationsEnvironmentsApisRevisionsDebugsessionsResource
       get debugsessions =>
-          OrganizationsEnvironmentsApisRevisionsDebugsessionsResourceApi(
+          OrganizationsEnvironmentsApisRevisionsDebugsessionsResource(
               _requester);
-  OrganizationsEnvironmentsApisRevisionsDeploymentsResourceApi
-      get deployments =>
-          OrganizationsEnvironmentsApisRevisionsDeploymentsResourceApi(
-              _requester);
+  OrganizationsEnvironmentsApisRevisionsDeploymentsResource get deployments =>
+      OrganizationsEnvironmentsApisRevisionsDeploymentsResource(_requester);
 
-  OrganizationsEnvironmentsApisRevisionsResourceApi(commons.ApiRequester client)
+  OrganizationsEnvironmentsApisRevisionsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Deploys a revision of an API proxy. If another revision of the same API
@@ -6746,14 +6736,14 @@
   }
 }
 
-class OrganizationsEnvironmentsApisRevisionsDebugsessionsResourceApi {
+class OrganizationsEnvironmentsApisRevisionsDebugsessionsResource {
   final commons.ApiRequester _requester;
 
-  OrganizationsEnvironmentsApisRevisionsDebugsessionsDataResourceApi get data =>
-      OrganizationsEnvironmentsApisRevisionsDebugsessionsDataResourceApi(
+  OrganizationsEnvironmentsApisRevisionsDebugsessionsDataResource get data =>
+      OrganizationsEnvironmentsApisRevisionsDebugsessionsDataResource(
           _requester);
 
-  OrganizationsEnvironmentsApisRevisionsDebugsessionsResourceApi(
+  OrganizationsEnvironmentsApisRevisionsDebugsessionsResource(
       commons.ApiRequester client)
       : _requester = client;
 
@@ -7012,10 +7002,10 @@
   }
 }
 
-class OrganizationsEnvironmentsApisRevisionsDebugsessionsDataResourceApi {
+class OrganizationsEnvironmentsApisRevisionsDebugsessionsDataResource {
   final commons.ApiRequester _requester;
 
-  OrganizationsEnvironmentsApisRevisionsDebugsessionsDataResourceApi(
+  OrganizationsEnvironmentsApisRevisionsDebugsessionsDataResource(
       commons.ApiRequester client)
       : _requester = client;
 
@@ -7075,10 +7065,10 @@
   }
 }
 
-class OrganizationsEnvironmentsApisRevisionsDeploymentsResourceApi {
+class OrganizationsEnvironmentsApisRevisionsDeploymentsResource {
   final commons.ApiRequester _requester;
 
-  OrganizationsEnvironmentsApisRevisionsDeploymentsResourceApi(
+  OrganizationsEnvironmentsApisRevisionsDeploymentsResource(
       commons.ApiRequester client)
       : _requester = client;
 
@@ -7229,10 +7219,10 @@
   }
 }
 
-class OrganizationsEnvironmentsCachesResourceApi {
+class OrganizationsEnvironmentsCachesResource {
   final commons.ApiRequester _requester;
 
-  OrganizationsEnvironmentsCachesResourceApi(commons.ApiRequester client)
+  OrganizationsEnvironmentsCachesResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Deletes a cache.
@@ -7290,10 +7280,10 @@
   }
 }
 
-class OrganizationsEnvironmentsDeploymentsResourceApi {
+class OrganizationsEnvironmentsDeploymentsResource {
   final commons.ApiRequester _requester;
 
-  OrganizationsEnvironmentsDeploymentsResourceApi(commons.ApiRequester client)
+  OrganizationsEnvironmentsDeploymentsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Lists all deployments of API proxies or shared flows in an environment.
@@ -7362,10 +7352,10 @@
   }
 }
 
-class OrganizationsEnvironmentsFlowhooksResourceApi {
+class OrganizationsEnvironmentsFlowhooksResource {
   final commons.ApiRequester _requester;
 
-  OrganizationsEnvironmentsFlowhooksResourceApi(commons.ApiRequester client)
+  OrganizationsEnvironmentsFlowhooksResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Attaches a shared flow to a flow hook.
@@ -7540,13 +7530,13 @@
   }
 }
 
-class OrganizationsEnvironmentsKeystoresResourceApi {
+class OrganizationsEnvironmentsKeystoresResource {
   final commons.ApiRequester _requester;
 
-  OrganizationsEnvironmentsKeystoresAliasesResourceApi get aliases =>
-      OrganizationsEnvironmentsKeystoresAliasesResourceApi(_requester);
+  OrganizationsEnvironmentsKeystoresAliasesResource get aliases =>
+      OrganizationsEnvironmentsKeystoresAliasesResource(_requester);
 
-  OrganizationsEnvironmentsKeystoresResourceApi(commons.ApiRequester client)
+  OrganizationsEnvironmentsKeystoresResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Creates a keystore or truststore: * Keystore: Contains certificates and
@@ -7729,11 +7719,10 @@
   }
 }
 
-class OrganizationsEnvironmentsKeystoresAliasesResourceApi {
+class OrganizationsEnvironmentsKeystoresAliasesResource {
   final commons.ApiRequester _requester;
 
-  OrganizationsEnvironmentsKeystoresAliasesResourceApi(
-      commons.ApiRequester client)
+  OrganizationsEnvironmentsKeystoresAliasesResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Creates an alias from a key, certificate pair. The structure of the
@@ -8137,10 +8126,10 @@
   }
 }
 
-class OrganizationsEnvironmentsKeyvaluemapsResourceApi {
+class OrganizationsEnvironmentsKeyvaluemapsResource {
   final commons.ApiRequester _requester;
 
-  OrganizationsEnvironmentsKeyvaluemapsResourceApi(commons.ApiRequester client)
+  OrganizationsEnvironmentsKeyvaluemapsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Creates a key value map in an environment.
@@ -8260,11 +8249,10 @@
   }
 }
 
-class OrganizationsEnvironmentsOptimizedStatsResourceApi {
+class OrganizationsEnvironmentsOptimizedStatsResource {
   final commons.ApiRequester _requester;
 
-  OrganizationsEnvironmentsOptimizedStatsResourceApi(
-      commons.ApiRequester client)
+  OrganizationsEnvironmentsOptimizedStatsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// This api is similar to GetStats except that the response is less verbose.
@@ -8434,10 +8422,10 @@
   }
 }
 
-class OrganizationsEnvironmentsQueriesResourceApi {
+class OrganizationsEnvironmentsQueriesResource {
   final commons.ApiRequester _requester;
 
-  OrganizationsEnvironmentsQueriesResourceApi(commons.ApiRequester client)
+  OrganizationsEnvironmentsQueriesResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Submit a query to be processed in the background. If the submission of the
@@ -8714,10 +8702,10 @@
   }
 }
 
-class OrganizationsEnvironmentsReferencesResourceApi {
+class OrganizationsEnvironmentsReferencesResource {
   final commons.ApiRequester _requester;
 
-  OrganizationsEnvironmentsReferencesResourceApi(commons.ApiRequester client)
+  OrganizationsEnvironmentsReferencesResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Creates a Reference in the specified environment.
@@ -8954,10 +8942,10 @@
   }
 }
 
-class OrganizationsEnvironmentsResourcefilesResourceApi {
+class OrganizationsEnvironmentsResourcefilesResource {
   final commons.ApiRequester _requester;
 
-  OrganizationsEnvironmentsResourcefilesResourceApi(commons.ApiRequester client)
+  OrganizationsEnvironmentsResourcefilesResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Creates a resource file. Specify the `Content-Type` as
@@ -9391,22 +9379,22 @@
   }
 }
 
-class OrganizationsEnvironmentsSharedflowsResourceApi {
+class OrganizationsEnvironmentsSharedflowsResource {
   final commons.ApiRequester _requester;
 
-  OrganizationsEnvironmentsSharedflowsDeploymentsResourceApi get deployments =>
-      OrganizationsEnvironmentsSharedflowsDeploymentsResourceApi(_requester);
-  OrganizationsEnvironmentsSharedflowsRevisionsResourceApi get revisions =>
-      OrganizationsEnvironmentsSharedflowsRevisionsResourceApi(_requester);
+  OrganizationsEnvironmentsSharedflowsDeploymentsResource get deployments =>
+      OrganizationsEnvironmentsSharedflowsDeploymentsResource(_requester);
+  OrganizationsEnvironmentsSharedflowsRevisionsResource get revisions =>
+      OrganizationsEnvironmentsSharedflowsRevisionsResource(_requester);
 
-  OrganizationsEnvironmentsSharedflowsResourceApi(commons.ApiRequester client)
+  OrganizationsEnvironmentsSharedflowsResource(commons.ApiRequester client)
       : _requester = client;
 }
 
-class OrganizationsEnvironmentsSharedflowsDeploymentsResourceApi {
+class OrganizationsEnvironmentsSharedflowsDeploymentsResource {
   final commons.ApiRequester _requester;
 
-  OrganizationsEnvironmentsSharedflowsDeploymentsResourceApi(
+  OrganizationsEnvironmentsSharedflowsDeploymentsResource(
       commons.ApiRequester client)
       : _requester = client;
 
@@ -9468,10 +9456,10 @@
   }
 }
 
-class OrganizationsEnvironmentsSharedflowsRevisionsResourceApi {
+class OrganizationsEnvironmentsSharedflowsRevisionsResource {
   final commons.ApiRequester _requester;
 
-  OrganizationsEnvironmentsSharedflowsRevisionsResourceApi(
+  OrganizationsEnvironmentsSharedflowsRevisionsResource(
       commons.ApiRequester client)
       : _requester = client;
 
@@ -9671,10 +9659,10 @@
   }
 }
 
-class OrganizationsEnvironmentsStatsResourceApi {
+class OrganizationsEnvironmentsStatsResource {
   final commons.ApiRequester _requester;
 
-  OrganizationsEnvironmentsStatsResourceApi(commons.ApiRequester client)
+  OrganizationsEnvironmentsStatsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Retrieve metrics grouped by dimensions. The types of metrics you can
@@ -9846,10 +9834,10 @@
   }
 }
 
-class OrganizationsEnvironmentsTargetserversResourceApi {
+class OrganizationsEnvironmentsTargetserversResource {
   final commons.ApiRequester _requester;
 
-  OrganizationsEnvironmentsTargetserversResourceApi(commons.ApiRequester client)
+  OrganizationsEnvironmentsTargetserversResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Creates a TargetServer in the specified environment.
@@ -10096,13 +10084,13 @@
   }
 }
 
-class OrganizationsInstancesResourceApi {
+class OrganizationsInstancesResource {
   final commons.ApiRequester _requester;
 
-  OrganizationsInstancesAttachmentsResourceApi get attachments =>
-      OrganizationsInstancesAttachmentsResourceApi(_requester);
+  OrganizationsInstancesAttachmentsResource get attachments =>
+      OrganizationsInstancesAttachmentsResource(_requester);
 
-  OrganizationsInstancesResourceApi(commons.ApiRequester client)
+  OrganizationsInstancesResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Creates an Apigee runtime instance. The instance is accessible from the
@@ -10407,10 +10395,10 @@
   }
 }
 
-class OrganizationsInstancesAttachmentsResourceApi {
+class OrganizationsInstancesAttachmentsResource {
   final commons.ApiRequester _requester;
 
-  OrganizationsInstancesAttachmentsResourceApi(commons.ApiRequester client)
+  OrganizationsInstancesAttachmentsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Creates a new attachment of an environment to an instance. **Note:** Not
@@ -10656,10 +10644,10 @@
   }
 }
 
-class OrganizationsKeyvaluemapsResourceApi {
+class OrganizationsKeyvaluemapsResource {
   final commons.ApiRequester _requester;
 
-  OrganizationsKeyvaluemapsResourceApi(commons.ApiRequester client)
+  OrganizationsKeyvaluemapsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Creates a key value map in an organization.
@@ -10777,10 +10765,10 @@
   }
 }
 
-class OrganizationsOperationsResourceApi {
+class OrganizationsOperationsResource {
   final commons.ApiRequester _requester;
 
-  OrganizationsOperationsResourceApi(commons.ApiRequester client)
+  OrganizationsOperationsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Gets the latest state of a long-running operation. Clients can use this
@@ -10917,10 +10905,10 @@
   }
 }
 
-class OrganizationsReportsResourceApi {
+class OrganizationsReportsResource {
   final commons.ApiRequester _requester;
 
-  OrganizationsReportsResourceApi(commons.ApiRequester client)
+  OrganizationsReportsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Creates a Custom Report for an Organization. A Custom Report provides
@@ -11216,15 +11204,15 @@
   }
 }
 
-class OrganizationsSharedflowsResourceApi {
+class OrganizationsSharedflowsResource {
   final commons.ApiRequester _requester;
 
-  OrganizationsSharedflowsDeploymentsResourceApi get deployments =>
-      OrganizationsSharedflowsDeploymentsResourceApi(_requester);
-  OrganizationsSharedflowsRevisionsResourceApi get revisions =>
-      OrganizationsSharedflowsRevisionsResourceApi(_requester);
+  OrganizationsSharedflowsDeploymentsResource get deployments =>
+      OrganizationsSharedflowsDeploymentsResource(_requester);
+  OrganizationsSharedflowsRevisionsResource get revisions =>
+      OrganizationsSharedflowsRevisionsResource(_requester);
 
-  OrganizationsSharedflowsResourceApi(commons.ApiRequester client)
+  OrganizationsSharedflowsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Uploads a ZIP-formatted shared flow configuration bundle to an
@@ -11482,10 +11470,10 @@
   }
 }
 
-class OrganizationsSharedflowsDeploymentsResourceApi {
+class OrganizationsSharedflowsDeploymentsResource {
   final commons.ApiRequester _requester;
 
-  OrganizationsSharedflowsDeploymentsResourceApi(commons.ApiRequester client)
+  OrganizationsSharedflowsDeploymentsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Lists all deployments of a shared flow.
@@ -11545,13 +11533,13 @@
   }
 }
 
-class OrganizationsSharedflowsRevisionsResourceApi {
+class OrganizationsSharedflowsRevisionsResource {
   final commons.ApiRequester _requester;
 
-  OrganizationsSharedflowsRevisionsDeploymentsResourceApi get deployments =>
-      OrganizationsSharedflowsRevisionsDeploymentsResourceApi(_requester);
+  OrganizationsSharedflowsRevisionsDeploymentsResource get deployments =>
+      OrganizationsSharedflowsRevisionsDeploymentsResource(_requester);
 
-  OrganizationsSharedflowsRevisionsResourceApi(commons.ApiRequester client)
+  OrganizationsSharedflowsRevisionsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Deletes a shared flow and all associated policies, resources, and
@@ -11748,10 +11736,10 @@
   }
 }
 
-class OrganizationsSharedflowsRevisionsDeploymentsResourceApi {
+class OrganizationsSharedflowsRevisionsDeploymentsResource {
   final commons.ApiRequester _requester;
 
-  OrganizationsSharedflowsRevisionsDeploymentsResourceApi(
+  OrganizationsSharedflowsRevisionsDeploymentsResource(
       commons.ApiRequester client)
       : _requester = client;
 
@@ -11813,20 +11801,19 @@
   }
 }
 
-class OrganizationsSitesResourceApi {
+class OrganizationsSitesResource {
   final commons.ApiRequester _requester;
 
-  OrganizationsSitesApicategoriesResourceApi get apicategories =>
-      OrganizationsSitesApicategoriesResourceApi(_requester);
+  OrganizationsSitesApicategoriesResource get apicategories =>
+      OrganizationsSitesApicategoriesResource(_requester);
 
-  OrganizationsSitesResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  OrganizationsSitesResource(commons.ApiRequester client) : _requester = client;
 }
 
-class OrganizationsSitesApicategoriesResourceApi {
+class OrganizationsSitesApicategoriesResource {
   final commons.ApiRequester _requester;
 
-  OrganizationsSitesApicategoriesResourceApi(commons.ApiRequester client)
+  OrganizationsSitesApicategoriesResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Creates a new category on the portal.
@@ -12117,10 +12104,10 @@
   }
 }
 
-class ProjectsResourceApi {
+class ProjectsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsResourceApi(commons.ApiRequester client) : _requester = client;
+  ProjectsResource(commons.ApiRequester client) : _requester = client;
 
   /// Provisions a new Apigee organization with a functioning runtime. This is
   /// the standard way to create trial organizations for a free Apigee trial.
diff --git a/generated/googleapis/lib/appengine/v1.dart b/generated/googleapis/lib/appengine/v1.dart
index d2fd96c..4cf8968 100644
--- a/generated/googleapis/lib/appengine/v1.dart
+++ b/generated/googleapis/lib/appengine/v1.dart
@@ -24,17 +24,17 @@
 ///
 /// Create an instance of [AppengineApi] to access these resources:
 ///
-/// - [AppsResourceApi]
-///   - [AppsAuthorizedCertificatesResourceApi]
-///   - [AppsAuthorizedDomainsResourceApi]
-///   - [AppsDomainMappingsResourceApi]
-///   - [AppsFirewallResourceApi]
-///     - [AppsFirewallIngressRulesResourceApi]
-///   - [AppsLocationsResourceApi]
-///   - [AppsOperationsResourceApi]
-///   - [AppsServicesResourceApi]
-///     - [AppsServicesVersionsResourceApi]
-///       - [AppsServicesVersionsInstancesResourceApi]
+/// - [AppsResource]
+///   - [AppsAuthorizedCertificatesResource]
+///   - [AppsAuthorizedDomainsResource]
+///   - [AppsDomainMappingsResource]
+///   - [AppsFirewallResource]
+///     - [AppsFirewallIngressRulesResource]
+///   - [AppsLocationsResource]
+///   - [AppsOperationsResource]
+///   - [AppsServicesResource]
+///     - [AppsServicesVersionsResource]
+///       - [AppsServicesVersionsInstancesResource]
 library appengine.v1;
 
 import 'dart:async' as async;
@@ -65,7 +65,7 @@
 
   final commons.ApiRequester _requester;
 
-  AppsResourceApi get apps => AppsResourceApi(_requester);
+  AppsResource get apps => AppsResource(_requester);
 
   AppengineApi(http.Client client,
       {core.String rootUrl = 'https://appengine.googleapis.com/',
@@ -74,23 +74,21 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class AppsResourceApi {
+class AppsResource {
   final commons.ApiRequester _requester;
 
-  AppsAuthorizedCertificatesResourceApi get authorizedCertificates =>
-      AppsAuthorizedCertificatesResourceApi(_requester);
-  AppsAuthorizedDomainsResourceApi get authorizedDomains =>
-      AppsAuthorizedDomainsResourceApi(_requester);
-  AppsDomainMappingsResourceApi get domainMappings =>
-      AppsDomainMappingsResourceApi(_requester);
-  AppsFirewallResourceApi get firewall => AppsFirewallResourceApi(_requester);
-  AppsLocationsResourceApi get locations =>
-      AppsLocationsResourceApi(_requester);
-  AppsOperationsResourceApi get operations =>
-      AppsOperationsResourceApi(_requester);
-  AppsServicesResourceApi get services => AppsServicesResourceApi(_requester);
+  AppsAuthorizedCertificatesResource get authorizedCertificates =>
+      AppsAuthorizedCertificatesResource(_requester);
+  AppsAuthorizedDomainsResource get authorizedDomains =>
+      AppsAuthorizedDomainsResource(_requester);
+  AppsDomainMappingsResource get domainMappings =>
+      AppsDomainMappingsResource(_requester);
+  AppsFirewallResource get firewall => AppsFirewallResource(_requester);
+  AppsLocationsResource get locations => AppsLocationsResource(_requester);
+  AppsOperationsResource get operations => AppsOperationsResource(_requester);
+  AppsServicesResource get services => AppsServicesResource(_requester);
 
-  AppsResourceApi(commons.ApiRequester client) : _requester = client;
+  AppsResource(commons.ApiRequester client) : _requester = client;
 
   /// Creates an App Engine application for a Google Cloud Platform project.
   /// Required fields: id - The ID of the target Cloud Platform project.
@@ -333,10 +331,10 @@
   }
 }
 
-class AppsAuthorizedCertificatesResourceApi {
+class AppsAuthorizedCertificatesResource {
   final commons.ApiRequester _requester;
 
-  AppsAuthorizedCertificatesResourceApi(commons.ApiRequester client)
+  AppsAuthorizedCertificatesResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Uploads the specified SSL certificate.
@@ -696,10 +694,10 @@
   }
 }
 
-class AppsAuthorizedDomainsResourceApi {
+class AppsAuthorizedDomainsResource {
   final commons.ApiRequester _requester;
 
-  AppsAuthorizedDomainsResourceApi(commons.ApiRequester client)
+  AppsAuthorizedDomainsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Lists all domains the user is authorized to administer.
@@ -769,11 +767,10 @@
   }
 }
 
-class AppsDomainMappingsResourceApi {
+class AppsDomainMappingsResource {
   final commons.ApiRequester _requester;
 
-  AppsDomainMappingsResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  AppsDomainMappingsResource(commons.ApiRequester client) : _requester = client;
 
   /// Maps a domain to an application. A user must be authorized to administer a
   /// domain in order to map it to an application. For a list of available
@@ -1118,19 +1115,19 @@
   }
 }
 
-class AppsFirewallResourceApi {
+class AppsFirewallResource {
   final commons.ApiRequester _requester;
 
-  AppsFirewallIngressRulesResourceApi get ingressRules =>
-      AppsFirewallIngressRulesResourceApi(_requester);
+  AppsFirewallIngressRulesResource get ingressRules =>
+      AppsFirewallIngressRulesResource(_requester);
 
-  AppsFirewallResourceApi(commons.ApiRequester client) : _requester = client;
+  AppsFirewallResource(commons.ApiRequester client) : _requester = client;
 }
 
-class AppsFirewallIngressRulesResourceApi {
+class AppsFirewallIngressRulesResource {
   final commons.ApiRequester _requester;
 
-  AppsFirewallIngressRulesResourceApi(commons.ApiRequester client)
+  AppsFirewallIngressRulesResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Replaces the entire firewall ruleset in one bulk operation. This overrides
@@ -1525,10 +1522,10 @@
   }
 }
 
-class AppsLocationsResourceApi {
+class AppsLocationsResource {
   final commons.ApiRequester _requester;
 
-  AppsLocationsResourceApi(commons.ApiRequester client) : _requester = client;
+  AppsLocationsResource(commons.ApiRequester client) : _requester = client;
 
   /// Gets information about a location.
   ///
@@ -1660,10 +1657,10 @@
   }
 }
 
-class AppsOperationsResourceApi {
+class AppsOperationsResource {
   final commons.ApiRequester _requester;
 
-  AppsOperationsResourceApi(commons.ApiRequester client) : _requester = client;
+  AppsOperationsResource(commons.ApiRequester client) : _requester = client;
 
   /// Gets the latest state of a long-running operation. Clients can use this
   /// method to poll the operation result at intervals as recommended by the API
@@ -1805,13 +1802,13 @@
   }
 }
 
-class AppsServicesResourceApi {
+class AppsServicesResource {
   final commons.ApiRequester _requester;
 
-  AppsServicesVersionsResourceApi get versions =>
-      AppsServicesVersionsResourceApi(_requester);
+  AppsServicesVersionsResource get versions =>
+      AppsServicesVersionsResource(_requester);
 
-  AppsServicesResourceApi(commons.ApiRequester client) : _requester = client;
+  AppsServicesResource(commons.ApiRequester client) : _requester = client;
 
   /// Deletes the specified service and all enclosed versions.
   ///
@@ -2088,13 +2085,13 @@
   }
 }
 
-class AppsServicesVersionsResourceApi {
+class AppsServicesVersionsResource {
   final commons.ApiRequester _requester;
 
-  AppsServicesVersionsInstancesResourceApi get instances =>
-      AppsServicesVersionsInstancesResourceApi(_requester);
+  AppsServicesVersionsInstancesResource get instances =>
+      AppsServicesVersionsInstancesResource(_requester);
 
-  AppsServicesVersionsResourceApi(commons.ApiRequester client)
+  AppsServicesVersionsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Deploys code and resource files to a new version.
@@ -2511,10 +2508,10 @@
   }
 }
 
-class AppsServicesVersionsInstancesResourceApi {
+class AppsServicesVersionsInstancesResource {
   final commons.ApiRequester _requester;
 
-  AppsServicesVersionsInstancesResourceApi(commons.ApiRequester client)
+  AppsServicesVersionsInstancesResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Enables debugging on a VM instance. This allows you to use the SSH command
diff --git a/generated/googleapis/lib/bigquery/v2.dart b/generated/googleapis/lib/bigquery/v2.dart
index d41347e..6c1925a 100644
--- a/generated/googleapis/lib/bigquery/v2.dart
+++ b/generated/googleapis/lib/bigquery/v2.dart
@@ -23,13 +23,13 @@
 ///
 /// Create an instance of [BigqueryApi] to access these resources:
 ///
-/// - [DatasetsResourceApi]
-/// - [JobsResourceApi]
-/// - [ModelsResourceApi]
-/// - [ProjectsResourceApi]
-/// - [RoutinesResourceApi]
-/// - [TabledataResourceApi]
-/// - [TablesResourceApi]
+/// - [DatasetsResource]
+/// - [JobsResource]
+/// - [ModelsResource]
+/// - [ProjectsResource]
+/// - [RoutinesResource]
+/// - [TabledataResource]
+/// - [TablesResource]
 library bigquery.v2;
 
 import 'dart:async' as async;
@@ -88,13 +88,13 @@
 
   final commons.ApiRequester _requester;
 
-  DatasetsResourceApi get datasets => DatasetsResourceApi(_requester);
-  JobsResourceApi get jobs => JobsResourceApi(_requester);
-  ModelsResourceApi get models => ModelsResourceApi(_requester);
-  ProjectsResourceApi get projects => ProjectsResourceApi(_requester);
-  RoutinesResourceApi get routines => RoutinesResourceApi(_requester);
-  TabledataResourceApi get tabledata => TabledataResourceApi(_requester);
-  TablesResourceApi get tables => TablesResourceApi(_requester);
+  DatasetsResource get datasets => DatasetsResource(_requester);
+  JobsResource get jobs => JobsResource(_requester);
+  ModelsResource get models => ModelsResource(_requester);
+  ProjectsResource get projects => ProjectsResource(_requester);
+  RoutinesResource get routines => RoutinesResource(_requester);
+  TabledataResource get tabledata => TabledataResource(_requester);
+  TablesResource get tables => TablesResource(_requester);
 
   BigqueryApi(http.Client client,
       {core.String rootUrl = 'https://bigquery.googleapis.com/',
@@ -103,10 +103,10 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class DatasetsResourceApi {
+class DatasetsResource {
   final commons.ApiRequester _requester;
 
-  DatasetsResourceApi(commons.ApiRequester client) : _requester = client;
+  DatasetsResource(commons.ApiRequester client) : _requester = client;
 
   /// Deletes the dataset specified by the datasetId value. Before you can
   /// delete a dataset, you must delete all its tables, either manually or by
@@ -511,10 +511,10 @@
   }
 }
 
-class JobsResourceApi {
+class JobsResource {
   final commons.ApiRequester _requester;
 
-  JobsResourceApi(commons.ApiRequester client) : _requester = client;
+  JobsResource(commons.ApiRequester client) : _requester = client;
 
   /// Requests that a job be cancelled. This call will return immediately, and
   /// the client will need to poll for the job status to see if the cancel
@@ -1001,10 +1001,10 @@
   }
 }
 
-class ModelsResourceApi {
+class ModelsResource {
   final commons.ApiRequester _requester;
 
-  ModelsResourceApi(commons.ApiRequester client) : _requester = client;
+  ModelsResource(commons.ApiRequester client) : _requester = client;
 
   /// Deletes the model specified by modelId from the dataset.
   ///
@@ -1302,10 +1302,10 @@
   }
 }
 
-class ProjectsResourceApi {
+class ProjectsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsResourceApi(commons.ApiRequester client) : _requester = client;
+  ProjectsResource(commons.ApiRequester client) : _requester = client;
 
   /// Returns the email address of the service account for your project used for
   /// interactions with Google Cloud KMS.
@@ -1420,10 +1420,10 @@
   }
 }
 
-class RoutinesResourceApi {
+class RoutinesResource {
   final commons.ApiRequester _requester;
 
-  RoutinesResourceApi(commons.ApiRequester client) : _requester = client;
+  RoutinesResource(commons.ApiRequester client) : _requester = client;
 
   /// Deletes the routine specified by routineId from the dataset.
   ///
@@ -1816,10 +1816,10 @@
   }
 }
 
-class TabledataResourceApi {
+class TabledataResource {
   final commons.ApiRequester _requester;
 
-  TabledataResourceApi(commons.ApiRequester client) : _requester = client;
+  TabledataResource(commons.ApiRequester client) : _requester = client;
 
   /// Streams data into BigQuery one record at a time without needing to run a
   /// load job. Requires the WRITER dataset role.
@@ -1994,10 +1994,10 @@
   }
 }
 
-class TablesResourceApi {
+class TablesResource {
   final commons.ApiRequester _requester;
 
-  TablesResourceApi(commons.ApiRequester client) : _requester = client;
+  TablesResource(commons.ApiRequester client) : _requester = client;
 
   /// Deletes the table specified by tableId from the dataset. If the table
   /// contains data, all the data will be deleted.
diff --git a/generated/googleapis/lib/bigquerydatatransfer/v1.dart b/generated/googleapis/lib/bigquerydatatransfer/v1.dart
index f1cecb2..1429210 100644
--- a/generated/googleapis/lib/bigquerydatatransfer/v1.dart
+++ b/generated/googleapis/lib/bigquerydatatransfer/v1.dart
@@ -24,16 +24,16 @@
 ///
 /// Create an instance of [BigQueryDataTransferApi] to access these resources:
 ///
-/// - [ProjectsResourceApi]
-///   - [ProjectsDataSourcesResourceApi]
-///   - [ProjectsLocationsResourceApi]
-///     - [ProjectsLocationsDataSourcesResourceApi]
-///     - [ProjectsLocationsTransferConfigsResourceApi]
-///       - [ProjectsLocationsTransferConfigsRunsResourceApi]
-///         - [ProjectsLocationsTransferConfigsRunsTransferLogsResourceApi]
-///   - [ProjectsTransferConfigsResourceApi]
-///     - [ProjectsTransferConfigsRunsResourceApi]
-///       - [ProjectsTransferConfigsRunsTransferLogsResourceApi]
+/// - [ProjectsResource]
+///   - [ProjectsDataSourcesResource]
+///   - [ProjectsLocationsResource]
+///     - [ProjectsLocationsDataSourcesResource]
+///     - [ProjectsLocationsTransferConfigsResource]
+///       - [ProjectsLocationsTransferConfigsRunsResource]
+///         - [ProjectsLocationsTransferConfigsRunsTransferLogsResource]
+///   - [ProjectsTransferConfigsResource]
+///     - [ProjectsTransferConfigsRunsResource]
+///       - [ProjectsTransferConfigsRunsTransferLogsResource]
 library bigquerydatatransfer.v1;
 
 import 'dart:async' as async;
@@ -68,7 +68,7 @@
 
   final commons.ApiRequester _requester;
 
-  ProjectsResourceApi get projects => ProjectsResourceApi(_requester);
+  ProjectsResource get projects => ProjectsResource(_requester);
 
   BigQueryDataTransferApi(http.Client client,
       {core.String rootUrl = 'https://bigquerydatatransfer.googleapis.com/',
@@ -77,23 +77,23 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class ProjectsResourceApi {
+class ProjectsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsDataSourcesResourceApi get dataSources =>
-      ProjectsDataSourcesResourceApi(_requester);
-  ProjectsLocationsResourceApi get locations =>
-      ProjectsLocationsResourceApi(_requester);
-  ProjectsTransferConfigsResourceApi get transferConfigs =>
-      ProjectsTransferConfigsResourceApi(_requester);
+  ProjectsDataSourcesResource get dataSources =>
+      ProjectsDataSourcesResource(_requester);
+  ProjectsLocationsResource get locations =>
+      ProjectsLocationsResource(_requester);
+  ProjectsTransferConfigsResource get transferConfigs =>
+      ProjectsTransferConfigsResource(_requester);
 
-  ProjectsResourceApi(commons.ApiRequester client) : _requester = client;
+  ProjectsResource(commons.ApiRequester client) : _requester = client;
 }
 
-class ProjectsDataSourcesResourceApi {
+class ProjectsDataSourcesResource {
   final commons.ApiRequester _requester;
 
-  ProjectsDataSourcesResourceApi(commons.ApiRequester client)
+  ProjectsDataSourcesResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Returns true if valid credentials exist for the given data source and
@@ -291,16 +291,15 @@
   }
 }
 
-class ProjectsLocationsResourceApi {
+class ProjectsLocationsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsLocationsDataSourcesResourceApi get dataSources =>
-      ProjectsLocationsDataSourcesResourceApi(_requester);
-  ProjectsLocationsTransferConfigsResourceApi get transferConfigs =>
-      ProjectsLocationsTransferConfigsResourceApi(_requester);
+  ProjectsLocationsDataSourcesResource get dataSources =>
+      ProjectsLocationsDataSourcesResource(_requester);
+  ProjectsLocationsTransferConfigsResource get transferConfigs =>
+      ProjectsLocationsTransferConfigsResource(_requester);
 
-  ProjectsLocationsResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  ProjectsLocationsResource(commons.ApiRequester client) : _requester = client;
 
   /// Gets information about a location.
   ///
@@ -425,10 +424,10 @@
   }
 }
 
-class ProjectsLocationsDataSourcesResourceApi {
+class ProjectsLocationsDataSourcesResource {
   final commons.ApiRequester _requester;
 
-  ProjectsLocationsDataSourcesResourceApi(commons.ApiRequester client)
+  ProjectsLocationsDataSourcesResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Returns true if valid credentials exist for the given data source and
@@ -628,13 +627,13 @@
   }
 }
 
-class ProjectsLocationsTransferConfigsResourceApi {
+class ProjectsLocationsTransferConfigsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsLocationsTransferConfigsRunsResourceApi get runs =>
-      ProjectsLocationsTransferConfigsRunsResourceApi(_requester);
+  ProjectsLocationsTransferConfigsRunsResource get runs =>
+      ProjectsLocationsTransferConfigsRunsResource(_requester);
 
-  ProjectsLocationsTransferConfigsResourceApi(commons.ApiRequester client)
+  ProjectsLocationsTransferConfigsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Creates a new data transfer configuration.
@@ -1175,15 +1174,13 @@
   }
 }
 
-class ProjectsLocationsTransferConfigsRunsResourceApi {
+class ProjectsLocationsTransferConfigsRunsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsLocationsTransferConfigsRunsTransferLogsResourceApi
-      get transferLogs =>
-          ProjectsLocationsTransferConfigsRunsTransferLogsResourceApi(
-              _requester);
+  ProjectsLocationsTransferConfigsRunsTransferLogsResource get transferLogs =>
+      ProjectsLocationsTransferConfigsRunsTransferLogsResource(_requester);
 
-  ProjectsLocationsTransferConfigsRunsResourceApi(commons.ApiRequester client)
+  ProjectsLocationsTransferConfigsRunsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Deletes the specified transfer run.
@@ -1386,10 +1383,10 @@
   }
 }
 
-class ProjectsLocationsTransferConfigsRunsTransferLogsResourceApi {
+class ProjectsLocationsTransferConfigsRunsTransferLogsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsLocationsTransferConfigsRunsTransferLogsResourceApi(
+  ProjectsLocationsTransferConfigsRunsTransferLogsResource(
       commons.ApiRequester client)
       : _requester = client;
 
@@ -1474,13 +1471,13 @@
   }
 }
 
-class ProjectsTransferConfigsResourceApi {
+class ProjectsTransferConfigsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsTransferConfigsRunsResourceApi get runs =>
-      ProjectsTransferConfigsRunsResourceApi(_requester);
+  ProjectsTransferConfigsRunsResource get runs =>
+      ProjectsTransferConfigsRunsResource(_requester);
 
-  ProjectsTransferConfigsResourceApi(commons.ApiRequester client)
+  ProjectsTransferConfigsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Creates a new data transfer configuration.
@@ -2016,13 +2013,13 @@
   }
 }
 
-class ProjectsTransferConfigsRunsResourceApi {
+class ProjectsTransferConfigsRunsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsTransferConfigsRunsTransferLogsResourceApi get transferLogs =>
-      ProjectsTransferConfigsRunsTransferLogsResourceApi(_requester);
+  ProjectsTransferConfigsRunsTransferLogsResource get transferLogs =>
+      ProjectsTransferConfigsRunsTransferLogsResource(_requester);
 
-  ProjectsTransferConfigsRunsResourceApi(commons.ApiRequester client)
+  ProjectsTransferConfigsRunsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Deletes the specified transfer run.
@@ -2224,11 +2221,10 @@
   }
 }
 
-class ProjectsTransferConfigsRunsTransferLogsResourceApi {
+class ProjectsTransferConfigsRunsTransferLogsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsTransferConfigsRunsTransferLogsResourceApi(
-      commons.ApiRequester client)
+  ProjectsTransferConfigsRunsTransferLogsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Returns user facing log messages for the data transfer run.
diff --git a/generated/googleapis/lib/bigqueryreservation/v1.dart b/generated/googleapis/lib/bigqueryreservation/v1.dart
index 606d2a2..a431bab 100644
--- a/generated/googleapis/lib/bigqueryreservation/v1.dart
+++ b/generated/googleapis/lib/bigqueryreservation/v1.dart
@@ -23,12 +23,12 @@
 ///
 /// Create an instance of [BigQueryReservationApi] to access these resources:
 ///
-/// - [OperationsResourceApi]
-/// - [ProjectsResourceApi]
-///   - [ProjectsLocationsResourceApi]
-///     - [ProjectsLocationsCapacityCommitmentsResourceApi]
-///     - [ProjectsLocationsReservationsResourceApi]
-///       - [ProjectsLocationsReservationsAssignmentsResourceApi]
+/// - [OperationsResource]
+/// - [ProjectsResource]
+///   - [ProjectsLocationsResource]
+///     - [ProjectsLocationsCapacityCommitmentsResource]
+///     - [ProjectsLocationsReservationsResource]
+///       - [ProjectsLocationsReservationsAssignmentsResource]
 library bigqueryreservation.v1;
 
 import 'dart:async' as async;
@@ -54,8 +54,8 @@
 
   final commons.ApiRequester _requester;
 
-  OperationsResourceApi get operations => OperationsResourceApi(_requester);
-  ProjectsResourceApi get projects => ProjectsResourceApi(_requester);
+  OperationsResource get operations => OperationsResource(_requester);
+  ProjectsResource get projects => ProjectsResource(_requester);
 
   BigQueryReservationApi(http.Client client,
       {core.String rootUrl = 'https://bigqueryreservation.googleapis.com/',
@@ -64,10 +64,10 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class OperationsResourceApi {
+class OperationsResource {
   final commons.ApiRequester _requester;
 
-  OperationsResourceApi(commons.ApiRequester client) : _requester = client;
+  OperationsResource(commons.ApiRequester client) : _requester = client;
 
   /// Deletes a long-running operation. This method indicates that the client is
   /// no longer interested in the operation result. It does not cancel the
@@ -202,25 +202,24 @@
   }
 }
 
-class ProjectsResourceApi {
+class ProjectsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsLocationsResourceApi get locations =>
-      ProjectsLocationsResourceApi(_requester);
+  ProjectsLocationsResource get locations =>
+      ProjectsLocationsResource(_requester);
 
-  ProjectsResourceApi(commons.ApiRequester client) : _requester = client;
+  ProjectsResource(commons.ApiRequester client) : _requester = client;
 }
 
-class ProjectsLocationsResourceApi {
+class ProjectsLocationsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsLocationsCapacityCommitmentsResourceApi get capacityCommitments =>
-      ProjectsLocationsCapacityCommitmentsResourceApi(_requester);
-  ProjectsLocationsReservationsResourceApi get reservations =>
-      ProjectsLocationsReservationsResourceApi(_requester);
+  ProjectsLocationsCapacityCommitmentsResource get capacityCommitments =>
+      ProjectsLocationsCapacityCommitmentsResource(_requester);
+  ProjectsLocationsReservationsResource get reservations =>
+      ProjectsLocationsReservationsResource(_requester);
 
-  ProjectsLocationsResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  ProjectsLocationsResource(commons.ApiRequester client) : _requester = client;
 
   /// Retrieves a BI reservation.
   ///
@@ -520,10 +519,10 @@
   }
 }
 
-class ProjectsLocationsCapacityCommitmentsResourceApi {
+class ProjectsLocationsCapacityCommitmentsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsLocationsCapacityCommitmentsResourceApi(commons.ApiRequester client)
+  ProjectsLocationsCapacityCommitmentsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Creates a new capacity commitment resource.
@@ -974,13 +973,13 @@
   }
 }
 
-class ProjectsLocationsReservationsResourceApi {
+class ProjectsLocationsReservationsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsLocationsReservationsAssignmentsResourceApi get assignments =>
-      ProjectsLocationsReservationsAssignmentsResourceApi(_requester);
+  ProjectsLocationsReservationsAssignmentsResource get assignments =>
+      ProjectsLocationsReservationsAssignmentsResource(_requester);
 
-  ProjectsLocationsReservationsResourceApi(commons.ApiRequester client)
+  ProjectsLocationsReservationsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Creates a new reservation resource.
@@ -1294,11 +1293,10 @@
   }
 }
 
-class ProjectsLocationsReservationsAssignmentsResourceApi {
+class ProjectsLocationsReservationsAssignmentsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsLocationsReservationsAssignmentsResourceApi(
-      commons.ApiRequester client)
+  ProjectsLocationsReservationsAssignmentsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Creates an assignment object which allows the given project to submit jobs
diff --git a/generated/googleapis/lib/bigtableadmin/v2.dart b/generated/googleapis/lib/bigtableadmin/v2.dart
index b15c4b1..cba3283 100644
--- a/generated/googleapis/lib/bigtableadmin/v2.dart
+++ b/generated/googleapis/lib/bigtableadmin/v2.dart
@@ -23,16 +23,16 @@
 ///
 /// Create an instance of [BigtableAdminApi] to access these resources:
 ///
-/// - [OperationsResourceApi]
-///   - [OperationsProjectsResourceApi]
-///     - [OperationsProjectsOperationsResourceApi]
-/// - [ProjectsResourceApi]
-///   - [ProjectsInstancesResourceApi]
-///     - [ProjectsInstancesAppProfilesResourceApi]
-///     - [ProjectsInstancesClustersResourceApi]
-///       - [ProjectsInstancesClustersBackupsResourceApi]
-///     - [ProjectsInstancesTablesResourceApi]
-///   - [ProjectsLocationsResourceApi]
+/// - [OperationsResource]
+///   - [OperationsProjectsResource]
+///     - [OperationsProjectsOperationsResource]
+/// - [ProjectsResource]
+///   - [ProjectsInstancesResource]
+///     - [ProjectsInstancesAppProfilesResource]
+///     - [ProjectsInstancesClustersResource]
+///       - [ProjectsInstancesClustersBackupsResource]
+///     - [ProjectsInstancesTablesResource]
+///   - [ProjectsLocationsResource]
 library bigtableadmin.v2;
 
 import 'dart:async' as async;
@@ -87,8 +87,8 @@
 
   final commons.ApiRequester _requester;
 
-  OperationsResourceApi get operations => OperationsResourceApi(_requester);
-  ProjectsResourceApi get projects => ProjectsResourceApi(_requester);
+  OperationsResource get operations => OperationsResource(_requester);
+  ProjectsResource get projects => ProjectsResource(_requester);
 
   BigtableAdminApi(http.Client client,
       {core.String rootUrl = 'https://bigtableadmin.googleapis.com/',
@@ -97,13 +97,13 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class OperationsResourceApi {
+class OperationsResource {
   final commons.ApiRequester _requester;
 
-  OperationsProjectsResourceApi get projects =>
-      OperationsProjectsResourceApi(_requester);
+  OperationsProjectsResource get projects =>
+      OperationsProjectsResource(_requester);
 
-  OperationsResourceApi(commons.ApiRequester client) : _requester = client;
+  OperationsResource(commons.ApiRequester client) : _requester = client;
 
   /// Starts asynchronous cancellation on a long-running operation. The server
   /// makes a best effort to cancel the operation, but success is not
@@ -272,20 +272,19 @@
   }
 }
 
-class OperationsProjectsResourceApi {
+class OperationsProjectsResource {
   final commons.ApiRequester _requester;
 
-  OperationsProjectsOperationsResourceApi get operations =>
-      OperationsProjectsOperationsResourceApi(_requester);
+  OperationsProjectsOperationsResource get operations =>
+      OperationsProjectsOperationsResource(_requester);
 
-  OperationsProjectsResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  OperationsProjectsResource(commons.ApiRequester client) : _requester = client;
 }
 
-class OperationsProjectsOperationsResourceApi {
+class OperationsProjectsOperationsResource {
   final commons.ApiRequester _requester;
 
-  OperationsProjectsOperationsResourceApi(commons.ApiRequester client)
+  OperationsProjectsOperationsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Lists operations that match the specified filter in the request. If the
@@ -368,29 +367,28 @@
   }
 }
 
-class ProjectsResourceApi {
+class ProjectsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsInstancesResourceApi get instances =>
-      ProjectsInstancesResourceApi(_requester);
-  ProjectsLocationsResourceApi get locations =>
-      ProjectsLocationsResourceApi(_requester);
+  ProjectsInstancesResource get instances =>
+      ProjectsInstancesResource(_requester);
+  ProjectsLocationsResource get locations =>
+      ProjectsLocationsResource(_requester);
 
-  ProjectsResourceApi(commons.ApiRequester client) : _requester = client;
+  ProjectsResource(commons.ApiRequester client) : _requester = client;
 }
 
-class ProjectsInstancesResourceApi {
+class ProjectsInstancesResource {
   final commons.ApiRequester _requester;
 
-  ProjectsInstancesAppProfilesResourceApi get appProfiles =>
-      ProjectsInstancesAppProfilesResourceApi(_requester);
-  ProjectsInstancesClustersResourceApi get clusters =>
-      ProjectsInstancesClustersResourceApi(_requester);
-  ProjectsInstancesTablesResourceApi get tables =>
-      ProjectsInstancesTablesResourceApi(_requester);
+  ProjectsInstancesAppProfilesResource get appProfiles =>
+      ProjectsInstancesAppProfilesResource(_requester);
+  ProjectsInstancesClustersResource get clusters =>
+      ProjectsInstancesClustersResource(_requester);
+  ProjectsInstancesTablesResource get tables =>
+      ProjectsInstancesTablesResource(_requester);
 
-  ProjectsInstancesResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  ProjectsInstancesResource(commons.ApiRequester client) : _requester = client;
 
   /// Create an instance within a project.
   ///
@@ -929,10 +927,10 @@
   }
 }
 
-class ProjectsInstancesAppProfilesResourceApi {
+class ProjectsInstancesAppProfilesResource {
   final commons.ApiRequester _requester;
 
-  ProjectsInstancesAppProfilesResourceApi(commons.ApiRequester client)
+  ProjectsInstancesAppProfilesResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Creates an app profile within an instance.
@@ -1278,13 +1276,13 @@
   }
 }
 
-class ProjectsInstancesClustersResourceApi {
+class ProjectsInstancesClustersResource {
   final commons.ApiRequester _requester;
 
-  ProjectsInstancesClustersBackupsResourceApi get backups =>
-      ProjectsInstancesClustersBackupsResourceApi(_requester);
+  ProjectsInstancesClustersBackupsResource get backups =>
+      ProjectsInstancesClustersBackupsResource(_requester);
 
-  ProjectsInstancesClustersResourceApi(commons.ApiRequester client)
+  ProjectsInstancesClustersResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Creates a cluster within an instance.
@@ -1582,10 +1580,10 @@
   }
 }
 
-class ProjectsInstancesClustersBackupsResourceApi {
+class ProjectsInstancesClustersBackupsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsInstancesClustersBackupsResourceApi(commons.ApiRequester client)
+  ProjectsInstancesClustersBackupsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Starts creating a new Cloud Bigtable Backup. The returned backup
@@ -2147,10 +2145,10 @@
   }
 }
 
-class ProjectsInstancesTablesResourceApi {
+class ProjectsInstancesTablesResource {
   final commons.ApiRequester _requester;
 
-  ProjectsInstancesTablesResourceApi(commons.ApiRequester client)
+  ProjectsInstancesTablesResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Checks replication consistency based on a consistency token, that is, if
@@ -2929,11 +2927,10 @@
   }
 }
 
-class ProjectsLocationsResourceApi {
+class ProjectsLocationsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsLocationsResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  ProjectsLocationsResource(commons.ApiRequester client) : _requester = client;
 
   /// Gets information about a location.
   ///
diff --git a/generated/googleapis/lib/binaryauthorization/v1.dart b/generated/googleapis/lib/binaryauthorization/v1.dart
index 51ea382..a4a8d4f 100644
--- a/generated/googleapis/lib/binaryauthorization/v1.dart
+++ b/generated/googleapis/lib/binaryauthorization/v1.dart
@@ -24,9 +24,9 @@
 ///
 /// Create an instance of [BinaryAuthorizationApi] to access these resources:
 ///
-/// - [ProjectsResourceApi]
-///   - [ProjectsAttestorsResourceApi]
-///   - [ProjectsPolicyResourceApi]
+/// - [ProjectsResource]
+///   - [ProjectsAttestorsResource]
+///   - [ProjectsPolicyResource]
 library binaryauthorization.v1;
 
 import 'dart:async' as async;
@@ -50,7 +50,7 @@
 
   final commons.ApiRequester _requester;
 
-  ProjectsResourceApi get projects => ProjectsResourceApi(_requester);
+  ProjectsResource get projects => ProjectsResource(_requester);
 
   BinaryAuthorizationApi(http.Client client,
       {core.String rootUrl = 'https://binaryauthorization.googleapis.com/',
@@ -59,14 +59,14 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class ProjectsResourceApi {
+class ProjectsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsAttestorsResourceApi get attestors =>
-      ProjectsAttestorsResourceApi(_requester);
-  ProjectsPolicyResourceApi get policy => ProjectsPolicyResourceApi(_requester);
+  ProjectsAttestorsResource get attestors =>
+      ProjectsAttestorsResource(_requester);
+  ProjectsPolicyResource get policy => ProjectsPolicyResource(_requester);
 
-  ProjectsResourceApi(commons.ApiRequester client) : _requester = client;
+  ProjectsResource(commons.ApiRequester client) : _requester = client;
 
   /// A policy specifies the attestors that must attest to a container image,
   /// before the project is allowed to deploy that image. There is at most one
@@ -187,11 +187,10 @@
   }
 }
 
-class ProjectsAttestorsResourceApi {
+class ProjectsAttestorsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsAttestorsResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  ProjectsAttestorsResource(commons.ApiRequester client) : _requester = client;
 
   /// Creates an attestor, and returns a copy of the new attestor. Returns
   /// NOT_FOUND if the project does not exist, INVALID_ARGUMENT if the request
@@ -754,10 +753,10 @@
   }
 }
 
-class ProjectsPolicyResourceApi {
+class ProjectsPolicyResource {
   final commons.ApiRequester _requester;
 
-  ProjectsPolicyResourceApi(commons.ApiRequester client) : _requester = client;
+  ProjectsPolicyResource(commons.ApiRequester client) : _requester = client;
 
   /// Gets the access control policy for a resource. Returns an empty policy if
   /// the resource exists and does not have a policy set.
diff --git a/generated/googleapis/lib/blogger/v3.dart b/generated/googleapis/lib/blogger/v3.dart
index d426426..d80b8fb 100644
--- a/generated/googleapis/lib/blogger/v3.dart
+++ b/generated/googleapis/lib/blogger/v3.dart
@@ -25,14 +25,14 @@
 ///
 /// Create an instance of [BloggerApi] to access these resources:
 ///
-/// - [BlogUserInfosResourceApi]
-/// - [BlogsResourceApi]
-/// - [CommentsResourceApi]
-/// - [PageViewsResourceApi]
-/// - [PagesResourceApi]
-/// - [PostUserInfosResourceApi]
-/// - [PostsResourceApi]
-/// - [UsersResourceApi]
+/// - [BlogUserInfosResource]
+/// - [BlogsResource]
+/// - [CommentsResource]
+/// - [PageViewsResource]
+/// - [PagesResource]
+/// - [PostUserInfosResource]
+/// - [PostsResource]
+/// - [UsersResource]
 library blogger.v3;
 
 import 'dart:async' as async;
@@ -59,16 +59,14 @@
 
   final commons.ApiRequester _requester;
 
-  BlogUserInfosResourceApi get blogUserInfos =>
-      BlogUserInfosResourceApi(_requester);
-  BlogsResourceApi get blogs => BlogsResourceApi(_requester);
-  CommentsResourceApi get comments => CommentsResourceApi(_requester);
-  PageViewsResourceApi get pageViews => PageViewsResourceApi(_requester);
-  PagesResourceApi get pages => PagesResourceApi(_requester);
-  PostUserInfosResourceApi get postUserInfos =>
-      PostUserInfosResourceApi(_requester);
-  PostsResourceApi get posts => PostsResourceApi(_requester);
-  UsersResourceApi get users => UsersResourceApi(_requester);
+  BlogUserInfosResource get blogUserInfos => BlogUserInfosResource(_requester);
+  BlogsResource get blogs => BlogsResource(_requester);
+  CommentsResource get comments => CommentsResource(_requester);
+  PageViewsResource get pageViews => PageViewsResource(_requester);
+  PagesResource get pages => PagesResource(_requester);
+  PostUserInfosResource get postUserInfos => PostUserInfosResource(_requester);
+  PostsResource get posts => PostsResource(_requester);
+  UsersResource get users => UsersResource(_requester);
 
   BloggerApi(http.Client client,
       {core.String rootUrl = 'https://blogger.googleapis.com/',
@@ -77,10 +75,10 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class BlogUserInfosResourceApi {
+class BlogUserInfosResource {
   final commons.ApiRequester _requester;
 
-  BlogUserInfosResourceApi(commons.ApiRequester client) : _requester = client;
+  BlogUserInfosResource(commons.ApiRequester client) : _requester = client;
 
   /// Gets one blog and user info pair by blog id and user id.
   ///
@@ -149,10 +147,10 @@
   }
 }
 
-class BlogsResourceApi {
+class BlogsResource {
   final commons.ApiRequester _requester;
 
-  BlogsResourceApi(commons.ApiRequester client) : _requester = client;
+  BlogsResource(commons.ApiRequester client) : _requester = client;
 
   /// Gets a blog by id.
   ///
@@ -363,10 +361,10 @@
   }
 }
 
-class CommentsResourceApi {
+class CommentsResource {
   final commons.ApiRequester _requester;
 
-  CommentsResourceApi(commons.ApiRequester client) : _requester = client;
+  CommentsResource(commons.ApiRequester client) : _requester = client;
 
   /// Marks a comment as not spam by blog id, post id and comment id.
   ///
@@ -918,10 +916,10 @@
   }
 }
 
-class PageViewsResourceApi {
+class PageViewsResource {
   final commons.ApiRequester _requester;
 
-  PageViewsResourceApi(commons.ApiRequester client) : _requester = client;
+  PageViewsResource(commons.ApiRequester client) : _requester = client;
 
   /// Gets page views by blog id.
   ///
@@ -981,10 +979,10 @@
   }
 }
 
-class PagesResourceApi {
+class PagesResource {
   final commons.ApiRequester _requester;
 
-  PagesResourceApi(commons.ApiRequester client) : _requester = client;
+  PagesResource(commons.ApiRequester client) : _requester = client;
 
   /// Deletes a page by blog id and page id.
   ///
@@ -1537,10 +1535,10 @@
   }
 }
 
-class PostUserInfosResourceApi {
+class PostUserInfosResource {
   final commons.ApiRequester _requester;
 
-  PostUserInfosResourceApi(commons.ApiRequester client) : _requester = client;
+  PostUserInfosResource(commons.ApiRequester client) : _requester = client;
 
   /// Gets one post and user info pair, by post_id and user_id.
   ///
@@ -1741,10 +1739,10 @@
   }
 }
 
-class PostsResourceApi {
+class PostsResource {
   final commons.ApiRequester _requester;
 
-  PostsResourceApi(commons.ApiRequester client) : _requester = client;
+  PostsResource(commons.ApiRequester client) : _requester = client;
 
   /// Deletes a post by blog id and post id.
   ///
@@ -2554,10 +2552,10 @@
   }
 }
 
-class UsersResourceApi {
+class UsersResource {
   final commons.ApiRequester _requester;
 
-  UsersResourceApi(commons.ApiRequester client) : _requester = client;
+  UsersResource(commons.ApiRequester client) : _requester = client;
 
   /// Gets one user by user_id.
   ///
diff --git a/generated/googleapis/lib/books/v1.dart b/generated/googleapis/lib/books/v1.dart
index 1eea3ab..dabfae6 100644
--- a/generated/googleapis/lib/books/v1.dart
+++ b/generated/googleapis/lib/books/v1.dart
@@ -24,31 +24,31 @@
 ///
 /// Create an instance of [BooksApi] to access these resources:
 ///
-/// - [BookshelvesResourceApi]
-///   - [BookshelvesVolumesResourceApi]
-/// - [CloudloadingResourceApi]
-/// - [DictionaryResourceApi]
-/// - [FamilysharingResourceApi]
-/// - [LayersResourceApi]
-///   - [LayersAnnotationDataResourceApi]
-///   - [LayersVolumeAnnotationsResourceApi]
-/// - [MyconfigResourceApi]
-/// - [MylibraryResourceApi]
-///   - [MylibraryAnnotationsResourceApi]
-///   - [MylibraryBookshelvesResourceApi]
-///     - [MylibraryBookshelvesVolumesResourceApi]
-///   - [MylibraryReadingpositionsResourceApi]
-/// - [NotificationResourceApi]
-/// - [OnboardingResourceApi]
-/// - [PersonalizedstreamResourceApi]
-/// - [PromoofferResourceApi]
-/// - [SeriesResourceApi]
-///   - [SeriesMembershipResourceApi]
-/// - [VolumesResourceApi]
-///   - [VolumesAssociatedResourceApi]
-///   - [VolumesMybooksResourceApi]
-///   - [VolumesRecommendedResourceApi]
-///   - [VolumesUseruploadedResourceApi]
+/// - [BookshelvesResource]
+///   - [BookshelvesVolumesResource]
+/// - [CloudloadingResource]
+/// - [DictionaryResource]
+/// - [FamilysharingResource]
+/// - [LayersResource]
+///   - [LayersAnnotationDataResource]
+///   - [LayersVolumeAnnotationsResource]
+/// - [MyconfigResource]
+/// - [MylibraryResource]
+///   - [MylibraryAnnotationsResource]
+///   - [MylibraryBookshelvesResource]
+///     - [MylibraryBookshelvesVolumesResource]
+///   - [MylibraryReadingpositionsResource]
+/// - [NotificationResource]
+/// - [OnboardingResource]
+/// - [PersonalizedstreamResource]
+/// - [PromoofferResource]
+/// - [SeriesResource]
+///   - [SeriesMembershipResource]
+/// - [VolumesResource]
+///   - [VolumesAssociatedResource]
+///   - [VolumesMybooksResource]
+///   - [VolumesRecommendedResource]
+///   - [VolumesUseruploadedResource]
 library books.v1;
 
 import 'dart:async' as async;
@@ -70,23 +70,20 @@
 
   final commons.ApiRequester _requester;
 
-  BookshelvesResourceApi get bookshelves => BookshelvesResourceApi(_requester);
-  CloudloadingResourceApi get cloudloading =>
-      CloudloadingResourceApi(_requester);
-  DictionaryResourceApi get dictionary => DictionaryResourceApi(_requester);
-  FamilysharingResourceApi get familysharing =>
-      FamilysharingResourceApi(_requester);
-  LayersResourceApi get layers => LayersResourceApi(_requester);
-  MyconfigResourceApi get myconfig => MyconfigResourceApi(_requester);
-  MylibraryResourceApi get mylibrary => MylibraryResourceApi(_requester);
-  NotificationResourceApi get notification =>
-      NotificationResourceApi(_requester);
-  OnboardingResourceApi get onboarding => OnboardingResourceApi(_requester);
-  PersonalizedstreamResourceApi get personalizedstream =>
-      PersonalizedstreamResourceApi(_requester);
-  PromoofferResourceApi get promooffer => PromoofferResourceApi(_requester);
-  SeriesResourceApi get series => SeriesResourceApi(_requester);
-  VolumesResourceApi get volumes => VolumesResourceApi(_requester);
+  BookshelvesResource get bookshelves => BookshelvesResource(_requester);
+  CloudloadingResource get cloudloading => CloudloadingResource(_requester);
+  DictionaryResource get dictionary => DictionaryResource(_requester);
+  FamilysharingResource get familysharing => FamilysharingResource(_requester);
+  LayersResource get layers => LayersResource(_requester);
+  MyconfigResource get myconfig => MyconfigResource(_requester);
+  MylibraryResource get mylibrary => MylibraryResource(_requester);
+  NotificationResource get notification => NotificationResource(_requester);
+  OnboardingResource get onboarding => OnboardingResource(_requester);
+  PersonalizedstreamResource get personalizedstream =>
+      PersonalizedstreamResource(_requester);
+  PromoofferResource get promooffer => PromoofferResource(_requester);
+  SeriesResource get series => SeriesResource(_requester);
+  VolumesResource get volumes => VolumesResource(_requester);
 
   BooksApi(http.Client client,
       {core.String rootUrl = 'https://books.googleapis.com/',
@@ -95,13 +92,13 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class BookshelvesResourceApi {
+class BookshelvesResource {
   final commons.ApiRequester _requester;
 
-  BookshelvesVolumesResourceApi get volumes =>
-      BookshelvesVolumesResourceApi(_requester);
+  BookshelvesVolumesResource get volumes =>
+      BookshelvesVolumesResource(_requester);
 
-  BookshelvesResourceApi(commons.ApiRequester client) : _requester = client;
+  BookshelvesResource(commons.ApiRequester client) : _requester = client;
 
   /// Retrieves metadata for a specific bookshelf for the specified user.
   ///
@@ -228,11 +225,10 @@
   }
 }
 
-class BookshelvesVolumesResourceApi {
+class BookshelvesVolumesResource {
   final commons.ApiRequester _requester;
 
-  BookshelvesVolumesResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  BookshelvesVolumesResource(commons.ApiRequester client) : _requester = client;
 
   /// Retrieves volumes in a specific bookshelf for the specified user.
   ///
@@ -320,10 +316,10 @@
   }
 }
 
-class CloudloadingResourceApi {
+class CloudloadingResource {
   final commons.ApiRequester _requester;
 
-  CloudloadingResourceApi(commons.ApiRequester client) : _requester = client;
+  CloudloadingResource(commons.ApiRequester client) : _requester = client;
 
   /// Add a user-upload volume and triggers processing.
   ///
@@ -499,10 +495,10 @@
   }
 }
 
-class DictionaryResourceApi {
+class DictionaryResource {
   final commons.ApiRequester _requester;
 
-  DictionaryResourceApi(commons.ApiRequester client) : _requester = client;
+  DictionaryResource(commons.ApiRequester client) : _requester = client;
 
   /// Returns a list of offline dictionary metadata available
   ///
@@ -555,10 +551,10 @@
   }
 }
 
-class FamilysharingResourceApi {
+class FamilysharingResource {
   final commons.ApiRequester _requester;
 
-  FamilysharingResourceApi(commons.ApiRequester client) : _requester = client;
+  FamilysharingResource(commons.ApiRequester client) : _requester = client;
 
   /// Gets information regarding the family that the user is part of.
   ///
@@ -738,15 +734,15 @@
   }
 }
 
-class LayersResourceApi {
+class LayersResource {
   final commons.ApiRequester _requester;
 
-  LayersAnnotationDataResourceApi get annotationData =>
-      LayersAnnotationDataResourceApi(_requester);
-  LayersVolumeAnnotationsResourceApi get volumeAnnotations =>
-      LayersVolumeAnnotationsResourceApi(_requester);
+  LayersAnnotationDataResource get annotationData =>
+      LayersAnnotationDataResource(_requester);
+  LayersVolumeAnnotationsResource get volumeAnnotations =>
+      LayersVolumeAnnotationsResource(_requester);
 
-  LayersResourceApi(commons.ApiRequester client) : _requester = client;
+  LayersResource(commons.ApiRequester client) : _requester = client;
 
   /// Gets the layer summary for a volume.
   ///
@@ -898,10 +894,10 @@
   }
 }
 
-class LayersAnnotationDataResourceApi {
+class LayersAnnotationDataResource {
   final commons.ApiRequester _requester;
 
-  LayersAnnotationDataResourceApi(commons.ApiRequester client)
+  LayersAnnotationDataResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Gets the annotation data.
@@ -1153,10 +1149,10 @@
   }
 }
 
-class LayersVolumeAnnotationsResourceApi {
+class LayersVolumeAnnotationsResource {
   final commons.ApiRequester _requester;
 
-  LayersVolumeAnnotationsResourceApi(commons.ApiRequester client)
+  LayersVolumeAnnotationsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Gets the volume annotation.
@@ -1384,10 +1380,10 @@
   }
 }
 
-class MyconfigResourceApi {
+class MyconfigResource {
   final commons.ApiRequester _requester;
 
-  MyconfigResourceApi(commons.ApiRequester client) : _requester = client;
+  MyconfigResource(commons.ApiRequester client) : _requester = client;
 
   /// Gets the current settings for the user.
   ///
@@ -1749,23 +1745,23 @@
   }
 }
 
-class MylibraryResourceApi {
+class MylibraryResource {
   final commons.ApiRequester _requester;
 
-  MylibraryAnnotationsResourceApi get annotations =>
-      MylibraryAnnotationsResourceApi(_requester);
-  MylibraryBookshelvesResourceApi get bookshelves =>
-      MylibraryBookshelvesResourceApi(_requester);
-  MylibraryReadingpositionsResourceApi get readingpositions =>
-      MylibraryReadingpositionsResourceApi(_requester);
+  MylibraryAnnotationsResource get annotations =>
+      MylibraryAnnotationsResource(_requester);
+  MylibraryBookshelvesResource get bookshelves =>
+      MylibraryBookshelvesResource(_requester);
+  MylibraryReadingpositionsResource get readingpositions =>
+      MylibraryReadingpositionsResource(_requester);
 
-  MylibraryResourceApi(commons.ApiRequester client) : _requester = client;
+  MylibraryResource(commons.ApiRequester client) : _requester = client;
 }
 
-class MylibraryAnnotationsResourceApi {
+class MylibraryAnnotationsResource {
   final commons.ApiRequester _requester;
 
-  MylibraryAnnotationsResourceApi(commons.ApiRequester client)
+  MylibraryAnnotationsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Deletes an annotation.
@@ -2133,13 +2129,13 @@
   }
 }
 
-class MylibraryBookshelvesResourceApi {
+class MylibraryBookshelvesResource {
   final commons.ApiRequester _requester;
 
-  MylibraryBookshelvesVolumesResourceApi get volumes =>
-      MylibraryBookshelvesVolumesResourceApi(_requester);
+  MylibraryBookshelvesVolumesResource get volumes =>
+      MylibraryBookshelvesVolumesResource(_requester);
 
-  MylibraryBookshelvesResourceApi(commons.ApiRequester client)
+  MylibraryBookshelvesResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Adds a volume to a bookshelf.
@@ -2530,10 +2526,10 @@
   }
 }
 
-class MylibraryBookshelvesVolumesResourceApi {
+class MylibraryBookshelvesVolumesResource {
   final commons.ApiRequester _requester;
 
-  MylibraryBookshelvesVolumesResourceApi(commons.ApiRequester client)
+  MylibraryBookshelvesVolumesResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Gets volume information for volumes on a bookshelf.
@@ -2636,10 +2632,10 @@
   }
 }
 
-class MylibraryReadingpositionsResourceApi {
+class MylibraryReadingpositionsResource {
   final commons.ApiRequester _requester;
 
-  MylibraryReadingpositionsResourceApi(commons.ApiRequester client)
+  MylibraryReadingpositionsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Retrieves my reading position information for a volume.
@@ -2806,10 +2802,10 @@
   }
 }
 
-class NotificationResourceApi {
+class NotificationResource {
   final commons.ApiRequester _requester;
 
-  NotificationResourceApi(commons.ApiRequester client) : _requester = client;
+  NotificationResource(commons.ApiRequester client) : _requester = client;
 
   /// Returns notification details for a given notification id.
   ///
@@ -2876,10 +2872,10 @@
   }
 }
 
-class OnboardingResourceApi {
+class OnboardingResource {
   final commons.ApiRequester _requester;
 
-  OnboardingResourceApi(commons.ApiRequester client) : _requester = client;
+  OnboardingResource(commons.ApiRequester client) : _requester = client;
 
   /// List categories for onboarding experience.
   ///
@@ -3014,11 +3010,10 @@
   }
 }
 
-class PersonalizedstreamResourceApi {
+class PersonalizedstreamResource {
   final commons.ApiRequester _requester;
 
-  PersonalizedstreamResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  PersonalizedstreamResource(commons.ApiRequester client) : _requester = client;
 
   /// Returns a stream of personalized book clusters
   ///
@@ -3091,10 +3086,10 @@
   }
 }
 
-class PromoofferResourceApi {
+class PromoofferResource {
   final commons.ApiRequester _requester;
 
-  PromoofferResourceApi(commons.ApiRequester client) : _requester = client;
+  PromoofferResource(commons.ApiRequester client) : _requester = client;
 
   /// Accepts the promo offer.
   ///
@@ -3355,13 +3350,13 @@
   }
 }
 
-class SeriesResourceApi {
+class SeriesResource {
   final commons.ApiRequester _requester;
 
-  SeriesMembershipResourceApi get membership =>
-      SeriesMembershipResourceApi(_requester);
+  SeriesMembershipResource get membership =>
+      SeriesMembershipResource(_requester);
 
-  SeriesResourceApi(commons.ApiRequester client) : _requester = client;
+  SeriesResource(commons.ApiRequester client) : _requester = client;
 
   /// Returns Series metadata for the given series ids.
   ///
@@ -3414,11 +3409,10 @@
   }
 }
 
-class SeriesMembershipResourceApi {
+class SeriesMembershipResource {
   final commons.ApiRequester _requester;
 
-  SeriesMembershipResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  SeriesMembershipResource(commons.ApiRequester client) : _requester = client;
 
   /// Returns Series membership data given the series id.
   ///
@@ -3485,19 +3479,18 @@
   }
 }
 
-class VolumesResourceApi {
+class VolumesResource {
   final commons.ApiRequester _requester;
 
-  VolumesAssociatedResourceApi get associated =>
-      VolumesAssociatedResourceApi(_requester);
-  VolumesMybooksResourceApi get mybooks =>
-      VolumesMybooksResourceApi(_requester);
-  VolumesRecommendedResourceApi get recommended =>
-      VolumesRecommendedResourceApi(_requester);
-  VolumesUseruploadedResourceApi get useruploaded =>
-      VolumesUseruploadedResourceApi(_requester);
+  VolumesAssociatedResource get associated =>
+      VolumesAssociatedResource(_requester);
+  VolumesMybooksResource get mybooks => VolumesMybooksResource(_requester);
+  VolumesRecommendedResource get recommended =>
+      VolumesRecommendedResource(_requester);
+  VolumesUseruploadedResource get useruploaded =>
+      VolumesUseruploadedResource(_requester);
 
-  VolumesResourceApi(commons.ApiRequester client) : _requester = client;
+  VolumesResource(commons.ApiRequester client) : _requester = client;
 
   /// Gets volume information for a single volume.
   ///
@@ -3755,11 +3748,10 @@
   }
 }
 
-class VolumesAssociatedResourceApi {
+class VolumesAssociatedResource {
   final commons.ApiRequester _requester;
 
-  VolumesAssociatedResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  VolumesAssociatedResource(commons.ApiRequester client) : _requester = client;
 
   /// Return a list of associated books.
   ///
@@ -3850,10 +3842,10 @@
   }
 }
 
-class VolumesMybooksResourceApi {
+class VolumesMybooksResource {
   final commons.ApiRequester _requester;
 
-  VolumesMybooksResourceApi(commons.ApiRequester client) : _requester = client;
+  VolumesMybooksResource(commons.ApiRequester client) : _requester = client;
 
   /// Return a list of books in My Library.
   ///
@@ -3945,11 +3937,10 @@
   }
 }
 
-class VolumesRecommendedResourceApi {
+class VolumesRecommendedResource {
   final commons.ApiRequester _requester;
 
-  VolumesRecommendedResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  VolumesRecommendedResource(commons.ApiRequester client) : _requester = client;
 
   /// Return a list of recommended books for the current user.
   ///
@@ -4095,10 +4086,10 @@
   }
 }
 
-class VolumesUseruploadedResourceApi {
+class VolumesUseruploadedResource {
   final commons.ApiRequester _requester;
 
-  VolumesUseruploadedResourceApi(commons.ApiRequester client)
+  VolumesUseruploadedResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Return a list of books uploaded by the current user.
diff --git a/generated/googleapis/lib/calendar/v3.dart b/generated/googleapis/lib/calendar/v3.dart
index 6bbaaae..759704e 100644
--- a/generated/googleapis/lib/calendar/v3.dart
+++ b/generated/googleapis/lib/calendar/v3.dart
@@ -24,14 +24,14 @@
 ///
 /// Create an instance of [CalendarApi] to access these resources:
 ///
-/// - [AclResourceApi]
-/// - [CalendarListResourceApi]
-/// - [CalendarsResourceApi]
-/// - [ChannelsResourceApi]
-/// - [ColorsResourceApi]
-/// - [EventsResourceApi]
-/// - [FreebusyResourceApi]
-/// - [SettingsResourceApi]
+/// - [AclResource]
+/// - [CalendarListResource]
+/// - [CalendarsResource]
+/// - [ChannelsResource]
+/// - [ColorsResource]
+/// - [EventsResource]
+/// - [FreebusyResource]
+/// - [SettingsResource]
 library calendar.v3;
 
 import 'dart:async' as async;
@@ -70,15 +70,14 @@
 
   final commons.ApiRequester _requester;
 
-  AclResourceApi get acl => AclResourceApi(_requester);
-  CalendarListResourceApi get calendarList =>
-      CalendarListResourceApi(_requester);
-  CalendarsResourceApi get calendars => CalendarsResourceApi(_requester);
-  ChannelsResourceApi get channels => ChannelsResourceApi(_requester);
-  ColorsResourceApi get colors => ColorsResourceApi(_requester);
-  EventsResourceApi get events => EventsResourceApi(_requester);
-  FreebusyResourceApi get freebusy => FreebusyResourceApi(_requester);
-  SettingsResourceApi get settings => SettingsResourceApi(_requester);
+  AclResource get acl => AclResource(_requester);
+  CalendarListResource get calendarList => CalendarListResource(_requester);
+  CalendarsResource get calendars => CalendarsResource(_requester);
+  ChannelsResource get channels => ChannelsResource(_requester);
+  ColorsResource get colors => ColorsResource(_requester);
+  EventsResource get events => EventsResource(_requester);
+  FreebusyResource get freebusy => FreebusyResource(_requester);
+  SettingsResource get settings => SettingsResource(_requester);
 
   CalendarApi(http.Client client,
       {core.String rootUrl = 'https://www.googleapis.com/',
@@ -87,10 +86,10 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class AclResourceApi {
+class AclResource {
   final commons.ApiRequester _requester;
 
-  AclResourceApi(commons.ApiRequester client) : _requester = client;
+  AclResource(commons.ApiRequester client) : _requester = client;
 
   /// Deletes an access control rule.
   ///
@@ -616,10 +615,10 @@
   }
 }
 
-class CalendarListResourceApi {
+class CalendarListResource {
   final commons.ApiRequester _requester;
 
-  CalendarListResourceApi(commons.ApiRequester client) : _requester = client;
+  CalendarListResource(commons.ApiRequester client) : _requester = client;
 
   /// Removes a calendar from the user's calendar list.
   ///
@@ -1141,10 +1140,10 @@
   }
 }
 
-class CalendarsResourceApi {
+class CalendarsResource {
   final commons.ApiRequester _requester;
 
-  CalendarsResourceApi(commons.ApiRequester client) : _requester = client;
+  CalendarsResource(commons.ApiRequester client) : _requester = client;
 
   /// Clears a primary calendar. This operation deletes all events associated
   /// with the primary calendar of an account.
@@ -1472,10 +1471,10 @@
   }
 }
 
-class ChannelsResourceApi {
+class ChannelsResource {
   final commons.ApiRequester _requester;
 
-  ChannelsResourceApi(commons.ApiRequester client) : _requester = client;
+  ChannelsResource(commons.ApiRequester client) : _requester = client;
 
   /// Stop watching resources through this channel
   ///
@@ -1528,10 +1527,10 @@
   }
 }
 
-class ColorsResourceApi {
+class ColorsResource {
   final commons.ApiRequester _requester;
 
-  ColorsResourceApi(commons.ApiRequester client) : _requester = client;
+  ColorsResource(commons.ApiRequester client) : _requester = client;
 
   /// Returns the color definitions for calendars and events.
   ///
@@ -1578,10 +1577,10 @@
   }
 }
 
-class EventsResourceApi {
+class EventsResource {
   final commons.ApiRequester _requester;
 
-  EventsResourceApi(commons.ApiRequester client) : _requester = client;
+  EventsResource(commons.ApiRequester client) : _requester = client;
 
   /// Deletes an event.
   ///
@@ -2956,10 +2955,10 @@
   }
 }
 
-class FreebusyResourceApi {
+class FreebusyResource {
   final commons.ApiRequester _requester;
 
-  FreebusyResourceApi(commons.ApiRequester client) : _requester = client;
+  FreebusyResource(commons.ApiRequester client) : _requester = client;
 
   /// Returns free/busy information for a set of calendars.
   ///
@@ -3013,10 +3012,10 @@
   }
 }
 
-class SettingsResourceApi {
+class SettingsResource {
   final commons.ApiRequester _requester;
 
-  SettingsResourceApi(commons.ApiRequester client) : _requester = client;
+  SettingsResource(commons.ApiRequester client) : _requester = client;
 
   /// Returns a single user setting.
   ///
diff --git a/generated/googleapis/lib/chat/v1.dart b/generated/googleapis/lib/chat/v1.dart
index f8d4843..b8490ca 100644
--- a/generated/googleapis/lib/chat/v1.dart
+++ b/generated/googleapis/lib/chat/v1.dart
@@ -23,11 +23,11 @@
 ///
 /// Create an instance of [HangoutsChatApi] to access these resources:
 ///
-/// - [MediaResourceApi]
-/// - [SpacesResourceApi]
-///   - [SpacesMembersResourceApi]
-///   - [SpacesMessagesResourceApi]
-///     - [SpacesMessagesAttachmentsResourceApi]
+/// - [MediaResource]
+/// - [SpacesResource]
+///   - [SpacesMembersResource]
+///   - [SpacesMessagesResource]
+///     - [SpacesMessagesAttachmentsResource]
 library chat.v1;
 
 import 'dart:async' as async;
@@ -54,8 +54,8 @@
 class HangoutsChatApi {
   final commons.ApiRequester _requester;
 
-  MediaResourceApi get media => MediaResourceApi(_requester);
-  SpacesResourceApi get spaces => SpacesResourceApi(_requester);
+  MediaResource get media => MediaResource(_requester);
+  SpacesResource get spaces => SpacesResource(_requester);
 
   HangoutsChatApi(http.Client client,
       {core.String rootUrl = 'https://chat.googleapis.com/',
@@ -64,10 +64,10 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class MediaResourceApi {
+class MediaResource {
   final commons.ApiRequester _requester;
 
-  MediaResourceApi(commons.ApiRequester client) : _requester = client;
+  MediaResource(commons.ApiRequester client) : _requester = client;
 
   /// Downloads media. Download is supported on the URI
   /// `/v1/media/{+name}?alt=media`.
@@ -139,14 +139,13 @@
   }
 }
 
-class SpacesResourceApi {
+class SpacesResource {
   final commons.ApiRequester _requester;
 
-  SpacesMembersResourceApi get members => SpacesMembersResourceApi(_requester);
-  SpacesMessagesResourceApi get messages =>
-      SpacesMessagesResourceApi(_requester);
+  SpacesMembersResource get members => SpacesMembersResource(_requester);
+  SpacesMessagesResource get messages => SpacesMessagesResource(_requester);
 
-  SpacesResourceApi(commons.ApiRequester client) : _requester = client;
+  SpacesResource(commons.ApiRequester client) : _requester = client;
 
   /// Returns a space.
   ///
@@ -261,10 +260,10 @@
   }
 }
 
-class SpacesMembersResourceApi {
+class SpacesMembersResource {
   final commons.ApiRequester _requester;
 
-  SpacesMembersResourceApi(commons.ApiRequester client) : _requester = client;
+  SpacesMembersResource(commons.ApiRequester client) : _requester = client;
 
   /// Returns a membership.
   ///
@@ -391,13 +390,13 @@
   }
 }
 
-class SpacesMessagesResourceApi {
+class SpacesMessagesResource {
   final commons.ApiRequester _requester;
 
-  SpacesMessagesAttachmentsResourceApi get attachments =>
-      SpacesMessagesAttachmentsResourceApi(_requester);
+  SpacesMessagesAttachmentsResource get attachments =>
+      SpacesMessagesAttachmentsResource(_requester);
 
-  SpacesMessagesResourceApi(commons.ApiRequester client) : _requester = client;
+  SpacesMessagesResource(commons.ApiRequester client) : _requester = client;
 
   /// Creates a message.
   ///
@@ -643,10 +642,10 @@
   }
 }
 
-class SpacesMessagesAttachmentsResourceApi {
+class SpacesMessagesAttachmentsResource {
   final commons.ApiRequester _requester;
 
-  SpacesMessagesAttachmentsResourceApi(commons.ApiRequester client)
+  SpacesMessagesAttachmentsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Gets the metadata of a message attachment. The attachment data is fetched
diff --git a/generated/googleapis/lib/civicinfo/v2.dart b/generated/googleapis/lib/civicinfo/v2.dart
index babb347..7cab3d4 100644
--- a/generated/googleapis/lib/civicinfo/v2.dart
+++ b/generated/googleapis/lib/civicinfo/v2.dart
@@ -24,9 +24,9 @@
 ///
 /// Create an instance of [CivicInfoApi] to access these resources:
 ///
-/// - [DivisionsResourceApi]
-/// - [ElectionsResourceApi]
-/// - [RepresentativesResourceApi]
+/// - [DivisionsResource]
+/// - [ElectionsResource]
+/// - [RepresentativesResource]
 library civicinfo.v2;
 
 import 'dart:async' as async;
@@ -45,10 +45,10 @@
 class CivicInfoApi {
   final commons.ApiRequester _requester;
 
-  DivisionsResourceApi get divisions => DivisionsResourceApi(_requester);
-  ElectionsResourceApi get elections => ElectionsResourceApi(_requester);
-  RepresentativesResourceApi get representatives =>
-      RepresentativesResourceApi(_requester);
+  DivisionsResource get divisions => DivisionsResource(_requester);
+  ElectionsResource get elections => ElectionsResource(_requester);
+  RepresentativesResource get representatives =>
+      RepresentativesResource(_requester);
 
   CivicInfoApi(http.Client client,
       {core.String rootUrl = 'https://civicinfo.googleapis.com/',
@@ -57,10 +57,10 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class DivisionsResourceApi {
+class DivisionsResource {
   final commons.ApiRequester _requester;
 
-  DivisionsResourceApi(commons.ApiRequester client) : _requester = client;
+  DivisionsResource(commons.ApiRequester client) : _requester = client;
 
   /// Searches for political divisions by their natural name or OCD ID.
   ///
@@ -118,10 +118,10 @@
   }
 }
 
-class ElectionsResourceApi {
+class ElectionsResource {
   final commons.ApiRequester _requester;
 
-  ElectionsResourceApi(commons.ApiRequester client) : _requester = client;
+  ElectionsResource(commons.ApiRequester client) : _requester = client;
 
   /// List of available elections to query.
   ///
@@ -249,10 +249,10 @@
   }
 }
 
-class RepresentativesResourceApi {
+class RepresentativesResource {
   final commons.ApiRequester _requester;
 
-  RepresentativesResourceApi(commons.ApiRequester client) : _requester = client;
+  RepresentativesResource(commons.ApiRequester client) : _requester = client;
 
   /// Looks up political geography and representative information for a single
   /// address.
diff --git a/generated/googleapis/lib/classroom/v1.dart b/generated/googleapis/lib/classroom/v1.dart
index c818232..eb3001e 100644
--- a/generated/googleapis/lib/classroom/v1.dart
+++ b/generated/googleapis/lib/classroom/v1.dart
@@ -23,20 +23,20 @@
 ///
 /// Create an instance of [ClassroomApi] to access these resources:
 ///
-/// - [CoursesResourceApi]
-///   - [CoursesAliasesResourceApi]
-///   - [CoursesAnnouncementsResourceApi]
-///   - [CoursesCourseWorkResourceApi]
-///     - [CoursesCourseWorkStudentSubmissionsResourceApi]
-///   - [CoursesCourseWorkMaterialsResourceApi]
-///   - [CoursesStudentsResourceApi]
-///   - [CoursesTeachersResourceApi]
-///   - [CoursesTopicsResourceApi]
-/// - [InvitationsResourceApi]
-/// - [RegistrationsResourceApi]
-/// - [UserProfilesResourceApi]
-///   - [UserProfilesGuardianInvitationsResourceApi]
-///   - [UserProfilesGuardiansResourceApi]
+/// - [CoursesResource]
+///   - [CoursesAliasesResource]
+///   - [CoursesAnnouncementsResource]
+///   - [CoursesCourseWorkResource]
+///     - [CoursesCourseWorkStudentSubmissionsResource]
+///   - [CoursesCourseWorkMaterialsResource]
+///   - [CoursesStudentsResource]
+///   - [CoursesTeachersResource]
+///   - [CoursesTopicsResource]
+/// - [InvitationsResource]
+/// - [RegistrationsResource]
+/// - [UserProfilesResource]
+///   - [UserProfilesGuardianInvitationsResource]
+///   - [UserProfilesGuardiansResource]
 library classroom.v1;
 
 import 'dart:async' as async;
@@ -146,12 +146,10 @@
 
   final commons.ApiRequester _requester;
 
-  CoursesResourceApi get courses => CoursesResourceApi(_requester);
-  InvitationsResourceApi get invitations => InvitationsResourceApi(_requester);
-  RegistrationsResourceApi get registrations =>
-      RegistrationsResourceApi(_requester);
-  UserProfilesResourceApi get userProfiles =>
-      UserProfilesResourceApi(_requester);
+  CoursesResource get courses => CoursesResource(_requester);
+  InvitationsResource get invitations => InvitationsResource(_requester);
+  RegistrationsResource get registrations => RegistrationsResource(_requester);
+  UserProfilesResource get userProfiles => UserProfilesResource(_requester);
 
   ClassroomApi(http.Client client,
       {core.String rootUrl = 'https://classroom.googleapis.com/',
@@ -160,24 +158,21 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class CoursesResourceApi {
+class CoursesResource {
   final commons.ApiRequester _requester;
 
-  CoursesAliasesResourceApi get aliases =>
-      CoursesAliasesResourceApi(_requester);
-  CoursesAnnouncementsResourceApi get announcements =>
-      CoursesAnnouncementsResourceApi(_requester);
-  CoursesCourseWorkResourceApi get courseWork =>
-      CoursesCourseWorkResourceApi(_requester);
-  CoursesCourseWorkMaterialsResourceApi get courseWorkMaterials =>
-      CoursesCourseWorkMaterialsResourceApi(_requester);
-  CoursesStudentsResourceApi get students =>
-      CoursesStudentsResourceApi(_requester);
-  CoursesTeachersResourceApi get teachers =>
-      CoursesTeachersResourceApi(_requester);
-  CoursesTopicsResourceApi get topics => CoursesTopicsResourceApi(_requester);
+  CoursesAliasesResource get aliases => CoursesAliasesResource(_requester);
+  CoursesAnnouncementsResource get announcements =>
+      CoursesAnnouncementsResource(_requester);
+  CoursesCourseWorkResource get courseWork =>
+      CoursesCourseWorkResource(_requester);
+  CoursesCourseWorkMaterialsResource get courseWorkMaterials =>
+      CoursesCourseWorkMaterialsResource(_requester);
+  CoursesStudentsResource get students => CoursesStudentsResource(_requester);
+  CoursesTeachersResource get teachers => CoursesTeachersResource(_requester);
+  CoursesTopicsResource get topics => CoursesTopicsResource(_requester);
 
-  CoursesResourceApi(commons.ApiRequester client) : _requester = client;
+  CoursesResource(commons.ApiRequester client) : _requester = client;
 
   /// Creates a course. The user specified in `ownerId` is the owner of the
   /// created course and added as a teacher. This method returns the following
@@ -575,10 +570,10 @@
   }
 }
 
-class CoursesAliasesResourceApi {
+class CoursesAliasesResource {
   final commons.ApiRequester _requester;
 
-  CoursesAliasesResourceApi(commons.ApiRequester client) : _requester = client;
+  CoursesAliasesResource(commons.ApiRequester client) : _requester = client;
 
   /// Creates an alias for a course. This method returns the following error
   /// codes: * `PERMISSION_DENIED` if the requesting user is not permitted to
@@ -785,10 +780,10 @@
   }
 }
 
-class CoursesAnnouncementsResourceApi {
+class CoursesAnnouncementsResource {
   final commons.ApiRequester _requester;
 
-  CoursesAnnouncementsResourceApi(commons.ApiRequester client)
+  CoursesAnnouncementsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Creates an announcement. This method returns the following error codes: *
@@ -1247,14 +1242,13 @@
   }
 }
 
-class CoursesCourseWorkResourceApi {
+class CoursesCourseWorkResource {
   final commons.ApiRequester _requester;
 
-  CoursesCourseWorkStudentSubmissionsResourceApi get studentSubmissions =>
-      CoursesCourseWorkStudentSubmissionsResourceApi(_requester);
+  CoursesCourseWorkStudentSubmissionsResource get studentSubmissions =>
+      CoursesCourseWorkStudentSubmissionsResource(_requester);
 
-  CoursesCourseWorkResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  CoursesCourseWorkResource(commons.ApiRequester client) : _requester = client;
 
   /// Creates course work. The resulting course work (and corresponding student
   /// submissions) are associated with the Developer Console project of the
@@ -1723,10 +1717,10 @@
   }
 }
 
-class CoursesCourseWorkStudentSubmissionsResourceApi {
+class CoursesCourseWorkStudentSubmissionsResource {
   final commons.ApiRequester _requester;
 
-  CoursesCourseWorkStudentSubmissionsResourceApi(commons.ApiRequester client)
+  CoursesCourseWorkStudentSubmissionsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Returns a student submission. * `PERMISSION_DENIED` if the requesting user
@@ -2364,10 +2358,10 @@
   }
 }
 
-class CoursesCourseWorkMaterialsResourceApi {
+class CoursesCourseWorkMaterialsResource {
   final commons.ApiRequester _requester;
 
-  CoursesCourseWorkMaterialsResourceApi(commons.ApiRequester client)
+  CoursesCourseWorkMaterialsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Creates a course work material. This method returns the following error
@@ -2769,10 +2763,10 @@
   }
 }
 
-class CoursesStudentsResourceApi {
+class CoursesStudentsResource {
   final commons.ApiRequester _requester;
 
-  CoursesStudentsResourceApi(commons.ApiRequester client) : _requester = client;
+  CoursesStudentsResource(commons.ApiRequester client) : _requester = client;
 
   /// Adds a user as a student of a course. This method returns the following
   /// error codes: * `PERMISSION_DENIED` if the requesting user is not permitted
@@ -3057,10 +3051,10 @@
   }
 }
 
-class CoursesTeachersResourceApi {
+class CoursesTeachersResource {
   final commons.ApiRequester _requester;
 
-  CoursesTeachersResourceApi(commons.ApiRequester client) : _requester = client;
+  CoursesTeachersResource(commons.ApiRequester client) : _requester = client;
 
   /// Creates a teacher of a course. This method returns the following error
   /// codes: * `PERMISSION_DENIED` if the requesting user is not permitted to
@@ -3337,10 +3331,10 @@
   }
 }
 
-class CoursesTopicsResourceApi {
+class CoursesTopicsResource {
   final commons.ApiRequester _requester;
 
-  CoursesTopicsResourceApi(commons.ApiRequester client) : _requester = client;
+  CoursesTopicsResource(commons.ApiRequester client) : _requester = client;
 
   /// Creates a topic. This method returns the following error codes: *
   /// `PERMISSION_DENIED` if the requesting user is not permitted to access the
@@ -3688,10 +3682,10 @@
   }
 }
 
-class InvitationsResourceApi {
+class InvitationsResource {
   final commons.ApiRequester _requester;
 
-  InvitationsResourceApi(commons.ApiRequester client) : _requester = client;
+  InvitationsResource(commons.ApiRequester client) : _requester = client;
 
   /// Accepts an invitation, removing it and adding the invited user to the
   /// teachers or students (as appropriate) of the specified course. Only the
@@ -4000,10 +3994,10 @@
   }
 }
 
-class RegistrationsResourceApi {
+class RegistrationsResource {
   final commons.ApiRequester _requester;
 
-  RegistrationsResourceApi(commons.ApiRequester client) : _requester = client;
+  RegistrationsResource(commons.ApiRequester client) : _requester = client;
 
   /// Creates a `Registration`, causing Classroom to start sending notifications
   /// from the provided `feed` to the destination provided in
@@ -4131,15 +4125,15 @@
   }
 }
 
-class UserProfilesResourceApi {
+class UserProfilesResource {
   final commons.ApiRequester _requester;
 
-  UserProfilesGuardianInvitationsResourceApi get guardianInvitations =>
-      UserProfilesGuardianInvitationsResourceApi(_requester);
-  UserProfilesGuardiansResourceApi get guardians =>
-      UserProfilesGuardiansResourceApi(_requester);
+  UserProfilesGuardianInvitationsResource get guardianInvitations =>
+      UserProfilesGuardianInvitationsResource(_requester);
+  UserProfilesGuardiansResource get guardians =>
+      UserProfilesGuardiansResource(_requester);
 
-  UserProfilesResourceApi(commons.ApiRequester client) : _requester = client;
+  UserProfilesResource(commons.ApiRequester client) : _requester = client;
 
   /// Returns a user profile. This method returns the following error codes: *
   /// `PERMISSION_DENIED` if the requesting user is not permitted to access this
@@ -4199,10 +4193,10 @@
   }
 }
 
-class UserProfilesGuardianInvitationsResourceApi {
+class UserProfilesGuardianInvitationsResource {
   final commons.ApiRequester _requester;
 
-  UserProfilesGuardianInvitationsResourceApi(commons.ApiRequester client)
+  UserProfilesGuardianInvitationsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Creates a guardian invitation, and sends an email to the guardian asking
@@ -4549,10 +4543,10 @@
   }
 }
 
-class UserProfilesGuardiansResourceApi {
+class UserProfilesGuardiansResource {
   final commons.ApiRequester _requester;
 
-  UserProfilesGuardiansResourceApi(commons.ApiRequester client)
+  UserProfilesGuardiansResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Deletes a guardian. The guardian will no longer receive guardian
diff --git a/generated/googleapis/lib/cloudasset/v1.dart b/generated/googleapis/lib/cloudasset/v1.dart
index 2f349f4..4fbb198 100644
--- a/generated/googleapis/lib/cloudasset/v1.dart
+++ b/generated/googleapis/lib/cloudasset/v1.dart
@@ -24,9 +24,9 @@
 ///
 /// Create an instance of [CloudAssetApi] to access these resources:
 ///
-/// - [FeedsResourceApi]
-/// - [OperationsResourceApi]
-/// - [V1ResourceApi]
+/// - [FeedsResource]
+/// - [OperationsResource]
+/// - [V1Resource]
 library cloudasset.v1;
 
 import 'dart:async' as async;
@@ -49,9 +49,9 @@
 
   final commons.ApiRequester _requester;
 
-  FeedsResourceApi get feeds => FeedsResourceApi(_requester);
-  OperationsResourceApi get operations => OperationsResourceApi(_requester);
-  V1ResourceApi get v1 => V1ResourceApi(_requester);
+  FeedsResource get feeds => FeedsResource(_requester);
+  OperationsResource get operations => OperationsResource(_requester);
+  V1Resource get v1 => V1Resource(_requester);
 
   CloudAssetApi(http.Client client,
       {core.String rootUrl = 'https://cloudasset.googleapis.com/',
@@ -60,10 +60,10 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class FeedsResourceApi {
+class FeedsResource {
   final commons.ApiRequester _requester;
 
-  FeedsResourceApi(commons.ApiRequester client) : _requester = client;
+  FeedsResource(commons.ApiRequester client) : _requester = client;
 
   /// Creates a feed in a parent project/folder/organization to listen to its
   /// asset updates.
@@ -351,10 +351,10 @@
   }
 }
 
-class OperationsResourceApi {
+class OperationsResource {
   final commons.ApiRequester _requester;
 
-  OperationsResourceApi(commons.ApiRequester client) : _requester = client;
+  OperationsResource(commons.ApiRequester client) : _requester = client;
 
   /// Gets the latest state of a long-running operation. Clients can use this
   /// method to poll the operation result at intervals as recommended by the API
@@ -410,10 +410,10 @@
   }
 }
 
-class V1ResourceApi {
+class V1Resource {
   final commons.ApiRequester _requester;
 
-  V1ResourceApi(commons.ApiRequester client) : _requester = client;
+  V1Resource(commons.ApiRequester client) : _requester = client;
 
   /// Batch gets the update history of assets that overlap a time window. For
   /// IAM_POLICY content, this API outputs history when the asset and its
diff --git a/generated/googleapis/lib/cloudbilling/v1.dart b/generated/googleapis/lib/cloudbilling/v1.dart
index 89c7197..9902075 100644
--- a/generated/googleapis/lib/cloudbilling/v1.dart
+++ b/generated/googleapis/lib/cloudbilling/v1.dart
@@ -24,11 +24,11 @@
 ///
 /// Create an instance of [CloudbillingApi] to access these resources:
 ///
-/// - [BillingAccountsResourceApi]
-///   - [BillingAccountsProjectsResourceApi]
-/// - [ProjectsResourceApi]
-/// - [ServicesResourceApi]
-///   - [ServicesSkusResourceApi]
+/// - [BillingAccountsResource]
+///   - [BillingAccountsProjectsResource]
+/// - [ProjectsResource]
+/// - [ServicesResource]
+///   - [ServicesSkusResource]
 library cloudbilling.v1;
 
 import 'dart:async' as async;
@@ -60,10 +60,10 @@
 
   final commons.ApiRequester _requester;
 
-  BillingAccountsResourceApi get billingAccounts =>
-      BillingAccountsResourceApi(_requester);
-  ProjectsResourceApi get projects => ProjectsResourceApi(_requester);
-  ServicesResourceApi get services => ServicesResourceApi(_requester);
+  BillingAccountsResource get billingAccounts =>
+      BillingAccountsResource(_requester);
+  ProjectsResource get projects => ProjectsResource(_requester);
+  ServicesResource get services => ServicesResource(_requester);
 
   CloudbillingApi(http.Client client,
       {core.String rootUrl = 'https://cloudbilling.googleapis.com/',
@@ -72,13 +72,13 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class BillingAccountsResourceApi {
+class BillingAccountsResource {
   final commons.ApiRequester _requester;
 
-  BillingAccountsProjectsResourceApi get projects =>
-      BillingAccountsProjectsResourceApi(_requester);
+  BillingAccountsProjectsResource get projects =>
+      BillingAccountsProjectsResource(_requester);
 
-  BillingAccountsResourceApi(commons.ApiRequester client) : _requester = client;
+  BillingAccountsResource(commons.ApiRequester client) : _requester = client;
 
   /// Creates a billing account. This method can only be used to create [billing
   /// subaccounts](https://cloud.google.com/billing/docs/concepts) by Google
@@ -537,10 +537,10 @@
   }
 }
 
-class BillingAccountsProjectsResourceApi {
+class BillingAccountsProjectsResource {
   final commons.ApiRequester _requester;
 
-  BillingAccountsProjectsResourceApi(commons.ApiRequester client)
+  BillingAccountsProjectsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Lists the projects associated with a billing account. The current
@@ -617,10 +617,10 @@
   }
 }
 
-class ProjectsResourceApi {
+class ProjectsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsResourceApi(commons.ApiRequester client) : _requester = client;
+  ProjectsResource(commons.ApiRequester client) : _requester = client;
 
   /// Gets the billing information for a project. The current authenticated user
   /// must have [permission to view the
@@ -765,12 +765,12 @@
   }
 }
 
-class ServicesResourceApi {
+class ServicesResource {
   final commons.ApiRequester _requester;
 
-  ServicesSkusResourceApi get skus => ServicesSkusResourceApi(_requester);
+  ServicesSkusResource get skus => ServicesSkusResource(_requester);
 
-  ServicesResourceApi(commons.ApiRequester client) : _requester = client;
+  ServicesResource(commons.ApiRequester client) : _requester = client;
 
   /// Lists all public cloud services.
   ///
@@ -832,10 +832,10 @@
   }
 }
 
-class ServicesSkusResourceApi {
+class ServicesSkusResource {
   final commons.ApiRequester _requester;
 
-  ServicesSkusResourceApi(commons.ApiRequester client) : _requester = client;
+  ServicesSkusResource(commons.ApiRequester client) : _requester = client;
 
   /// Lists all publicly available SKUs for a given cloud service.
   ///
diff --git a/generated/googleapis/lib/cloudbuild/v1.dart b/generated/googleapis/lib/cloudbuild/v1.dart
index f9adc9e..ee08e20 100644
--- a/generated/googleapis/lib/cloudbuild/v1.dart
+++ b/generated/googleapis/lib/cloudbuild/v1.dart
@@ -23,13 +23,13 @@
 ///
 /// Create an instance of [CloudBuildApi] to access these resources:
 ///
-/// - [OperationsResourceApi]
-/// - [ProjectsResourceApi]
-///   - [ProjectsBuildsResourceApi]
-///   - [ProjectsLocationsResourceApi]
-///     - [ProjectsLocationsBuildsResourceApi]
-///     - [ProjectsLocationsOperationsResourceApi]
-///   - [ProjectsTriggersResourceApi]
+/// - [OperationsResource]
+/// - [ProjectsResource]
+///   - [ProjectsBuildsResource]
+///   - [ProjectsLocationsResource]
+///     - [ProjectsLocationsBuildsResource]
+///     - [ProjectsLocationsOperationsResource]
+///   - [ProjectsTriggersResource]
 library cloudbuild.v1;
 
 import 'dart:async' as async;
@@ -52,8 +52,8 @@
 
   final commons.ApiRequester _requester;
 
-  OperationsResourceApi get operations => OperationsResourceApi(_requester);
-  ProjectsResourceApi get projects => ProjectsResourceApi(_requester);
+  OperationsResource get operations => OperationsResource(_requester);
+  ProjectsResource get projects => ProjectsResource(_requester);
 
   CloudBuildApi(http.Client client,
       {core.String rootUrl = 'https://cloudbuild.googleapis.com/',
@@ -62,10 +62,10 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class OperationsResourceApi {
+class OperationsResource {
   final commons.ApiRequester _requester;
 
-  OperationsResourceApi(commons.ApiRequester client) : _requester = client;
+  OperationsResource(commons.ApiRequester client) : _requester = client;
 
   /// Starts asynchronous cancellation on a long-running operation. The server
   /// makes a best effort to cancel the operation, but success is not
@@ -186,22 +186,21 @@
   }
 }
 
-class ProjectsResourceApi {
+class ProjectsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsBuildsResourceApi get builds => ProjectsBuildsResourceApi(_requester);
-  ProjectsLocationsResourceApi get locations =>
-      ProjectsLocationsResourceApi(_requester);
-  ProjectsTriggersResourceApi get triggers =>
-      ProjectsTriggersResourceApi(_requester);
+  ProjectsBuildsResource get builds => ProjectsBuildsResource(_requester);
+  ProjectsLocationsResource get locations =>
+      ProjectsLocationsResource(_requester);
+  ProjectsTriggersResource get triggers => ProjectsTriggersResource(_requester);
 
-  ProjectsResourceApi(commons.ApiRequester client) : _requester = client;
+  ProjectsResource(commons.ApiRequester client) : _requester = client;
 }
 
-class ProjectsBuildsResourceApi {
+class ProjectsBuildsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsBuildsResourceApi(commons.ApiRequester client) : _requester = client;
+  ProjectsBuildsResource(commons.ApiRequester client) : _requester = client;
 
   /// Cancels a build in progress.
   ///
@@ -566,22 +565,21 @@
   }
 }
 
-class ProjectsLocationsResourceApi {
+class ProjectsLocationsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsLocationsBuildsResourceApi get builds =>
-      ProjectsLocationsBuildsResourceApi(_requester);
-  ProjectsLocationsOperationsResourceApi get operations =>
-      ProjectsLocationsOperationsResourceApi(_requester);
+  ProjectsLocationsBuildsResource get builds =>
+      ProjectsLocationsBuildsResource(_requester);
+  ProjectsLocationsOperationsResource get operations =>
+      ProjectsLocationsOperationsResource(_requester);
 
-  ProjectsLocationsResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  ProjectsLocationsResource(commons.ApiRequester client) : _requester = client;
 }
 
-class ProjectsLocationsBuildsResourceApi {
+class ProjectsLocationsBuildsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsLocationsBuildsResourceApi(commons.ApiRequester client)
+  ProjectsLocationsBuildsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Cancels a build in progress.
@@ -927,10 +925,10 @@
   }
 }
 
-class ProjectsLocationsOperationsResourceApi {
+class ProjectsLocationsOperationsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsLocationsOperationsResourceApi(commons.ApiRequester client)
+  ProjectsLocationsOperationsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Starts asynchronous cancellation on a long-running operation. The server
@@ -1054,11 +1052,10 @@
   }
 }
 
-class ProjectsTriggersResourceApi {
+class ProjectsTriggersResource {
   final commons.ApiRequester _requester;
 
-  ProjectsTriggersResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  ProjectsTriggersResource(commons.ApiRequester client) : _requester = client;
 
   /// Creates a new `BuildTrigger`. This API is experimental.
   ///
diff --git a/generated/googleapis/lib/clouddebugger/v2.dart b/generated/googleapis/lib/clouddebugger/v2.dart
index b68d1e9..f7bb88b 100644
--- a/generated/googleapis/lib/clouddebugger/v2.dart
+++ b/generated/googleapis/lib/clouddebugger/v2.dart
@@ -24,12 +24,12 @@
 ///
 /// Create an instance of [CloudDebuggerApi] to access these resources:
 ///
-/// - [ControllerResourceApi]
-///   - [ControllerDebuggeesResourceApi]
-///     - [ControllerDebuggeesBreakpointsResourceApi]
-/// - [DebuggerResourceApi]
-///   - [DebuggerDebuggeesResourceApi]
-///     - [DebuggerDebuggeesBreakpointsResourceApi]
+/// - [ControllerResource]
+///   - [ControllerDebuggeesResource]
+///     - [ControllerDebuggeesBreakpointsResource]
+/// - [DebuggerResource]
+///   - [DebuggerDebuggeesResource]
+///     - [DebuggerDebuggeesBreakpointsResource]
 library clouddebugger.v2;
 
 import 'dart:async' as async;
@@ -57,8 +57,8 @@
 
   final commons.ApiRequester _requester;
 
-  ControllerResourceApi get controller => ControllerResourceApi(_requester);
-  DebuggerResourceApi get debugger => DebuggerResourceApi(_requester);
+  ControllerResource get controller => ControllerResource(_requester);
+  DebuggerResource get debugger => DebuggerResource(_requester);
 
   CloudDebuggerApi(http.Client client,
       {core.String rootUrl = 'https://clouddebugger.googleapis.com/',
@@ -67,22 +67,22 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class ControllerResourceApi {
+class ControllerResource {
   final commons.ApiRequester _requester;
 
-  ControllerDebuggeesResourceApi get debuggees =>
-      ControllerDebuggeesResourceApi(_requester);
+  ControllerDebuggeesResource get debuggees =>
+      ControllerDebuggeesResource(_requester);
 
-  ControllerResourceApi(commons.ApiRequester client) : _requester = client;
+  ControllerResource(commons.ApiRequester client) : _requester = client;
 }
 
-class ControllerDebuggeesResourceApi {
+class ControllerDebuggeesResource {
   final commons.ApiRequester _requester;
 
-  ControllerDebuggeesBreakpointsResourceApi get breakpoints =>
-      ControllerDebuggeesBreakpointsResourceApi(_requester);
+  ControllerDebuggeesBreakpointsResource get breakpoints =>
+      ControllerDebuggeesBreakpointsResource(_requester);
 
-  ControllerDebuggeesResourceApi(commons.ApiRequester client)
+  ControllerDebuggeesResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Registers the debuggee with the controller service. All agents attached to
@@ -143,10 +143,10 @@
   }
 }
 
-class ControllerDebuggeesBreakpointsResourceApi {
+class ControllerDebuggeesBreakpointsResource {
   final commons.ApiRequester _requester;
 
-  ControllerDebuggeesBreakpointsResourceApi(commons.ApiRequester client)
+  ControllerDebuggeesBreakpointsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Returns the list of all active breakpoints for the debuggee. The
@@ -310,23 +310,22 @@
   }
 }
 
-class DebuggerResourceApi {
+class DebuggerResource {
   final commons.ApiRequester _requester;
 
-  DebuggerDebuggeesResourceApi get debuggees =>
-      DebuggerDebuggeesResourceApi(_requester);
+  DebuggerDebuggeesResource get debuggees =>
+      DebuggerDebuggeesResource(_requester);
 
-  DebuggerResourceApi(commons.ApiRequester client) : _requester = client;
+  DebuggerResource(commons.ApiRequester client) : _requester = client;
 }
 
-class DebuggerDebuggeesResourceApi {
+class DebuggerDebuggeesResource {
   final commons.ApiRequester _requester;
 
-  DebuggerDebuggeesBreakpointsResourceApi get breakpoints =>
-      DebuggerDebuggeesBreakpointsResourceApi(_requester);
+  DebuggerDebuggeesBreakpointsResource get breakpoints =>
+      DebuggerDebuggeesBreakpointsResource(_requester);
 
-  DebuggerDebuggeesResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  DebuggerDebuggeesResource(commons.ApiRequester client) : _requester = client;
 
   /// Lists all the debuggees that the user has access to.
   ///
@@ -395,10 +394,10 @@
   }
 }
 
-class DebuggerDebuggeesBreakpointsResourceApi {
+class DebuggerDebuggeesBreakpointsResource {
   final commons.ApiRequester _requester;
 
-  DebuggerDebuggeesBreakpointsResourceApi(commons.ApiRequester client)
+  DebuggerDebuggeesBreakpointsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Deletes the breakpoint from the debuggee.
diff --git a/generated/googleapis/lib/cloudfunctions/v1.dart b/generated/googleapis/lib/cloudfunctions/v1.dart
index 2c23bbf..6bed2df 100644
--- a/generated/googleapis/lib/cloudfunctions/v1.dart
+++ b/generated/googleapis/lib/cloudfunctions/v1.dart
@@ -23,10 +23,10 @@
 ///
 /// Create an instance of [CloudFunctionsApi] to access these resources:
 ///
-/// - [OperationsResourceApi]
-/// - [ProjectsResourceApi]
-///   - [ProjectsLocationsResourceApi]
-///     - [ProjectsLocationsFunctionsResourceApi]
+/// - [OperationsResource]
+/// - [ProjectsResource]
+///   - [ProjectsLocationsResource]
+///     - [ProjectsLocationsFunctionsResource]
 library cloudfunctions.v1;
 
 import 'dart:async' as async;
@@ -49,8 +49,8 @@
 
   final commons.ApiRequester _requester;
 
-  OperationsResourceApi get operations => OperationsResourceApi(_requester);
-  ProjectsResourceApi get projects => ProjectsResourceApi(_requester);
+  OperationsResource get operations => OperationsResource(_requester);
+  ProjectsResource get projects => ProjectsResource(_requester);
 
   CloudFunctionsApi(http.Client client,
       {core.String rootUrl = 'https://cloudfunctions.googleapis.com/',
@@ -59,10 +59,10 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class OperationsResourceApi {
+class OperationsResource {
   final commons.ApiRequester _requester;
 
-  OperationsResourceApi(commons.ApiRequester client) : _requester = client;
+  OperationsResource(commons.ApiRequester client) : _requester = client;
 
   /// Gets the latest state of a long-running operation. Clients can use this
   /// method to poll the operation result at intervals as recommended by the API
@@ -203,23 +203,22 @@
   }
 }
 
-class ProjectsResourceApi {
+class ProjectsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsLocationsResourceApi get locations =>
-      ProjectsLocationsResourceApi(_requester);
+  ProjectsLocationsResource get locations =>
+      ProjectsLocationsResource(_requester);
 
-  ProjectsResourceApi(commons.ApiRequester client) : _requester = client;
+  ProjectsResource(commons.ApiRequester client) : _requester = client;
 }
 
-class ProjectsLocationsResourceApi {
+class ProjectsLocationsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsLocationsFunctionsResourceApi get functions =>
-      ProjectsLocationsFunctionsResourceApi(_requester);
+  ProjectsLocationsFunctionsResource get functions =>
+      ProjectsLocationsFunctionsResource(_requester);
 
-  ProjectsLocationsResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  ProjectsLocationsResource(commons.ApiRequester client) : _requester = client;
 
   /// Lists information about the supported locations for this service.
   ///
@@ -293,10 +292,10 @@
   }
 }
 
-class ProjectsLocationsFunctionsResourceApi {
+class ProjectsLocationsFunctionsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsLocationsFunctionsResourceApi(commons.ApiRequester client)
+  ProjectsLocationsFunctionsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Synchronously invokes a deployed Cloud Function. To be used for testing
diff --git a/generated/googleapis/lib/cloudidentity/v1.dart b/generated/googleapis/lib/cloudidentity/v1.dart
index 11e3fd4..06cc9cc 100644
--- a/generated/googleapis/lib/cloudidentity/v1.dart
+++ b/generated/googleapis/lib/cloudidentity/v1.dart
@@ -23,11 +23,11 @@
 ///
 /// Create an instance of [CloudIdentityApi] to access these resources:
 ///
-/// - [DevicesResourceApi]
-///   - [DevicesDeviceUsersResourceApi]
-///     - [DevicesDeviceUsersClientStatesResourceApi]
-/// - [GroupsResourceApi]
-///   - [GroupsMembershipsResourceApi]
+/// - [DevicesResource]
+///   - [DevicesDeviceUsersResource]
+///     - [DevicesDeviceUsersClientStatesResource]
+/// - [GroupsResource]
+///   - [GroupsMembershipsResource]
 library cloudidentity.v1;
 
 import 'dart:async' as async;
@@ -64,8 +64,8 @@
 
   final commons.ApiRequester _requester;
 
-  DevicesResourceApi get devices => DevicesResourceApi(_requester);
-  GroupsResourceApi get groups => GroupsResourceApi(_requester);
+  DevicesResource get devices => DevicesResource(_requester);
+  GroupsResource get groups => GroupsResource(_requester);
 
   CloudIdentityApi(http.Client client,
       {core.String rootUrl = 'https://cloudidentity.googleapis.com/',
@@ -74,13 +74,13 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class DevicesResourceApi {
+class DevicesResource {
   final commons.ApiRequester _requester;
 
-  DevicesDeviceUsersResourceApi get deviceUsers =>
-      DevicesDeviceUsersResourceApi(_requester);
+  DevicesDeviceUsersResource get deviceUsers =>
+      DevicesDeviceUsersResource(_requester);
 
-  DevicesResourceApi(commons.ApiRequester client) : _requester = client;
+  DevicesResource(commons.ApiRequester client) : _requester = client;
 
   /// Cancels an unfinished device wipe. This operation can be used to cancel
   /// device wipe in the gap between the wipe operation returning success and
@@ -512,14 +512,13 @@
   }
 }
 
-class DevicesDeviceUsersResourceApi {
+class DevicesDeviceUsersResource {
   final commons.ApiRequester _requester;
 
-  DevicesDeviceUsersClientStatesResourceApi get clientStates =>
-      DevicesDeviceUsersClientStatesResourceApi(_requester);
+  DevicesDeviceUsersClientStatesResource get clientStates =>
+      DevicesDeviceUsersClientStatesResource(_requester);
 
-  DevicesDeviceUsersResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  DevicesDeviceUsersResource(commons.ApiRequester client) : _requester = client;
 
   /// Approves device to access user data.
   ///
@@ -1116,10 +1115,10 @@
   }
 }
 
-class DevicesDeviceUsersClientStatesResourceApi {
+class DevicesDeviceUsersClientStatesResource {
   final commons.ApiRequester _requester;
 
-  DevicesDeviceUsersClientStatesResourceApi(commons.ApiRequester client)
+  DevicesDeviceUsersClientStatesResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Gets the client state for the device user
@@ -1378,13 +1377,13 @@
   }
 }
 
-class GroupsResourceApi {
+class GroupsResource {
   final commons.ApiRequester _requester;
 
-  GroupsMembershipsResourceApi get memberships =>
-      GroupsMembershipsResourceApi(_requester);
+  GroupsMembershipsResource get memberships =>
+      GroupsMembershipsResource(_requester);
 
-  GroupsResourceApi(commons.ApiRequester client) : _requester = client;
+  GroupsResource(commons.ApiRequester client) : _requester = client;
 
   /// Creates a Group.
   ///
@@ -1841,11 +1840,10 @@
   }
 }
 
-class GroupsMembershipsResourceApi {
+class GroupsMembershipsResource {
   final commons.ApiRequester _requester;
 
-  GroupsMembershipsResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  GroupsMembershipsResource(commons.ApiRequester client) : _requester = client;
 
   /// Creates a Membership.
   ///
diff --git a/generated/googleapis/lib/cloudiot/v1.dart b/generated/googleapis/lib/cloudiot/v1.dart
index c5dc658..615e01e 100644
--- a/generated/googleapis/lib/cloudiot/v1.dart
+++ b/generated/googleapis/lib/cloudiot/v1.dart
@@ -24,14 +24,14 @@
 ///
 /// Create an instance of [CloudIotApi] to access these resources:
 ///
-/// - [ProjectsResourceApi]
-///   - [ProjectsLocationsResourceApi]
-///     - [ProjectsLocationsRegistriesResourceApi]
-///       - [ProjectsLocationsRegistriesDevicesResourceApi]
-///         - [ProjectsLocationsRegistriesDevicesConfigVersionsResourceApi]
-///         - [ProjectsLocationsRegistriesDevicesStatesResourceApi]
-///       - [ProjectsLocationsRegistriesGroupsResourceApi]
-///         - [ProjectsLocationsRegistriesGroupsDevicesResourceApi]
+/// - [ProjectsResource]
+///   - [ProjectsLocationsResource]
+///     - [ProjectsLocationsRegistriesResource]
+///       - [ProjectsLocationsRegistriesDevicesResource]
+///         - [ProjectsLocationsRegistriesDevicesConfigVersionsResource]
+///         - [ProjectsLocationsRegistriesDevicesStatesResource]
+///       - [ProjectsLocationsRegistriesGroupsResource]
+///         - [ProjectsLocationsRegistriesGroupsDevicesResource]
 library cloudiot.v1;
 
 import 'dart:async' as async;
@@ -58,7 +58,7 @@
 
   final commons.ApiRequester _requester;
 
-  ProjectsResourceApi get projects => ProjectsResourceApi(_requester);
+  ProjectsResource get projects => ProjectsResource(_requester);
 
   CloudIotApi(http.Client client,
       {core.String rootUrl = 'https://cloudiot.googleapis.com/',
@@ -67,34 +67,33 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class ProjectsResourceApi {
+class ProjectsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsLocationsResourceApi get locations =>
-      ProjectsLocationsResourceApi(_requester);
+  ProjectsLocationsResource get locations =>
+      ProjectsLocationsResource(_requester);
 
-  ProjectsResourceApi(commons.ApiRequester client) : _requester = client;
+  ProjectsResource(commons.ApiRequester client) : _requester = client;
 }
 
-class ProjectsLocationsResourceApi {
+class ProjectsLocationsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsLocationsRegistriesResourceApi get registries =>
-      ProjectsLocationsRegistriesResourceApi(_requester);
+  ProjectsLocationsRegistriesResource get registries =>
+      ProjectsLocationsRegistriesResource(_requester);
 
-  ProjectsLocationsResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  ProjectsLocationsResource(commons.ApiRequester client) : _requester = client;
 }
 
-class ProjectsLocationsRegistriesResourceApi {
+class ProjectsLocationsRegistriesResource {
   final commons.ApiRequester _requester;
 
-  ProjectsLocationsRegistriesDevicesResourceApi get devices =>
-      ProjectsLocationsRegistriesDevicesResourceApi(_requester);
-  ProjectsLocationsRegistriesGroupsResourceApi get groups =>
-      ProjectsLocationsRegistriesGroupsResourceApi(_requester);
+  ProjectsLocationsRegistriesDevicesResource get devices =>
+      ProjectsLocationsRegistriesDevicesResource(_requester);
+  ProjectsLocationsRegistriesGroupsResource get groups =>
+      ProjectsLocationsRegistriesGroupsResource(_requester);
 
-  ProjectsLocationsRegistriesResourceApi(commons.ApiRequester client)
+  ProjectsLocationsRegistriesResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Associates the device with the gateway.
@@ -725,17 +724,15 @@
   }
 }
 
-class ProjectsLocationsRegistriesDevicesResourceApi {
+class ProjectsLocationsRegistriesDevicesResource {
   final commons.ApiRequester _requester;
 
-  ProjectsLocationsRegistriesDevicesConfigVersionsResourceApi
-      get configVersions =>
-          ProjectsLocationsRegistriesDevicesConfigVersionsResourceApi(
-              _requester);
-  ProjectsLocationsRegistriesDevicesStatesResourceApi get states =>
-      ProjectsLocationsRegistriesDevicesStatesResourceApi(_requester);
+  ProjectsLocationsRegistriesDevicesConfigVersionsResource get configVersions =>
+      ProjectsLocationsRegistriesDevicesConfigVersionsResource(_requester);
+  ProjectsLocationsRegistriesDevicesStatesResource get states =>
+      ProjectsLocationsRegistriesDevicesStatesResource(_requester);
 
-  ProjectsLocationsRegistriesDevicesResourceApi(commons.ApiRequester client)
+  ProjectsLocationsRegistriesDevicesResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Creates a device in a device registry.
@@ -1263,10 +1260,10 @@
   }
 }
 
-class ProjectsLocationsRegistriesDevicesConfigVersionsResourceApi {
+class ProjectsLocationsRegistriesDevicesConfigVersionsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsLocationsRegistriesDevicesConfigVersionsResourceApi(
+  ProjectsLocationsRegistriesDevicesConfigVersionsResource(
       commons.ApiRequester client)
       : _requester = client;
 
@@ -1339,11 +1336,10 @@
   }
 }
 
-class ProjectsLocationsRegistriesDevicesStatesResourceApi {
+class ProjectsLocationsRegistriesDevicesStatesResource {
   final commons.ApiRequester _requester;
 
-  ProjectsLocationsRegistriesDevicesStatesResourceApi(
-      commons.ApiRequester client)
+  ProjectsLocationsRegistriesDevicesStatesResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Lists the last few versions of the device state in descending order (i.e.:
@@ -1412,13 +1408,13 @@
   }
 }
 
-class ProjectsLocationsRegistriesGroupsResourceApi {
+class ProjectsLocationsRegistriesGroupsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsLocationsRegistriesGroupsDevicesResourceApi get devices =>
-      ProjectsLocationsRegistriesGroupsDevicesResourceApi(_requester);
+  ProjectsLocationsRegistriesGroupsDevicesResource get devices =>
+      ProjectsLocationsRegistriesGroupsDevicesResource(_requester);
 
-  ProjectsLocationsRegistriesGroupsResourceApi(commons.ApiRequester client)
+  ProjectsLocationsRegistriesGroupsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Gets the access control policy for a resource. Returns an empty policy if
@@ -1613,11 +1609,10 @@
   }
 }
 
-class ProjectsLocationsRegistriesGroupsDevicesResourceApi {
+class ProjectsLocationsRegistriesGroupsDevicesResource {
   final commons.ApiRequester _requester;
 
-  ProjectsLocationsRegistriesGroupsDevicesResourceApi(
-      commons.ApiRequester client)
+  ProjectsLocationsRegistriesGroupsDevicesResource(commons.ApiRequester client)
       : _requester = client;
 
   /// List devices in a device registry.
diff --git a/generated/googleapis/lib/cloudkms/v1.dart b/generated/googleapis/lib/cloudkms/v1.dart
index bbe3e9a..0d3fb7e 100644
--- a/generated/googleapis/lib/cloudkms/v1.dart
+++ b/generated/googleapis/lib/cloudkms/v1.dart
@@ -24,12 +24,12 @@
 ///
 /// Create an instance of [CloudKMSApi] to access these resources:
 ///
-/// - [ProjectsResourceApi]
-///   - [ProjectsLocationsResourceApi]
-///     - [ProjectsLocationsKeyRingsResourceApi]
-///       - [ProjectsLocationsKeyRingsCryptoKeysResourceApi]
-///         - [ProjectsLocationsKeyRingsCryptoKeysCryptoKeyVersionsResourceApi]
-///       - [ProjectsLocationsKeyRingsImportJobsResourceApi]
+/// - [ProjectsResource]
+///   - [ProjectsLocationsResource]
+///     - [ProjectsLocationsKeyRingsResource]
+///       - [ProjectsLocationsKeyRingsCryptoKeysResource]
+///         - [ProjectsLocationsKeyRingsCryptoKeysCryptoKeyVersionsResource]
+///       - [ProjectsLocationsKeyRingsImportJobsResource]
 library cloudkms.v1;
 
 import 'dart:async' as async;
@@ -57,7 +57,7 @@
 
   final commons.ApiRequester _requester;
 
-  ProjectsResourceApi get projects => ProjectsResourceApi(_requester);
+  ProjectsResource get projects => ProjectsResource(_requester);
 
   CloudKMSApi(http.Client client,
       {core.String rootUrl = 'https://cloudkms.googleapis.com/',
@@ -66,23 +66,22 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class ProjectsResourceApi {
+class ProjectsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsLocationsResourceApi get locations =>
-      ProjectsLocationsResourceApi(_requester);
+  ProjectsLocationsResource get locations =>
+      ProjectsLocationsResource(_requester);
 
-  ProjectsResourceApi(commons.ApiRequester client) : _requester = client;
+  ProjectsResource(commons.ApiRequester client) : _requester = client;
 }
 
-class ProjectsLocationsResourceApi {
+class ProjectsLocationsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsLocationsKeyRingsResourceApi get keyRings =>
-      ProjectsLocationsKeyRingsResourceApi(_requester);
+  ProjectsLocationsKeyRingsResource get keyRings =>
+      ProjectsLocationsKeyRingsResource(_requester);
 
-  ProjectsLocationsResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  ProjectsLocationsResource(commons.ApiRequester client) : _requester = client;
 
   /// Gets information about a location.
   ///
@@ -207,15 +206,15 @@
   }
 }
 
-class ProjectsLocationsKeyRingsResourceApi {
+class ProjectsLocationsKeyRingsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsLocationsKeyRingsCryptoKeysResourceApi get cryptoKeys =>
-      ProjectsLocationsKeyRingsCryptoKeysResourceApi(_requester);
-  ProjectsLocationsKeyRingsImportJobsResourceApi get importJobs =>
-      ProjectsLocationsKeyRingsImportJobsResourceApi(_requester);
+  ProjectsLocationsKeyRingsCryptoKeysResource get cryptoKeys =>
+      ProjectsLocationsKeyRingsCryptoKeysResource(_requester);
+  ProjectsLocationsKeyRingsImportJobsResource get importJobs =>
+      ProjectsLocationsKeyRingsImportJobsResource(_requester);
 
-  ProjectsLocationsKeyRingsResourceApi(commons.ApiRequester client)
+  ProjectsLocationsKeyRingsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Create a new KeyRing in a given Project and Location.
@@ -622,15 +621,15 @@
   }
 }
 
-class ProjectsLocationsKeyRingsCryptoKeysResourceApi {
+class ProjectsLocationsKeyRingsCryptoKeysResource {
   final commons.ApiRequester _requester;
 
-  ProjectsLocationsKeyRingsCryptoKeysCryptoKeyVersionsResourceApi
+  ProjectsLocationsKeyRingsCryptoKeysCryptoKeyVersionsResource
       get cryptoKeyVersions =>
-          ProjectsLocationsKeyRingsCryptoKeysCryptoKeyVersionsResourceApi(
+          ProjectsLocationsKeyRingsCryptoKeysCryptoKeyVersionsResource(
               _requester);
 
-  ProjectsLocationsKeyRingsCryptoKeysResourceApi(commons.ApiRequester client)
+  ProjectsLocationsKeyRingsCryptoKeysResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Create a new CryptoKey within a KeyRing. CryptoKey.purpose and
@@ -1317,10 +1316,10 @@
   }
 }
 
-class ProjectsLocationsKeyRingsCryptoKeysCryptoKeyVersionsResourceApi {
+class ProjectsLocationsKeyRingsCryptoKeysCryptoKeyVersionsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsLocationsKeyRingsCryptoKeysCryptoKeyVersionsResourceApi(
+  ProjectsLocationsKeyRingsCryptoKeysCryptoKeyVersionsResource(
       commons.ApiRequester client)
       : _requester = client;
 
@@ -1981,10 +1980,10 @@
   }
 }
 
-class ProjectsLocationsKeyRingsImportJobsResourceApi {
+class ProjectsLocationsKeyRingsImportJobsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsLocationsKeyRingsImportJobsResourceApi(commons.ApiRequester client)
+  ProjectsLocationsKeyRingsImportJobsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Create a new ImportJob within a KeyRing. ImportJob.import_method is
diff --git a/generated/googleapis/lib/cloudprofiler/v2.dart b/generated/googleapis/lib/cloudprofiler/v2.dart
index 9221314..9ca2ce6 100644
--- a/generated/googleapis/lib/cloudprofiler/v2.dart
+++ b/generated/googleapis/lib/cloudprofiler/v2.dart
@@ -23,8 +23,8 @@
 ///
 /// Create an instance of [CloudProfilerApi] to access these resources:
 ///
-/// - [ProjectsResourceApi]
-///   - [ProjectsProfilesResourceApi]
+/// - [ProjectsResource]
+///   - [ProjectsProfilesResource]
 library cloudprofiler.v2;
 
 import 'dart:async' as async;
@@ -55,7 +55,7 @@
 
   final commons.ApiRequester _requester;
 
-  ProjectsResourceApi get projects => ProjectsResourceApi(_requester);
+  ProjectsResource get projects => ProjectsResource(_requester);
 
   CloudProfilerApi(http.Client client,
       {core.String rootUrl = 'https://cloudprofiler.googleapis.com/',
@@ -64,20 +64,18 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class ProjectsResourceApi {
+class ProjectsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsProfilesResourceApi get profiles =>
-      ProjectsProfilesResourceApi(_requester);
+  ProjectsProfilesResource get profiles => ProjectsProfilesResource(_requester);
 
-  ProjectsResourceApi(commons.ApiRequester client) : _requester = client;
+  ProjectsResource(commons.ApiRequester client) : _requester = client;
 }
 
-class ProjectsProfilesResourceApi {
+class ProjectsProfilesResource {
   final commons.ApiRequester _requester;
 
-  ProjectsProfilesResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  ProjectsProfilesResource(commons.ApiRequester client) : _requester = client;
 
   /// CreateProfile creates a new profile resource in the online mode. The
   /// server ensures that the new profiles are created at a constant rate per
diff --git a/generated/googleapis/lib/cloudresourcemanager/v1.dart b/generated/googleapis/lib/cloudresourcemanager/v1.dart
index 8408f57..8da7cd6 100644
--- a/generated/googleapis/lib/cloudresourcemanager/v1.dart
+++ b/generated/googleapis/lib/cloudresourcemanager/v1.dart
@@ -24,11 +24,11 @@
 ///
 /// Create an instance of [CloudResourceManagerApi] to access these resources:
 ///
-/// - [FoldersResourceApi]
-/// - [LiensResourceApi]
-/// - [OperationsResourceApi]
-/// - [OrganizationsResourceApi]
-/// - [ProjectsResourceApi]
+/// - [FoldersResource]
+/// - [LiensResource]
+/// - [OperationsResource]
+/// - [OrganizationsResource]
+/// - [ProjectsResource]
 library cloudresourcemanager.v1;
 
 import 'dart:async' as async;
@@ -56,12 +56,11 @@
 
   final commons.ApiRequester _requester;
 
-  FoldersResourceApi get folders => FoldersResourceApi(_requester);
-  LiensResourceApi get liens => LiensResourceApi(_requester);
-  OperationsResourceApi get operations => OperationsResourceApi(_requester);
-  OrganizationsResourceApi get organizations =>
-      OrganizationsResourceApi(_requester);
-  ProjectsResourceApi get projects => ProjectsResourceApi(_requester);
+  FoldersResource get folders => FoldersResource(_requester);
+  LiensResource get liens => LiensResource(_requester);
+  OperationsResource get operations => OperationsResource(_requester);
+  OrganizationsResource get organizations => OrganizationsResource(_requester);
+  ProjectsResource get projects => ProjectsResource(_requester);
 
   CloudResourceManagerApi(http.Client client,
       {core.String rootUrl = 'https://cloudresourcemanager.googleapis.com/',
@@ -70,10 +69,10 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class FoldersResourceApi {
+class FoldersResource {
   final commons.ApiRequester _requester;
 
-  FoldersResourceApi(commons.ApiRequester client) : _requester = client;
+  FoldersResource(commons.ApiRequester client) : _requester = client;
 
   /// Clears a `Policy` from a resource.
   ///
@@ -444,10 +443,10 @@
   }
 }
 
-class LiensResourceApi {
+class LiensResource {
   final commons.ApiRequester _requester;
 
-  LiensResourceApi(commons.ApiRequester client) : _requester = client;
+  LiensResource(commons.ApiRequester client) : _requester = client;
 
   /// Create a Lien which applies to the resource denoted by the `parent` field.
   /// Callers of this method will require permission on the `parent` resource.
@@ -684,10 +683,10 @@
   }
 }
 
-class OperationsResourceApi {
+class OperationsResource {
   final commons.ApiRequester _requester;
 
-  OperationsResourceApi(commons.ApiRequester client) : _requester = client;
+  OperationsResource(commons.ApiRequester client) : _requester = client;
 
   /// Gets the latest state of a long-running operation. Clients can use this
   /// method to poll the operation result at intervals as recommended by the API
@@ -743,10 +742,10 @@
   }
 }
 
-class OrganizationsResourceApi {
+class OrganizationsResource {
   final commons.ApiRequester _requester;
 
-  OrganizationsResourceApi(commons.ApiRequester client) : _requester = client;
+  OrganizationsResource(commons.ApiRequester client) : _requester = client;
 
   /// Clears a `Policy` from a resource.
   ///
@@ -1422,10 +1421,10 @@
   }
 }
 
-class ProjectsResourceApi {
+class ProjectsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsResourceApi(commons.ApiRequester client) : _requester = client;
+  ProjectsResource(commons.ApiRequester client) : _requester = client;
 
   /// Clears a `Policy` from a resource.
   ///
diff --git a/generated/googleapis/lib/cloudresourcemanager/v2.dart b/generated/googleapis/lib/cloudresourcemanager/v2.dart
index 4449120..c995015 100644
--- a/generated/googleapis/lib/cloudresourcemanager/v2.dart
+++ b/generated/googleapis/lib/cloudresourcemanager/v2.dart
@@ -24,8 +24,8 @@
 ///
 /// Create an instance of [CloudResourceManagerApi] to access these resources:
 ///
-/// - [FoldersResourceApi]
-/// - [OperationsResourceApi]
+/// - [FoldersResource]
+/// - [OperationsResource]
 library cloudresourcemanager.v2;
 
 import 'dart:async' as async;
@@ -53,8 +53,8 @@
 
   final commons.ApiRequester _requester;
 
-  FoldersResourceApi get folders => FoldersResourceApi(_requester);
-  OperationsResourceApi get operations => OperationsResourceApi(_requester);
+  FoldersResource get folders => FoldersResource(_requester);
+  OperationsResource get operations => OperationsResource(_requester);
 
   CloudResourceManagerApi(http.Client client,
       {core.String rootUrl = 'https://cloudresourcemanager.googleapis.com/',
@@ -63,10 +63,10 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class FoldersResourceApi {
+class FoldersResource {
   final commons.ApiRequester _requester;
 
-  FoldersResourceApi(commons.ApiRequester client) : _requester = client;
+  FoldersResource(commons.ApiRequester client) : _requester = client;
 
   /// Creates a Folder in the resource hierarchy. Returns an Operation which can
   /// be used to track the progress of the folder creation workflow. Upon
@@ -792,10 +792,10 @@
   }
 }
 
-class OperationsResourceApi {
+class OperationsResource {
   final commons.ApiRequester _requester;
 
-  OperationsResourceApi(commons.ApiRequester client) : _requester = client;
+  OperationsResource(commons.ApiRequester client) : _requester = client;
 
   /// Gets the latest state of a long-running operation. Clients can use this
   /// method to poll the operation result at intervals as recommended by the API
diff --git a/generated/googleapis/lib/cloudscheduler/v1.dart b/generated/googleapis/lib/cloudscheduler/v1.dart
index b4d7010..88b9c9e 100644
--- a/generated/googleapis/lib/cloudscheduler/v1.dart
+++ b/generated/googleapis/lib/cloudscheduler/v1.dart
@@ -23,9 +23,9 @@
 ///
 /// Create an instance of [CloudSchedulerApi] to access these resources:
 ///
-/// - [ProjectsResourceApi]
-///   - [ProjectsLocationsResourceApi]
-///     - [ProjectsLocationsJobsResourceApi]
+/// - [ProjectsResource]
+///   - [ProjectsLocationsResource]
+///     - [ProjectsLocationsJobsResource]
 library cloudscheduler.v1;
 
 import 'dart:async' as async;
@@ -48,7 +48,7 @@
 
   final commons.ApiRequester _requester;
 
-  ProjectsResourceApi get projects => ProjectsResourceApi(_requester);
+  ProjectsResource get projects => ProjectsResource(_requester);
 
   CloudSchedulerApi(http.Client client,
       {core.String rootUrl = 'https://cloudscheduler.googleapis.com/',
@@ -57,23 +57,22 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class ProjectsResourceApi {
+class ProjectsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsLocationsResourceApi get locations =>
-      ProjectsLocationsResourceApi(_requester);
+  ProjectsLocationsResource get locations =>
+      ProjectsLocationsResource(_requester);
 
-  ProjectsResourceApi(commons.ApiRequester client) : _requester = client;
+  ProjectsResource(commons.ApiRequester client) : _requester = client;
 }
 
-class ProjectsLocationsResourceApi {
+class ProjectsLocationsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsLocationsJobsResourceApi get jobs =>
-      ProjectsLocationsJobsResourceApi(_requester);
+  ProjectsLocationsJobsResource get jobs =>
+      ProjectsLocationsJobsResource(_requester);
 
-  ProjectsLocationsResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  ProjectsLocationsResource(commons.ApiRequester client) : _requester = client;
 
   /// Gets information about a location.
   ///
@@ -198,10 +197,10 @@
   }
 }
 
-class ProjectsLocationsJobsResourceApi {
+class ProjectsLocationsJobsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsLocationsJobsResourceApi(commons.ApiRequester client)
+  ProjectsLocationsJobsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Creates a job.
diff --git a/generated/googleapis/lib/cloudsearch/v1.dart b/generated/googleapis/lib/cloudsearch/v1.dart
index 00b0562..b5c471e 100644
--- a/generated/googleapis/lib/cloudsearch/v1.dart
+++ b/generated/googleapis/lib/cloudsearch/v1.dart
@@ -25,33 +25,33 @@
 ///
 /// Create an instance of [CloudSearchApi] to access these resources:
 ///
-/// - [DebugResourceApi]
-///   - [DebugDatasourcesResourceApi]
-///     - [DebugDatasourcesItemsResourceApi]
-///       - [DebugDatasourcesItemsUnmappedidsResourceApi]
-///   - [DebugIdentitysourcesResourceApi]
-///     - [DebugIdentitysourcesItemsResourceApi]
-///     - [DebugIdentitysourcesUnmappedidsResourceApi]
-/// - [IndexingResourceApi]
-///   - [IndexingDatasourcesResourceApi]
-///     - [IndexingDatasourcesItemsResourceApi]
-/// - [MediaResourceApi]
-/// - [OperationsResourceApi]
-///   - [OperationsLroResourceApi]
-/// - [QueryResourceApi]
-///   - [QuerySourcesResourceApi]
-/// - [SettingsResourceApi]
-///   - [SettingsDatasourcesResourceApi]
-///   - [SettingsSearchapplicationsResourceApi]
-/// - [StatsResourceApi]
-///   - [StatsIndexResourceApi]
-///     - [StatsIndexDatasourcesResourceApi]
-///   - [StatsQueryResourceApi]
-///     - [StatsQuerySearchapplicationsResourceApi]
-///   - [StatsSessionResourceApi]
-///     - [StatsSessionSearchapplicationsResourceApi]
-///   - [StatsUserResourceApi]
-///     - [StatsUserSearchapplicationsResourceApi]
+/// - [DebugResource]
+///   - [DebugDatasourcesResource]
+///     - [DebugDatasourcesItemsResource]
+///       - [DebugDatasourcesItemsUnmappedidsResource]
+///   - [DebugIdentitysourcesResource]
+///     - [DebugIdentitysourcesItemsResource]
+///     - [DebugIdentitysourcesUnmappedidsResource]
+/// - [IndexingResource]
+///   - [IndexingDatasourcesResource]
+///     - [IndexingDatasourcesItemsResource]
+/// - [MediaResource]
+/// - [OperationsResource]
+///   - [OperationsLroResource]
+/// - [QueryResource]
+///   - [QuerySourcesResource]
+/// - [SettingsResource]
+///   - [SettingsDatasourcesResource]
+///   - [SettingsSearchapplicationsResource]
+/// - [StatsResource]
+///   - [StatsIndexResource]
+///     - [StatsIndexDatasourcesResource]
+///   - [StatsQueryResource]
+///     - [StatsQuerySearchapplicationsResource]
+///   - [StatsSessionResource]
+///     - [StatsSessionSearchapplicationsResource]
+///   - [StatsUserResource]
+///     - [StatsUserSearchapplicationsResource]
 library cloudsearch.v1;
 
 import 'dart:async' as async;
@@ -115,13 +115,13 @@
 
   final commons.ApiRequester _requester;
 
-  DebugResourceApi get debug => DebugResourceApi(_requester);
-  IndexingResourceApi get indexing => IndexingResourceApi(_requester);
-  MediaResourceApi get media => MediaResourceApi(_requester);
-  OperationsResourceApi get operations => OperationsResourceApi(_requester);
-  QueryResourceApi get query => QueryResourceApi(_requester);
-  SettingsResourceApi get settings => SettingsResourceApi(_requester);
-  StatsResourceApi get stats => StatsResourceApi(_requester);
+  DebugResource get debug => DebugResource(_requester);
+  IndexingResource get indexing => IndexingResource(_requester);
+  MediaResource get media => MediaResource(_requester);
+  OperationsResource get operations => OperationsResource(_requester);
+  QueryResource get query => QueryResource(_requester);
+  SettingsResource get settings => SettingsResource(_requester);
+  StatsResource get stats => StatsResource(_requester);
 
   CloudSearchApi(http.Client client,
       {core.String rootUrl = 'https://cloudsearch.googleapis.com/',
@@ -130,34 +130,33 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class DebugResourceApi {
+class DebugResource {
   final commons.ApiRequester _requester;
 
-  DebugDatasourcesResourceApi get datasources =>
-      DebugDatasourcesResourceApi(_requester);
-  DebugIdentitysourcesResourceApi get identitysources =>
-      DebugIdentitysourcesResourceApi(_requester);
+  DebugDatasourcesResource get datasources =>
+      DebugDatasourcesResource(_requester);
+  DebugIdentitysourcesResource get identitysources =>
+      DebugIdentitysourcesResource(_requester);
 
-  DebugResourceApi(commons.ApiRequester client) : _requester = client;
+  DebugResource(commons.ApiRequester client) : _requester = client;
 }
 
-class DebugDatasourcesResourceApi {
+class DebugDatasourcesResource {
   final commons.ApiRequester _requester;
 
-  DebugDatasourcesItemsResourceApi get items =>
-      DebugDatasourcesItemsResourceApi(_requester);
+  DebugDatasourcesItemsResource get items =>
+      DebugDatasourcesItemsResource(_requester);
 
-  DebugDatasourcesResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  DebugDatasourcesResource(commons.ApiRequester client) : _requester = client;
 }
 
-class DebugDatasourcesItemsResourceApi {
+class DebugDatasourcesItemsResource {
   final commons.ApiRequester _requester;
 
-  DebugDatasourcesItemsUnmappedidsResourceApi get unmappedids =>
-      DebugDatasourcesItemsUnmappedidsResourceApi(_requester);
+  DebugDatasourcesItemsUnmappedidsResource get unmappedids =>
+      DebugDatasourcesItemsUnmappedidsResource(_requester);
 
-  DebugDatasourcesItemsResourceApi(commons.ApiRequester client)
+  DebugDatasourcesItemsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Checks whether an item is accessible by specified principal. **Note:**
@@ -292,10 +291,10 @@
   }
 }
 
-class DebugDatasourcesItemsUnmappedidsResourceApi {
+class DebugDatasourcesItemsUnmappedidsResource {
   final commons.ApiRequester _requester;
 
-  DebugDatasourcesItemsUnmappedidsResourceApi(commons.ApiRequester client)
+  DebugDatasourcesItemsUnmappedidsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// List all unmapped identities for a specific item. **Note:** This API
@@ -378,22 +377,22 @@
   }
 }
 
-class DebugIdentitysourcesResourceApi {
+class DebugIdentitysourcesResource {
   final commons.ApiRequester _requester;
 
-  DebugIdentitysourcesItemsResourceApi get items =>
-      DebugIdentitysourcesItemsResourceApi(_requester);
-  DebugIdentitysourcesUnmappedidsResourceApi get unmappedids =>
-      DebugIdentitysourcesUnmappedidsResourceApi(_requester);
+  DebugIdentitysourcesItemsResource get items =>
+      DebugIdentitysourcesItemsResource(_requester);
+  DebugIdentitysourcesUnmappedidsResource get unmappedids =>
+      DebugIdentitysourcesUnmappedidsResource(_requester);
 
-  DebugIdentitysourcesResourceApi(commons.ApiRequester client)
+  DebugIdentitysourcesResource(commons.ApiRequester client)
       : _requester = client;
 }
 
-class DebugIdentitysourcesItemsResourceApi {
+class DebugIdentitysourcesItemsResource {
   final commons.ApiRequester _requester;
 
-  DebugIdentitysourcesItemsResourceApi(commons.ApiRequester client)
+  DebugIdentitysourcesItemsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Lists names of items associated with an unmapped identity. **Note:** This
@@ -489,10 +488,10 @@
   }
 }
 
-class DebugIdentitysourcesUnmappedidsResourceApi {
+class DebugIdentitysourcesUnmappedidsResource {
   final commons.ApiRequester _requester;
 
-  DebugIdentitysourcesUnmappedidsResourceApi(commons.ApiRequester client)
+  DebugIdentitysourcesUnmappedidsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Lists unmapped user identities for an identity source. **Note:** This API
@@ -593,22 +592,22 @@
   }
 }
 
-class IndexingResourceApi {
+class IndexingResource {
   final commons.ApiRequester _requester;
 
-  IndexingDatasourcesResourceApi get datasources =>
-      IndexingDatasourcesResourceApi(_requester);
+  IndexingDatasourcesResource get datasources =>
+      IndexingDatasourcesResource(_requester);
 
-  IndexingResourceApi(commons.ApiRequester client) : _requester = client;
+  IndexingResource(commons.ApiRequester client) : _requester = client;
 }
 
-class IndexingDatasourcesResourceApi {
+class IndexingDatasourcesResource {
   final commons.ApiRequester _requester;
 
-  IndexingDatasourcesItemsResourceApi get items =>
-      IndexingDatasourcesItemsResourceApi(_requester);
+  IndexingDatasourcesItemsResource get items =>
+      IndexingDatasourcesItemsResource(_requester);
 
-  IndexingDatasourcesResourceApi(commons.ApiRequester client)
+  IndexingDatasourcesResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Deletes the schema of a data source. **Note:** This API requires an admin
@@ -803,10 +802,10 @@
   }
 }
 
-class IndexingDatasourcesItemsResourceApi {
+class IndexingDatasourcesItemsResource {
   final commons.ApiRequester _requester;
 
-  IndexingDatasourcesItemsResourceApi(commons.ApiRequester client)
+  IndexingDatasourcesItemsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Deletes Item resource for the specified resource name. This API requires
@@ -1464,10 +1463,10 @@
   }
 }
 
-class MediaResourceApi {
+class MediaResource {
   final commons.ApiRequester _requester;
 
-  MediaResourceApi(commons.ApiRequester client) : _requester = client;
+  MediaResource(commons.ApiRequester client) : _requester = client;
 
   /// Uploads media for indexing. The upload endpoint supports direct and
   /// resumable upload protocols and is intended for large items that can not be
@@ -1553,12 +1552,12 @@
   }
 }
 
-class OperationsResourceApi {
+class OperationsResource {
   final commons.ApiRequester _requester;
 
-  OperationsLroResourceApi get lro => OperationsLroResourceApi(_requester);
+  OperationsLroResource get lro => OperationsLroResource(_requester);
 
-  OperationsResourceApi(commons.ApiRequester client) : _requester = client;
+  OperationsResource(commons.ApiRequester client) : _requester = client;
 
   /// Gets the latest state of a long-running operation. Clients can use this
   /// method to poll the operation result at intervals as recommended by the API
@@ -1614,10 +1613,10 @@
   }
 }
 
-class OperationsLroResourceApi {
+class OperationsLroResource {
   final commons.ApiRequester _requester;
 
-  OperationsLroResourceApi(commons.ApiRequester client) : _requester = client;
+  OperationsLroResource(commons.ApiRequester client) : _requester = client;
 
   /// Lists operations that match the specified filter in the request. If the
   /// server doesn't support this method, it returns `UNIMPLEMENTED`. NOTE: the
@@ -1698,12 +1697,12 @@
   }
 }
 
-class QueryResourceApi {
+class QueryResource {
   final commons.ApiRequester _requester;
 
-  QuerySourcesResourceApi get sources => QuerySourcesResourceApi(_requester);
+  QuerySourcesResource get sources => QuerySourcesResource(_requester);
 
-  QueryResourceApi(commons.ApiRequester client) : _requester = client;
+  QueryResource(commons.ApiRequester client) : _requester = client;
 
   /// The Cloud Search Query API provides the search method, which returns the
   /// most relevant results from a user query. The results can come from G Suite
@@ -1819,10 +1818,10 @@
   }
 }
 
-class QuerySourcesResourceApi {
+class QuerySourcesResource {
   final commons.ApiRequester _requester;
 
-  QuerySourcesResourceApi(commons.ApiRequester client) : _requester = client;
+  QuerySourcesResource(commons.ApiRequester client) : _requester = client;
 
   /// Returns list of sources that user can use for Search and Suggest APIs.
   /// **Note:** This API requires a standard end user account to execute. A
@@ -1928,21 +1927,21 @@
   }
 }
 
-class SettingsResourceApi {
+class SettingsResource {
   final commons.ApiRequester _requester;
 
-  SettingsDatasourcesResourceApi get datasources =>
-      SettingsDatasourcesResourceApi(_requester);
-  SettingsSearchapplicationsResourceApi get searchapplications =>
-      SettingsSearchapplicationsResourceApi(_requester);
+  SettingsDatasourcesResource get datasources =>
+      SettingsDatasourcesResource(_requester);
+  SettingsSearchapplicationsResource get searchapplications =>
+      SettingsSearchapplicationsResource(_requester);
 
-  SettingsResourceApi(commons.ApiRequester client) : _requester = client;
+  SettingsResource(commons.ApiRequester client) : _requester = client;
 }
 
-class SettingsDatasourcesResourceApi {
+class SettingsDatasourcesResource {
   final commons.ApiRequester _requester;
 
-  SettingsDatasourcesResourceApi(commons.ApiRequester client)
+  SettingsDatasourcesResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Creates a datasource. **Note:** This API requires an admin account to
@@ -2247,10 +2246,10 @@
   }
 }
 
-class SettingsSearchapplicationsResourceApi {
+class SettingsSearchapplicationsResource {
   final commons.ApiRequester _requester;
 
-  SettingsSearchapplicationsResourceApi(commons.ApiRequester client)
+  SettingsSearchapplicationsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Creates a search application. **Note:** This API requires an admin account
@@ -2618,15 +2617,15 @@
   }
 }
 
-class StatsResourceApi {
+class StatsResource {
   final commons.ApiRequester _requester;
 
-  StatsIndexResourceApi get index => StatsIndexResourceApi(_requester);
-  StatsQueryResourceApi get query => StatsQueryResourceApi(_requester);
-  StatsSessionResourceApi get session => StatsSessionResourceApi(_requester);
-  StatsUserResourceApi get user => StatsUserResourceApi(_requester);
+  StatsIndexResource get index => StatsIndexResource(_requester);
+  StatsQueryResource get query => StatsQueryResource(_requester);
+  StatsSessionResource get session => StatsSessionResource(_requester);
+  StatsUserResource get user => StatsUserResource(_requester);
 
-  StatsResourceApi(commons.ApiRequester client) : _requester = client;
+  StatsResource(commons.ApiRequester client) : _requester = client;
 
   /// Gets indexed item statistics aggreggated across all data sources. This API
   /// only returns statistics for previous dates; it doesn't return statistics
@@ -2968,19 +2967,19 @@
   }
 }
 
-class StatsIndexResourceApi {
+class StatsIndexResource {
   final commons.ApiRequester _requester;
 
-  StatsIndexDatasourcesResourceApi get datasources =>
-      StatsIndexDatasourcesResourceApi(_requester);
+  StatsIndexDatasourcesResource get datasources =>
+      StatsIndexDatasourcesResource(_requester);
 
-  StatsIndexResourceApi(commons.ApiRequester client) : _requester = client;
+  StatsIndexResource(commons.ApiRequester client) : _requester = client;
 }
 
-class StatsIndexDatasourcesResourceApi {
+class StatsIndexDatasourcesResource {
   final commons.ApiRequester _requester;
 
-  StatsIndexDatasourcesResourceApi(commons.ApiRequester client)
+  StatsIndexDatasourcesResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Gets indexed item statistics for a single data source. **Note:** This API
@@ -3076,19 +3075,19 @@
   }
 }
 
-class StatsQueryResourceApi {
+class StatsQueryResource {
   final commons.ApiRequester _requester;
 
-  StatsQuerySearchapplicationsResourceApi get searchapplications =>
-      StatsQuerySearchapplicationsResourceApi(_requester);
+  StatsQuerySearchapplicationsResource get searchapplications =>
+      StatsQuerySearchapplicationsResource(_requester);
 
-  StatsQueryResourceApi(commons.ApiRequester client) : _requester = client;
+  StatsQueryResource(commons.ApiRequester client) : _requester = client;
 }
 
-class StatsQuerySearchapplicationsResourceApi {
+class StatsQuerySearchapplicationsResource {
   final commons.ApiRequester _requester;
 
-  StatsQuerySearchapplicationsResourceApi(commons.ApiRequester client)
+  StatsQuerySearchapplicationsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Get the query statistics for search application. **Note:** This API
@@ -3184,19 +3183,19 @@
   }
 }
 
-class StatsSessionResourceApi {
+class StatsSessionResource {
   final commons.ApiRequester _requester;
 
-  StatsSessionSearchapplicationsResourceApi get searchapplications =>
-      StatsSessionSearchapplicationsResourceApi(_requester);
+  StatsSessionSearchapplicationsResource get searchapplications =>
+      StatsSessionSearchapplicationsResource(_requester);
 
-  StatsSessionResourceApi(commons.ApiRequester client) : _requester = client;
+  StatsSessionResource(commons.ApiRequester client) : _requester = client;
 }
 
-class StatsSessionSearchapplicationsResourceApi {
+class StatsSessionSearchapplicationsResource {
   final commons.ApiRequester _requester;
 
-  StatsSessionSearchapplicationsResourceApi(commons.ApiRequester client)
+  StatsSessionSearchapplicationsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Get the # of search sessions, % of successful sessions with a click query
@@ -3293,19 +3292,19 @@
   }
 }
 
-class StatsUserResourceApi {
+class StatsUserResource {
   final commons.ApiRequester _requester;
 
-  StatsUserSearchapplicationsResourceApi get searchapplications =>
-      StatsUserSearchapplicationsResourceApi(_requester);
+  StatsUserSearchapplicationsResource get searchapplications =>
+      StatsUserSearchapplicationsResource(_requester);
 
-  StatsUserResourceApi(commons.ApiRequester client) : _requester = client;
+  StatsUserResource(commons.ApiRequester client) : _requester = client;
 }
 
-class StatsUserSearchapplicationsResourceApi {
+class StatsUserSearchapplicationsResource {
   final commons.ApiRequester _requester;
 
-  StatsUserSearchapplicationsResourceApi(commons.ApiRequester client)
+  StatsUserSearchapplicationsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Get the users statistics for search application. **Note:** This API
diff --git a/generated/googleapis/lib/cloudshell/v1.dart b/generated/googleapis/lib/cloudshell/v1.dart
index f2b218f..581b342 100644
--- a/generated/googleapis/lib/cloudshell/v1.dart
+++ b/generated/googleapis/lib/cloudshell/v1.dart
@@ -24,9 +24,9 @@
 ///
 /// Create an instance of [CloudShellApi] to access these resources:
 ///
-/// - [OperationsResourceApi]
-/// - [UsersResourceApi]
-///   - [UsersEnvironmentsResourceApi]
+/// - [OperationsResource]
+/// - [UsersResource]
+///   - [UsersEnvironmentsResource]
 library cloudshell.v1;
 
 import 'dart:async' as async;
@@ -50,8 +50,8 @@
 
   final commons.ApiRequester _requester;
 
-  OperationsResourceApi get operations => OperationsResourceApi(_requester);
-  UsersResourceApi get users => UsersResourceApi(_requester);
+  OperationsResource get operations => OperationsResource(_requester);
+  UsersResource get users => UsersResource(_requester);
 
   CloudShellApi(http.Client client,
       {core.String rootUrl = 'https://cloudshell.googleapis.com/',
@@ -60,10 +60,10 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class OperationsResourceApi {
+class OperationsResource {
   final commons.ApiRequester _requester;
 
-  OperationsResourceApi(commons.ApiRequester client) : _requester = client;
+  OperationsResource(commons.ApiRequester client) : _requester = client;
 
   /// Starts asynchronous cancellation on a long-running operation. The server
   /// makes a best effort to cancel the operation, but success is not
@@ -316,20 +316,19 @@
   }
 }
 
-class UsersResourceApi {
+class UsersResource {
   final commons.ApiRequester _requester;
 
-  UsersEnvironmentsResourceApi get environments =>
-      UsersEnvironmentsResourceApi(_requester);
+  UsersEnvironmentsResource get environments =>
+      UsersEnvironmentsResource(_requester);
 
-  UsersResourceApi(commons.ApiRequester client) : _requester = client;
+  UsersResource(commons.ApiRequester client) : _requester = client;
 }
 
-class UsersEnvironmentsResourceApi {
+class UsersEnvironmentsResource {
   final commons.ApiRequester _requester;
 
-  UsersEnvironmentsResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  UsersEnvironmentsResource(commons.ApiRequester client) : _requester = client;
 
   /// Adds a public SSH key to an environment, allowing clients with the
   /// corresponding private key to connect to that environment via SSH. If a key
diff --git a/generated/googleapis/lib/cloudtasks/v2.dart b/generated/googleapis/lib/cloudtasks/v2.dart
index 9feea69..43cb690 100644
--- a/generated/googleapis/lib/cloudtasks/v2.dart
+++ b/generated/googleapis/lib/cloudtasks/v2.dart
@@ -23,10 +23,10 @@
 ///
 /// Create an instance of [CloudTasksApi] to access these resources:
 ///
-/// - [ProjectsResourceApi]
-///   - [ProjectsLocationsResourceApi]
-///     - [ProjectsLocationsQueuesResourceApi]
-///       - [ProjectsLocationsQueuesTasksResourceApi]
+/// - [ProjectsResource]
+///   - [ProjectsLocationsResource]
+///     - [ProjectsLocationsQueuesResource]
+///       - [ProjectsLocationsQueuesTasksResource]
 library cloudtasks.v2;
 
 import 'dart:async' as async;
@@ -49,7 +49,7 @@
 
   final commons.ApiRequester _requester;
 
-  ProjectsResourceApi get projects => ProjectsResourceApi(_requester);
+  ProjectsResource get projects => ProjectsResource(_requester);
 
   CloudTasksApi(http.Client client,
       {core.String rootUrl = 'https://cloudtasks.googleapis.com/',
@@ -58,23 +58,22 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class ProjectsResourceApi {
+class ProjectsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsLocationsResourceApi get locations =>
-      ProjectsLocationsResourceApi(_requester);
+  ProjectsLocationsResource get locations =>
+      ProjectsLocationsResource(_requester);
 
-  ProjectsResourceApi(commons.ApiRequester client) : _requester = client;
+  ProjectsResource(commons.ApiRequester client) : _requester = client;
 }
 
-class ProjectsLocationsResourceApi {
+class ProjectsLocationsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsLocationsQueuesResourceApi get queues =>
-      ProjectsLocationsQueuesResourceApi(_requester);
+  ProjectsLocationsQueuesResource get queues =>
+      ProjectsLocationsQueuesResource(_requester);
 
-  ProjectsLocationsResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  ProjectsLocationsResource(commons.ApiRequester client) : _requester = client;
 
   /// Gets information about a location.
   ///
@@ -199,13 +198,13 @@
   }
 }
 
-class ProjectsLocationsQueuesResourceApi {
+class ProjectsLocationsQueuesResource {
   final commons.ApiRequester _requester;
 
-  ProjectsLocationsQueuesTasksResourceApi get tasks =>
-      ProjectsLocationsQueuesTasksResourceApi(_requester);
+  ProjectsLocationsQueuesTasksResource get tasks =>
+      ProjectsLocationsQueuesTasksResource(_requester);
 
-  ProjectsLocationsQueuesResourceApi(commons.ApiRequester client)
+  ProjectsLocationsQueuesResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Creates a queue. Queues created with this method allow tasks to live for a
@@ -935,10 +934,10 @@
   }
 }
 
-class ProjectsLocationsQueuesTasksResourceApi {
+class ProjectsLocationsQueuesTasksResource {
   final commons.ApiRequester _requester;
 
-  ProjectsLocationsQueuesTasksResourceApi(commons.ApiRequester client)
+  ProjectsLocationsQueuesTasksResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Creates a task and adds it to a queue. Tasks cannot be updated after
diff --git a/generated/googleapis/lib/cloudtrace/v2.dart b/generated/googleapis/lib/cloudtrace/v2.dart
index c565dab..71b65bc 100644
--- a/generated/googleapis/lib/cloudtrace/v2.dart
+++ b/generated/googleapis/lib/cloudtrace/v2.dart
@@ -27,9 +27,9 @@
 ///
 /// Create an instance of [CloudTraceApi] to access these resources:
 ///
-/// - [ProjectsResourceApi]
-///   - [ProjectsTracesResourceApi]
-///     - [ProjectsTracesSpansResourceApi]
+/// - [ProjectsResource]
+///   - [ProjectsTracesResource]
+///     - [ProjectsTracesSpansResource]
 library cloudtrace.v2;
 
 import 'dart:async' as async;
@@ -60,7 +60,7 @@
 
   final commons.ApiRequester _requester;
 
-  ProjectsResourceApi get projects => ProjectsResourceApi(_requester);
+  ProjectsResource get projects => ProjectsResource(_requester);
 
   CloudTraceApi(http.Client client,
       {core.String rootUrl = 'https://cloudtrace.googleapis.com/',
@@ -69,21 +69,21 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class ProjectsResourceApi {
+class ProjectsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsTracesResourceApi get traces => ProjectsTracesResourceApi(_requester);
+  ProjectsTracesResource get traces => ProjectsTracesResource(_requester);
 
-  ProjectsResourceApi(commons.ApiRequester client) : _requester = client;
+  ProjectsResource(commons.ApiRequester client) : _requester = client;
 }
 
-class ProjectsTracesResourceApi {
+class ProjectsTracesResource {
   final commons.ApiRequester _requester;
 
-  ProjectsTracesSpansResourceApi get spans =>
-      ProjectsTracesSpansResourceApi(_requester);
+  ProjectsTracesSpansResource get spans =>
+      ProjectsTracesSpansResource(_requester);
 
-  ProjectsTracesResourceApi(commons.ApiRequester client) : _requester = client;
+  ProjectsTracesResource(commons.ApiRequester client) : _requester = client;
 
   /// Sends new spans to new or existing traces. You cannot update existing
   /// spans.
@@ -147,10 +147,10 @@
   }
 }
 
-class ProjectsTracesSpansResourceApi {
+class ProjectsTracesSpansResource {
   final commons.ApiRequester _requester;
 
-  ProjectsTracesSpansResourceApi(commons.ApiRequester client)
+  ProjectsTracesSpansResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Creates a new span.
diff --git a/generated/googleapis/lib/composer/v1.dart b/generated/googleapis/lib/composer/v1.dart
index 894337c..d0351b6 100644
--- a/generated/googleapis/lib/composer/v1.dart
+++ b/generated/googleapis/lib/composer/v1.dart
@@ -23,11 +23,11 @@
 ///
 /// Create an instance of [CloudComposerApi] to access these resources:
 ///
-/// - [ProjectsResourceApi]
-///   - [ProjectsLocationsResourceApi]
-///     - [ProjectsLocationsEnvironmentsResourceApi]
-///     - [ProjectsLocationsImageVersionsResourceApi]
-///     - [ProjectsLocationsOperationsResourceApi]
+/// - [ProjectsResource]
+///   - [ProjectsLocationsResource]
+///     - [ProjectsLocationsEnvironmentsResource]
+///     - [ProjectsLocationsImageVersionsResource]
+///     - [ProjectsLocationsOperationsResource]
 library composer.v1;
 
 import 'dart:async' as async;
@@ -50,7 +50,7 @@
 
   final commons.ApiRequester _requester;
 
-  ProjectsResourceApi get projects => ProjectsResourceApi(_requester);
+  ProjectsResource get projects => ProjectsResource(_requester);
 
   CloudComposerApi(http.Client client,
       {core.String rootUrl = 'https://composer.googleapis.com/',
@@ -59,33 +59,32 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class ProjectsResourceApi {
+class ProjectsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsLocationsResourceApi get locations =>
-      ProjectsLocationsResourceApi(_requester);
+  ProjectsLocationsResource get locations =>
+      ProjectsLocationsResource(_requester);
 
-  ProjectsResourceApi(commons.ApiRequester client) : _requester = client;
+  ProjectsResource(commons.ApiRequester client) : _requester = client;
 }
 
-class ProjectsLocationsResourceApi {
+class ProjectsLocationsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsLocationsEnvironmentsResourceApi get environments =>
-      ProjectsLocationsEnvironmentsResourceApi(_requester);
-  ProjectsLocationsImageVersionsResourceApi get imageVersions =>
-      ProjectsLocationsImageVersionsResourceApi(_requester);
-  ProjectsLocationsOperationsResourceApi get operations =>
-      ProjectsLocationsOperationsResourceApi(_requester);
+  ProjectsLocationsEnvironmentsResource get environments =>
+      ProjectsLocationsEnvironmentsResource(_requester);
+  ProjectsLocationsImageVersionsResource get imageVersions =>
+      ProjectsLocationsImageVersionsResource(_requester);
+  ProjectsLocationsOperationsResource get operations =>
+      ProjectsLocationsOperationsResource(_requester);
 
-  ProjectsLocationsResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  ProjectsLocationsResource(commons.ApiRequester client) : _requester = client;
 }
 
-class ProjectsLocationsEnvironmentsResourceApi {
+class ProjectsLocationsEnvironmentsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsLocationsEnvironmentsResourceApi(commons.ApiRequester client)
+  ProjectsLocationsEnvironmentsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Create a new environment.
@@ -452,10 +451,10 @@
   }
 }
 
-class ProjectsLocationsImageVersionsResourceApi {
+class ProjectsLocationsImageVersionsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsLocationsImageVersionsResourceApi(commons.ApiRequester client)
+  ProjectsLocationsImageVersionsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// List ImageVersions for provided location.
@@ -527,10 +526,10 @@
   }
 }
 
-class ProjectsLocationsOperationsResourceApi {
+class ProjectsLocationsOperationsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsLocationsOperationsResourceApi(commons.ApiRequester client)
+  ProjectsLocationsOperationsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Deletes a long-running operation. This method indicates that the client is
diff --git a/generated/googleapis/lib/compute/v1.dart b/generated/googleapis/lib/compute/v1.dart
index f5561b8..72badab 100644
--- a/generated/googleapis/lib/compute/v1.dart
+++ b/generated/googleapis/lib/compute/v1.dart
@@ -24,80 +24,80 @@
 ///
 /// Create an instance of [ComputeApi] to access these resources:
 ///
-/// - [AcceleratorTypesResourceApi]
-/// - [AddressesResourceApi]
-/// - [AutoscalersResourceApi]
-/// - [BackendBucketsResourceApi]
-/// - [BackendServicesResourceApi]
-/// - [DiskTypesResourceApi]
-/// - [DisksResourceApi]
-/// - [ExternalVpnGatewaysResourceApi]
-/// - [FirewallsResourceApi]
-/// - [ForwardingRulesResourceApi]
-/// - [GlobalAddressesResourceApi]
-/// - [GlobalForwardingRulesResourceApi]
-/// - [GlobalNetworkEndpointGroupsResourceApi]
-/// - [GlobalOperationsResourceApi]
-/// - [HealthChecksResourceApi]
-/// - [HttpHealthChecksResourceApi]
-/// - [HttpsHealthChecksResourceApi]
-/// - [ImagesResourceApi]
-/// - [InstanceGroupManagersResourceApi]
-/// - [InstanceGroupsResourceApi]
-/// - [InstanceTemplatesResourceApi]
-/// - [InstancesResourceApi]
-/// - [InterconnectAttachmentsResourceApi]
-/// - [InterconnectLocationsResourceApi]
-/// - [InterconnectsResourceApi]
-/// - [LicenseCodesResourceApi]
-/// - [LicensesResourceApi]
-/// - [MachineTypesResourceApi]
-/// - [NetworkEndpointGroupsResourceApi]
-/// - [NetworksResourceApi]
-/// - [NodeGroupsResourceApi]
-/// - [NodeTemplatesResourceApi]
-/// - [NodeTypesResourceApi]
-/// - [PacketMirroringsResourceApi]
-/// - [ProjectsResourceApi]
-/// - [RegionAutoscalersResourceApi]
-/// - [RegionBackendServicesResourceApi]
-/// - [RegionCommitmentsResourceApi]
-/// - [RegionDiskTypesResourceApi]
-/// - [RegionDisksResourceApi]
-/// - [RegionHealthCheckServicesResourceApi]
-/// - [RegionHealthChecksResourceApi]
-/// - [RegionInstanceGroupManagersResourceApi]
-/// - [RegionInstanceGroupsResourceApi]
-/// - [RegionNetworkEndpointGroupsResourceApi]
-/// - [RegionNotificationEndpointsResourceApi]
-/// - [RegionOperationsResourceApi]
-/// - [RegionSslCertificatesResourceApi]
-/// - [RegionTargetHttpProxiesResourceApi]
-/// - [RegionTargetHttpsProxiesResourceApi]
-/// - [RegionUrlMapsResourceApi]
-/// - [RegionsResourceApi]
-/// - [ReservationsResourceApi]
-/// - [ResourcePoliciesResourceApi]
-/// - [RoutersResourceApi]
-/// - [RoutesResourceApi]
-/// - [SecurityPoliciesResourceApi]
-/// - [SnapshotsResourceApi]
-/// - [SslCertificatesResourceApi]
-/// - [SslPoliciesResourceApi]
-/// - [SubnetworksResourceApi]
-/// - [TargetGrpcProxiesResourceApi]
-/// - [TargetHttpProxiesResourceApi]
-/// - [TargetHttpsProxiesResourceApi]
-/// - [TargetInstancesResourceApi]
-/// - [TargetPoolsResourceApi]
-/// - [TargetSslProxiesResourceApi]
-/// - [TargetTcpProxiesResourceApi]
-/// - [TargetVpnGatewaysResourceApi]
-/// - [UrlMapsResourceApi]
-/// - [VpnGatewaysResourceApi]
-/// - [VpnTunnelsResourceApi]
-/// - [ZoneOperationsResourceApi]
-/// - [ZonesResourceApi]
+/// - [AcceleratorTypesResource]
+/// - [AddressesResource]
+/// - [AutoscalersResource]
+/// - [BackendBucketsResource]
+/// - [BackendServicesResource]
+/// - [DiskTypesResource]
+/// - [DisksResource]
+/// - [ExternalVpnGatewaysResource]
+/// - [FirewallsResource]
+/// - [ForwardingRulesResource]
+/// - [GlobalAddressesResource]
+/// - [GlobalForwardingRulesResource]
+/// - [GlobalNetworkEndpointGroupsResource]
+/// - [GlobalOperationsResource]
+/// - [HealthChecksResource]
+/// - [HttpHealthChecksResource]
+/// - [HttpsHealthChecksResource]
+/// - [ImagesResource]
+/// - [InstanceGroupManagersResource]
+/// - [InstanceGroupsResource]
+/// - [InstanceTemplatesResource]
+/// - [InstancesResource]
+/// - [InterconnectAttachmentsResource]
+/// - [InterconnectLocationsResource]
+/// - [InterconnectsResource]
+/// - [LicenseCodesResource]
+/// - [LicensesResource]
+/// - [MachineTypesResource]
+/// - [NetworkEndpointGroupsResource]
+/// - [NetworksResource]
+/// - [NodeGroupsResource]
+/// - [NodeTemplatesResource]
+/// - [NodeTypesResource]
+/// - [PacketMirroringsResource]
+/// - [ProjectsResource]
+/// - [RegionAutoscalersResource]
+/// - [RegionBackendServicesResource]
+/// - [RegionCommitmentsResource]
+/// - [RegionDiskTypesResource]
+/// - [RegionDisksResource]
+/// - [RegionHealthCheckServicesResource]
+/// - [RegionHealthChecksResource]
+/// - [RegionInstanceGroupManagersResource]
+/// - [RegionInstanceGroupsResource]
+/// - [RegionNetworkEndpointGroupsResource]
+/// - [RegionNotificationEndpointsResource]
+/// - [RegionOperationsResource]
+/// - [RegionSslCertificatesResource]
+/// - [RegionTargetHttpProxiesResource]
+/// - [RegionTargetHttpsProxiesResource]
+/// - [RegionUrlMapsResource]
+/// - [RegionsResource]
+/// - [ReservationsResource]
+/// - [ResourcePoliciesResource]
+/// - [RoutersResource]
+/// - [RoutesResource]
+/// - [SecurityPoliciesResource]
+/// - [SnapshotsResource]
+/// - [SslCertificatesResource]
+/// - [SslPoliciesResource]
+/// - [SubnetworksResource]
+/// - [TargetGrpcProxiesResource]
+/// - [TargetHttpProxiesResource]
+/// - [TargetHttpsProxiesResource]
+/// - [TargetInstancesResource]
+/// - [TargetPoolsResource]
+/// - [TargetSslProxiesResource]
+/// - [TargetTcpProxiesResource]
+/// - [TargetVpnGatewaysResource]
+/// - [UrlMapsResource]
+/// - [VpnGatewaysResource]
+/// - [VpnTunnelsResource]
+/// - [ZoneOperationsResource]
+/// - [ZonesResource]
 library compute.v1;
 
 import 'dart:async' as async;
@@ -139,130 +139,123 @@
 
   final commons.ApiRequester _requester;
 
-  AcceleratorTypesResourceApi get acceleratorTypes =>
-      AcceleratorTypesResourceApi(_requester);
-  AddressesResourceApi get addresses => AddressesResourceApi(_requester);
-  AutoscalersResourceApi get autoscalers => AutoscalersResourceApi(_requester);
-  BackendBucketsResourceApi get backendBuckets =>
-      BackendBucketsResourceApi(_requester);
-  BackendServicesResourceApi get backendServices =>
-      BackendServicesResourceApi(_requester);
-  DiskTypesResourceApi get diskTypes => DiskTypesResourceApi(_requester);
-  DisksResourceApi get disks => DisksResourceApi(_requester);
-  ExternalVpnGatewaysResourceApi get externalVpnGateways =>
-      ExternalVpnGatewaysResourceApi(_requester);
-  FirewallsResourceApi get firewalls => FirewallsResourceApi(_requester);
-  ForwardingRulesResourceApi get forwardingRules =>
-      ForwardingRulesResourceApi(_requester);
-  GlobalAddressesResourceApi get globalAddresses =>
-      GlobalAddressesResourceApi(_requester);
-  GlobalForwardingRulesResourceApi get globalForwardingRules =>
-      GlobalForwardingRulesResourceApi(_requester);
-  GlobalNetworkEndpointGroupsResourceApi get globalNetworkEndpointGroups =>
-      GlobalNetworkEndpointGroupsResourceApi(_requester);
-  GlobalOperationsResourceApi get globalOperations =>
-      GlobalOperationsResourceApi(_requester);
-  HealthChecksResourceApi get healthChecks =>
-      HealthChecksResourceApi(_requester);
-  HttpHealthChecksResourceApi get httpHealthChecks =>
-      HttpHealthChecksResourceApi(_requester);
-  HttpsHealthChecksResourceApi get httpsHealthChecks =>
-      HttpsHealthChecksResourceApi(_requester);
-  ImagesResourceApi get images => ImagesResourceApi(_requester);
-  InstanceGroupManagersResourceApi get instanceGroupManagers =>
-      InstanceGroupManagersResourceApi(_requester);
-  InstanceGroupsResourceApi get instanceGroups =>
-      InstanceGroupsResourceApi(_requester);
-  InstanceTemplatesResourceApi get instanceTemplates =>
-      InstanceTemplatesResourceApi(_requester);
-  InstancesResourceApi get instances => InstancesResourceApi(_requester);
-  InterconnectAttachmentsResourceApi get interconnectAttachments =>
-      InterconnectAttachmentsResourceApi(_requester);
-  InterconnectLocationsResourceApi get interconnectLocations =>
-      InterconnectLocationsResourceApi(_requester);
-  InterconnectsResourceApi get interconnects =>
-      InterconnectsResourceApi(_requester);
-  LicenseCodesResourceApi get licenseCodes =>
-      LicenseCodesResourceApi(_requester);
-  LicensesResourceApi get licenses => LicensesResourceApi(_requester);
-  MachineTypesResourceApi get machineTypes =>
-      MachineTypesResourceApi(_requester);
-  NetworkEndpointGroupsResourceApi get networkEndpointGroups =>
-      NetworkEndpointGroupsResourceApi(_requester);
-  NetworksResourceApi get networks => NetworksResourceApi(_requester);
-  NodeGroupsResourceApi get nodeGroups => NodeGroupsResourceApi(_requester);
-  NodeTemplatesResourceApi get nodeTemplates =>
-      NodeTemplatesResourceApi(_requester);
-  NodeTypesResourceApi get nodeTypes => NodeTypesResourceApi(_requester);
-  PacketMirroringsResourceApi get packetMirrorings =>
-      PacketMirroringsResourceApi(_requester);
-  ProjectsResourceApi get projects => ProjectsResourceApi(_requester);
-  RegionAutoscalersResourceApi get regionAutoscalers =>
-      RegionAutoscalersResourceApi(_requester);
-  RegionBackendServicesResourceApi get regionBackendServices =>
-      RegionBackendServicesResourceApi(_requester);
-  RegionCommitmentsResourceApi get regionCommitments =>
-      RegionCommitmentsResourceApi(_requester);
-  RegionDiskTypesResourceApi get regionDiskTypes =>
-      RegionDiskTypesResourceApi(_requester);
-  RegionDisksResourceApi get regionDisks => RegionDisksResourceApi(_requester);
-  RegionHealthCheckServicesResourceApi get regionHealthCheckServices =>
-      RegionHealthCheckServicesResourceApi(_requester);
-  RegionHealthChecksResourceApi get regionHealthChecks =>
-      RegionHealthChecksResourceApi(_requester);
-  RegionInstanceGroupManagersResourceApi get regionInstanceGroupManagers =>
-      RegionInstanceGroupManagersResourceApi(_requester);
-  RegionInstanceGroupsResourceApi get regionInstanceGroups =>
-      RegionInstanceGroupsResourceApi(_requester);
-  RegionNetworkEndpointGroupsResourceApi get regionNetworkEndpointGroups =>
-      RegionNetworkEndpointGroupsResourceApi(_requester);
-  RegionNotificationEndpointsResourceApi get regionNotificationEndpoints =>
-      RegionNotificationEndpointsResourceApi(_requester);
-  RegionOperationsResourceApi get regionOperations =>
-      RegionOperationsResourceApi(_requester);
-  RegionSslCertificatesResourceApi get regionSslCertificates =>
-      RegionSslCertificatesResourceApi(_requester);
-  RegionTargetHttpProxiesResourceApi get regionTargetHttpProxies =>
-      RegionTargetHttpProxiesResourceApi(_requester);
-  RegionTargetHttpsProxiesResourceApi get regionTargetHttpsProxies =>
-      RegionTargetHttpsProxiesResourceApi(_requester);
-  RegionUrlMapsResourceApi get regionUrlMaps =>
-      RegionUrlMapsResourceApi(_requester);
-  RegionsResourceApi get regions => RegionsResourceApi(_requester);
-  ReservationsResourceApi get reservations =>
-      ReservationsResourceApi(_requester);
-  ResourcePoliciesResourceApi get resourcePolicies =>
-      ResourcePoliciesResourceApi(_requester);
-  RoutersResourceApi get routers => RoutersResourceApi(_requester);
-  RoutesResourceApi get routes => RoutesResourceApi(_requester);
-  SecurityPoliciesResourceApi get securityPolicies =>
-      SecurityPoliciesResourceApi(_requester);
-  SnapshotsResourceApi get snapshots => SnapshotsResourceApi(_requester);
-  SslCertificatesResourceApi get sslCertificates =>
-      SslCertificatesResourceApi(_requester);
-  SslPoliciesResourceApi get sslPolicies => SslPoliciesResourceApi(_requester);
-  SubnetworksResourceApi get subnetworks => SubnetworksResourceApi(_requester);
-  TargetGrpcProxiesResourceApi get targetGrpcProxies =>
-      TargetGrpcProxiesResourceApi(_requester);
-  TargetHttpProxiesResourceApi get targetHttpProxies =>
-      TargetHttpProxiesResourceApi(_requester);
-  TargetHttpsProxiesResourceApi get targetHttpsProxies =>
-      TargetHttpsProxiesResourceApi(_requester);
-  TargetInstancesResourceApi get targetInstances =>
-      TargetInstancesResourceApi(_requester);
-  TargetPoolsResourceApi get targetPools => TargetPoolsResourceApi(_requester);
-  TargetSslProxiesResourceApi get targetSslProxies =>
-      TargetSslProxiesResourceApi(_requester);
-  TargetTcpProxiesResourceApi get targetTcpProxies =>
-      TargetTcpProxiesResourceApi(_requester);
-  TargetVpnGatewaysResourceApi get targetVpnGateways =>
-      TargetVpnGatewaysResourceApi(_requester);
-  UrlMapsResourceApi get urlMaps => UrlMapsResourceApi(_requester);
-  VpnGatewaysResourceApi get vpnGateways => VpnGatewaysResourceApi(_requester);
-  VpnTunnelsResourceApi get vpnTunnels => VpnTunnelsResourceApi(_requester);
-  ZoneOperationsResourceApi get zoneOperations =>
-      ZoneOperationsResourceApi(_requester);
-  ZonesResourceApi get zones => ZonesResourceApi(_requester);
+  AcceleratorTypesResource get acceleratorTypes =>
+      AcceleratorTypesResource(_requester);
+  AddressesResource get addresses => AddressesResource(_requester);
+  AutoscalersResource get autoscalers => AutoscalersResource(_requester);
+  BackendBucketsResource get backendBuckets =>
+      BackendBucketsResource(_requester);
+  BackendServicesResource get backendServices =>
+      BackendServicesResource(_requester);
+  DiskTypesResource get diskTypes => DiskTypesResource(_requester);
+  DisksResource get disks => DisksResource(_requester);
+  ExternalVpnGatewaysResource get externalVpnGateways =>
+      ExternalVpnGatewaysResource(_requester);
+  FirewallsResource get firewalls => FirewallsResource(_requester);
+  ForwardingRulesResource get forwardingRules =>
+      ForwardingRulesResource(_requester);
+  GlobalAddressesResource get globalAddresses =>
+      GlobalAddressesResource(_requester);
+  GlobalForwardingRulesResource get globalForwardingRules =>
+      GlobalForwardingRulesResource(_requester);
+  GlobalNetworkEndpointGroupsResource get globalNetworkEndpointGroups =>
+      GlobalNetworkEndpointGroupsResource(_requester);
+  GlobalOperationsResource get globalOperations =>
+      GlobalOperationsResource(_requester);
+  HealthChecksResource get healthChecks => HealthChecksResource(_requester);
+  HttpHealthChecksResource get httpHealthChecks =>
+      HttpHealthChecksResource(_requester);
+  HttpsHealthChecksResource get httpsHealthChecks =>
+      HttpsHealthChecksResource(_requester);
+  ImagesResource get images => ImagesResource(_requester);
+  InstanceGroupManagersResource get instanceGroupManagers =>
+      InstanceGroupManagersResource(_requester);
+  InstanceGroupsResource get instanceGroups =>
+      InstanceGroupsResource(_requester);
+  InstanceTemplatesResource get instanceTemplates =>
+      InstanceTemplatesResource(_requester);
+  InstancesResource get instances => InstancesResource(_requester);
+  InterconnectAttachmentsResource get interconnectAttachments =>
+      InterconnectAttachmentsResource(_requester);
+  InterconnectLocationsResource get interconnectLocations =>
+      InterconnectLocationsResource(_requester);
+  InterconnectsResource get interconnects => InterconnectsResource(_requester);
+  LicenseCodesResource get licenseCodes => LicenseCodesResource(_requester);
+  LicensesResource get licenses => LicensesResource(_requester);
+  MachineTypesResource get machineTypes => MachineTypesResource(_requester);
+  NetworkEndpointGroupsResource get networkEndpointGroups =>
+      NetworkEndpointGroupsResource(_requester);
+  NetworksResource get networks => NetworksResource(_requester);
+  NodeGroupsResource get nodeGroups => NodeGroupsResource(_requester);
+  NodeTemplatesResource get nodeTemplates => NodeTemplatesResource(_requester);
+  NodeTypesResource get nodeTypes => NodeTypesResource(_requester);
+  PacketMirroringsResource get packetMirrorings =>
+      PacketMirroringsResource(_requester);
+  ProjectsResource get projects => ProjectsResource(_requester);
+  RegionAutoscalersResource get regionAutoscalers =>
+      RegionAutoscalersResource(_requester);
+  RegionBackendServicesResource get regionBackendServices =>
+      RegionBackendServicesResource(_requester);
+  RegionCommitmentsResource get regionCommitments =>
+      RegionCommitmentsResource(_requester);
+  RegionDiskTypesResource get regionDiskTypes =>
+      RegionDiskTypesResource(_requester);
+  RegionDisksResource get regionDisks => RegionDisksResource(_requester);
+  RegionHealthCheckServicesResource get regionHealthCheckServices =>
+      RegionHealthCheckServicesResource(_requester);
+  RegionHealthChecksResource get regionHealthChecks =>
+      RegionHealthChecksResource(_requester);
+  RegionInstanceGroupManagersResource get regionInstanceGroupManagers =>
+      RegionInstanceGroupManagersResource(_requester);
+  RegionInstanceGroupsResource get regionInstanceGroups =>
+      RegionInstanceGroupsResource(_requester);
+  RegionNetworkEndpointGroupsResource get regionNetworkEndpointGroups =>
+      RegionNetworkEndpointGroupsResource(_requester);
+  RegionNotificationEndpointsResource get regionNotificationEndpoints =>
+      RegionNotificationEndpointsResource(_requester);
+  RegionOperationsResource get regionOperations =>
+      RegionOperationsResource(_requester);
+  RegionSslCertificatesResource get regionSslCertificates =>
+      RegionSslCertificatesResource(_requester);
+  RegionTargetHttpProxiesResource get regionTargetHttpProxies =>
+      RegionTargetHttpProxiesResource(_requester);
+  RegionTargetHttpsProxiesResource get regionTargetHttpsProxies =>
+      RegionTargetHttpsProxiesResource(_requester);
+  RegionUrlMapsResource get regionUrlMaps => RegionUrlMapsResource(_requester);
+  RegionsResource get regions => RegionsResource(_requester);
+  ReservationsResource get reservations => ReservationsResource(_requester);
+  ResourcePoliciesResource get resourcePolicies =>
+      ResourcePoliciesResource(_requester);
+  RoutersResource get routers => RoutersResource(_requester);
+  RoutesResource get routes => RoutesResource(_requester);
+  SecurityPoliciesResource get securityPolicies =>
+      SecurityPoliciesResource(_requester);
+  SnapshotsResource get snapshots => SnapshotsResource(_requester);
+  SslCertificatesResource get sslCertificates =>
+      SslCertificatesResource(_requester);
+  SslPoliciesResource get sslPolicies => SslPoliciesResource(_requester);
+  SubnetworksResource get subnetworks => SubnetworksResource(_requester);
+  TargetGrpcProxiesResource get targetGrpcProxies =>
+      TargetGrpcProxiesResource(_requester);
+  TargetHttpProxiesResource get targetHttpProxies =>
+      TargetHttpProxiesResource(_requester);
+  TargetHttpsProxiesResource get targetHttpsProxies =>
+      TargetHttpsProxiesResource(_requester);
+  TargetInstancesResource get targetInstances =>
+      TargetInstancesResource(_requester);
+  TargetPoolsResource get targetPools => TargetPoolsResource(_requester);
+  TargetSslProxiesResource get targetSslProxies =>
+      TargetSslProxiesResource(_requester);
+  TargetTcpProxiesResource get targetTcpProxies =>
+      TargetTcpProxiesResource(_requester);
+  TargetVpnGatewaysResource get targetVpnGateways =>
+      TargetVpnGatewaysResource(_requester);
+  UrlMapsResource get urlMaps => UrlMapsResource(_requester);
+  VpnGatewaysResource get vpnGateways => VpnGatewaysResource(_requester);
+  VpnTunnelsResource get vpnTunnels => VpnTunnelsResource(_requester);
+  ZoneOperationsResource get zoneOperations =>
+      ZoneOperationsResource(_requester);
+  ZonesResource get zones => ZonesResource(_requester);
 
   ComputeApi(http.Client client,
       {core.String rootUrl = 'https://compute.googleapis.com/',
@@ -271,11 +264,10 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class AcceleratorTypesResourceApi {
+class AcceleratorTypesResource {
   final commons.ApiRequester _requester;
 
-  AcceleratorTypesResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  AcceleratorTypesResource(commons.ApiRequester client) : _requester = client;
 
   /// Retrieves an aggregated list of accelerator types.
   ///
@@ -618,10 +610,10 @@
   }
 }
 
-class AddressesResourceApi {
+class AddressesResource {
   final commons.ApiRequester _requester;
 
-  AddressesResourceApi(commons.ApiRequester client) : _requester = client;
+  AddressesResource(commons.ApiRequester client) : _requester = client;
 
   /// Retrieves an aggregated list of addresses.
   ///
@@ -1135,10 +1127,10 @@
   }
 }
 
-class AutoscalersResourceApi {
+class AutoscalersResource {
   final commons.ApiRequester _requester;
 
-  AutoscalersResourceApi(commons.ApiRequester client) : _requester = client;
+  AutoscalersResource(commons.ApiRequester client) : _requester = client;
 
   /// Retrieves an aggregated list of autoscalers.
   ///
@@ -1844,10 +1836,10 @@
   }
 }
 
-class BackendBucketsResourceApi {
+class BackendBucketsResource {
   final commons.ApiRequester _requester;
 
-  BackendBucketsResourceApi(commons.ApiRequester client) : _requester = client;
+  BackendBucketsResource(commons.ApiRequester client) : _requester = client;
 
   /// Adds a key for validating requests with signed URLs for this backend
   /// bucket.
@@ -2538,10 +2530,10 @@
   }
 }
 
-class BackendServicesResourceApi {
+class BackendServicesResource {
   final commons.ApiRequester _requester;
 
-  BackendServicesResourceApi(commons.ApiRequester client) : _requester = client;
+  BackendServicesResource(commons.ApiRequester client) : _requester = client;
 
   /// Adds a key for validating requests with signed URLs for this backend
   /// service.
@@ -3532,10 +3524,10 @@
   }
 }
 
-class DiskTypesResourceApi {
+class DiskTypesResource {
   final commons.ApiRequester _requester;
 
-  DiskTypesResourceApi(commons.ApiRequester client) : _requester = client;
+  DiskTypesResource(commons.ApiRequester client) : _requester = client;
 
   /// Retrieves an aggregated list of disk types.
   ///
@@ -3876,10 +3868,10 @@
   }
 }
 
-class DisksResourceApi {
+class DisksResource {
   final commons.ApiRequester _requester;
 
-  DisksResourceApi(commons.ApiRequester client) : _requester = client;
+  DisksResource(commons.ApiRequester client) : _requester = client;
 
   /// Adds existing resource policies to a disk. You can only add one policy
   /// which will be applied to this disk for scheduling snapshot creation.
@@ -5129,10 +5121,10 @@
   }
 }
 
-class ExternalVpnGatewaysResourceApi {
+class ExternalVpnGatewaysResource {
   final commons.ApiRequester _requester;
 
-  ExternalVpnGatewaysResourceApi(commons.ApiRequester client)
+  ExternalVpnGatewaysResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Deletes the specified externalVpnGateway.
@@ -5618,10 +5610,10 @@
   }
 }
 
-class FirewallsResourceApi {
+class FirewallsResource {
   final commons.ApiRequester _requester;
 
-  FirewallsResourceApi(commons.ApiRequester client) : _requester = client;
+  FirewallsResource(commons.ApiRequester client) : _requester = client;
 
   /// Deletes the specified firewall.
   ///
@@ -6137,10 +6129,10 @@
   }
 }
 
-class ForwardingRulesResourceApi {
+class ForwardingRulesResource {
   final commons.ApiRequester _requester;
 
-  ForwardingRulesResourceApi(commons.ApiRequester client) : _requester = client;
+  ForwardingRulesResource(commons.ApiRequester client) : _requester = client;
 
   /// Retrieves an aggregated list of forwarding rules.
   ///
@@ -6851,10 +6843,10 @@
   }
 }
 
-class GlobalAddressesResourceApi {
+class GlobalAddressesResource {
   final commons.ApiRequester _requester;
 
-  GlobalAddressesResourceApi(commons.ApiRequester client) : _requester = client;
+  GlobalAddressesResource(commons.ApiRequester client) : _requester = client;
 
   /// Deletes the specified address resource.
   ///
@@ -7197,10 +7189,10 @@
   }
 }
 
-class GlobalForwardingRulesResourceApi {
+class GlobalForwardingRulesResource {
   final commons.ApiRequester _requester;
 
-  GlobalForwardingRulesResourceApi(commons.ApiRequester client)
+  GlobalForwardingRulesResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Deletes the specified GlobalForwardingRule resource.
@@ -7724,10 +7716,10 @@
   }
 }
 
-class GlobalNetworkEndpointGroupsResourceApi {
+class GlobalNetworkEndpointGroupsResource {
   final commons.ApiRequester _requester;
 
-  GlobalNetworkEndpointGroupsResourceApi(commons.ApiRequester client)
+  GlobalNetworkEndpointGroupsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Attach a network endpoint to the specified network endpoint group.
@@ -8377,11 +8369,10 @@
   }
 }
 
-class GlobalOperationsResourceApi {
+class GlobalOperationsResource {
   final commons.ApiRequester _requester;
 
-  GlobalOperationsResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  GlobalOperationsResource(commons.ApiRequester client) : _requester = client;
 
   /// Retrieves an aggregated list of all operations.
   ///
@@ -8842,10 +8833,10 @@
   }
 }
 
-class HealthChecksResourceApi {
+class HealthChecksResource {
   final commons.ApiRequester _requester;
 
-  HealthChecksResourceApi(commons.ApiRequester client) : _requester = client;
+  HealthChecksResource(commons.ApiRequester client) : _requester = client;
 
   /// Retrieves the list of all HealthCheck resources, regional and global,
   /// available to the specified project.
@@ -9499,11 +9490,10 @@
   }
 }
 
-class HttpHealthChecksResourceApi {
+class HttpHealthChecksResource {
   final commons.ApiRequester _requester;
 
-  HttpHealthChecksResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  HttpHealthChecksResource(commons.ApiRequester client) : _requester = client;
 
   /// Deletes the specified HttpHealthCheck resource.
   ///
@@ -10023,11 +10013,10 @@
   }
 }
 
-class HttpsHealthChecksResourceApi {
+class HttpsHealthChecksResource {
   final commons.ApiRequester _requester;
 
-  HttpsHealthChecksResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  HttpsHealthChecksResource(commons.ApiRequester client) : _requester = client;
 
   /// Deletes the specified HttpsHealthCheck resource.
   ///
@@ -10547,10 +10536,10 @@
   }
 }
 
-class ImagesResourceApi {
+class ImagesResource {
   final commons.ApiRequester _requester;
 
-  ImagesResourceApi(commons.ApiRequester client) : _requester = client;
+  ImagesResource(commons.ApiRequester client) : _requester = client;
 
   /// Deletes the specified image.
   ///
@@ -11423,10 +11412,10 @@
   }
 }
 
-class InstanceGroupManagersResourceApi {
+class InstanceGroupManagersResource {
   final commons.ApiRequester _requester;
 
-  InstanceGroupManagersResourceApi(commons.ApiRequester client)
+  InstanceGroupManagersResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Flags the specified instances to be removed from the managed instance
@@ -13539,10 +13528,10 @@
   }
 }
 
-class InstanceGroupsResourceApi {
+class InstanceGroupsResource {
   final commons.ApiRequester _requester;
 
-  InstanceGroupsResourceApi(commons.ApiRequester client) : _requester = client;
+  InstanceGroupsResource(commons.ApiRequester client) : _requester = client;
 
   /// Adds a list of instances to the specified instance group. All of the
   /// instances in the instance group must be in the same network/subnetwork.
@@ -14493,11 +14482,10 @@
   }
 }
 
-class InstanceTemplatesResourceApi {
+class InstanceTemplatesResource {
   final commons.ApiRequester _requester;
 
-  InstanceTemplatesResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  InstanceTemplatesResource(commons.ApiRequester client) : _requester = client;
 
   /// Deletes the specified instance template. Deleting an instance template is
   /// permanent and cannot be undone. It is not possible to delete templates
@@ -15060,10 +15048,10 @@
   }
 }
 
-class InstancesResourceApi {
+class InstancesResource {
   final commons.ApiRequester _requester;
 
-  InstancesResourceApi(commons.ApiRequester client) : _requester = client;
+  InstancesResource(commons.ApiRequester client) : _requester = client;
 
   /// Adds an access config to an instance's network interface.
   ///
@@ -18951,10 +18939,10 @@
   }
 }
 
-class InterconnectAttachmentsResourceApi {
+class InterconnectAttachmentsResource {
   final commons.ApiRequester _requester;
 
-  InterconnectAttachmentsResourceApi(commons.ApiRequester client)
+  InterconnectAttachmentsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Retrieves an aggregated list of interconnect attachments.
@@ -19574,10 +19562,10 @@
   }
 }
 
-class InterconnectLocationsResourceApi {
+class InterconnectLocationsResource {
   final commons.ApiRequester _requester;
 
-  InterconnectLocationsResourceApi(commons.ApiRequester client)
+  InterconnectLocationsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Returns the details for the specified interconnect location. Gets a list
@@ -19769,10 +19757,10 @@
   }
 }
 
-class InterconnectsResourceApi {
+class InterconnectsResource {
   final commons.ApiRequester _requester;
 
-  InterconnectsResourceApi(commons.ApiRequester client) : _requester = client;
+  InterconnectsResource(commons.ApiRequester client) : _requester = client;
 
   /// Deletes the specified interconnect.
   ///
@@ -20267,10 +20255,10 @@
   }
 }
 
-class LicenseCodesResourceApi {
+class LicenseCodesResource {
   final commons.ApiRequester _requester;
 
-  LicenseCodesResourceApi(commons.ApiRequester client) : _requester = client;
+  LicenseCodesResource(commons.ApiRequester client) : _requester = client;
 
   /// Return a specified license code. License codes are mirrored across all
   /// projects that have permissions to read the License Code.  Caution This
@@ -20411,10 +20399,10 @@
   }
 }
 
-class LicensesResourceApi {
+class LicensesResource {
   final commons.ApiRequester _requester;
 
-  LicensesResourceApi(commons.ApiRequester client) : _requester = client;
+  LicensesResource(commons.ApiRequester client) : _requester = client;
 
   /// Deletes the specified license.  Caution This resource is intended for use
   /// only by third-party partners who are creating Cloud Marketplace images.
@@ -20982,10 +20970,10 @@
   }
 }
 
-class MachineTypesResourceApi {
+class MachineTypesResource {
   final commons.ApiRequester _requester;
 
-  MachineTypesResourceApi(commons.ApiRequester client) : _requester = client;
+  MachineTypesResource(commons.ApiRequester client) : _requester = client;
 
   /// Retrieves an aggregated list of machine types.
   ///
@@ -21328,10 +21316,10 @@
   }
 }
 
-class NetworkEndpointGroupsResourceApi {
+class NetworkEndpointGroupsResource {
   final commons.ApiRequester _requester;
 
-  NetworkEndpointGroupsResourceApi(commons.ApiRequester client)
+  NetworkEndpointGroupsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Retrieves the list of network endpoint groups and sorts them by zone.
@@ -22268,10 +22256,10 @@
   }
 }
 
-class NetworksResourceApi {
+class NetworksResource {
   final commons.ApiRequester _requester;
 
-  NetworksResourceApi(commons.ApiRequester client) : _requester = client;
+  NetworksResource(commons.ApiRequester client) : _requester = client;
 
   /// Adds a peering to the specified network.
   ///
@@ -23197,10 +23185,10 @@
   }
 }
 
-class NodeGroupsResourceApi {
+class NodeGroupsResource {
   final commons.ApiRequester _requester;
 
-  NodeGroupsResourceApi(commons.ApiRequester client) : _requester = client;
+  NodeGroupsResource(commons.ApiRequester client) : _requester = client;
 
   /// Adds specified number of nodes to the node group.
   ///
@@ -24485,10 +24473,10 @@
   }
 }
 
-class NodeTemplatesResourceApi {
+class NodeTemplatesResource {
   final commons.ApiRequester _requester;
 
-  NodeTemplatesResourceApi(commons.ApiRequester client) : _requester = client;
+  NodeTemplatesResource(commons.ApiRequester client) : _requester = client;
 
   /// Retrieves an aggregated list of node templates.
   ///
@@ -25244,10 +25232,10 @@
   }
 }
 
-class NodeTypesResourceApi {
+class NodeTypesResource {
   final commons.ApiRequester _requester;
 
-  NodeTypesResourceApi(commons.ApiRequester client) : _requester = client;
+  NodeTypesResource(commons.ApiRequester client) : _requester = client;
 
   /// Retrieves an aggregated list of node types.
   ///
@@ -25588,11 +25576,10 @@
   }
 }
 
-class PacketMirroringsResourceApi {
+class PacketMirroringsResource {
   final commons.ApiRequester _requester;
 
-  PacketMirroringsResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  PacketMirroringsResource(commons.ApiRequester client) : _requester = client;
 
   /// Retrieves an aggregated list of packetMirrorings.
   ///
@@ -26284,10 +26271,10 @@
   }
 }
 
-class ProjectsResourceApi {
+class ProjectsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsResourceApi(commons.ApiRequester client) : _requester = client;
+  ProjectsResource(commons.ApiRequester client) : _requester = client;
 
   /// Disable this project as a shared VPC host project.
   ///
@@ -27319,11 +27306,10 @@
   }
 }
 
-class RegionAutoscalersResourceApi {
+class RegionAutoscalersResource {
   final commons.ApiRequester _requester;
 
-  RegionAutoscalersResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  RegionAutoscalersResource(commons.ApiRequester client) : _requester = client;
 
   /// Deletes the specified autoscaler.
   ///
@@ -27893,10 +27879,10 @@
   }
 }
 
-class RegionBackendServicesResourceApi {
+class RegionBackendServicesResource {
   final commons.ApiRequester _requester;
 
-  RegionBackendServicesResourceApi(commons.ApiRequester client)
+  RegionBackendServicesResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Deletes the specified regional BackendService resource.
@@ -28554,11 +28540,10 @@
   }
 }
 
-class RegionCommitmentsResourceApi {
+class RegionCommitmentsResource {
   final commons.ApiRequester _requester;
 
-  RegionCommitmentsResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  RegionCommitmentsResource(commons.ApiRequester client) : _requester = client;
 
   /// Retrieves an aggregated list of commitments.
   ///
@@ -28987,10 +28972,10 @@
   }
 }
 
-class RegionDiskTypesResourceApi {
+class RegionDiskTypesResource {
   final commons.ApiRequester _requester;
 
-  RegionDiskTypesResourceApi(commons.ApiRequester client) : _requester = client;
+  RegionDiskTypesResource(commons.ApiRequester client) : _requester = client;
 
   /// Returns the specified regional disk type. Gets a list of available disk
   /// types by making a list() request.
@@ -29198,10 +29183,10 @@
   }
 }
 
-class RegionDisksResourceApi {
+class RegionDisksResource {
   final commons.ApiRequester _requester;
 
-  RegionDisksResourceApi(commons.ApiRequester client) : _requester = client;
+  RegionDisksResource(commons.ApiRequester client) : _requester = client;
 
   /// Adds existing resource policies to a regional disk. You can only add one
   /// policy which will be applied to this disk for scheduling snapshot
@@ -30304,10 +30289,10 @@
   }
 }
 
-class RegionHealthCheckServicesResourceApi {
+class RegionHealthCheckServicesResource {
   final commons.ApiRequester _requester;
 
-  RegionHealthCheckServicesResourceApi(commons.ApiRequester client)
+  RegionHealthCheckServicesResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Deletes the specified regional HealthCheckService.
@@ -30783,11 +30768,10 @@
   }
 }
 
-class RegionHealthChecksResourceApi {
+class RegionHealthChecksResource {
   final commons.ApiRequester _requester;
 
-  RegionHealthChecksResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  RegionHealthChecksResource(commons.ApiRequester client) : _requester = client;
 
   /// Deletes the specified HealthCheck resource.
   ///
@@ -31361,10 +31345,10 @@
   }
 }
 
-class RegionInstanceGroupManagersResourceApi {
+class RegionInstanceGroupManagersResource {
   final commons.ApiRequester _requester;
 
-  RegionInstanceGroupManagersResourceApi(commons.ApiRequester client)
+  RegionInstanceGroupManagersResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Flags the specified instances to be immediately removed from the managed
@@ -33322,10 +33306,10 @@
   }
 }
 
-class RegionInstanceGroupsResourceApi {
+class RegionInstanceGroupsResource {
   final commons.ApiRequester _requester;
 
-  RegionInstanceGroupsResourceApi(commons.ApiRequester client)
+  RegionInstanceGroupsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Returns the specified instance group resource.
@@ -33772,10 +33756,10 @@
   }
 }
 
-class RegionNetworkEndpointGroupsResourceApi {
+class RegionNetworkEndpointGroupsResource {
   final commons.ApiRequester _requester;
 
-  RegionNetworkEndpointGroupsResourceApi(commons.ApiRequester client)
+  RegionNetworkEndpointGroupsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Deletes the specified network endpoint group. Note that the NEG cannot be
@@ -34158,10 +34142,10 @@
   }
 }
 
-class RegionNotificationEndpointsResourceApi {
+class RegionNotificationEndpointsResource {
   final commons.ApiRequester _requester;
 
-  RegionNotificationEndpointsResourceApi(commons.ApiRequester client)
+  RegionNotificationEndpointsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Deletes the specified NotificationEndpoint in the given region
@@ -34545,11 +34529,10 @@
   }
 }
 
-class RegionOperationsResourceApi {
+class RegionOperationsResource {
   final commons.ApiRequester _requester;
 
-  RegionOperationsResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  RegionOperationsResource(commons.ApiRequester client) : _requester = client;
 
   /// Deletes the specified region-specific Operations resource.
   ///
@@ -34912,10 +34895,10 @@
   }
 }
 
-class RegionSslCertificatesResourceApi {
+class RegionSslCertificatesResource {
   final commons.ApiRequester _requester;
 
-  RegionSslCertificatesResourceApi(commons.ApiRequester client)
+  RegionSslCertificatesResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Deletes the specified SslCertificate resource in the region.
@@ -35299,10 +35282,10 @@
   }
 }
 
-class RegionTargetHttpProxiesResourceApi {
+class RegionTargetHttpProxiesResource {
   final commons.ApiRequester _requester;
 
-  RegionTargetHttpProxiesResourceApi(commons.ApiRequester client)
+  RegionTargetHttpProxiesResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Deletes the specified TargetHttpProxy resource.
@@ -35781,10 +35764,10 @@
   }
 }
 
-class RegionTargetHttpsProxiesResourceApi {
+class RegionTargetHttpsProxiesResource {
   final commons.ApiRequester _requester;
 
-  RegionTargetHttpsProxiesResourceApi(commons.ApiRequester client)
+  RegionTargetHttpsProxiesResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Deletes the specified TargetHttpsProxy resource.
@@ -36359,10 +36342,10 @@
   }
 }
 
-class RegionUrlMapsResourceApi {
+class RegionUrlMapsResource {
   final commons.ApiRequester _requester;
 
-  RegionUrlMapsResourceApi(commons.ApiRequester client) : _requester = client;
+  RegionUrlMapsResource(commons.ApiRequester client) : _requester = client;
 
   /// Deletes the specified UrlMap resource.
   ///
@@ -36976,10 +36959,10 @@
   }
 }
 
-class RegionsResourceApi {
+class RegionsResource {
   final commons.ApiRequester _requester;
 
-  RegionsResourceApi(commons.ApiRequester client) : _requester = client;
+  RegionsResource(commons.ApiRequester client) : _requester = client;
 
   /// Returns the specified Region resource. Gets a list of available regions by
   /// making a list() request.
@@ -37167,10 +37150,10 @@
   }
 }
 
-class ReservationsResourceApi {
+class ReservationsResource {
   final commons.ApiRequester _requester;
 
-  ReservationsResourceApi(commons.ApiRequester client) : _requester = client;
+  ReservationsResource(commons.ApiRequester client) : _requester = client;
 
   /// Retrieves an aggregated list of reservations.
   ///
@@ -38021,11 +38004,10 @@
   }
 }
 
-class ResourcePoliciesResourceApi {
+class ResourcePoliciesResource {
   final commons.ApiRequester _requester;
 
-  ResourcePoliciesResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  ResourcePoliciesResource(commons.ApiRequester client) : _requester = client;
 
   /// Retrieves an aggregated list of resource policies.
   ///
@@ -38780,10 +38762,10 @@
   }
 }
 
-class RoutersResourceApi {
+class RoutersResource {
   final commons.ApiRequester _requester;
 
-  RoutersResourceApi(commons.ApiRequester client) : _requester = client;
+  RoutersResource(commons.ApiRequester client) : _requester = client;
 
   /// Retrieves an aggregated list of routers.
   ///
@@ -39787,10 +39769,10 @@
   }
 }
 
-class RoutesResourceApi {
+class RoutesResource {
   final commons.ApiRequester _requester;
 
-  RoutesResourceApi(commons.ApiRequester client) : _requester = client;
+  RoutesResource(commons.ApiRequester client) : _requester = client;
 
   /// Deletes the specified Route resource.
   ///
@@ -40132,11 +40114,10 @@
   }
 }
 
-class SecurityPoliciesResourceApi {
+class SecurityPoliciesResource {
   final commons.ApiRequester _requester;
 
-  SecurityPoliciesResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  SecurityPoliciesResource(commons.ApiRequester client) : _requester = client;
 
   /// Inserts a rule into a security policy.
   ///
@@ -40977,10 +40958,10 @@
   }
 }
 
-class SnapshotsResourceApi {
+class SnapshotsResource {
   final commons.ApiRequester _requester;
 
-  SnapshotsResourceApi(commons.ApiRequester client) : _requester = client;
+  SnapshotsResource(commons.ApiRequester client) : _requester = client;
 
   /// Deletes the specified Snapshot resource. Keep in mind that deleting a
   /// single snapshot might not necessarily delete all the data on that
@@ -41536,10 +41517,10 @@
   }
 }
 
-class SslCertificatesResourceApi {
+class SslCertificatesResource {
   final commons.ApiRequester _requester;
 
-  SslCertificatesResourceApi(commons.ApiRequester client) : _requester = client;
+  SslCertificatesResource(commons.ApiRequester client) : _requester = client;
 
   /// Retrieves the list of all SslCertificate resources, regional and global,
   /// available to the specified project.
@@ -42022,10 +42003,10 @@
   }
 }
 
-class SslPoliciesResourceApi {
+class SslPoliciesResource {
   final commons.ApiRequester _requester;
 
-  SslPoliciesResourceApi(commons.ApiRequester client) : _requester = client;
+  SslPoliciesResource(commons.ApiRequester client) : _requester = client;
 
   /// Deletes the specified SSL policy. The SSL policy resource can be deleted
   /// only if it is not in use by any TargetHttpsProxy or TargetSslProxy
@@ -42576,10 +42557,10 @@
   }
 }
 
-class SubnetworksResourceApi {
+class SubnetworksResource {
   final commons.ApiRequester _requester;
 
-  SubnetworksResourceApi(commons.ApiRequester client) : _requester = client;
+  SubnetworksResource(commons.ApiRequester client) : _requester = client;
 
   /// Retrieves an aggregated list of subnetworks.
   ///
@@ -43759,11 +43740,10 @@
   }
 }
 
-class TargetGrpcProxiesResourceApi {
+class TargetGrpcProxiesResource {
   final commons.ApiRequester _requester;
 
-  TargetGrpcProxiesResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  TargetGrpcProxiesResource(commons.ApiRequester client) : _requester = client;
 
   /// Deletes the specified TargetGrpcProxy in the given scope
   ///
@@ -44195,11 +44175,10 @@
   }
 }
 
-class TargetHttpProxiesResourceApi {
+class TargetHttpProxiesResource {
   final commons.ApiRequester _requester;
 
-  TargetHttpProxiesResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  TargetHttpProxiesResource(commons.ApiRequester client) : _requester = client;
 
   /// Retrieves the list of all TargetHttpProxy resources, regional and global,
   /// available to the specified project.
@@ -44856,11 +44835,10 @@
   }
 }
 
-class TargetHttpsProxiesResourceApi {
+class TargetHttpsProxiesResource {
   final commons.ApiRequester _requester;
 
-  TargetHttpsProxiesResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  TargetHttpsProxiesResource(commons.ApiRequester client) : _requester = client;
 
   /// Retrieves the list of all TargetHttpsProxy resources, regional and global,
   /// available to the specified project.
@@ -45691,10 +45669,10 @@
   }
 }
 
-class TargetInstancesResourceApi {
+class TargetInstancesResource {
   final commons.ApiRequester _requester;
 
-  TargetInstancesResourceApi(commons.ApiRequester client) : _requester = client;
+  TargetInstancesResource(commons.ApiRequester client) : _requester = client;
 
   /// Retrieves an aggregated list of target instances.
   ///
@@ -46212,10 +46190,10 @@
   }
 }
 
-class TargetPoolsResourceApi {
+class TargetPoolsResource {
   final commons.ApiRequester _requester;
 
-  TargetPoolsResourceApi(commons.ApiRequester client) : _requester = client;
+  TargetPoolsResource(commons.ApiRequester client) : _requester = client;
 
   /// Adds health check URLs to a target pool.
   ///
@@ -47295,11 +47273,10 @@
   }
 }
 
-class TargetSslProxiesResourceApi {
+class TargetSslProxiesResource {
   final commons.ApiRequester _requester;
 
-  TargetSslProxiesResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  TargetSslProxiesResource(commons.ApiRequester client) : _requester = client;
 
   /// Deletes the specified TargetSslProxy resource.
   ///
@@ -47995,11 +47972,10 @@
   }
 }
 
-class TargetTcpProxiesResourceApi {
+class TargetTcpProxiesResource {
   final commons.ApiRequester _requester;
 
-  TargetTcpProxiesResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  TargetTcpProxiesResource(commons.ApiRequester client) : _requester = client;
 
   /// Deletes the specified TargetTcpProxy resource.
   ///
@@ -48520,11 +48496,10 @@
   }
 }
 
-class TargetVpnGatewaysResourceApi {
+class TargetVpnGatewaysResource {
   final commons.ApiRequester _requester;
 
-  TargetVpnGatewaysResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  TargetVpnGatewaysResource(commons.ApiRequester client) : _requester = client;
 
   /// Retrieves an aggregated list of target VPN gateways.
   ///
@@ -49042,10 +49017,10 @@
   }
 }
 
-class UrlMapsResourceApi {
+class UrlMapsResource {
   final commons.ApiRequester _requester;
 
-  UrlMapsResourceApi(commons.ApiRequester client) : _requester = client;
+  UrlMapsResource(commons.ApiRequester client) : _requester = client;
 
   /// Retrieves the list of all UrlMap resources, regional and global, available
   /// to the specified project.
@@ -49855,10 +49830,10 @@
   }
 }
 
-class VpnGatewaysResourceApi {
+class VpnGatewaysResource {
   final commons.ApiRequester _requester;
 
-  VpnGatewaysResourceApi(commons.ApiRequester client) : _requester = client;
+  VpnGatewaysResource(commons.ApiRequester client) : _requester = client;
 
   /// Retrieves an aggregated list of VPN gateways.
   ///
@@ -50624,10 +50599,10 @@
   }
 }
 
-class VpnTunnelsResourceApi {
+class VpnTunnelsResource {
   final commons.ApiRequester _requester;
 
-  VpnTunnelsResourceApi(commons.ApiRequester client) : _requester = client;
+  VpnTunnelsResource(commons.ApiRequester client) : _requester = client;
 
   /// Retrieves an aggregated list of VPN tunnels.
   ///
@@ -51143,10 +51118,10 @@
   }
 }
 
-class ZoneOperationsResourceApi {
+class ZoneOperationsResource {
   final commons.ApiRequester _requester;
 
-  ZoneOperationsResourceApi(commons.ApiRequester client) : _requester = client;
+  ZoneOperationsResource(commons.ApiRequester client) : _requester = client;
 
   /// Deletes the specified zone-specific Operations resource.
   ///
@@ -51509,10 +51484,10 @@
   }
 }
 
-class ZonesResourceApi {
+class ZonesResource {
   final commons.ApiRequester _requester;
 
-  ZonesResourceApi(commons.ApiRequester client) : _requester = client;
+  ZonesResource(commons.ApiRequester client) : _requester = client;
 
   /// Returns the specified Zone resource. Gets a list of available zones by
   /// making a list() request.
diff --git a/generated/googleapis/lib/container/v1.dart b/generated/googleapis/lib/container/v1.dart
index e187441..a77dd82 100644
--- a/generated/googleapis/lib/container/v1.dart
+++ b/generated/googleapis/lib/container/v1.dart
@@ -24,18 +24,18 @@
 ///
 /// Create an instance of [ContainerApi] to access these resources:
 ///
-/// - [ProjectsResourceApi]
-///   - [ProjectsAggregatedResourceApi]
-///     - [ProjectsAggregatedUsableSubnetworksResourceApi]
-///   - [ProjectsLocationsResourceApi]
-///     - [ProjectsLocationsClustersResourceApi]
-///       - [ProjectsLocationsClustersNodePoolsResourceApi]
-///       - [ProjectsLocationsClustersWellKnownResourceApi]
-///     - [ProjectsLocationsOperationsResourceApi]
-///   - [ProjectsZonesResourceApi]
-///     - [ProjectsZonesClustersResourceApi]
-///       - [ProjectsZonesClustersNodePoolsResourceApi]
-///     - [ProjectsZonesOperationsResourceApi]
+/// - [ProjectsResource]
+///   - [ProjectsAggregatedResource]
+///     - [ProjectsAggregatedUsableSubnetworksResource]
+///   - [ProjectsLocationsResource]
+///     - [ProjectsLocationsClustersResource]
+///       - [ProjectsLocationsClustersNodePoolsResource]
+///       - [ProjectsLocationsClustersWellKnownResource]
+///     - [ProjectsLocationsOperationsResource]
+///   - [ProjectsZonesResource]
+///     - [ProjectsZonesClustersResource]
+///       - [ProjectsZonesClustersNodePoolsResource]
+///     - [ProjectsZonesOperationsResource]
 library container.v1;
 
 import 'dart:async' as async;
@@ -59,7 +59,7 @@
 
   final commons.ApiRequester _requester;
 
-  ProjectsResourceApi get projects => ProjectsResourceApi(_requester);
+  ProjectsResource get projects => ProjectsResource(_requester);
 
   ContainerApi(http.Client client,
       {core.String rootUrl = 'https://container.googleapis.com/',
@@ -68,32 +68,31 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class ProjectsResourceApi {
+class ProjectsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsAggregatedResourceApi get aggregated =>
-      ProjectsAggregatedResourceApi(_requester);
-  ProjectsLocationsResourceApi get locations =>
-      ProjectsLocationsResourceApi(_requester);
-  ProjectsZonesResourceApi get zones => ProjectsZonesResourceApi(_requester);
+  ProjectsAggregatedResource get aggregated =>
+      ProjectsAggregatedResource(_requester);
+  ProjectsLocationsResource get locations =>
+      ProjectsLocationsResource(_requester);
+  ProjectsZonesResource get zones => ProjectsZonesResource(_requester);
 
-  ProjectsResourceApi(commons.ApiRequester client) : _requester = client;
+  ProjectsResource(commons.ApiRequester client) : _requester = client;
 }
 
-class ProjectsAggregatedResourceApi {
+class ProjectsAggregatedResource {
   final commons.ApiRequester _requester;
 
-  ProjectsAggregatedUsableSubnetworksResourceApi get usableSubnetworks =>
-      ProjectsAggregatedUsableSubnetworksResourceApi(_requester);
+  ProjectsAggregatedUsableSubnetworksResource get usableSubnetworks =>
+      ProjectsAggregatedUsableSubnetworksResource(_requester);
 
-  ProjectsAggregatedResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  ProjectsAggregatedResource(commons.ApiRequester client) : _requester = client;
 }
 
-class ProjectsAggregatedUsableSubnetworksResourceApi {
+class ProjectsAggregatedUsableSubnetworksResource {
   final commons.ApiRequester _requester;
 
-  ProjectsAggregatedUsableSubnetworksResourceApi(commons.ApiRequester client)
+  ProjectsAggregatedUsableSubnetworksResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Lists subnetworks that are usable for creating clusters in a project.
@@ -178,16 +177,15 @@
   }
 }
 
-class ProjectsLocationsResourceApi {
+class ProjectsLocationsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsLocationsClustersResourceApi get clusters =>
-      ProjectsLocationsClustersResourceApi(_requester);
-  ProjectsLocationsOperationsResourceApi get operations =>
-      ProjectsLocationsOperationsResourceApi(_requester);
+  ProjectsLocationsClustersResource get clusters =>
+      ProjectsLocationsClustersResource(_requester);
+  ProjectsLocationsOperationsResource get operations =>
+      ProjectsLocationsOperationsResource(_requester);
 
-  ProjectsLocationsResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  ProjectsLocationsResource(commons.ApiRequester client) : _requester = client;
 
   /// Returns configuration info about the Google Kubernetes Engine service.
   ///
@@ -262,15 +260,15 @@
   }
 }
 
-class ProjectsLocationsClustersResourceApi {
+class ProjectsLocationsClustersResource {
   final commons.ApiRequester _requester;
 
-  ProjectsLocationsClustersNodePoolsResourceApi get nodePools =>
-      ProjectsLocationsClustersNodePoolsResourceApi(_requester);
-  ProjectsLocationsClustersWellKnownResourceApi get wellKnown =>
-      ProjectsLocationsClustersWellKnownResourceApi(_requester);
+  ProjectsLocationsClustersNodePoolsResource get nodePools =>
+      ProjectsLocationsClustersNodePoolsResource(_requester);
+  ProjectsLocationsClustersWellKnownResource get wellKnown =>
+      ProjectsLocationsClustersWellKnownResource(_requester);
 
-  ProjectsLocationsClustersResourceApi(commons.ApiRequester client)
+  ProjectsLocationsClustersResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Completes master IP rotation.
@@ -1415,10 +1413,10 @@
   }
 }
 
-class ProjectsLocationsClustersNodePoolsResourceApi {
+class ProjectsLocationsClustersNodePoolsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsLocationsClustersNodePoolsResourceApi(commons.ApiRequester client)
+  ProjectsLocationsClustersNodePoolsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Creates a node pool for a cluster.
@@ -2039,10 +2037,10 @@
   }
 }
 
-class ProjectsLocationsClustersWellKnownResourceApi {
+class ProjectsLocationsClustersWellKnownResource {
   final commons.ApiRequester _requester;
 
-  ProjectsLocationsClustersWellKnownResourceApi(commons.ApiRequester client)
+  ProjectsLocationsClustersWellKnownResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Gets the OIDC discovery document for the cluster. See the [OpenID Connect
@@ -2106,10 +2104,10 @@
   }
 }
 
-class ProjectsLocationsOperationsResourceApi {
+class ProjectsLocationsOperationsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsLocationsOperationsResourceApi(commons.ApiRequester client)
+  ProjectsLocationsOperationsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Cancels the specified operation.
@@ -2324,15 +2322,15 @@
   }
 }
 
-class ProjectsZonesResourceApi {
+class ProjectsZonesResource {
   final commons.ApiRequester _requester;
 
-  ProjectsZonesClustersResourceApi get clusters =>
-      ProjectsZonesClustersResourceApi(_requester);
-  ProjectsZonesOperationsResourceApi get operations =>
-      ProjectsZonesOperationsResourceApi(_requester);
+  ProjectsZonesClustersResource get clusters =>
+      ProjectsZonesClustersResource(_requester);
+  ProjectsZonesOperationsResource get operations =>
+      ProjectsZonesOperationsResource(_requester);
 
-  ProjectsZonesResourceApi(commons.ApiRequester client) : _requester = client;
+  ProjectsZonesResource(commons.ApiRequester client) : _requester = client;
 
   /// Returns configuration info about the Google Kubernetes Engine service.
   ///
@@ -2408,13 +2406,13 @@
   }
 }
 
-class ProjectsZonesClustersResourceApi {
+class ProjectsZonesClustersResource {
   final commons.ApiRequester _requester;
 
-  ProjectsZonesClustersNodePoolsResourceApi get nodePools =>
-      ProjectsZonesClustersNodePoolsResourceApi(_requester);
+  ProjectsZonesClustersNodePoolsResource get nodePools =>
+      ProjectsZonesClustersNodePoolsResource(_requester);
 
-  ProjectsZonesClustersResourceApi(commons.ApiRequester client)
+  ProjectsZonesClustersResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Sets the addons for a specific cluster.
@@ -3780,10 +3778,10 @@
   }
 }
 
-class ProjectsZonesClustersNodePoolsResourceApi {
+class ProjectsZonesClustersNodePoolsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsZonesClustersNodePoolsResourceApi(commons.ApiRequester client)
+  ProjectsZonesClustersNodePoolsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Sets the autoscaling settings for the specified node pool.
@@ -4580,10 +4578,10 @@
   }
 }
 
-class ProjectsZonesOperationsResourceApi {
+class ProjectsZonesOperationsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsZonesOperationsResourceApi(commons.ApiRequester client)
+  ProjectsZonesOperationsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Cancels the specified operation.
diff --git a/generated/googleapis/lib/content/v2_1.dart b/generated/googleapis/lib/content/v2_1.dart
index 37a78ce..2be5f6d 100644
--- a/generated/googleapis/lib/content/v2_1.dart
+++ b/generated/googleapis/lib/content/v2_1.dart
@@ -24,27 +24,27 @@
 ///
 /// Create an instance of [ShoppingContentApi] to access these resources:
 ///
-/// - [AccountsResourceApi]
-/// - [AccountstatusesResourceApi]
-/// - [AccounttaxResourceApi]
-/// - [DatafeedsResourceApi]
-/// - [DatafeedstatusesResourceApi]
-/// - [LiasettingsResourceApi]
-/// - [LocalinventoryResourceApi]
-/// - [OrderinvoicesResourceApi]
-/// - [OrderreportsResourceApi]
-/// - [OrderreturnsResourceApi]
-/// - [OrdersResourceApi]
-/// - [PosResourceApi]
-/// - [ProductsResourceApi]
-/// - [ProductstatusesResourceApi]
-/// - [PubsubnotificationsettingsResourceApi]
-/// - [RegionalinventoryResourceApi]
-/// - [ReturnaddressResourceApi]
-/// - [ReturnpolicyResourceApi]
-/// - [SettlementreportsResourceApi]
-/// - [SettlementtransactionsResourceApi]
-/// - [ShippingsettingsResourceApi]
+/// - [AccountsResource]
+/// - [AccountstatusesResource]
+/// - [AccounttaxResource]
+/// - [DatafeedsResource]
+/// - [DatafeedstatusesResource]
+/// - [LiasettingsResource]
+/// - [LocalinventoryResource]
+/// - [OrderinvoicesResource]
+/// - [OrderreportsResource]
+/// - [OrderreturnsResource]
+/// - [OrdersResource]
+/// - [PosResource]
+/// - [ProductsResource]
+/// - [ProductstatusesResource]
+/// - [PubsubnotificationsettingsResource]
+/// - [RegionalinventoryResource]
+/// - [ReturnaddressResource]
+/// - [ReturnpolicyResource]
+/// - [SettlementreportsResource]
+/// - [SettlementtransactionsResource]
+/// - [ShippingsettingsResource]
 library content.v2_1;
 
 import 'dart:async' as async;
@@ -67,41 +67,36 @@
 
   final commons.ApiRequester _requester;
 
-  AccountsResourceApi get accounts => AccountsResourceApi(_requester);
-  AccountstatusesResourceApi get accountstatuses =>
-      AccountstatusesResourceApi(_requester);
-  AccounttaxResourceApi get accounttax => AccounttaxResourceApi(_requester);
-  DatafeedsResourceApi get datafeeds => DatafeedsResourceApi(_requester);
-  DatafeedstatusesResourceApi get datafeedstatuses =>
-      DatafeedstatusesResourceApi(_requester);
-  LiasettingsResourceApi get liasettings => LiasettingsResourceApi(_requester);
-  LocalinventoryResourceApi get localinventory =>
-      LocalinventoryResourceApi(_requester);
-  OrderinvoicesResourceApi get orderinvoices =>
-      OrderinvoicesResourceApi(_requester);
-  OrderreportsResourceApi get orderreports =>
-      OrderreportsResourceApi(_requester);
-  OrderreturnsResourceApi get orderreturns =>
-      OrderreturnsResourceApi(_requester);
-  OrdersResourceApi get orders => OrdersResourceApi(_requester);
-  PosResourceApi get pos => PosResourceApi(_requester);
-  ProductsResourceApi get products => ProductsResourceApi(_requester);
-  ProductstatusesResourceApi get productstatuses =>
-      ProductstatusesResourceApi(_requester);
-  PubsubnotificationsettingsResourceApi get pubsubnotificationsettings =>
-      PubsubnotificationsettingsResourceApi(_requester);
-  RegionalinventoryResourceApi get regionalinventory =>
-      RegionalinventoryResourceApi(_requester);
-  ReturnaddressResourceApi get returnaddress =>
-      ReturnaddressResourceApi(_requester);
-  ReturnpolicyResourceApi get returnpolicy =>
-      ReturnpolicyResourceApi(_requester);
-  SettlementreportsResourceApi get settlementreports =>
-      SettlementreportsResourceApi(_requester);
-  SettlementtransactionsResourceApi get settlementtransactions =>
-      SettlementtransactionsResourceApi(_requester);
-  ShippingsettingsResourceApi get shippingsettings =>
-      ShippingsettingsResourceApi(_requester);
+  AccountsResource get accounts => AccountsResource(_requester);
+  AccountstatusesResource get accountstatuses =>
+      AccountstatusesResource(_requester);
+  AccounttaxResource get accounttax => AccounttaxResource(_requester);
+  DatafeedsResource get datafeeds => DatafeedsResource(_requester);
+  DatafeedstatusesResource get datafeedstatuses =>
+      DatafeedstatusesResource(_requester);
+  LiasettingsResource get liasettings => LiasettingsResource(_requester);
+  LocalinventoryResource get localinventory =>
+      LocalinventoryResource(_requester);
+  OrderinvoicesResource get orderinvoices => OrderinvoicesResource(_requester);
+  OrderreportsResource get orderreports => OrderreportsResource(_requester);
+  OrderreturnsResource get orderreturns => OrderreturnsResource(_requester);
+  OrdersResource get orders => OrdersResource(_requester);
+  PosResource get pos => PosResource(_requester);
+  ProductsResource get products => ProductsResource(_requester);
+  ProductstatusesResource get productstatuses =>
+      ProductstatusesResource(_requester);
+  PubsubnotificationsettingsResource get pubsubnotificationsettings =>
+      PubsubnotificationsettingsResource(_requester);
+  RegionalinventoryResource get regionalinventory =>
+      RegionalinventoryResource(_requester);
+  ReturnaddressResource get returnaddress => ReturnaddressResource(_requester);
+  ReturnpolicyResource get returnpolicy => ReturnpolicyResource(_requester);
+  SettlementreportsResource get settlementreports =>
+      SettlementreportsResource(_requester);
+  SettlementtransactionsResource get settlementtransactions =>
+      SettlementtransactionsResource(_requester);
+  ShippingsettingsResource get shippingsettings =>
+      ShippingsettingsResource(_requester);
 
   ShoppingContentApi(http.Client client,
       {core.String rootUrl = 'https://www.googleapis.com/',
@@ -110,10 +105,10 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class AccountsResourceApi {
+class AccountsResource {
   final commons.ApiRequester _requester;
 
-  AccountsResourceApi(commons.ApiRequester client) : _requester = client;
+  AccountsResource(commons.ApiRequester client) : _requester = client;
 
   /// Returns information about the authenticated user.
   ///
@@ -836,10 +831,10 @@
   }
 }
 
-class AccountstatusesResourceApi {
+class AccountstatusesResource {
   final commons.ApiRequester _requester;
 
-  AccountstatusesResourceApi(commons.ApiRequester client) : _requester = client;
+  AccountstatusesResource(commons.ApiRequester client) : _requester = client;
 
   /// Retrieves multiple Merchant Center account statuses in a single request.
   ///
@@ -1034,10 +1029,10 @@
   }
 }
 
-class AccounttaxResourceApi {
+class AccounttaxResource {
   final commons.ApiRequester _requester;
 
-  AccounttaxResourceApi(commons.ApiRequester client) : _requester = client;
+  AccounttaxResource(commons.ApiRequester client) : _requester = client;
 
   /// Retrieves and updates tax settings of multiple accounts in a single
   /// request.
@@ -1289,10 +1284,10 @@
   }
 }
 
-class DatafeedsResourceApi {
+class DatafeedsResource {
   final commons.ApiRequester _requester;
 
-  DatafeedsResourceApi(commons.ApiRequester client) : _requester = client;
+  DatafeedsResource(commons.ApiRequester client) : _requester = client;
 
   /// Deletes, fetches, gets, inserts and updates multiple datafeeds in a single
   /// request.
@@ -1714,11 +1709,10 @@
   }
 }
 
-class DatafeedstatusesResourceApi {
+class DatafeedstatusesResource {
   final commons.ApiRequester _requester;
 
-  DatafeedstatusesResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  DatafeedstatusesResource(commons.ApiRequester client) : _requester = client;
 
   /// Gets multiple Merchant Center datafeed statuses in a single request.
   ///
@@ -1915,10 +1909,10 @@
   }
 }
 
-class LiasettingsResourceApi {
+class LiasettingsResource {
   final commons.ApiRequester _requester;
 
-  LiasettingsResourceApi(commons.ApiRequester client) : _requester = client;
+  LiasettingsResource(commons.ApiRequester client) : _requester = client;
 
   /// Retrieves and/or updates the LIA settings of multiple accounts in a single
   /// request.
@@ -2595,10 +2589,10 @@
   }
 }
 
-class LocalinventoryResourceApi {
+class LocalinventoryResource {
   final commons.ApiRequester _requester;
 
-  LocalinventoryResourceApi(commons.ApiRequester client) : _requester = client;
+  LocalinventoryResource(commons.ApiRequester client) : _requester = client;
 
   /// Updates local inventory for multiple products or stores in a single
   /// request.
@@ -2721,10 +2715,10 @@
   }
 }
 
-class OrderinvoicesResourceApi {
+class OrderinvoicesResource {
   final commons.ApiRequester _requester;
 
-  OrderinvoicesResourceApi(commons.ApiRequester client) : _requester = client;
+  OrderinvoicesResource(commons.ApiRequester client) : _requester = client;
 
   /// Creates a charge invoice for a shipment group, and triggers a charge
   /// capture for orderinvoice enabled orders.
@@ -2866,10 +2860,10 @@
   }
 }
 
-class OrderreportsResourceApi {
+class OrderreportsResource {
   final commons.ApiRequester _requester;
 
-  OrderreportsResourceApi(commons.ApiRequester client) : _requester = client;
+  OrderreportsResource(commons.ApiRequester client) : _requester = client;
 
   /// Retrieves a report for disbursements from your Merchant Center account.
   ///
@@ -3044,10 +3038,10 @@
   }
 }
 
-class OrderreturnsResourceApi {
+class OrderreturnsResource {
   final commons.ApiRequester _requester;
 
-  OrderreturnsResourceApi(commons.ApiRequester client) : _requester = client;
+  OrderreturnsResource(commons.ApiRequester client) : _requester = client;
 
   /// Acks an order return in your Merchant Center account.
   ///
@@ -3453,10 +3447,10 @@
   }
 }
 
-class OrdersResourceApi {
+class OrdersResource {
   final commons.ApiRequester _requester;
 
-  OrdersResourceApi(commons.ApiRequester client) : _requester = client;
+  OrdersResource(commons.ApiRequester client) : _requester = client;
 
   /// Marks an order as acknowledged.
   ///
@@ -4908,10 +4902,10 @@
   }
 }
 
-class PosResourceApi {
+class PosResource {
   final commons.ApiRequester _requester;
 
-  PosResourceApi(commons.ApiRequester client) : _requester = client;
+  PosResource(commons.ApiRequester client) : _requester = client;
 
   /// Batches multiple POS-related calls in a single request.
   ///
@@ -5354,10 +5348,10 @@
   }
 }
 
-class ProductsResourceApi {
+class ProductsResource {
   final commons.ApiRequester _requester;
 
-  ProductsResourceApi(commons.ApiRequester client) : _requester = client;
+  ProductsResource(commons.ApiRequester client) : _requester = client;
 
   /// Retrieves, inserts, and deletes multiple products in a single request.
   ///
@@ -5667,10 +5661,10 @@
   }
 }
 
-class ProductstatusesResourceApi {
+class ProductstatusesResource {
   final commons.ApiRequester _requester;
 
-  ProductstatusesResourceApi(commons.ApiRequester client) : _requester = client;
+  ProductstatusesResource(commons.ApiRequester client) : _requester = client;
 
   /// Gets the statuses of multiple products in a single request.
   ///
@@ -5863,10 +5857,10 @@
   }
 }
 
-class PubsubnotificationsettingsResourceApi {
+class PubsubnotificationsettingsResource {
   final commons.ApiRequester _requester;
 
-  PubsubnotificationsettingsResourceApi(commons.ApiRequester client)
+  PubsubnotificationsettingsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Retrieves a Merchant Center account's pubsub notification settings.
@@ -5982,11 +5976,10 @@
   }
 }
 
-class RegionalinventoryResourceApi {
+class RegionalinventoryResource {
   final commons.ApiRequester _requester;
 
-  RegionalinventoryResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  RegionalinventoryResource(commons.ApiRequester client) : _requester = client;
 
   /// Updates regional inventory for multiple products or regions in a single
   /// request.
@@ -6111,10 +6104,10 @@
   }
 }
 
-class ReturnaddressResourceApi {
+class ReturnaddressResource {
   final commons.ApiRequester _requester;
 
-  ReturnaddressResourceApi(commons.ApiRequester client) : _requester = client;
+  ReturnaddressResource(commons.ApiRequester client) : _requester = client;
 
   /// Batches multiple return address related calls in a single request.
   ///
@@ -6414,10 +6407,10 @@
   }
 }
 
-class ReturnpolicyResourceApi {
+class ReturnpolicyResource {
   final commons.ApiRequester _requester;
 
-  ReturnpolicyResourceApi(commons.ApiRequester client) : _requester = client;
+  ReturnpolicyResource(commons.ApiRequester client) : _requester = client;
 
   /// Batches multiple return policy related calls in a single request.
   ///
@@ -6697,11 +6690,10 @@
   }
 }
 
-class SettlementreportsResourceApi {
+class SettlementreportsResource {
   final commons.ApiRequester _requester;
 
-  SettlementreportsResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  SettlementreportsResource(commons.ApiRequester client) : _requester = client;
 
   /// Retrieves a settlement report from your Merchant Center account.
   ///
@@ -6842,10 +6834,10 @@
   }
 }
 
-class SettlementtransactionsResourceApi {
+class SettlementtransactionsResource {
   final commons.ApiRequester _requester;
 
-  SettlementtransactionsResourceApi(commons.ApiRequester client)
+  SettlementtransactionsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Retrieves a list of transactions for the settlement.
@@ -6930,11 +6922,10 @@
   }
 }
 
-class ShippingsettingsResourceApi {
+class ShippingsettingsResource {
   final commons.ApiRequester _requester;
 
-  ShippingsettingsResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  ShippingsettingsResource(commons.ApiRequester client) : _requester = client;
 
   /// Retrieves and updates the shipping settings of multiple accounts in a
   /// single request.
diff --git a/generated/googleapis/lib/customsearch/v1.dart b/generated/googleapis/lib/customsearch/v1.dart
index 748e229..432c49d 100644
--- a/generated/googleapis/lib/customsearch/v1.dart
+++ b/generated/googleapis/lib/customsearch/v1.dart
@@ -24,8 +24,8 @@
 ///
 /// Create an instance of [CustomSearchApi] to access these resources:
 ///
-/// - [CseResourceApi]
-///   - [CseSiterestrictResourceApi]
+/// - [CseResource]
+///   - [CseSiterestrictResource]
 library customsearch.v1;
 
 import 'dart:async' as async;
@@ -43,7 +43,7 @@
 class CustomSearchApi {
   final commons.ApiRequester _requester;
 
-  CseResourceApi get cse => CseResourceApi(_requester);
+  CseResource get cse => CseResource(_requester);
 
   CustomSearchApi(http.Client client,
       {core.String rootUrl = 'https://customsearch.googleapis.com/',
@@ -52,13 +52,13 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class CseResourceApi {
+class CseResource {
   final commons.ApiRequester _requester;
 
-  CseSiterestrictResourceApi get siterestrict =>
-      CseSiterestrictResourceApi(_requester);
+  CseSiterestrictResource get siterestrict =>
+      CseSiterestrictResource(_requester);
 
-  CseResourceApi(commons.ApiRequester client) : _requester = client;
+  CseResource(commons.ApiRequester client) : _requester = client;
 
   /// Returns metadata about the search performed, metadata about the engine
   /// used for the search, and the search results.
@@ -436,10 +436,10 @@
   }
 }
 
-class CseSiterestrictResourceApi {
+class CseSiterestrictResource {
   final commons.ApiRequester _requester;
 
-  CseSiterestrictResourceApi(commons.ApiRequester client) : _requester = client;
+  CseSiterestrictResource(commons.ApiRequester client) : _requester = client;
 
   /// Returns metadata about the search performed, metadata about the engine
   /// used for the search, and the search results. Uses a small set of url
diff --git a/generated/googleapis/lib/dataproc/v1.dart b/generated/googleapis/lib/dataproc/v1.dart
index 93c943f..1114435 100644
--- a/generated/googleapis/lib/dataproc/v1.dart
+++ b/generated/googleapis/lib/dataproc/v1.dart
@@ -23,16 +23,16 @@
 ///
 /// Create an instance of [DataprocApi] to access these resources:
 ///
-/// - [ProjectsResourceApi]
-///   - [ProjectsLocationsResourceApi]
-///     - [ProjectsLocationsAutoscalingPoliciesResourceApi]
-///     - [ProjectsLocationsWorkflowTemplatesResourceApi]
-///   - [ProjectsRegionsResourceApi]
-///     - [ProjectsRegionsAutoscalingPoliciesResourceApi]
-///     - [ProjectsRegionsClustersResourceApi]
-///     - [ProjectsRegionsJobsResourceApi]
-///     - [ProjectsRegionsOperationsResourceApi]
-///     - [ProjectsRegionsWorkflowTemplatesResourceApi]
+/// - [ProjectsResource]
+///   - [ProjectsLocationsResource]
+///     - [ProjectsLocationsAutoscalingPoliciesResource]
+///     - [ProjectsLocationsWorkflowTemplatesResource]
+///   - [ProjectsRegionsResource]
+///     - [ProjectsRegionsAutoscalingPoliciesResource]
+///     - [ProjectsRegionsClustersResource]
+///     - [ProjectsRegionsJobsResource]
+///     - [ProjectsRegionsOperationsResource]
+///     - [ProjectsRegionsWorkflowTemplatesResource]
 library dataproc.v1;
 
 import 'dart:async' as async;
@@ -55,7 +55,7 @@
 
   final commons.ApiRequester _requester;
 
-  ProjectsResourceApi get projects => ProjectsResourceApi(_requester);
+  ProjectsResource get projects => ProjectsResource(_requester);
 
   DataprocApi(http.Client client,
       {core.String rootUrl = 'https://dataproc.googleapis.com/',
@@ -64,33 +64,31 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class ProjectsResourceApi {
+class ProjectsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsLocationsResourceApi get locations =>
-      ProjectsLocationsResourceApi(_requester);
-  ProjectsRegionsResourceApi get regions =>
-      ProjectsRegionsResourceApi(_requester);
+  ProjectsLocationsResource get locations =>
+      ProjectsLocationsResource(_requester);
+  ProjectsRegionsResource get regions => ProjectsRegionsResource(_requester);
 
-  ProjectsResourceApi(commons.ApiRequester client) : _requester = client;
+  ProjectsResource(commons.ApiRequester client) : _requester = client;
 }
 
-class ProjectsLocationsResourceApi {
+class ProjectsLocationsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsLocationsAutoscalingPoliciesResourceApi get autoscalingPolicies =>
-      ProjectsLocationsAutoscalingPoliciesResourceApi(_requester);
-  ProjectsLocationsWorkflowTemplatesResourceApi get workflowTemplates =>
-      ProjectsLocationsWorkflowTemplatesResourceApi(_requester);
+  ProjectsLocationsAutoscalingPoliciesResource get autoscalingPolicies =>
+      ProjectsLocationsAutoscalingPoliciesResource(_requester);
+  ProjectsLocationsWorkflowTemplatesResource get workflowTemplates =>
+      ProjectsLocationsWorkflowTemplatesResource(_requester);
 
-  ProjectsLocationsResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  ProjectsLocationsResource(commons.ApiRequester client) : _requester = client;
 }
 
-class ProjectsLocationsAutoscalingPoliciesResourceApi {
+class ProjectsLocationsAutoscalingPoliciesResource {
   final commons.ApiRequester _requester;
 
-  ProjectsLocationsAutoscalingPoliciesResourceApi(commons.ApiRequester client)
+  ProjectsLocationsAutoscalingPoliciesResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Creates new autoscaling policy.
@@ -615,10 +613,10 @@
   }
 }
 
-class ProjectsLocationsWorkflowTemplatesResourceApi {
+class ProjectsLocationsWorkflowTemplatesResource {
   final commons.ApiRequester _requester;
 
-  ProjectsLocationsWorkflowTemplatesResourceApi(commons.ApiRequester client)
+  ProjectsLocationsWorkflowTemplatesResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Creates new workflow template.
@@ -1323,27 +1321,27 @@
   }
 }
 
-class ProjectsRegionsResourceApi {
+class ProjectsRegionsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsRegionsAutoscalingPoliciesResourceApi get autoscalingPolicies =>
-      ProjectsRegionsAutoscalingPoliciesResourceApi(_requester);
-  ProjectsRegionsClustersResourceApi get clusters =>
-      ProjectsRegionsClustersResourceApi(_requester);
-  ProjectsRegionsJobsResourceApi get jobs =>
-      ProjectsRegionsJobsResourceApi(_requester);
-  ProjectsRegionsOperationsResourceApi get operations =>
-      ProjectsRegionsOperationsResourceApi(_requester);
-  ProjectsRegionsWorkflowTemplatesResourceApi get workflowTemplates =>
-      ProjectsRegionsWorkflowTemplatesResourceApi(_requester);
+  ProjectsRegionsAutoscalingPoliciesResource get autoscalingPolicies =>
+      ProjectsRegionsAutoscalingPoliciesResource(_requester);
+  ProjectsRegionsClustersResource get clusters =>
+      ProjectsRegionsClustersResource(_requester);
+  ProjectsRegionsJobsResource get jobs =>
+      ProjectsRegionsJobsResource(_requester);
+  ProjectsRegionsOperationsResource get operations =>
+      ProjectsRegionsOperationsResource(_requester);
+  ProjectsRegionsWorkflowTemplatesResource get workflowTemplates =>
+      ProjectsRegionsWorkflowTemplatesResource(_requester);
 
-  ProjectsRegionsResourceApi(commons.ApiRequester client) : _requester = client;
+  ProjectsRegionsResource(commons.ApiRequester client) : _requester = client;
 }
 
-class ProjectsRegionsAutoscalingPoliciesResourceApi {
+class ProjectsRegionsAutoscalingPoliciesResource {
   final commons.ApiRequester _requester;
 
-  ProjectsRegionsAutoscalingPoliciesResourceApi(commons.ApiRequester client)
+  ProjectsRegionsAutoscalingPoliciesResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Creates new autoscaling policy.
@@ -1868,10 +1866,10 @@
   }
 }
 
-class ProjectsRegionsClustersResourceApi {
+class ProjectsRegionsClustersResource {
   final commons.ApiRequester _requester;
 
-  ProjectsRegionsClustersResourceApi(commons.ApiRequester client)
+  ProjectsRegionsClustersResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Creates a cluster in a project. The returned Operation.metadata will be
@@ -2601,10 +2599,10 @@
   }
 }
 
-class ProjectsRegionsJobsResourceApi {
+class ProjectsRegionsJobsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsRegionsJobsResourceApi(commons.ApiRequester client)
+  ProjectsRegionsJobsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Starts a job cancellation request. To access the job resource after
@@ -3342,10 +3340,10 @@
   }
 }
 
-class ProjectsRegionsOperationsResourceApi {
+class ProjectsRegionsOperationsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsRegionsOperationsResourceApi(commons.ApiRequester client)
+  ProjectsRegionsOperationsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Starts asynchronous cancellation on a long-running operation. The server
@@ -3784,10 +3782,10 @@
   }
 }
 
-class ProjectsRegionsWorkflowTemplatesResourceApi {
+class ProjectsRegionsWorkflowTemplatesResource {
   final commons.ApiRequester _requester;
 
-  ProjectsRegionsWorkflowTemplatesResourceApi(commons.ApiRequester client)
+  ProjectsRegionsWorkflowTemplatesResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Creates new workflow template.
diff --git a/generated/googleapis/lib/datastore/v1.dart b/generated/googleapis/lib/datastore/v1.dart
index a306a80..37b4ada 100644
--- a/generated/googleapis/lib/datastore/v1.dart
+++ b/generated/googleapis/lib/datastore/v1.dart
@@ -24,9 +24,9 @@
 ///
 /// Create an instance of [DatastoreApi] to access these resources:
 ///
-/// - [ProjectsResourceApi]
-///   - [ProjectsIndexesResourceApi]
-///   - [ProjectsOperationsResourceApi]
+/// - [ProjectsResource]
+///   - [ProjectsIndexesResource]
+///   - [ProjectsOperationsResource]
 library datastore.v1;
 
 import 'dart:async' as async;
@@ -53,7 +53,7 @@
 
   final commons.ApiRequester _requester;
 
-  ProjectsResourceApi get projects => ProjectsResourceApi(_requester);
+  ProjectsResource get projects => ProjectsResource(_requester);
 
   DatastoreApi(http.Client client,
       {core.String rootUrl = 'https://datastore.googleapis.com/',
@@ -62,15 +62,14 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class ProjectsResourceApi {
+class ProjectsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsIndexesResourceApi get indexes =>
-      ProjectsIndexesResourceApi(_requester);
-  ProjectsOperationsResourceApi get operations =>
-      ProjectsOperationsResourceApi(_requester);
+  ProjectsIndexesResource get indexes => ProjectsIndexesResource(_requester);
+  ProjectsOperationsResource get operations =>
+      ProjectsOperationsResource(_requester);
 
-  ProjectsResourceApi(commons.ApiRequester client) : _requester = client;
+  ProjectsResource(commons.ApiRequester client) : _requester = client;
 
   /// Allocates IDs for the given keys, which is useful for referencing an
   /// entity before it is inserted.
@@ -625,10 +624,10 @@
   }
 }
 
-class ProjectsIndexesResourceApi {
+class ProjectsIndexesResource {
   final commons.ApiRequester _requester;
 
-  ProjectsIndexesResourceApi(commons.ApiRequester client) : _requester = client;
+  ProjectsIndexesResource(commons.ApiRequester client) : _requester = client;
 
   /// Creates the specified index. A newly created index's initial state is
   /// `CREATING`. On completion of the returned google.longrunning.Operation,
@@ -898,11 +897,10 @@
   }
 }
 
-class ProjectsOperationsResourceApi {
+class ProjectsOperationsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsOperationsResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  ProjectsOperationsResource(commons.ApiRequester client) : _requester = client;
 
   /// Starts asynchronous cancellation on a long-running operation. The server
   /// makes a best effort to cancel the operation, but success is not
diff --git a/generated/googleapis/lib/deploymentmanager/v2.dart b/generated/googleapis/lib/deploymentmanager/v2.dart
index 84a38aa..3115690 100644
--- a/generated/googleapis/lib/deploymentmanager/v2.dart
+++ b/generated/googleapis/lib/deploymentmanager/v2.dart
@@ -24,11 +24,11 @@
 ///
 /// Create an instance of [DeploymentManagerApi] to access these resources:
 ///
-/// - [DeploymentsResourceApi]
-/// - [ManifestsResourceApi]
-/// - [OperationsResourceApi]
-/// - [ResourcesResourceApi]
-/// - [TypesResourceApi]
+/// - [DeploymentsResource]
+/// - [ManifestsResource]
+/// - [OperationsResource]
+/// - [ResourcesResource]
+/// - [TypesResource]
 library deploymentmanager.v2;
 
 import 'dart:async' as async;
@@ -66,11 +66,11 @@
 
   final commons.ApiRequester _requester;
 
-  DeploymentsResourceApi get deployments => DeploymentsResourceApi(_requester);
-  ManifestsResourceApi get manifests => ManifestsResourceApi(_requester);
-  OperationsResourceApi get operations => OperationsResourceApi(_requester);
-  ResourcesResourceApi get resources => ResourcesResourceApi(_requester);
-  TypesResourceApi get types => TypesResourceApi(_requester);
+  DeploymentsResource get deployments => DeploymentsResource(_requester);
+  ManifestsResource get manifests => ManifestsResource(_requester);
+  OperationsResource get operations => OperationsResource(_requester);
+  ResourcesResource get resources => ResourcesResource(_requester);
+  TypesResource get types => TypesResource(_requester);
 
   DeploymentManagerApi(http.Client client,
       {core.String rootUrl = 'https://www.googleapis.com/',
@@ -79,10 +79,10 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class DeploymentsResourceApi {
+class DeploymentsResource {
   final commons.ApiRequester _requester;
 
-  DeploymentsResourceApi(commons.ApiRequester client) : _requester = client;
+  DeploymentsResource(commons.ApiRequester client) : _requester = client;
 
   /// Cancels and removes the preview currently associated with the deployment.
   ///
@@ -954,10 +954,10 @@
   }
 }
 
-class ManifestsResourceApi {
+class ManifestsResource {
   final commons.ApiRequester _requester;
 
-  ManifestsResourceApi(commons.ApiRequester client) : _requester = client;
+  ManifestsResource(commons.ApiRequester client) : _requester = client;
 
   /// Gets information about a specific manifest.
   ///
@@ -1154,10 +1154,10 @@
   }
 }
 
-class OperationsResourceApi {
+class OperationsResource {
   final commons.ApiRequester _requester;
 
-  OperationsResourceApi(commons.ApiRequester client) : _requester = client;
+  OperationsResource(commons.ApiRequester client) : _requester = client;
 
   /// Gets information about a specific operation.
   ///
@@ -1334,10 +1334,10 @@
   }
 }
 
-class ResourcesResourceApi {
+class ResourcesResource {
   final commons.ApiRequester _requester;
 
-  ResourcesResourceApi(commons.ApiRequester client) : _requester = client;
+  ResourcesResource(commons.ApiRequester client) : _requester = client;
 
   /// Gets information about a single resource.
   ///
@@ -1533,10 +1533,10 @@
   }
 }
 
-class TypesResourceApi {
+class TypesResource {
   final commons.ApiRequester _requester;
 
-  TypesResourceApi(commons.ApiRequester client) : _requester = client;
+  TypesResource(commons.ApiRequester client) : _requester = client;
 
   /// Lists all resource types for Deployment Manager.
   ///
diff --git a/generated/googleapis/lib/dfareporting/v3_4.dart b/generated/googleapis/lib/dfareporting/v3_4.dart
index fd7021d..8f543ab 100644
--- a/generated/googleapis/lib/dfareporting/v3_4.dart
+++ b/generated/googleapis/lib/dfareporting/v3_4.dart
@@ -24,69 +24,69 @@
 ///
 /// Create an instance of [DfareportingApi] to access these resources:
 ///
-/// - [AccountActiveAdSummariesResourceApi]
-/// - [AccountPermissionGroupsResourceApi]
-/// - [AccountPermissionsResourceApi]
-/// - [AccountUserProfilesResourceApi]
-/// - [AccountsResourceApi]
-/// - [AdsResourceApi]
-/// - [AdvertiserGroupsResourceApi]
-/// - [AdvertiserLandingPagesResourceApi]
-/// - [AdvertisersResourceApi]
-/// - [BrowsersResourceApi]
-/// - [CampaignCreativeAssociationsResourceApi]
-/// - [CampaignsResourceApi]
-/// - [ChangeLogsResourceApi]
-/// - [CitiesResourceApi]
-/// - [ConnectionTypesResourceApi]
-/// - [ContentCategoriesResourceApi]
-/// - [ConversionsResourceApi]
-/// - [CountriesResourceApi]
-/// - [CreativeAssetsResourceApi]
-/// - [CreativeFieldValuesResourceApi]
-/// - [CreativeFieldsResourceApi]
-/// - [CreativeGroupsResourceApi]
-/// - [CreativesResourceApi]
-/// - [CustomEventsResourceApi]
-/// - [DimensionValuesResourceApi]
-/// - [DirectorySitesResourceApi]
-/// - [DynamicTargetingKeysResourceApi]
-/// - [EventTagsResourceApi]
-/// - [FilesResourceApi]
-/// - [FloodlightActivitiesResourceApi]
-/// - [FloodlightActivityGroupsResourceApi]
-/// - [FloodlightConfigurationsResourceApi]
-/// - [InventoryItemsResourceApi]
-/// - [LanguagesResourceApi]
-/// - [MetrosResourceApi]
-/// - [MobileAppsResourceApi]
-/// - [MobileCarriersResourceApi]
-/// - [OperatingSystemVersionsResourceApi]
-/// - [OperatingSystemsResourceApi]
-/// - [OrderDocumentsResourceApi]
-/// - [OrdersResourceApi]
-/// - [PlacementGroupsResourceApi]
-/// - [PlacementStrategiesResourceApi]
-/// - [PlacementsResourceApi]
-/// - [PlatformTypesResourceApi]
-/// - [PostalCodesResourceApi]
-/// - [ProjectsResourceApi]
-/// - [RegionsResourceApi]
-/// - [RemarketingListSharesResourceApi]
-/// - [RemarketingListsResourceApi]
-/// - [ReportsResourceApi]
-///   - [ReportsCompatibleFieldsResourceApi]
-///   - [ReportsFilesResourceApi]
-/// - [SitesResourceApi]
-/// - [SizesResourceApi]
-/// - [SubaccountsResourceApi]
-/// - [TargetableRemarketingListsResourceApi]
-/// - [TargetingTemplatesResourceApi]
-/// - [UserProfilesResourceApi]
-/// - [UserRolePermissionGroupsResourceApi]
-/// - [UserRolePermissionsResourceApi]
-/// - [UserRolesResourceApi]
-/// - [VideoFormatsResourceApi]
+/// - [AccountActiveAdSummariesResource]
+/// - [AccountPermissionGroupsResource]
+/// - [AccountPermissionsResource]
+/// - [AccountUserProfilesResource]
+/// - [AccountsResource]
+/// - [AdsResource]
+/// - [AdvertiserGroupsResource]
+/// - [AdvertiserLandingPagesResource]
+/// - [AdvertisersResource]
+/// - [BrowsersResource]
+/// - [CampaignCreativeAssociationsResource]
+/// - [CampaignsResource]
+/// - [ChangeLogsResource]
+/// - [CitiesResource]
+/// - [ConnectionTypesResource]
+/// - [ContentCategoriesResource]
+/// - [ConversionsResource]
+/// - [CountriesResource]
+/// - [CreativeAssetsResource]
+/// - [CreativeFieldValuesResource]
+/// - [CreativeFieldsResource]
+/// - [CreativeGroupsResource]
+/// - [CreativesResource]
+/// - [CustomEventsResource]
+/// - [DimensionValuesResource]
+/// - [DirectorySitesResource]
+/// - [DynamicTargetingKeysResource]
+/// - [EventTagsResource]
+/// - [FilesResource]
+/// - [FloodlightActivitiesResource]
+/// - [FloodlightActivityGroupsResource]
+/// - [FloodlightConfigurationsResource]
+/// - [InventoryItemsResource]
+/// - [LanguagesResource]
+/// - [MetrosResource]
+/// - [MobileAppsResource]
+/// - [MobileCarriersResource]
+/// - [OperatingSystemVersionsResource]
+/// - [OperatingSystemsResource]
+/// - [OrderDocumentsResource]
+/// - [OrdersResource]
+/// - [PlacementGroupsResource]
+/// - [PlacementStrategiesResource]
+/// - [PlacementsResource]
+/// - [PlatformTypesResource]
+/// - [PostalCodesResource]
+/// - [ProjectsResource]
+/// - [RegionsResource]
+/// - [RemarketingListSharesResource]
+/// - [RemarketingListsResource]
+/// - [ReportsResource]
+///   - [ReportsCompatibleFieldsResource]
+///   - [ReportsFilesResource]
+/// - [SitesResource]
+/// - [SizesResource]
+/// - [SubaccountsResource]
+/// - [TargetableRemarketingListsResource]
+/// - [TargetingTemplatesResource]
+/// - [UserProfilesResource]
+/// - [UserRolePermissionGroupsResource]
+/// - [UserRolePermissionsResource]
+/// - [UserRolesResource]
+/// - [VideoFormatsResource]
 library dfareporting.v3_4;
 
 import 'dart:async' as async;
@@ -126,103 +126,99 @@
 
   final commons.ApiRequester _requester;
 
-  AccountActiveAdSummariesResourceApi get accountActiveAdSummaries =>
-      AccountActiveAdSummariesResourceApi(_requester);
-  AccountPermissionGroupsResourceApi get accountPermissionGroups =>
-      AccountPermissionGroupsResourceApi(_requester);
-  AccountPermissionsResourceApi get accountPermissions =>
-      AccountPermissionsResourceApi(_requester);
-  AccountUserProfilesResourceApi get accountUserProfiles =>
-      AccountUserProfilesResourceApi(_requester);
-  AccountsResourceApi get accounts => AccountsResourceApi(_requester);
-  AdsResourceApi get ads => AdsResourceApi(_requester);
-  AdvertiserGroupsResourceApi get advertiserGroups =>
-      AdvertiserGroupsResourceApi(_requester);
-  AdvertiserLandingPagesResourceApi get advertiserLandingPages =>
-      AdvertiserLandingPagesResourceApi(_requester);
-  AdvertisersResourceApi get advertisers => AdvertisersResourceApi(_requester);
-  BrowsersResourceApi get browsers => BrowsersResourceApi(_requester);
-  CampaignCreativeAssociationsResourceApi get campaignCreativeAssociations =>
-      CampaignCreativeAssociationsResourceApi(_requester);
-  CampaignsResourceApi get campaigns => CampaignsResourceApi(_requester);
-  ChangeLogsResourceApi get changeLogs => ChangeLogsResourceApi(_requester);
-  CitiesResourceApi get cities => CitiesResourceApi(_requester);
-  ConnectionTypesResourceApi get connectionTypes =>
-      ConnectionTypesResourceApi(_requester);
-  ContentCategoriesResourceApi get contentCategories =>
-      ContentCategoriesResourceApi(_requester);
-  ConversionsResourceApi get conversions => ConversionsResourceApi(_requester);
-  CountriesResourceApi get countries => CountriesResourceApi(_requester);
-  CreativeAssetsResourceApi get creativeAssets =>
-      CreativeAssetsResourceApi(_requester);
-  CreativeFieldValuesResourceApi get creativeFieldValues =>
-      CreativeFieldValuesResourceApi(_requester);
-  CreativeFieldsResourceApi get creativeFields =>
-      CreativeFieldsResourceApi(_requester);
-  CreativeGroupsResourceApi get creativeGroups =>
-      CreativeGroupsResourceApi(_requester);
-  CreativesResourceApi get creatives => CreativesResourceApi(_requester);
-  CustomEventsResourceApi get customEvents =>
-      CustomEventsResourceApi(_requester);
-  DimensionValuesResourceApi get dimensionValues =>
-      DimensionValuesResourceApi(_requester);
-  DirectorySitesResourceApi get directorySites =>
-      DirectorySitesResourceApi(_requester);
-  DynamicTargetingKeysResourceApi get dynamicTargetingKeys =>
-      DynamicTargetingKeysResourceApi(_requester);
-  EventTagsResourceApi get eventTags => EventTagsResourceApi(_requester);
-  FilesResourceApi get files => FilesResourceApi(_requester);
-  FloodlightActivitiesResourceApi get floodlightActivities =>
-      FloodlightActivitiesResourceApi(_requester);
-  FloodlightActivityGroupsResourceApi get floodlightActivityGroups =>
-      FloodlightActivityGroupsResourceApi(_requester);
-  FloodlightConfigurationsResourceApi get floodlightConfigurations =>
-      FloodlightConfigurationsResourceApi(_requester);
-  InventoryItemsResourceApi get inventoryItems =>
-      InventoryItemsResourceApi(_requester);
-  LanguagesResourceApi get languages => LanguagesResourceApi(_requester);
-  MetrosResourceApi get metros => MetrosResourceApi(_requester);
-  MobileAppsResourceApi get mobileApps => MobileAppsResourceApi(_requester);
-  MobileCarriersResourceApi get mobileCarriers =>
-      MobileCarriersResourceApi(_requester);
-  OperatingSystemVersionsResourceApi get operatingSystemVersions =>
-      OperatingSystemVersionsResourceApi(_requester);
-  OperatingSystemsResourceApi get operatingSystems =>
-      OperatingSystemsResourceApi(_requester);
-  OrderDocumentsResourceApi get orderDocuments =>
-      OrderDocumentsResourceApi(_requester);
-  OrdersResourceApi get orders => OrdersResourceApi(_requester);
-  PlacementGroupsResourceApi get placementGroups =>
-      PlacementGroupsResourceApi(_requester);
-  PlacementStrategiesResourceApi get placementStrategies =>
-      PlacementStrategiesResourceApi(_requester);
-  PlacementsResourceApi get placements => PlacementsResourceApi(_requester);
-  PlatformTypesResourceApi get platformTypes =>
-      PlatformTypesResourceApi(_requester);
-  PostalCodesResourceApi get postalCodes => PostalCodesResourceApi(_requester);
-  ProjectsResourceApi get projects => ProjectsResourceApi(_requester);
-  RegionsResourceApi get regions => RegionsResourceApi(_requester);
-  RemarketingListSharesResourceApi get remarketingListShares =>
-      RemarketingListSharesResourceApi(_requester);
-  RemarketingListsResourceApi get remarketingLists =>
-      RemarketingListsResourceApi(_requester);
-  ReportsResourceApi get reports => ReportsResourceApi(_requester);
-  SitesResourceApi get sites => SitesResourceApi(_requester);
-  SizesResourceApi get sizes => SizesResourceApi(_requester);
-  SubaccountsResourceApi get subaccounts => SubaccountsResourceApi(_requester);
-  TargetableRemarketingListsResourceApi get targetableRemarketingLists =>
-      TargetableRemarketingListsResourceApi(_requester);
-  TargetingTemplatesResourceApi get targetingTemplates =>
-      TargetingTemplatesResourceApi(_requester);
-  UserProfilesResourceApi get userProfiles =>
-      UserProfilesResourceApi(_requester);
-  UserRolePermissionGroupsResourceApi get userRolePermissionGroups =>
-      UserRolePermissionGroupsResourceApi(_requester);
-  UserRolePermissionsResourceApi get userRolePermissions =>
-      UserRolePermissionsResourceApi(_requester);
-  UserRolesResourceApi get userRoles => UserRolesResourceApi(_requester);
-  VideoFormatsResourceApi get videoFormats =>
-      VideoFormatsResourceApi(_requester);
+  AccountActiveAdSummariesResource get accountActiveAdSummaries =>
+      AccountActiveAdSummariesResource(_requester);
+  AccountPermissionGroupsResource get accountPermissionGroups =>
+      AccountPermissionGroupsResource(_requester);
+  AccountPermissionsResource get accountPermissions =>
+      AccountPermissionsResource(_requester);
+  AccountUserProfilesResource get accountUserProfiles =>
+      AccountUserProfilesResource(_requester);
+  AccountsResource get accounts => AccountsResource(_requester);
+  AdsResource get ads => AdsResource(_requester);
+  AdvertiserGroupsResource get advertiserGroups =>
+      AdvertiserGroupsResource(_requester);
+  AdvertiserLandingPagesResource get advertiserLandingPages =>
+      AdvertiserLandingPagesResource(_requester);
+  AdvertisersResource get advertisers => AdvertisersResource(_requester);
+  BrowsersResource get browsers => BrowsersResource(_requester);
+  CampaignCreativeAssociationsResource get campaignCreativeAssociations =>
+      CampaignCreativeAssociationsResource(_requester);
+  CampaignsResource get campaigns => CampaignsResource(_requester);
+  ChangeLogsResource get changeLogs => ChangeLogsResource(_requester);
+  CitiesResource get cities => CitiesResource(_requester);
+  ConnectionTypesResource get connectionTypes =>
+      ConnectionTypesResource(_requester);
+  ContentCategoriesResource get contentCategories =>
+      ContentCategoriesResource(_requester);
+  ConversionsResource get conversions => ConversionsResource(_requester);
+  CountriesResource get countries => CountriesResource(_requester);
+  CreativeAssetsResource get creativeAssets =>
+      CreativeAssetsResource(_requester);
+  CreativeFieldValuesResource get creativeFieldValues =>
+      CreativeFieldValuesResource(_requester);
+  CreativeFieldsResource get creativeFields =>
+      CreativeFieldsResource(_requester);
+  CreativeGroupsResource get creativeGroups =>
+      CreativeGroupsResource(_requester);
+  CreativesResource get creatives => CreativesResource(_requester);
+  CustomEventsResource get customEvents => CustomEventsResource(_requester);
+  DimensionValuesResource get dimensionValues =>
+      DimensionValuesResource(_requester);
+  DirectorySitesResource get directorySites =>
+      DirectorySitesResource(_requester);
+  DynamicTargetingKeysResource get dynamicTargetingKeys =>
+      DynamicTargetingKeysResource(_requester);
+  EventTagsResource get eventTags => EventTagsResource(_requester);
+  FilesResource get files => FilesResource(_requester);
+  FloodlightActivitiesResource get floodlightActivities =>
+      FloodlightActivitiesResource(_requester);
+  FloodlightActivityGroupsResource get floodlightActivityGroups =>
+      FloodlightActivityGroupsResource(_requester);
+  FloodlightConfigurationsResource get floodlightConfigurations =>
+      FloodlightConfigurationsResource(_requester);
+  InventoryItemsResource get inventoryItems =>
+      InventoryItemsResource(_requester);
+  LanguagesResource get languages => LanguagesResource(_requester);
+  MetrosResource get metros => MetrosResource(_requester);
+  MobileAppsResource get mobileApps => MobileAppsResource(_requester);
+  MobileCarriersResource get mobileCarriers =>
+      MobileCarriersResource(_requester);
+  OperatingSystemVersionsResource get operatingSystemVersions =>
+      OperatingSystemVersionsResource(_requester);
+  OperatingSystemsResource get operatingSystems =>
+      OperatingSystemsResource(_requester);
+  OrderDocumentsResource get orderDocuments =>
+      OrderDocumentsResource(_requester);
+  OrdersResource get orders => OrdersResource(_requester);
+  PlacementGroupsResource get placementGroups =>
+      PlacementGroupsResource(_requester);
+  PlacementStrategiesResource get placementStrategies =>
+      PlacementStrategiesResource(_requester);
+  PlacementsResource get placements => PlacementsResource(_requester);
+  PlatformTypesResource get platformTypes => PlatformTypesResource(_requester);
+  PostalCodesResource get postalCodes => PostalCodesResource(_requester);
+  ProjectsResource get projects => ProjectsResource(_requester);
+  RegionsResource get regions => RegionsResource(_requester);
+  RemarketingListSharesResource get remarketingListShares =>
+      RemarketingListSharesResource(_requester);
+  RemarketingListsResource get remarketingLists =>
+      RemarketingListsResource(_requester);
+  ReportsResource get reports => ReportsResource(_requester);
+  SitesResource get sites => SitesResource(_requester);
+  SizesResource get sizes => SizesResource(_requester);
+  SubaccountsResource get subaccounts => SubaccountsResource(_requester);
+  TargetableRemarketingListsResource get targetableRemarketingLists =>
+      TargetableRemarketingListsResource(_requester);
+  TargetingTemplatesResource get targetingTemplates =>
+      TargetingTemplatesResource(_requester);
+  UserProfilesResource get userProfiles => UserProfilesResource(_requester);
+  UserRolePermissionGroupsResource get userRolePermissionGroups =>
+      UserRolePermissionGroupsResource(_requester);
+  UserRolePermissionsResource get userRolePermissions =>
+      UserRolePermissionsResource(_requester);
+  UserRolesResource get userRoles => UserRolesResource(_requester);
+  VideoFormatsResource get videoFormats => VideoFormatsResource(_requester);
 
   DfareportingApi(http.Client client,
       {core.String rootUrl = 'https://dfareporting.googleapis.com/',
@@ -231,10 +227,10 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class AccountActiveAdSummariesResourceApi {
+class AccountActiveAdSummariesResource {
   final commons.ApiRequester _requester;
 
-  AccountActiveAdSummariesResourceApi(commons.ApiRequester client)
+  AccountActiveAdSummariesResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Gets the account's active ad summary by account ID.
@@ -298,10 +294,10 @@
   }
 }
 
-class AccountPermissionGroupsResourceApi {
+class AccountPermissionGroupsResource {
   final commons.ApiRequester _requester;
 
-  AccountPermissionGroupsResourceApi(commons.ApiRequester client)
+  AccountPermissionGroupsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Gets one account permission group by ID.
@@ -418,11 +414,10 @@
   }
 }
 
-class AccountPermissionsResourceApi {
+class AccountPermissionsResource {
   final commons.ApiRequester _requester;
 
-  AccountPermissionsResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  AccountPermissionsResource(commons.ApiRequester client) : _requester = client;
 
   /// Gets one account permission by ID.
   ///
@@ -538,10 +533,10 @@
   }
 }
 
-class AccountUserProfilesResourceApi {
+class AccountUserProfilesResource {
   final commons.ApiRequester _requester;
 
-  AccountUserProfilesResourceApi(commons.ApiRequester client)
+  AccountUserProfilesResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Gets one account user profile by ID.
@@ -912,10 +907,10 @@
   }
 }
 
-class AccountsResourceApi {
+class AccountsResource {
   final commons.ApiRequester _requester;
 
-  AccountsResourceApi(commons.ApiRequester client) : _requester = client;
+  AccountsResource(commons.ApiRequester client) : _requester = client;
 
   /// Gets one account by ID.
   ///
@@ -1209,10 +1204,10 @@
   }
 }
 
-class AdsResourceApi {
+class AdsResource {
   final commons.ApiRequester _requester;
 
-  AdsResourceApi(commons.ApiRequester client) : _requester = client;
+  AdsResource(commons.ApiRequester client) : _requester = client;
 
   /// Gets one ad by ID.
   ///
@@ -1672,11 +1667,10 @@
   }
 }
 
-class AdvertiserGroupsResourceApi {
+class AdvertiserGroupsResource {
   final commons.ApiRequester _requester;
 
-  AdvertiserGroupsResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  AdvertiserGroupsResource(commons.ApiRequester client) : _requester = client;
 
   /// Deletes an existing advertiser group.
   ///
@@ -2086,10 +2080,10 @@
   }
 }
 
-class AdvertiserLandingPagesResourceApi {
+class AdvertiserLandingPagesResource {
   final commons.ApiRequester _requester;
 
-  AdvertiserLandingPagesResourceApi(commons.ApiRequester client)
+  AdvertiserLandingPagesResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Gets one landing page by ID.
@@ -2467,10 +2461,10 @@
   }
 }
 
-class AdvertisersResourceApi {
+class AdvertisersResource {
   final commons.ApiRequester _requester;
 
-  AdvertisersResourceApi(commons.ApiRequester client) : _requester = client;
+  AdvertisersResource(commons.ApiRequester client) : _requester = client;
 
   /// Gets one advertiser by ID.
   ///
@@ -2865,10 +2859,10 @@
   }
 }
 
-class BrowsersResourceApi {
+class BrowsersResource {
   final commons.ApiRequester _requester;
 
-  BrowsersResourceApi(commons.ApiRequester client) : _requester = client;
+  BrowsersResource(commons.ApiRequester client) : _requester = client;
 
   /// Retrieves a list of browsers.
   ///
@@ -2924,10 +2918,10 @@
   }
 }
 
-class CampaignCreativeAssociationsResourceApi {
+class CampaignCreativeAssociationsResource {
   final commons.ApiRequester _requester;
 
-  CampaignCreativeAssociationsResourceApi(commons.ApiRequester client)
+  CampaignCreativeAssociationsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Associates a creative with the specified campaign. This method creates a
@@ -3084,10 +3078,10 @@
   }
 }
 
-class CampaignsResourceApi {
+class CampaignsResource {
   final commons.ApiRequester _requester;
 
-  CampaignsResourceApi(commons.ApiRequester client) : _requester = client;
+  CampaignsResource(commons.ApiRequester client) : _requester = client;
 
   /// Gets one campaign by ID.
   ///
@@ -3481,10 +3475,10 @@
   }
 }
 
-class ChangeLogsResourceApi {
+class ChangeLogsResource {
   final commons.ApiRequester _requester;
 
-  ChangeLogsResourceApi(commons.ApiRequester client) : _requester = client;
+  ChangeLogsResource(commons.ApiRequester client) : _requester = client;
 
   /// Gets one change log by ID.
   ///
@@ -3730,10 +3724,10 @@
   }
 }
 
-class CitiesResourceApi {
+class CitiesResource {
   final commons.ApiRequester _requester;
 
-  CitiesResourceApi(commons.ApiRequester client) : _requester = client;
+  CitiesResource(commons.ApiRequester client) : _requester = client;
 
   /// Retrieves a list of cities, possibly filtered.
   ///
@@ -3813,10 +3807,10 @@
   }
 }
 
-class ConnectionTypesResourceApi {
+class ConnectionTypesResource {
   final commons.ApiRequester _requester;
 
-  ConnectionTypesResourceApi(commons.ApiRequester client) : _requester = client;
+  ConnectionTypesResource(commons.ApiRequester client) : _requester = client;
 
   /// Gets one connection type by ID.
   ///
@@ -3932,11 +3926,10 @@
   }
 }
 
-class ContentCategoriesResourceApi {
+class ContentCategoriesResource {
   final commons.ApiRequester _requester;
 
-  ContentCategoriesResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  ContentCategoriesResource(commons.ApiRequester client) : _requester = client;
 
   /// Deletes an existing content category.
   ///
@@ -4346,10 +4339,10 @@
   }
 }
 
-class ConversionsResourceApi {
+class ConversionsResource {
   final commons.ApiRequester _requester;
 
-  ConversionsResourceApi(commons.ApiRequester client) : _requester = client;
+  ConversionsResource(commons.ApiRequester client) : _requester = client;
 
   /// Inserts conversions.
   ///
@@ -4470,10 +4463,10 @@
   }
 }
 
-class CountriesResourceApi {
+class CountriesResource {
   final commons.ApiRequester _requester;
 
-  CountriesResourceApi(commons.ApiRequester client) : _requester = client;
+  CountriesResource(commons.ApiRequester client) : _requester = client;
 
   /// Gets one country by ID.
   ///
@@ -4588,10 +4581,10 @@
   }
 }
 
-class CreativeAssetsResourceApi {
+class CreativeAssetsResource {
   final commons.ApiRequester _requester;
 
-  CreativeAssetsResourceApi(commons.ApiRequester client) : _requester = client;
+  CreativeAssetsResource(commons.ApiRequester client) : _requester = client;
 
   /// Inserts a new creative asset.
   ///
@@ -4675,10 +4668,10 @@
   }
 }
 
-class CreativeFieldValuesResourceApi {
+class CreativeFieldValuesResource {
   final commons.ApiRequester _requester;
 
-  CreativeFieldValuesResourceApi(commons.ApiRequester client)
+  CreativeFieldValuesResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Deletes an existing creative field value.
@@ -5132,10 +5125,10 @@
   }
 }
 
-class CreativeFieldsResourceApi {
+class CreativeFieldsResource {
   final commons.ApiRequester _requester;
 
-  CreativeFieldsResourceApi(commons.ApiRequester client) : _requester = client;
+  CreativeFieldsResource(commons.ApiRequester client) : _requester = client;
 
   /// Deletes an existing creative field.
   ///
@@ -5552,10 +5545,10 @@
   }
 }
 
-class CreativeGroupsResourceApi {
+class CreativeGroupsResource {
   final commons.ApiRequester _requester;
 
-  CreativeGroupsResourceApi(commons.ApiRequester client) : _requester = client;
+  CreativeGroupsResource(commons.ApiRequester client) : _requester = client;
 
   /// Gets one creative group by ID.
   ///
@@ -5920,10 +5913,10 @@
   }
 }
 
-class CreativesResourceApi {
+class CreativesResource {
   final commons.ApiRequester _requester;
 
-  CreativesResourceApi(commons.ApiRequester client) : _requester = client;
+  CreativesResource(commons.ApiRequester client) : _requester = client;
 
   /// Gets one creative by ID.
   ///
@@ -6333,10 +6326,10 @@
   }
 }
 
-class CustomEventsResourceApi {
+class CustomEventsResource {
   final commons.ApiRequester _requester;
 
-  CustomEventsResourceApi(commons.ApiRequester client) : _requester = client;
+  CustomEventsResource(commons.ApiRequester client) : _requester = client;
 
   /// Inserts custom events.
   ///
@@ -6398,10 +6391,10 @@
   }
 }
 
-class DimensionValuesResourceApi {
+class DimensionValuesResource {
   final commons.ApiRequester _requester;
 
-  DimensionValuesResourceApi(commons.ApiRequester client) : _requester = client;
+  DimensionValuesResource(commons.ApiRequester client) : _requester = client;
 
   /// Retrieves list of report dimension values for a list of filters.
   ///
@@ -6476,10 +6469,10 @@
   }
 }
 
-class DirectorySitesResourceApi {
+class DirectorySitesResource {
   final commons.ApiRequester _requester;
 
-  DirectorySitesResourceApi(commons.ApiRequester client) : _requester = client;
+  DirectorySitesResource(commons.ApiRequester client) : _requester = client;
 
   /// Gets one directory site by ID.
   ///
@@ -6745,10 +6738,10 @@
   }
 }
 
-class DynamicTargetingKeysResourceApi {
+class DynamicTargetingKeysResource {
   final commons.ApiRequester _requester;
 
-  DynamicTargetingKeysResourceApi(commons.ApiRequester client)
+  DynamicTargetingKeysResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Deletes an existing dynamic targeting key.
@@ -6979,10 +6972,10 @@
   }
 }
 
-class EventTagsResourceApi {
+class EventTagsResource {
   final commons.ApiRequester _requester;
 
-  EventTagsResourceApi(commons.ApiRequester client) : _requester = client;
+  EventTagsResource(commons.ApiRequester client) : _requester = client;
 
   /// Deletes an existing event tag.
   ///
@@ -7423,10 +7416,10 @@
   }
 }
 
-class FilesResourceApi {
+class FilesResource {
   final commons.ApiRequester _requester;
 
-  FilesResourceApi(commons.ApiRequester client) : _requester = client;
+  FilesResource(commons.ApiRequester client) : _requester = client;
 
   /// Retrieves a report file by its report ID and file ID. This method supports
   /// media download.
@@ -7598,10 +7591,10 @@
   }
 }
 
-class FloodlightActivitiesResourceApi {
+class FloodlightActivitiesResource {
   final commons.ApiRequester _requester;
 
-  FloodlightActivitiesResourceApi(commons.ApiRequester client)
+  FloodlightActivitiesResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Deletes an existing floodlight activity.
@@ -8135,10 +8128,10 @@
   }
 }
 
-class FloodlightActivityGroupsResourceApi {
+class FloodlightActivityGroupsResource {
   final commons.ApiRequester _requester;
 
-  FloodlightActivityGroupsResourceApi(commons.ApiRequester client)
+  FloodlightActivityGroupsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Gets one floodlight activity group by ID.
@@ -8520,10 +8513,10 @@
   }
 }
 
-class FloodlightConfigurationsResourceApi {
+class FloodlightConfigurationsResource {
   final commons.ApiRequester _requester;
 
-  FloodlightConfigurationsResourceApi(commons.ApiRequester client)
+  FloodlightConfigurationsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Gets one floodlight configuration by ID.
@@ -8773,10 +8766,10 @@
   }
 }
 
-class InventoryItemsResourceApi {
+class InventoryItemsResource {
   final commons.ApiRequester _requester;
 
-  InventoryItemsResourceApi(commons.ApiRequester client) : _requester = client;
+  InventoryItemsResource(commons.ApiRequester client) : _requester = client;
 
   /// Gets one inventory item by ID.
   ///
@@ -8974,10 +8967,10 @@
   }
 }
 
-class LanguagesResourceApi {
+class LanguagesResource {
   final commons.ApiRequester _requester;
 
-  LanguagesResourceApi(commons.ApiRequester client) : _requester = client;
+  LanguagesResource(commons.ApiRequester client) : _requester = client;
 
   /// Retrieves a list of languages.
   ///
@@ -9033,10 +9026,10 @@
   }
 }
 
-class MetrosResourceApi {
+class MetrosResource {
   final commons.ApiRequester _requester;
 
-  MetrosResourceApi(commons.ApiRequester client) : _requester = client;
+  MetrosResource(commons.ApiRequester client) : _requester = client;
 
   /// Retrieves a list of metros.
   ///
@@ -9092,10 +9085,10 @@
   }
 }
 
-class MobileAppsResourceApi {
+class MobileAppsResource {
   final commons.ApiRequester _requester;
 
-  MobileAppsResourceApi(commons.ApiRequester client) : _requester = client;
+  MobileAppsResource(commons.ApiRequester client) : _requester = client;
 
   /// Gets one mobile app by ID.
   ///
@@ -9246,10 +9239,10 @@
   }
 }
 
-class MobileCarriersResourceApi {
+class MobileCarriersResource {
   final commons.ApiRequester _requester;
 
-  MobileCarriersResourceApi(commons.ApiRequester client) : _requester = client;
+  MobileCarriersResource(commons.ApiRequester client) : _requester = client;
 
   /// Gets one mobile carrier by ID.
   ///
@@ -9365,10 +9358,10 @@
   }
 }
 
-class OperatingSystemVersionsResourceApi {
+class OperatingSystemVersionsResource {
   final commons.ApiRequester _requester;
 
-  OperatingSystemVersionsResourceApi(commons.ApiRequester client)
+  OperatingSystemVersionsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Gets one operating system version by ID.
@@ -9485,11 +9478,10 @@
   }
 }
 
-class OperatingSystemsResourceApi {
+class OperatingSystemsResource {
   final commons.ApiRequester _requester;
 
-  OperatingSystemsResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  OperatingSystemsResource(commons.ApiRequester client) : _requester = client;
 
   /// Gets one operating system by DART ID.
   ///
@@ -9605,10 +9597,10 @@
   }
 }
 
-class OrderDocumentsResourceApi {
+class OrderDocumentsResource {
   final commons.ApiRequester _requester;
 
-  OrderDocumentsResourceApi(commons.ApiRequester client) : _requester = client;
+  OrderDocumentsResource(commons.ApiRequester client) : _requester = client;
 
   /// Gets one order document by ID.
   ///
@@ -9811,10 +9803,10 @@
   }
 }
 
-class OrdersResourceApi {
+class OrdersResource {
   final commons.ApiRequester _requester;
 
-  OrdersResourceApi(commons.ApiRequester client) : _requester = client;
+  OrdersResource(commons.ApiRequester client) : _requester = client;
 
   /// Gets one order by ID.
   ///
@@ -10000,10 +9992,10 @@
   }
 }
 
-class PlacementGroupsResourceApi {
+class PlacementGroupsResource {
   final commons.ApiRequester _requester;
 
-  PlacementGroupsResourceApi(commons.ApiRequester client) : _requester = client;
+  PlacementGroupsResource(commons.ApiRequester client) : _requester = client;
 
   /// Gets one placement group by ID.
   ///
@@ -10456,10 +10448,10 @@
   }
 }
 
-class PlacementStrategiesResourceApi {
+class PlacementStrategiesResource {
   final commons.ApiRequester _requester;
 
-  PlacementStrategiesResourceApi(commons.ApiRequester client)
+  PlacementStrategiesResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Deletes an existing placement strategy.
@@ -10871,10 +10863,10 @@
   }
 }
 
-class PlacementsResourceApi {
+class PlacementsResource {
   final commons.ApiRequester _requester;
 
-  PlacementsResourceApi(commons.ApiRequester client) : _requester = client;
+  PlacementsResource(commons.ApiRequester client) : _requester = client;
 
   /// Generates tags for a placement.
   ///
@@ -11409,10 +11401,10 @@
   }
 }
 
-class PlatformTypesResourceApi {
+class PlatformTypesResource {
   final commons.ApiRequester _requester;
 
-  PlatformTypesResourceApi(commons.ApiRequester client) : _requester = client;
+  PlatformTypesResource(commons.ApiRequester client) : _requester = client;
 
   /// Gets one platform type by ID.
   ///
@@ -11528,10 +11520,10 @@
   }
 }
 
-class PostalCodesResourceApi {
+class PostalCodesResource {
   final commons.ApiRequester _requester;
 
-  PostalCodesResourceApi(commons.ApiRequester client) : _requester = client;
+  PostalCodesResource(commons.ApiRequester client) : _requester = client;
 
   /// Gets one postal code by ID.
   ///
@@ -11647,10 +11639,10 @@
   }
 }
 
-class ProjectsResourceApi {
+class ProjectsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsResourceApi(commons.ApiRequester client) : _requester = client;
+  ProjectsResource(commons.ApiRequester client) : _requester = client;
 
   /// Gets one project by ID.
   ///
@@ -11821,10 +11813,10 @@
   }
 }
 
-class RegionsResourceApi {
+class RegionsResource {
   final commons.ApiRequester _requester;
 
-  RegionsResourceApi(commons.ApiRequester client) : _requester = client;
+  RegionsResource(commons.ApiRequester client) : _requester = client;
 
   /// Retrieves a list of regions.
   ///
@@ -11880,10 +11872,10 @@
   }
 }
 
-class RemarketingListSharesResourceApi {
+class RemarketingListSharesResource {
   final commons.ApiRequester _requester;
 
-  RemarketingListSharesResourceApi(commons.ApiRequester client)
+  RemarketingListSharesResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Gets one remarketing list share by remarketing list ID.
@@ -12073,11 +12065,10 @@
   }
 }
 
-class RemarketingListsResourceApi {
+class RemarketingListsResource {
   final commons.ApiRequester _requester;
 
-  RemarketingListsResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  RemarketingListsResource(commons.ApiRequester client) : _requester = client;
 
   /// Gets one remarketing list by ID.
   ///
@@ -12442,14 +12433,14 @@
   }
 }
 
-class ReportsResourceApi {
+class ReportsResource {
   final commons.ApiRequester _requester;
 
-  ReportsCompatibleFieldsResourceApi get compatibleFields =>
-      ReportsCompatibleFieldsResourceApi(_requester);
-  ReportsFilesResourceApi get files => ReportsFilesResourceApi(_requester);
+  ReportsCompatibleFieldsResource get compatibleFields =>
+      ReportsCompatibleFieldsResource(_requester);
+  ReportsFilesResource get files => ReportsFilesResource(_requester);
 
-  ReportsResourceApi(commons.ApiRequester client) : _requester = client;
+  ReportsResource(commons.ApiRequester client) : _requester = client;
 
   /// Deletes a report by its ID.
   ///
@@ -12918,10 +12909,10 @@
   }
 }
 
-class ReportsCompatibleFieldsResourceApi {
+class ReportsCompatibleFieldsResource {
   final commons.ApiRequester _requester;
 
-  ReportsCompatibleFieldsResourceApi(commons.ApiRequester client)
+  ReportsCompatibleFieldsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Returns the fields that are compatible to be selected in the respective
@@ -12986,10 +12977,10 @@
   }
 }
 
-class ReportsFilesResourceApi {
+class ReportsFilesResource {
   final commons.ApiRequester _requester;
 
-  ReportsFilesResourceApi(commons.ApiRequester client) : _requester = client;
+  ReportsFilesResource(commons.ApiRequester client) : _requester = client;
 
   /// Retrieves a report file by its report ID and file ID. This method supports
   /// media download.
@@ -13167,10 +13158,10 @@
   }
 }
 
-class SitesResourceApi {
+class SitesResource {
   final commons.ApiRequester _requester;
 
-  SitesResourceApi(commons.ApiRequester client) : _requester = client;
+  SitesResource(commons.ApiRequester client) : _requester = client;
 
   /// Gets one site by ID.
   ///
@@ -13578,10 +13569,10 @@
   }
 }
 
-class SizesResourceApi {
+class SizesResource {
   final commons.ApiRequester _requester;
 
-  SizesResourceApi(commons.ApiRequester client) : _requester = client;
+  SizesResource(commons.ApiRequester client) : _requester = client;
 
   /// Gets one size by ID.
   ///
@@ -13783,10 +13774,10 @@
   }
 }
 
-class SubaccountsResourceApi {
+class SubaccountsResource {
   final commons.ApiRequester _requester;
 
-  SubaccountsResourceApi(commons.ApiRequester client) : _requester = client;
+  SubaccountsResource(commons.ApiRequester client) : _requester = client;
 
   /// Gets one subaccount by ID.
   ///
@@ -14136,10 +14127,10 @@
   }
 }
 
-class TargetableRemarketingListsResourceApi {
+class TargetableRemarketingListsResource {
   final commons.ApiRequester _requester;
 
-  TargetableRemarketingListsResourceApi(commons.ApiRequester client)
+  TargetableRemarketingListsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Gets one remarketing list by ID.
@@ -14315,11 +14306,10 @@
   }
 }
 
-class TargetingTemplatesResourceApi {
+class TargetingTemplatesResource {
   final commons.ApiRequester _requester;
 
-  TargetingTemplatesResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  TargetingTemplatesResource(commons.ApiRequester client) : _requester = client;
 
   /// Gets one targeting template by ID.
   ///
@@ -14676,10 +14666,10 @@
   }
 }
 
-class UserProfilesResourceApi {
+class UserProfilesResource {
   final commons.ApiRequester _requester;
 
-  UserProfilesResourceApi(commons.ApiRequester client) : _requester = client;
+  UserProfilesResource(commons.ApiRequester client) : _requester = client;
 
   /// Gets one user profile by ID.
   ///
@@ -14778,10 +14768,10 @@
   }
 }
 
-class UserRolePermissionGroupsResourceApi {
+class UserRolePermissionGroupsResource {
   final commons.ApiRequester _requester;
 
-  UserRolePermissionGroupsResourceApi(commons.ApiRequester client)
+  UserRolePermissionGroupsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Gets one user role permission group by ID.
@@ -14898,10 +14888,10 @@
   }
 }
 
-class UserRolePermissionsResourceApi {
+class UserRolePermissionsResource {
   final commons.ApiRequester _requester;
 
-  UserRolePermissionsResourceApi(commons.ApiRequester client)
+  UserRolePermissionsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Gets one user role permission by ID.
@@ -15024,10 +15014,10 @@
   }
 }
 
-class UserRolesResourceApi {
+class UserRolesResource {
   final commons.ApiRequester _requester;
 
-  UserRolesResourceApi(commons.ApiRequester client) : _requester = client;
+  UserRolesResource(commons.ApiRequester client) : _requester = client;
 
   /// Deletes an existing user role.
   ///
@@ -15445,10 +15435,10 @@
   }
 }
 
-class VideoFormatsResourceApi {
+class VideoFormatsResource {
   final commons.ApiRequester _requester;
 
-  VideoFormatsResourceApi(commons.ApiRequester client) : _requester = client;
+  VideoFormatsResource(commons.ApiRequester client) : _requester = client;
 
   /// Gets one video format by ID.
   ///
diff --git a/generated/googleapis/lib/dialogflow/v2.dart b/generated/googleapis/lib/dialogflow/v2.dart
index 908670d..f1496b0 100644
--- a/generated/googleapis/lib/dialogflow/v2.dart
+++ b/generated/googleapis/lib/dialogflow/v2.dart
@@ -24,22 +24,22 @@
 ///
 /// Create an instance of [DialogflowApi] to access these resources:
 ///
-/// - [ProjectsResourceApi]
-///   - [ProjectsAgentResourceApi]
-///     - [ProjectsAgentEntityTypesResourceApi]
-///       - [ProjectsAgentEntityTypesEntitiesResourceApi]
-///     - [ProjectsAgentEnvironmentsResourceApi]
-///       - [ProjectsAgentEnvironmentsUsersResourceApi]
-///         - [ProjectsAgentEnvironmentsUsersSessionsResourceApi]
-///           - [ProjectsAgentEnvironmentsUsersSessionsContextsResourceApi]
-///           - [ProjectsAgentEnvironmentsUsersSessionsEntityTypesResourceApi]
-///     - [ProjectsAgentIntentsResourceApi]
-///     - [ProjectsAgentSessionsResourceApi]
-///       - [ProjectsAgentSessionsContextsResourceApi]
-///       - [ProjectsAgentSessionsEntityTypesResourceApi]
-///   - [ProjectsLocationsResourceApi]
-///     - [ProjectsLocationsOperationsResourceApi]
-///   - [ProjectsOperationsResourceApi]
+/// - [ProjectsResource]
+///   - [ProjectsAgentResource]
+///     - [ProjectsAgentEntityTypesResource]
+///       - [ProjectsAgentEntityTypesEntitiesResource]
+///     - [ProjectsAgentEnvironmentsResource]
+///       - [ProjectsAgentEnvironmentsUsersResource]
+///         - [ProjectsAgentEnvironmentsUsersSessionsResource]
+///           - [ProjectsAgentEnvironmentsUsersSessionsContextsResource]
+///           - [ProjectsAgentEnvironmentsUsersSessionsEntityTypesResource]
+///     - [ProjectsAgentIntentsResource]
+///     - [ProjectsAgentSessionsResource]
+///       - [ProjectsAgentSessionsContextsResource]
+///       - [ProjectsAgentSessionsEntityTypesResource]
+///   - [ProjectsLocationsResource]
+///     - [ProjectsLocationsOperationsResource]
+///   - [ProjectsOperationsResource]
 library dialogflow.v2;
 
 import 'dart:async' as async;
@@ -66,7 +66,7 @@
 
   final commons.ApiRequester _requester;
 
-  ProjectsResourceApi get projects => ProjectsResourceApi(_requester);
+  ProjectsResource get projects => ProjectsResource(_requester);
 
   DialogflowApi(http.Client client,
       {core.String rootUrl = 'https://dialogflow.googleapis.com/',
@@ -75,16 +75,16 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class ProjectsResourceApi {
+class ProjectsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsAgentResourceApi get agent => ProjectsAgentResourceApi(_requester);
-  ProjectsLocationsResourceApi get locations =>
-      ProjectsLocationsResourceApi(_requester);
-  ProjectsOperationsResourceApi get operations =>
-      ProjectsOperationsResourceApi(_requester);
+  ProjectsAgentResource get agent => ProjectsAgentResource(_requester);
+  ProjectsLocationsResource get locations =>
+      ProjectsLocationsResource(_requester);
+  ProjectsOperationsResource get operations =>
+      ProjectsOperationsResource(_requester);
 
-  ProjectsResourceApi(commons.ApiRequester client) : _requester = client;
+  ProjectsResource(commons.ApiRequester client) : _requester = client;
 
   /// Deletes the specified agent.
   ///
@@ -257,19 +257,19 @@
   }
 }
 
-class ProjectsAgentResourceApi {
+class ProjectsAgentResource {
   final commons.ApiRequester _requester;
 
-  ProjectsAgentEntityTypesResourceApi get entityTypes =>
-      ProjectsAgentEntityTypesResourceApi(_requester);
-  ProjectsAgentEnvironmentsResourceApi get environments =>
-      ProjectsAgentEnvironmentsResourceApi(_requester);
-  ProjectsAgentIntentsResourceApi get intents =>
-      ProjectsAgentIntentsResourceApi(_requester);
-  ProjectsAgentSessionsResourceApi get sessions =>
-      ProjectsAgentSessionsResourceApi(_requester);
+  ProjectsAgentEntityTypesResource get entityTypes =>
+      ProjectsAgentEntityTypesResource(_requester);
+  ProjectsAgentEnvironmentsResource get environments =>
+      ProjectsAgentEnvironmentsResource(_requester);
+  ProjectsAgentIntentsResource get intents =>
+      ProjectsAgentIntentsResource(_requester);
+  ProjectsAgentSessionsResource get sessions =>
+      ProjectsAgentSessionsResource(_requester);
 
-  ProjectsAgentResourceApi(commons.ApiRequester client) : _requester = client;
+  ProjectsAgentResource(commons.ApiRequester client) : _requester = client;
 
   /// Exports the specified agent to a ZIP file. Operation
   ///
@@ -790,13 +790,13 @@
   }
 }
 
-class ProjectsAgentEntityTypesResourceApi {
+class ProjectsAgentEntityTypesResource {
   final commons.ApiRequester _requester;
 
-  ProjectsAgentEntityTypesEntitiesResourceApi get entities =>
-      ProjectsAgentEntityTypesEntitiesResourceApi(_requester);
+  ProjectsAgentEntityTypesEntitiesResource get entities =>
+      ProjectsAgentEntityTypesEntitiesResource(_requester);
 
-  ProjectsAgentEntityTypesResourceApi(commons.ApiRequester client)
+  ProjectsAgentEntityTypesResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Deletes entity types in the specified agent. Operation
@@ -1260,10 +1260,10 @@
   }
 }
 
-class ProjectsAgentEntityTypesEntitiesResourceApi {
+class ProjectsAgentEntityTypesEntitiesResource {
   final commons.ApiRequester _requester;
 
-  ProjectsAgentEntityTypesEntitiesResourceApi(commons.ApiRequester client)
+  ProjectsAgentEntityTypesEntitiesResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Creates multiple new entities in the specified entity type. Operation
@@ -1452,13 +1452,13 @@
   }
 }
 
-class ProjectsAgentEnvironmentsResourceApi {
+class ProjectsAgentEnvironmentsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsAgentEnvironmentsUsersResourceApi get users =>
-      ProjectsAgentEnvironmentsUsersResourceApi(_requester);
+  ProjectsAgentEnvironmentsUsersResource get users =>
+      ProjectsAgentEnvironmentsUsersResource(_requester);
 
-  ProjectsAgentEnvironmentsResourceApi(commons.ApiRequester client)
+  ProjectsAgentEnvironmentsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Returns the list of all non-draft environments of the specified agent.
@@ -1531,27 +1531,25 @@
   }
 }
 
-class ProjectsAgentEnvironmentsUsersResourceApi {
+class ProjectsAgentEnvironmentsUsersResource {
   final commons.ApiRequester _requester;
 
-  ProjectsAgentEnvironmentsUsersSessionsResourceApi get sessions =>
-      ProjectsAgentEnvironmentsUsersSessionsResourceApi(_requester);
+  ProjectsAgentEnvironmentsUsersSessionsResource get sessions =>
+      ProjectsAgentEnvironmentsUsersSessionsResource(_requester);
 
-  ProjectsAgentEnvironmentsUsersResourceApi(commons.ApiRequester client)
+  ProjectsAgentEnvironmentsUsersResource(commons.ApiRequester client)
       : _requester = client;
 }
 
-class ProjectsAgentEnvironmentsUsersSessionsResourceApi {
+class ProjectsAgentEnvironmentsUsersSessionsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsAgentEnvironmentsUsersSessionsContextsResourceApi get contexts =>
-      ProjectsAgentEnvironmentsUsersSessionsContextsResourceApi(_requester);
-  ProjectsAgentEnvironmentsUsersSessionsEntityTypesResourceApi
-      get entityTypes =>
-          ProjectsAgentEnvironmentsUsersSessionsEntityTypesResourceApi(
-              _requester);
+  ProjectsAgentEnvironmentsUsersSessionsContextsResource get contexts =>
+      ProjectsAgentEnvironmentsUsersSessionsContextsResource(_requester);
+  ProjectsAgentEnvironmentsUsersSessionsEntityTypesResource get entityTypes =>
+      ProjectsAgentEnvironmentsUsersSessionsEntityTypesResource(_requester);
 
-  ProjectsAgentEnvironmentsUsersSessionsResourceApi(commons.ApiRequester client)
+  ProjectsAgentEnvironmentsUsersSessionsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Deletes all active contexts in the specified session.
@@ -1686,10 +1684,10 @@
   }
 }
 
-class ProjectsAgentEnvironmentsUsersSessionsContextsResourceApi {
+class ProjectsAgentEnvironmentsUsersSessionsContextsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsAgentEnvironmentsUsersSessionsContextsResourceApi(
+  ProjectsAgentEnvironmentsUsersSessionsContextsResource(
       commons.ApiRequester client)
       : _requester = client;
 
@@ -2019,10 +2017,10 @@
   }
 }
 
-class ProjectsAgentEnvironmentsUsersSessionsEntityTypesResourceApi {
+class ProjectsAgentEnvironmentsUsersSessionsEntityTypesResource {
   final commons.ApiRequester _requester;
 
-  ProjectsAgentEnvironmentsUsersSessionsEntityTypesResourceApi(
+  ProjectsAgentEnvironmentsUsersSessionsEntityTypesResource(
       commons.ApiRequester client)
       : _requester = client;
 
@@ -2362,10 +2360,10 @@
   }
 }
 
-class ProjectsAgentIntentsResourceApi {
+class ProjectsAgentIntentsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsAgentIntentsResourceApi(commons.ApiRequester client)
+  ProjectsAgentIntentsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Deletes intents in the specified agent. Operation
@@ -2872,15 +2870,15 @@
   }
 }
 
-class ProjectsAgentSessionsResourceApi {
+class ProjectsAgentSessionsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsAgentSessionsContextsResourceApi get contexts =>
-      ProjectsAgentSessionsContextsResourceApi(_requester);
-  ProjectsAgentSessionsEntityTypesResourceApi get entityTypes =>
-      ProjectsAgentSessionsEntityTypesResourceApi(_requester);
+  ProjectsAgentSessionsContextsResource get contexts =>
+      ProjectsAgentSessionsContextsResource(_requester);
+  ProjectsAgentSessionsEntityTypesResource get entityTypes =>
+      ProjectsAgentSessionsEntityTypesResource(_requester);
 
-  ProjectsAgentSessionsResourceApi(commons.ApiRequester client)
+  ProjectsAgentSessionsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Deletes all active contexts in the specified session.
@@ -3013,10 +3011,10 @@
   }
 }
 
-class ProjectsAgentSessionsContextsResourceApi {
+class ProjectsAgentSessionsContextsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsAgentSessionsContextsResourceApi(commons.ApiRequester client)
+  ProjectsAgentSessionsContextsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Creates a context. If the specified context already exists, overrides the
@@ -3343,10 +3341,10 @@
   }
 }
 
-class ProjectsAgentSessionsEntityTypesResourceApi {
+class ProjectsAgentSessionsEntityTypesResource {
   final commons.ApiRequester _requester;
 
-  ProjectsAgentSessionsEntityTypesResourceApi(commons.ApiRequester client)
+  ProjectsAgentSessionsEntityTypesResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Creates a session entity type. If the specified session entity type
@@ -3683,20 +3681,19 @@
   }
 }
 
-class ProjectsLocationsResourceApi {
+class ProjectsLocationsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsLocationsOperationsResourceApi get operations =>
-      ProjectsLocationsOperationsResourceApi(_requester);
+  ProjectsLocationsOperationsResource get operations =>
+      ProjectsLocationsOperationsResource(_requester);
 
-  ProjectsLocationsResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  ProjectsLocationsResource(commons.ApiRequester client) : _requester = client;
 }
 
-class ProjectsLocationsOperationsResourceApi {
+class ProjectsLocationsOperationsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsLocationsOperationsResourceApi(commons.ApiRequester client)
+  ProjectsLocationsOperationsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Starts asynchronous cancellation on a long-running operation. The server
@@ -3895,11 +3892,10 @@
   }
 }
 
-class ProjectsOperationsResourceApi {
+class ProjectsOperationsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsOperationsResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  ProjectsOperationsResource(commons.ApiRequester client) : _requester = client;
 
   /// Starts asynchronous cancellation on a long-running operation. The server
   /// makes a best effort to cancel the operation, but success is not
diff --git a/generated/googleapis/lib/digitalassetlinks/v1.dart b/generated/googleapis/lib/digitalassetlinks/v1.dart
index f5d1ccd..e6c4a51 100644
--- a/generated/googleapis/lib/digitalassetlinks/v1.dart
+++ b/generated/googleapis/lib/digitalassetlinks/v1.dart
@@ -25,8 +25,8 @@
 ///
 /// Create an instance of [DigitalassetlinksApi] to access these resources:
 ///
-/// - [AssetlinksResourceApi]
-/// - [StatementsResourceApi]
+/// - [AssetlinksResource]
+/// - [StatementsResource]
 library digitalassetlinks.v1;
 
 import 'dart:async' as async;
@@ -45,8 +45,8 @@
 class DigitalassetlinksApi {
   final commons.ApiRequester _requester;
 
-  AssetlinksResourceApi get assetlinks => AssetlinksResourceApi(_requester);
-  StatementsResourceApi get statements => StatementsResourceApi(_requester);
+  AssetlinksResource get assetlinks => AssetlinksResource(_requester);
+  StatementsResource get statements => StatementsResource(_requester);
 
   DigitalassetlinksApi(http.Client client,
       {core.String rootUrl = 'https://digitalassetlinks.googleapis.com/',
@@ -55,10 +55,10 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class AssetlinksResourceApi {
+class AssetlinksResource {
   final commons.ApiRequester _requester;
 
-  AssetlinksResourceApi(commons.ApiRequester client) : _requester = client;
+  AssetlinksResource(commons.ApiRequester client) : _requester = client;
 
   /// Determines whether the specified (directional) relationship exists between
   /// the specified source and target assets. The relation describes the intent
@@ -239,10 +239,10 @@
   }
 }
 
-class StatementsResourceApi {
+class StatementsResource {
   final commons.ApiRequester _requester;
 
-  StatementsResourceApi(commons.ApiRequester client) : _requester = client;
+  StatementsResource(commons.ApiRequester client) : _requester = client;
 
   /// Retrieves a list of all statements from a given source that match the
   /// specified target and statement string. The API guarantees that all
diff --git a/generated/googleapis/lib/discovery/v1.dart b/generated/googleapis/lib/discovery/v1.dart
index 641ba7e..2ac3641 100644
--- a/generated/googleapis/lib/discovery/v1.dart
+++ b/generated/googleapis/lib/discovery/v1.dart
@@ -24,7 +24,7 @@
 ///
 /// Create an instance of [DiscoveryApi] to access these resources:
 ///
-/// - [ApisResourceApi]
+/// - [ApisResource]
 library discovery.v1;
 
 import 'dart:async' as async;
@@ -43,7 +43,7 @@
 class DiscoveryApi {
   final commons.ApiRequester _requester;
 
-  ApisResourceApi get apis => ApisResourceApi(_requester);
+  ApisResource get apis => ApisResource(_requester);
 
   DiscoveryApi(http.Client client,
       {core.String rootUrl = 'https://www.googleapis.com/',
@@ -52,10 +52,10 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class ApisResourceApi {
+class ApisResource {
   final commons.ApiRequester _requester;
 
-  ApisResourceApi(commons.ApiRequester client) : _requester = client;
+  ApisResource(commons.ApiRequester client) : _requester = client;
 
   /// Retrieve the description of a particular version of an api.
   ///
diff --git a/generated/googleapis/lib/displayvideo/v1.dart b/generated/googleapis/lib/displayvideo/v1.dart
index 6cbb7c5..7e67b7d 100644
--- a/generated/googleapis/lib/displayvideo/v1.dart
+++ b/generated/googleapis/lib/displayvideo/v1.dart
@@ -24,42 +24,42 @@
 ///
 /// Create an instance of [DisplayVideoApi] to access these resources:
 ///
-/// - [AdvertisersResourceApi]
-///   - [AdvertisersAssetsResourceApi]
-///   - [AdvertisersCampaignsResourceApi]
-///   - [AdvertisersChannelsResourceApi]
-///     - [AdvertisersChannelsSitesResourceApi]
-///   - [AdvertisersCreativesResourceApi]
-///   - [AdvertisersInsertionOrdersResourceApi]
-///   - [AdvertisersLineItemsResourceApi]
-///     - [AdvertisersLineItemsTargetingTypesResourceApi]
-/// - [AdvertisersLineItemsTargetingTypesAssignedTargetingOptionsResourceApi]
-///   - [AdvertisersLocationListsResourceApi]
-///     - [AdvertisersLocationListsAssignedLocationsResourceApi]
-///   - [AdvertisersNegativeKeywordListsResourceApi]
-///     - [AdvertisersNegativeKeywordListsNegativeKeywordsResourceApi]
-///   - [AdvertisersTargetingTypesResourceApi]
-///     - [AdvertisersTargetingTypesAssignedTargetingOptionsResourceApi]
-/// - [CombinedAudiencesResourceApi]
-/// - [CustomBiddingAlgorithmsResourceApi]
-/// - [CustomListsResourceApi]
-/// - [FirstAndThirdPartyAudiencesResourceApi]
-/// - [FloodlightGroupsResourceApi]
-/// - [GoogleAudiencesResourceApi]
-/// - [InventorySourceGroupsResourceApi]
-///   - [InventorySourceGroupsAssignedInventorySourcesResourceApi]
-/// - [InventorySourcesResourceApi]
-/// - [MediaResourceApi]
-/// - [PartnersResourceApi]
-///   - [PartnersChannelsResourceApi]
-///     - [PartnersChannelsSitesResourceApi]
-///   - [PartnersTargetingTypesResourceApi]
-///     - [PartnersTargetingTypesAssignedTargetingOptionsResourceApi]
-/// - [SdfdownloadtasksResourceApi]
-///   - [SdfdownloadtasksOperationsResourceApi]
-/// - [TargetingTypesResourceApi]
-///   - [TargetingTypesTargetingOptionsResourceApi]
-/// - [UsersResourceApi]
+/// - [AdvertisersResource]
+///   - [AdvertisersAssetsResource]
+///   - [AdvertisersCampaignsResource]
+///   - [AdvertisersChannelsResource]
+///     - [AdvertisersChannelsSitesResource]
+///   - [AdvertisersCreativesResource]
+///   - [AdvertisersInsertionOrdersResource]
+///   - [AdvertisersLineItemsResource]
+///     - [AdvertisersLineItemsTargetingTypesResource]
+/// - [AdvertisersLineItemsTargetingTypesAssignedTargetingOptionsResource]
+///   - [AdvertisersLocationListsResource]
+///     - [AdvertisersLocationListsAssignedLocationsResource]
+///   - [AdvertisersNegativeKeywordListsResource]
+///     - [AdvertisersNegativeKeywordListsNegativeKeywordsResource]
+///   - [AdvertisersTargetingTypesResource]
+///     - [AdvertisersTargetingTypesAssignedTargetingOptionsResource]
+/// - [CombinedAudiencesResource]
+/// - [CustomBiddingAlgorithmsResource]
+/// - [CustomListsResource]
+/// - [FirstAndThirdPartyAudiencesResource]
+/// - [FloodlightGroupsResource]
+/// - [GoogleAudiencesResource]
+/// - [InventorySourceGroupsResource]
+///   - [InventorySourceGroupsAssignedInventorySourcesResource]
+/// - [InventorySourcesResource]
+/// - [MediaResource]
+/// - [PartnersResource]
+///   - [PartnersChannelsResource]
+///     - [PartnersChannelsSitesResource]
+///   - [PartnersTargetingTypesResource]
+///     - [PartnersTargetingTypesAssignedTargetingOptionsResource]
+/// - [SdfdownloadtasksResource]
+///   - [SdfdownloadtasksOperationsResource]
+/// - [TargetingTypesResource]
+///   - [TargetingTypesTargetingOptionsResource]
+/// - [UsersResource]
 library displayvideo.v1;
 
 import 'dart:async' as async;
@@ -105,29 +105,29 @@
 
   final commons.ApiRequester _requester;
 
-  AdvertisersResourceApi get advertisers => AdvertisersResourceApi(_requester);
-  CombinedAudiencesResourceApi get combinedAudiences =>
-      CombinedAudiencesResourceApi(_requester);
-  CustomBiddingAlgorithmsResourceApi get customBiddingAlgorithms =>
-      CustomBiddingAlgorithmsResourceApi(_requester);
-  CustomListsResourceApi get customLists => CustomListsResourceApi(_requester);
-  FirstAndThirdPartyAudiencesResourceApi get firstAndThirdPartyAudiences =>
-      FirstAndThirdPartyAudiencesResourceApi(_requester);
-  FloodlightGroupsResourceApi get floodlightGroups =>
-      FloodlightGroupsResourceApi(_requester);
-  GoogleAudiencesResourceApi get googleAudiences =>
-      GoogleAudiencesResourceApi(_requester);
-  InventorySourceGroupsResourceApi get inventorySourceGroups =>
-      InventorySourceGroupsResourceApi(_requester);
-  InventorySourcesResourceApi get inventorySources =>
-      InventorySourcesResourceApi(_requester);
-  MediaResourceApi get media => MediaResourceApi(_requester);
-  PartnersResourceApi get partners => PartnersResourceApi(_requester);
-  SdfdownloadtasksResourceApi get sdfdownloadtasks =>
-      SdfdownloadtasksResourceApi(_requester);
-  TargetingTypesResourceApi get targetingTypes =>
-      TargetingTypesResourceApi(_requester);
-  UsersResourceApi get users => UsersResourceApi(_requester);
+  AdvertisersResource get advertisers => AdvertisersResource(_requester);
+  CombinedAudiencesResource get combinedAudiences =>
+      CombinedAudiencesResource(_requester);
+  CustomBiddingAlgorithmsResource get customBiddingAlgorithms =>
+      CustomBiddingAlgorithmsResource(_requester);
+  CustomListsResource get customLists => CustomListsResource(_requester);
+  FirstAndThirdPartyAudiencesResource get firstAndThirdPartyAudiences =>
+      FirstAndThirdPartyAudiencesResource(_requester);
+  FloodlightGroupsResource get floodlightGroups =>
+      FloodlightGroupsResource(_requester);
+  GoogleAudiencesResource get googleAudiences =>
+      GoogleAudiencesResource(_requester);
+  InventorySourceGroupsResource get inventorySourceGroups =>
+      InventorySourceGroupsResource(_requester);
+  InventorySourcesResource get inventorySources =>
+      InventorySourcesResource(_requester);
+  MediaResource get media => MediaResource(_requester);
+  PartnersResource get partners => PartnersResource(_requester);
+  SdfdownloadtasksResource get sdfdownloadtasks =>
+      SdfdownloadtasksResource(_requester);
+  TargetingTypesResource get targetingTypes =>
+      TargetingTypesResource(_requester);
+  UsersResource get users => UsersResource(_requester);
 
   DisplayVideoApi(http.Client client,
       {core.String rootUrl = 'https://displayvideo.googleapis.com/',
@@ -136,29 +136,28 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class AdvertisersResourceApi {
+class AdvertisersResource {
   final commons.ApiRequester _requester;
 
-  AdvertisersAssetsResourceApi get assets =>
-      AdvertisersAssetsResourceApi(_requester);
-  AdvertisersCampaignsResourceApi get campaigns =>
-      AdvertisersCampaignsResourceApi(_requester);
-  AdvertisersChannelsResourceApi get channels =>
-      AdvertisersChannelsResourceApi(_requester);
-  AdvertisersCreativesResourceApi get creatives =>
-      AdvertisersCreativesResourceApi(_requester);
-  AdvertisersInsertionOrdersResourceApi get insertionOrders =>
-      AdvertisersInsertionOrdersResourceApi(_requester);
-  AdvertisersLineItemsResourceApi get lineItems =>
-      AdvertisersLineItemsResourceApi(_requester);
-  AdvertisersLocationListsResourceApi get locationLists =>
-      AdvertisersLocationListsResourceApi(_requester);
-  AdvertisersNegativeKeywordListsResourceApi get negativeKeywordLists =>
-      AdvertisersNegativeKeywordListsResourceApi(_requester);
-  AdvertisersTargetingTypesResourceApi get targetingTypes =>
-      AdvertisersTargetingTypesResourceApi(_requester);
+  AdvertisersAssetsResource get assets => AdvertisersAssetsResource(_requester);
+  AdvertisersCampaignsResource get campaigns =>
+      AdvertisersCampaignsResource(_requester);
+  AdvertisersChannelsResource get channels =>
+      AdvertisersChannelsResource(_requester);
+  AdvertisersCreativesResource get creatives =>
+      AdvertisersCreativesResource(_requester);
+  AdvertisersInsertionOrdersResource get insertionOrders =>
+      AdvertisersInsertionOrdersResource(_requester);
+  AdvertisersLineItemsResource get lineItems =>
+      AdvertisersLineItemsResource(_requester);
+  AdvertisersLocationListsResource get locationLists =>
+      AdvertisersLocationListsResource(_requester);
+  AdvertisersNegativeKeywordListsResource get negativeKeywordLists =>
+      AdvertisersNegativeKeywordListsResource(_requester);
+  AdvertisersTargetingTypesResource get targetingTypes =>
+      AdvertisersTargetingTypesResource(_requester);
 
-  AdvertisersResourceApi(commons.ApiRequester client) : _requester = client;
+  AdvertisersResource(commons.ApiRequester client) : _requester = client;
 
   /// Audits an advertiser. Returns the counts of used entities per resource
   /// type under the advertiser provided. Used entities count towards their
@@ -708,11 +707,10 @@
   }
 }
 
-class AdvertisersAssetsResourceApi {
+class AdvertisersAssetsResource {
   final commons.ApiRequester _requester;
 
-  AdvertisersAssetsResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  AdvertisersAssetsResource(commons.ApiRequester client) : _requester = client;
 
   /// Uploads an asset. Returns the ID of the newly uploaded asset if
   /// successful. The asset file size should be no more than 10 MB for images,
@@ -789,10 +787,10 @@
   }
 }
 
-class AdvertisersCampaignsResourceApi {
+class AdvertisersCampaignsResource {
   final commons.ApiRequester _requester;
 
-  AdvertisersCampaignsResourceApi(commons.ApiRequester client)
+  AdvertisersCampaignsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Creates a new campaign. Returns the newly created campaign if successful.
@@ -1152,13 +1150,13 @@
   }
 }
 
-class AdvertisersChannelsResourceApi {
+class AdvertisersChannelsResource {
   final commons.ApiRequester _requester;
 
-  AdvertisersChannelsSitesResourceApi get sites =>
-      AdvertisersChannelsSitesResourceApi(_requester);
+  AdvertisersChannelsSitesResource get sites =>
+      AdvertisersChannelsSitesResource(_requester);
 
-  AdvertisersChannelsResourceApi(commons.ApiRequester client)
+  AdvertisersChannelsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Creates a new channel. Returns the newly created channel if successful.
@@ -1471,10 +1469,10 @@
   }
 }
 
-class AdvertisersChannelsSitesResourceApi {
+class AdvertisersChannelsSitesResource {
   final commons.ApiRequester _requester;
 
-  AdvertisersChannelsSitesResourceApi(commons.ApiRequester client)
+  AdvertisersChannelsSitesResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Bulk edits sites under a single channel. The operation will delete the
@@ -1806,10 +1804,10 @@
   }
 }
 
-class AdvertisersCreativesResourceApi {
+class AdvertisersCreativesResource {
   final commons.ApiRequester _requester;
 
-  AdvertisersCreativesResourceApi(commons.ApiRequester client)
+  AdvertisersCreativesResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Creates a new creative. Returns the newly created creative if successful.
@@ -2191,10 +2189,10 @@
   }
 }
 
-class AdvertisersInsertionOrdersResourceApi {
+class AdvertisersInsertionOrdersResource {
   final commons.ApiRequester _requester;
 
-  AdvertisersInsertionOrdersResourceApi(commons.ApiRequester client)
+  AdvertisersInsertionOrdersResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Creates a new insertion order. Returns the newly created insertion order
@@ -2570,13 +2568,13 @@
   }
 }
 
-class AdvertisersLineItemsResourceApi {
+class AdvertisersLineItemsResource {
   final commons.ApiRequester _requester;
 
-  AdvertisersLineItemsTargetingTypesResourceApi get targetingTypes =>
-      AdvertisersLineItemsTargetingTypesResourceApi(_requester);
+  AdvertisersLineItemsTargetingTypesResource get targetingTypes =>
+      AdvertisersLineItemsTargetingTypesResource(_requester);
 
-  AdvertisersLineItemsResourceApi(commons.ApiRequester client)
+  AdvertisersLineItemsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Bulk edits targeting options under a single line item. The operation will
@@ -3138,22 +3136,22 @@
   }
 }
 
-class AdvertisersLineItemsTargetingTypesResourceApi {
+class AdvertisersLineItemsTargetingTypesResource {
   final commons.ApiRequester _requester;
 
-  AdvertisersLineItemsTargetingTypesAssignedTargetingOptionsResourceApi
+  AdvertisersLineItemsTargetingTypesAssignedTargetingOptionsResource
       get assignedTargetingOptions =>
-          AdvertisersLineItemsTargetingTypesAssignedTargetingOptionsResourceApi(
+          AdvertisersLineItemsTargetingTypesAssignedTargetingOptionsResource(
               _requester);
 
-  AdvertisersLineItemsTargetingTypesResourceApi(commons.ApiRequester client)
+  AdvertisersLineItemsTargetingTypesResource(commons.ApiRequester client)
       : _requester = client;
 }
 
-class AdvertisersLineItemsTargetingTypesAssignedTargetingOptionsResourceApi {
+class AdvertisersLineItemsTargetingTypesAssignedTargetingOptionsResource {
   final commons.ApiRequester _requester;
 
-  AdvertisersLineItemsTargetingTypesAssignedTargetingOptionsResourceApi(
+  AdvertisersLineItemsTargetingTypesAssignedTargetingOptionsResource(
       commons.ApiRequester client)
       : _requester = client;
 
@@ -3843,13 +3841,13 @@
   }
 }
 
-class AdvertisersLocationListsResourceApi {
+class AdvertisersLocationListsResource {
   final commons.ApiRequester _requester;
 
-  AdvertisersLocationListsAssignedLocationsResourceApi get assignedLocations =>
-      AdvertisersLocationListsAssignedLocationsResourceApi(_requester);
+  AdvertisersLocationListsAssignedLocationsResource get assignedLocations =>
+      AdvertisersLocationListsAssignedLocationsResource(_requester);
 
-  AdvertisersLocationListsResourceApi(commons.ApiRequester client)
+  AdvertisersLocationListsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Creates a new location list. Returns the newly created location list if
@@ -4147,11 +4145,10 @@
   }
 }
 
-class AdvertisersLocationListsAssignedLocationsResourceApi {
+class AdvertisersLocationListsAssignedLocationsResource {
   final commons.ApiRequester _requester;
 
-  AdvertisersLocationListsAssignedLocationsResourceApi(
-      commons.ApiRequester client)
+  AdvertisersLocationListsAssignedLocationsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Bulk edits multiple assignments between locations and a single location
@@ -4469,15 +4466,14 @@
   }
 }
 
-class AdvertisersNegativeKeywordListsResourceApi {
+class AdvertisersNegativeKeywordListsResource {
   final commons.ApiRequester _requester;
 
-  AdvertisersNegativeKeywordListsNegativeKeywordsResourceApi
+  AdvertisersNegativeKeywordListsNegativeKeywordsResource
       get negativeKeywords =>
-          AdvertisersNegativeKeywordListsNegativeKeywordsResourceApi(
-              _requester);
+          AdvertisersNegativeKeywordListsNegativeKeywordsResource(_requester);
 
-  AdvertisersNegativeKeywordListsResourceApi(commons.ApiRequester client)
+  AdvertisersNegativeKeywordListsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Creates a new negative keyword list. Returns the newly created negative
@@ -4820,10 +4816,10 @@
   }
 }
 
-class AdvertisersNegativeKeywordListsNegativeKeywordsResourceApi {
+class AdvertisersNegativeKeywordListsNegativeKeywordsResource {
   final commons.ApiRequester _requester;
 
-  AdvertisersNegativeKeywordListsNegativeKeywordsResourceApi(
+  AdvertisersNegativeKeywordListsNegativeKeywordsResource(
       commons.ApiRequester client)
       : _requester = client;
 
@@ -5148,22 +5144,21 @@
   }
 }
 
-class AdvertisersTargetingTypesResourceApi {
+class AdvertisersTargetingTypesResource {
   final commons.ApiRequester _requester;
 
-  AdvertisersTargetingTypesAssignedTargetingOptionsResourceApi
+  AdvertisersTargetingTypesAssignedTargetingOptionsResource
       get assignedTargetingOptions =>
-          AdvertisersTargetingTypesAssignedTargetingOptionsResourceApi(
-              _requester);
+          AdvertisersTargetingTypesAssignedTargetingOptionsResource(_requester);
 
-  AdvertisersTargetingTypesResourceApi(commons.ApiRequester client)
+  AdvertisersTargetingTypesResource(commons.ApiRequester client)
       : _requester = client;
 }
 
-class AdvertisersTargetingTypesAssignedTargetingOptionsResourceApi {
+class AdvertisersTargetingTypesAssignedTargetingOptionsResource {
   final commons.ApiRequester _requester;
 
-  AdvertisersTargetingTypesAssignedTargetingOptionsResourceApi(
+  AdvertisersTargetingTypesAssignedTargetingOptionsResource(
       commons.ApiRequester client)
       : _requester = client;
 
@@ -5806,11 +5801,10 @@
   }
 }
 
-class CombinedAudiencesResourceApi {
+class CombinedAudiencesResource {
   final commons.ApiRequester _requester;
 
-  CombinedAudiencesResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  CombinedAudiencesResource(commons.ApiRequester client) : _requester = client;
 
   /// Gets a combined audience.
   ///
@@ -5977,10 +5971,10 @@
   }
 }
 
-class CustomBiddingAlgorithmsResourceApi {
+class CustomBiddingAlgorithmsResource {
   final commons.ApiRequester _requester;
 
-  CustomBiddingAlgorithmsResourceApi(commons.ApiRequester client)
+  CustomBiddingAlgorithmsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Gets a custom bidding algorithm.
@@ -6161,10 +6155,10 @@
   }
 }
 
-class CustomListsResourceApi {
+class CustomListsResource {
   final commons.ApiRequester _requester;
 
-  CustomListsResourceApi(commons.ApiRequester client) : _requester = client;
+  CustomListsResource(commons.ApiRequester client) : _requester = client;
 
   /// Gets a custom list.
   ///
@@ -6317,10 +6311,10 @@
   }
 }
 
-class FirstAndThirdPartyAudiencesResourceApi {
+class FirstAndThirdPartyAudiencesResource {
   final commons.ApiRequester _requester;
 
-  FirstAndThirdPartyAudiencesResourceApi(commons.ApiRequester client)
+  FirstAndThirdPartyAudiencesResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Gets a first and third party audience.
@@ -6493,11 +6487,10 @@
   }
 }
 
-class FloodlightGroupsResourceApi {
+class FloodlightGroupsResource {
   final commons.ApiRequester _requester;
 
-  FloodlightGroupsResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  FloodlightGroupsResource(commons.ApiRequester client) : _requester = client;
 
   /// Gets a Floodlight group.
   ///
@@ -6633,10 +6626,10 @@
   }
 }
 
-class GoogleAudiencesResourceApi {
+class GoogleAudiencesResource {
   final commons.ApiRequester _requester;
 
-  GoogleAudiencesResourceApi(commons.ApiRequester client) : _requester = client;
+  GoogleAudiencesResource(commons.ApiRequester client) : _requester = client;
 
   /// Gets a Google audience.
   ///
@@ -6803,14 +6796,14 @@
   }
 }
 
-class InventorySourceGroupsResourceApi {
+class InventorySourceGroupsResource {
   final commons.ApiRequester _requester;
 
-  InventorySourceGroupsAssignedInventorySourcesResourceApi
+  InventorySourceGroupsAssignedInventorySourcesResource
       get assignedInventorySources =>
-          InventorySourceGroupsAssignedInventorySourcesResourceApi(_requester);
+          InventorySourceGroupsAssignedInventorySourcesResource(_requester);
 
-  InventorySourceGroupsResourceApi(commons.ApiRequester client)
+  InventorySourceGroupsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Creates a new inventory source group. Returns the newly created inventory
@@ -7198,10 +7191,10 @@
   }
 }
 
-class InventorySourceGroupsAssignedInventorySourcesResourceApi {
+class InventorySourceGroupsAssignedInventorySourcesResource {
   final commons.ApiRequester _requester;
 
-  InventorySourceGroupsAssignedInventorySourcesResourceApi(
+  InventorySourceGroupsAssignedInventorySourcesResource(
       commons.ApiRequester client)
       : _requester = client;
 
@@ -7541,11 +7534,10 @@
   }
 }
 
-class InventorySourcesResourceApi {
+class InventorySourcesResource {
   final commons.ApiRequester _requester;
 
-  InventorySourcesResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  InventorySourcesResource(commons.ApiRequester client) : _requester = client;
 
   /// Gets an inventory source.
   ///
@@ -7711,10 +7703,10 @@
   }
 }
 
-class MediaResourceApi {
+class MediaResource {
   final commons.ApiRequester _requester;
 
-  MediaResourceApi(commons.ApiRequester client) : _requester = client;
+  MediaResource(commons.ApiRequester client) : _requester = client;
 
   /// Downloads media. Download is supported on the URI
   /// `/download/{resource_name=**}?alt=media.` **Note**: Download requests will
@@ -7788,15 +7780,14 @@
   }
 }
 
-class PartnersResourceApi {
+class PartnersResource {
   final commons.ApiRequester _requester;
 
-  PartnersChannelsResourceApi get channels =>
-      PartnersChannelsResourceApi(_requester);
-  PartnersTargetingTypesResourceApi get targetingTypes =>
-      PartnersTargetingTypesResourceApi(_requester);
+  PartnersChannelsResource get channels => PartnersChannelsResource(_requester);
+  PartnersTargetingTypesResource get targetingTypes =>
+      PartnersTargetingTypesResource(_requester);
 
-  PartnersResourceApi(commons.ApiRequester client) : _requester = client;
+  PartnersResource(commons.ApiRequester client) : _requester = client;
 
   /// Bulk edits targeting options under a single partner. The operation will
   /// delete the assigned targeting options provided in
@@ -7999,14 +7990,13 @@
   }
 }
 
-class PartnersChannelsResourceApi {
+class PartnersChannelsResource {
   final commons.ApiRequester _requester;
 
-  PartnersChannelsSitesResourceApi get sites =>
-      PartnersChannelsSitesResourceApi(_requester);
+  PartnersChannelsSitesResource get sites =>
+      PartnersChannelsSitesResource(_requester);
 
-  PartnersChannelsResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  PartnersChannelsResource(commons.ApiRequester client) : _requester = client;
 
   /// Creates a new channel. Returns the newly created channel if successful.
   ///
@@ -8318,10 +8308,10 @@
   }
 }
 
-class PartnersChannelsSitesResourceApi {
+class PartnersChannelsSitesResource {
   final commons.ApiRequester _requester;
 
-  PartnersChannelsSitesResourceApi(commons.ApiRequester client)
+  PartnersChannelsSitesResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Bulk edits sites under a single channel. The operation will delete the
@@ -8653,21 +8643,21 @@
   }
 }
 
-class PartnersTargetingTypesResourceApi {
+class PartnersTargetingTypesResource {
   final commons.ApiRequester _requester;
 
-  PartnersTargetingTypesAssignedTargetingOptionsResourceApi
+  PartnersTargetingTypesAssignedTargetingOptionsResource
       get assignedTargetingOptions =>
-          PartnersTargetingTypesAssignedTargetingOptionsResourceApi(_requester);
+          PartnersTargetingTypesAssignedTargetingOptionsResource(_requester);
 
-  PartnersTargetingTypesResourceApi(commons.ApiRequester client)
+  PartnersTargetingTypesResource(commons.ApiRequester client)
       : _requester = client;
 }
 
-class PartnersTargetingTypesAssignedTargetingOptionsResourceApi {
+class PartnersTargetingTypesAssignedTargetingOptionsResource {
   final commons.ApiRequester _requester;
 
-  PartnersTargetingTypesAssignedTargetingOptionsResourceApi(
+  PartnersTargetingTypesAssignedTargetingOptionsResource(
       commons.ApiRequester client)
       : _requester = client;
 
@@ -9310,14 +9300,13 @@
   }
 }
 
-class SdfdownloadtasksResourceApi {
+class SdfdownloadtasksResource {
   final commons.ApiRequester _requester;
 
-  SdfdownloadtasksOperationsResourceApi get operations =>
-      SdfdownloadtasksOperationsResourceApi(_requester);
+  SdfdownloadtasksOperationsResource get operations =>
+      SdfdownloadtasksOperationsResource(_requester);
 
-  SdfdownloadtasksResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  SdfdownloadtasksResource(commons.ApiRequester client) : _requester = client;
 
   /// Creates an SDF Download Task. Returns an Operation. An SDF Download Task
   /// is a long-running, asynchronous operation. The metadata type of this
@@ -9377,10 +9366,10 @@
   }
 }
 
-class SdfdownloadtasksOperationsResourceApi {
+class SdfdownloadtasksOperationsResource {
   final commons.ApiRequester _requester;
 
-  SdfdownloadtasksOperationsResourceApi(commons.ApiRequester client)
+  SdfdownloadtasksOperationsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Gets the latest state of an asynchronous SDF download task operation.
@@ -9436,19 +9425,19 @@
   }
 }
 
-class TargetingTypesResourceApi {
+class TargetingTypesResource {
   final commons.ApiRequester _requester;
 
-  TargetingTypesTargetingOptionsResourceApi get targetingOptions =>
-      TargetingTypesTargetingOptionsResourceApi(_requester);
+  TargetingTypesTargetingOptionsResource get targetingOptions =>
+      TargetingTypesTargetingOptionsResource(_requester);
 
-  TargetingTypesResourceApi(commons.ApiRequester client) : _requester = client;
+  TargetingTypesResource(commons.ApiRequester client) : _requester = client;
 }
 
-class TargetingTypesTargetingOptionsResourceApi {
+class TargetingTypesTargetingOptionsResource {
   final commons.ApiRequester _requester;
 
-  TargetingTypesTargetingOptionsResourceApi(commons.ApiRequester client)
+  TargetingTypesTargetingOptionsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Gets a single targeting option.
@@ -9786,10 +9775,10 @@
   }
 }
 
-class UsersResourceApi {
+class UsersResource {
   final commons.ApiRequester _requester;
 
-  UsersResourceApi(commons.ApiRequester client) : _requester = client;
+  UsersResource(commons.ApiRequester client) : _requester = client;
 
   /// Bulk edits user roles for a user. The operation will delete the assigned
   /// user roles provided in
diff --git a/generated/googleapis/lib/dlp/v2.dart b/generated/googleapis/lib/dlp/v2.dart
index 1b46801..acd3d2e 100644
--- a/generated/googleapis/lib/dlp/v2.dart
+++ b/generated/googleapis/lib/dlp/v2.dart
@@ -25,33 +25,33 @@
 ///
 /// Create an instance of [DLPApi] to access these resources:
 ///
-/// - [InfoTypesResourceApi]
-/// - [LocationsResourceApi]
-///   - [LocationsInfoTypesResourceApi]
-/// - [OrganizationsResourceApi]
-///   - [OrganizationsDeidentifyTemplatesResourceApi]
-///   - [OrganizationsInspectTemplatesResourceApi]
-///   - [OrganizationsLocationsResourceApi]
-///     - [OrganizationsLocationsDeidentifyTemplatesResourceApi]
-///     - [OrganizationsLocationsInspectTemplatesResourceApi]
-///     - [OrganizationsLocationsStoredInfoTypesResourceApi]
-///   - [OrganizationsStoredInfoTypesResourceApi]
-/// - [ProjectsResourceApi]
-///   - [ProjectsContentResourceApi]
-///   - [ProjectsDeidentifyTemplatesResourceApi]
-///   - [ProjectsDlpJobsResourceApi]
-///   - [ProjectsImageResourceApi]
-///   - [ProjectsInspectTemplatesResourceApi]
-///   - [ProjectsJobTriggersResourceApi]
-///   - [ProjectsLocationsResourceApi]
-///     - [ProjectsLocationsContentResourceApi]
-///     - [ProjectsLocationsDeidentifyTemplatesResourceApi]
-///     - [ProjectsLocationsDlpJobsResourceApi]
-///     - [ProjectsLocationsImageResourceApi]
-///     - [ProjectsLocationsInspectTemplatesResourceApi]
-///     - [ProjectsLocationsJobTriggersResourceApi]
-///     - [ProjectsLocationsStoredInfoTypesResourceApi]
-///   - [ProjectsStoredInfoTypesResourceApi]
+/// - [InfoTypesResource]
+/// - [LocationsResource]
+///   - [LocationsInfoTypesResource]
+/// - [OrganizationsResource]
+///   - [OrganizationsDeidentifyTemplatesResource]
+///   - [OrganizationsInspectTemplatesResource]
+///   - [OrganizationsLocationsResource]
+///     - [OrganizationsLocationsDeidentifyTemplatesResource]
+///     - [OrganizationsLocationsInspectTemplatesResource]
+///     - [OrganizationsLocationsStoredInfoTypesResource]
+///   - [OrganizationsStoredInfoTypesResource]
+/// - [ProjectsResource]
+///   - [ProjectsContentResource]
+///   - [ProjectsDeidentifyTemplatesResource]
+///   - [ProjectsDlpJobsResource]
+///   - [ProjectsImageResource]
+///   - [ProjectsInspectTemplatesResource]
+///   - [ProjectsJobTriggersResource]
+///   - [ProjectsLocationsResource]
+///     - [ProjectsLocationsContentResource]
+///     - [ProjectsLocationsDeidentifyTemplatesResource]
+///     - [ProjectsLocationsDlpJobsResource]
+///     - [ProjectsLocationsImageResource]
+///     - [ProjectsLocationsInspectTemplatesResource]
+///     - [ProjectsLocationsJobTriggersResource]
+///     - [ProjectsLocationsStoredInfoTypesResource]
+///   - [ProjectsStoredInfoTypesResource]
 library dlp.v2;
 
 import 'dart:async' as async;
@@ -76,11 +76,10 @@
 
   final commons.ApiRequester _requester;
 
-  InfoTypesResourceApi get infoTypes => InfoTypesResourceApi(_requester);
-  LocationsResourceApi get locations => LocationsResourceApi(_requester);
-  OrganizationsResourceApi get organizations =>
-      OrganizationsResourceApi(_requester);
-  ProjectsResourceApi get projects => ProjectsResourceApi(_requester);
+  InfoTypesResource get infoTypes => InfoTypesResource(_requester);
+  LocationsResource get locations => LocationsResource(_requester);
+  OrganizationsResource get organizations => OrganizationsResource(_requester);
+  ProjectsResource get projects => ProjectsResource(_requester);
 
   DLPApi(http.Client client,
       {core.String rootUrl = 'https://dlp.googleapis.com/',
@@ -89,10 +88,10 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class InfoTypesResourceApi {
+class InfoTypesResource {
   final commons.ApiRequester _requester;
 
-  InfoTypesResourceApi(commons.ApiRequester client) : _requester = client;
+  InfoTypesResource(commons.ApiRequester client) : _requester = client;
 
   /// Returns a list of the sensitive information types that the DLP API
   /// supports. See https://cloud.google.com/dlp/docs/infotypes-reference to
@@ -170,20 +169,19 @@
   }
 }
 
-class LocationsResourceApi {
+class LocationsResource {
   final commons.ApiRequester _requester;
 
-  LocationsInfoTypesResourceApi get infoTypes =>
-      LocationsInfoTypesResourceApi(_requester);
+  LocationsInfoTypesResource get infoTypes =>
+      LocationsInfoTypesResource(_requester);
 
-  LocationsResourceApi(commons.ApiRequester client) : _requester = client;
+  LocationsResource(commons.ApiRequester client) : _requester = client;
 }
 
-class LocationsInfoTypesResourceApi {
+class LocationsInfoTypesResource {
   final commons.ApiRequester _requester;
 
-  LocationsInfoTypesResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  LocationsInfoTypesResource(commons.ApiRequester client) : _requester = client;
 
   /// Returns a list of the sensitive information types that the DLP API
   /// supports. See https://cloud.google.com/dlp/docs/infotypes-reference to
@@ -263,25 +261,25 @@
   }
 }
 
-class OrganizationsResourceApi {
+class OrganizationsResource {
   final commons.ApiRequester _requester;
 
-  OrganizationsDeidentifyTemplatesResourceApi get deidentifyTemplates =>
-      OrganizationsDeidentifyTemplatesResourceApi(_requester);
-  OrganizationsInspectTemplatesResourceApi get inspectTemplates =>
-      OrganizationsInspectTemplatesResourceApi(_requester);
-  OrganizationsLocationsResourceApi get locations =>
-      OrganizationsLocationsResourceApi(_requester);
-  OrganizationsStoredInfoTypesResourceApi get storedInfoTypes =>
-      OrganizationsStoredInfoTypesResourceApi(_requester);
+  OrganizationsDeidentifyTemplatesResource get deidentifyTemplates =>
+      OrganizationsDeidentifyTemplatesResource(_requester);
+  OrganizationsInspectTemplatesResource get inspectTemplates =>
+      OrganizationsInspectTemplatesResource(_requester);
+  OrganizationsLocationsResource get locations =>
+      OrganizationsLocationsResource(_requester);
+  OrganizationsStoredInfoTypesResource get storedInfoTypes =>
+      OrganizationsStoredInfoTypesResource(_requester);
 
-  OrganizationsResourceApi(commons.ApiRequester client) : _requester = client;
+  OrganizationsResource(commons.ApiRequester client) : _requester = client;
 }
 
-class OrganizationsDeidentifyTemplatesResourceApi {
+class OrganizationsDeidentifyTemplatesResource {
   final commons.ApiRequester _requester;
 
-  OrganizationsDeidentifyTemplatesResourceApi(commons.ApiRequester client)
+  OrganizationsDeidentifyTemplatesResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Creates a DeidentifyTemplate for re-using frequently used configuration
@@ -634,10 +632,10 @@
   }
 }
 
-class OrganizationsInspectTemplatesResourceApi {
+class OrganizationsInspectTemplatesResource {
   final commons.ApiRequester _requester;
 
-  OrganizationsInspectTemplatesResourceApi(commons.ApiRequester client)
+  OrganizationsInspectTemplatesResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Creates an InspectTemplate for re-using frequently used configuration for
@@ -989,26 +987,24 @@
   }
 }
 
-class OrganizationsLocationsResourceApi {
+class OrganizationsLocationsResource {
   final commons.ApiRequester _requester;
 
-  OrganizationsLocationsDeidentifyTemplatesResourceApi
-      get deidentifyTemplates =>
-          OrganizationsLocationsDeidentifyTemplatesResourceApi(_requester);
-  OrganizationsLocationsInspectTemplatesResourceApi get inspectTemplates =>
-      OrganizationsLocationsInspectTemplatesResourceApi(_requester);
-  OrganizationsLocationsStoredInfoTypesResourceApi get storedInfoTypes =>
-      OrganizationsLocationsStoredInfoTypesResourceApi(_requester);
+  OrganizationsLocationsDeidentifyTemplatesResource get deidentifyTemplates =>
+      OrganizationsLocationsDeidentifyTemplatesResource(_requester);
+  OrganizationsLocationsInspectTemplatesResource get inspectTemplates =>
+      OrganizationsLocationsInspectTemplatesResource(_requester);
+  OrganizationsLocationsStoredInfoTypesResource get storedInfoTypes =>
+      OrganizationsLocationsStoredInfoTypesResource(_requester);
 
-  OrganizationsLocationsResourceApi(commons.ApiRequester client)
+  OrganizationsLocationsResource(commons.ApiRequester client)
       : _requester = client;
 }
 
-class OrganizationsLocationsDeidentifyTemplatesResourceApi {
+class OrganizationsLocationsDeidentifyTemplatesResource {
   final commons.ApiRequester _requester;
 
-  OrganizationsLocationsDeidentifyTemplatesResourceApi(
-      commons.ApiRequester client)
+  OrganizationsLocationsDeidentifyTemplatesResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Creates a DeidentifyTemplate for re-using frequently used configuration
@@ -1364,10 +1360,10 @@
   }
 }
 
-class OrganizationsLocationsInspectTemplatesResourceApi {
+class OrganizationsLocationsInspectTemplatesResource {
   final commons.ApiRequester _requester;
 
-  OrganizationsLocationsInspectTemplatesResourceApi(commons.ApiRequester client)
+  OrganizationsLocationsInspectTemplatesResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Creates an InspectTemplate for re-using frequently used configuration for
@@ -1722,10 +1718,10 @@
   }
 }
 
-class OrganizationsLocationsStoredInfoTypesResourceApi {
+class OrganizationsLocationsStoredInfoTypesResource {
   final commons.ApiRequester _requester;
 
-  OrganizationsLocationsStoredInfoTypesResourceApi(commons.ApiRequester client)
+  OrganizationsLocationsStoredInfoTypesResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Creates a pre-built stored infoType to be used for inspection. See
@@ -2080,10 +2076,10 @@
   }
 }
 
-class OrganizationsStoredInfoTypesResourceApi {
+class OrganizationsStoredInfoTypesResource {
   final commons.ApiRequester _requester;
 
-  OrganizationsStoredInfoTypesResourceApi(commons.ApiRequester client)
+  OrganizationsStoredInfoTypesResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Creates a pre-built stored infoType to be used for inspection. See
@@ -2435,32 +2431,30 @@
   }
 }
 
-class ProjectsResourceApi {
+class ProjectsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsContentResourceApi get content =>
-      ProjectsContentResourceApi(_requester);
-  ProjectsDeidentifyTemplatesResourceApi get deidentifyTemplates =>
-      ProjectsDeidentifyTemplatesResourceApi(_requester);
-  ProjectsDlpJobsResourceApi get dlpJobs =>
-      ProjectsDlpJobsResourceApi(_requester);
-  ProjectsImageResourceApi get image => ProjectsImageResourceApi(_requester);
-  ProjectsInspectTemplatesResourceApi get inspectTemplates =>
-      ProjectsInspectTemplatesResourceApi(_requester);
-  ProjectsJobTriggersResourceApi get jobTriggers =>
-      ProjectsJobTriggersResourceApi(_requester);
-  ProjectsLocationsResourceApi get locations =>
-      ProjectsLocationsResourceApi(_requester);
-  ProjectsStoredInfoTypesResourceApi get storedInfoTypes =>
-      ProjectsStoredInfoTypesResourceApi(_requester);
+  ProjectsContentResource get content => ProjectsContentResource(_requester);
+  ProjectsDeidentifyTemplatesResource get deidentifyTemplates =>
+      ProjectsDeidentifyTemplatesResource(_requester);
+  ProjectsDlpJobsResource get dlpJobs => ProjectsDlpJobsResource(_requester);
+  ProjectsImageResource get image => ProjectsImageResource(_requester);
+  ProjectsInspectTemplatesResource get inspectTemplates =>
+      ProjectsInspectTemplatesResource(_requester);
+  ProjectsJobTriggersResource get jobTriggers =>
+      ProjectsJobTriggersResource(_requester);
+  ProjectsLocationsResource get locations =>
+      ProjectsLocationsResource(_requester);
+  ProjectsStoredInfoTypesResource get storedInfoTypes =>
+      ProjectsStoredInfoTypesResource(_requester);
 
-  ProjectsResourceApi(commons.ApiRequester client) : _requester = client;
+  ProjectsResource(commons.ApiRequester client) : _requester = client;
 }
 
-class ProjectsContentResourceApi {
+class ProjectsContentResource {
   final commons.ApiRequester _requester;
 
-  ProjectsContentResourceApi(commons.ApiRequester client) : _requester = client;
+  ProjectsContentResource(commons.ApiRequester client) : _requester = client;
 
   /// De-identifies potentially sensitive info from a ContentItem. This method
   /// has limits on input size and output size. See
@@ -2683,10 +2677,10 @@
   }
 }
 
-class ProjectsDeidentifyTemplatesResourceApi {
+class ProjectsDeidentifyTemplatesResource {
   final commons.ApiRequester _requester;
 
-  ProjectsDeidentifyTemplatesResourceApi(commons.ApiRequester client)
+  ProjectsDeidentifyTemplatesResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Creates a DeidentifyTemplate for re-using frequently used configuration
@@ -3039,10 +3033,10 @@
   }
 }
 
-class ProjectsDlpJobsResourceApi {
+class ProjectsDlpJobsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsDlpJobsResourceApi(commons.ApiRequester client) : _requester = client;
+  ProjectsDlpJobsResource(commons.ApiRequester client) : _requester = client;
 
   /// Starts asynchronous cancellation on a long-running DlpJob. The server
   /// makes a best effort to cancel the DlpJob, but success is not guaranteed.
@@ -3415,10 +3409,10 @@
   }
 }
 
-class ProjectsImageResourceApi {
+class ProjectsImageResource {
   final commons.ApiRequester _requester;
 
-  ProjectsImageResourceApi(commons.ApiRequester client) : _requester = client;
+  ProjectsImageResource(commons.ApiRequester client) : _requester = client;
 
   /// Redacts potentially sensitive info from an image. This method has limits
   /// on input size, processing time, and output size. See
@@ -3495,10 +3489,10 @@
   }
 }
 
-class ProjectsInspectTemplatesResourceApi {
+class ProjectsInspectTemplatesResource {
   final commons.ApiRequester _requester;
 
-  ProjectsInspectTemplatesResourceApi(commons.ApiRequester client)
+  ProjectsInspectTemplatesResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Creates an InspectTemplate for re-using frequently used configuration for
@@ -3850,10 +3844,10 @@
   }
 }
 
-class ProjectsJobTriggersResourceApi {
+class ProjectsJobTriggersResource {
   final commons.ApiRequester _requester;
 
-  ProjectsJobTriggersResourceApi(commons.ApiRequester client)
+  ProjectsJobTriggersResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Activate a job trigger. Causes the immediate execute of a trigger instead
@@ -4274,32 +4268,31 @@
   }
 }
 
-class ProjectsLocationsResourceApi {
+class ProjectsLocationsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsLocationsContentResourceApi get content =>
-      ProjectsLocationsContentResourceApi(_requester);
-  ProjectsLocationsDeidentifyTemplatesResourceApi get deidentifyTemplates =>
-      ProjectsLocationsDeidentifyTemplatesResourceApi(_requester);
-  ProjectsLocationsDlpJobsResourceApi get dlpJobs =>
-      ProjectsLocationsDlpJobsResourceApi(_requester);
-  ProjectsLocationsImageResourceApi get image =>
-      ProjectsLocationsImageResourceApi(_requester);
-  ProjectsLocationsInspectTemplatesResourceApi get inspectTemplates =>
-      ProjectsLocationsInspectTemplatesResourceApi(_requester);
-  ProjectsLocationsJobTriggersResourceApi get jobTriggers =>
-      ProjectsLocationsJobTriggersResourceApi(_requester);
-  ProjectsLocationsStoredInfoTypesResourceApi get storedInfoTypes =>
-      ProjectsLocationsStoredInfoTypesResourceApi(_requester);
+  ProjectsLocationsContentResource get content =>
+      ProjectsLocationsContentResource(_requester);
+  ProjectsLocationsDeidentifyTemplatesResource get deidentifyTemplates =>
+      ProjectsLocationsDeidentifyTemplatesResource(_requester);
+  ProjectsLocationsDlpJobsResource get dlpJobs =>
+      ProjectsLocationsDlpJobsResource(_requester);
+  ProjectsLocationsImageResource get image =>
+      ProjectsLocationsImageResource(_requester);
+  ProjectsLocationsInspectTemplatesResource get inspectTemplates =>
+      ProjectsLocationsInspectTemplatesResource(_requester);
+  ProjectsLocationsJobTriggersResource get jobTriggers =>
+      ProjectsLocationsJobTriggersResource(_requester);
+  ProjectsLocationsStoredInfoTypesResource get storedInfoTypes =>
+      ProjectsLocationsStoredInfoTypesResource(_requester);
 
-  ProjectsLocationsResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  ProjectsLocationsResource(commons.ApiRequester client) : _requester = client;
 }
 
-class ProjectsLocationsContentResourceApi {
+class ProjectsLocationsContentResource {
   final commons.ApiRequester _requester;
 
-  ProjectsLocationsContentResourceApi(commons.ApiRequester client)
+  ProjectsLocationsContentResource(commons.ApiRequester client)
       : _requester = client;
 
   /// De-identifies potentially sensitive info from a ContentItem. This method
@@ -4523,10 +4516,10 @@
   }
 }
 
-class ProjectsLocationsDeidentifyTemplatesResourceApi {
+class ProjectsLocationsDeidentifyTemplatesResource {
   final commons.ApiRequester _requester;
 
-  ProjectsLocationsDeidentifyTemplatesResourceApi(commons.ApiRequester client)
+  ProjectsLocationsDeidentifyTemplatesResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Creates a DeidentifyTemplate for re-using frequently used configuration
@@ -4882,10 +4875,10 @@
   }
 }
 
-class ProjectsLocationsDlpJobsResourceApi {
+class ProjectsLocationsDlpJobsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsLocationsDlpJobsResourceApi(commons.ApiRequester client)
+  ProjectsLocationsDlpJobsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Starts asynchronous cancellation on a long-running DlpJob. The server
@@ -5386,10 +5379,10 @@
   }
 }
 
-class ProjectsLocationsImageResourceApi {
+class ProjectsLocationsImageResource {
   final commons.ApiRequester _requester;
 
-  ProjectsLocationsImageResourceApi(commons.ApiRequester client)
+  ProjectsLocationsImageResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Redacts potentially sensitive info from an image. This method has limits
@@ -5467,10 +5460,10 @@
   }
 }
 
-class ProjectsLocationsInspectTemplatesResourceApi {
+class ProjectsLocationsInspectTemplatesResource {
   final commons.ApiRequester _requester;
 
-  ProjectsLocationsInspectTemplatesResourceApi(commons.ApiRequester client)
+  ProjectsLocationsInspectTemplatesResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Creates an InspectTemplate for re-using frequently used configuration for
@@ -5825,10 +5818,10 @@
   }
 }
 
-class ProjectsLocationsJobTriggersResourceApi {
+class ProjectsLocationsJobTriggersResource {
   final commons.ApiRequester _requester;
 
-  ProjectsLocationsJobTriggersResourceApi(commons.ApiRequester client)
+  ProjectsLocationsJobTriggersResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Activate a job trigger. Causes the immediate execute of a trigger instead
@@ -6319,10 +6312,10 @@
   }
 }
 
-class ProjectsLocationsStoredInfoTypesResourceApi {
+class ProjectsLocationsStoredInfoTypesResource {
   final commons.ApiRequester _requester;
 
-  ProjectsLocationsStoredInfoTypesResourceApi(commons.ApiRequester client)
+  ProjectsLocationsStoredInfoTypesResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Creates a pre-built stored infoType to be used for inspection. See
@@ -6677,10 +6670,10 @@
   }
 }
 
-class ProjectsStoredInfoTypesResourceApi {
+class ProjectsStoredInfoTypesResource {
   final commons.ApiRequester _requester;
 
-  ProjectsStoredInfoTypesResourceApi(commons.ApiRequester client)
+  ProjectsStoredInfoTypesResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Creates a pre-built stored infoType to be used for inspection. See
diff --git a/generated/googleapis/lib/dns/v1.dart b/generated/googleapis/lib/dns/v1.dart
index 93690d2..e3f50ed 100644
--- a/generated/googleapis/lib/dns/v1.dart
+++ b/generated/googleapis/lib/dns/v1.dart
@@ -21,13 +21,13 @@
 ///
 /// Create an instance of [DnsApi] to access these resources:
 ///
-/// - [ChangesResourceApi]
-/// - [DnsKeysResourceApi]
-/// - [ManagedZoneOperationsResourceApi]
-/// - [ManagedZonesResourceApi]
-/// - [PoliciesResourceApi]
-/// - [ProjectsResourceApi]
-/// - [ResourceRecordSetsResourceApi]
+/// - [ChangesResource]
+/// - [DnsKeysResource]
+/// - [ManagedZoneOperationsResource]
+/// - [ManagedZonesResource]
+/// - [PoliciesResource]
+/// - [ProjectsResource]
+/// - [ResourceRecordSetsResource]
 library dns.v1;
 
 import 'dart:async' as async;
@@ -61,16 +61,15 @@
 
   final commons.ApiRequester _requester;
 
-  ChangesResourceApi get changes => ChangesResourceApi(_requester);
-  DnsKeysResourceApi get dnsKeys => DnsKeysResourceApi(_requester);
-  ManagedZoneOperationsResourceApi get managedZoneOperations =>
-      ManagedZoneOperationsResourceApi(_requester);
-  ManagedZonesResourceApi get managedZones =>
-      ManagedZonesResourceApi(_requester);
-  PoliciesResourceApi get policies => PoliciesResourceApi(_requester);
-  ProjectsResourceApi get projects => ProjectsResourceApi(_requester);
-  ResourceRecordSetsResourceApi get resourceRecordSets =>
-      ResourceRecordSetsResourceApi(_requester);
+  ChangesResource get changes => ChangesResource(_requester);
+  DnsKeysResource get dnsKeys => DnsKeysResource(_requester);
+  ManagedZoneOperationsResource get managedZoneOperations =>
+      ManagedZoneOperationsResource(_requester);
+  ManagedZonesResource get managedZones => ManagedZonesResource(_requester);
+  PoliciesResource get policies => PoliciesResource(_requester);
+  ProjectsResource get projects => ProjectsResource(_requester);
+  ResourceRecordSetsResource get resourceRecordSets =>
+      ResourceRecordSetsResource(_requester);
 
   DnsApi(http.Client client,
       {core.String rootUrl = 'https://dns.googleapis.com/',
@@ -79,10 +78,10 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class ChangesResourceApi {
+class ChangesResource {
   final commons.ApiRequester _requester;
 
-  ChangesResourceApi(commons.ApiRequester client) : _requester = client;
+  ChangesResource(commons.ApiRequester client) : _requester = client;
 
   /// Atomically update the ResourceRecordSet collection.
   ///
@@ -327,10 +326,10 @@
   }
 }
 
-class DnsKeysResourceApi {
+class DnsKeysResource {
   final commons.ApiRequester _requester;
 
-  DnsKeysResourceApi(commons.ApiRequester client) : _requester = client;
+  DnsKeysResource(commons.ApiRequester client) : _requester = client;
 
   /// Fetch the representation of an existing DnsKey.
   ///
@@ -501,10 +500,10 @@
   }
 }
 
-class ManagedZoneOperationsResourceApi {
+class ManagedZoneOperationsResource {
   final commons.ApiRequester _requester;
 
-  ManagedZoneOperationsResourceApi(commons.ApiRequester client)
+  ManagedZoneOperationsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Fetch the representation of an existing Operation.
@@ -668,10 +667,10 @@
   }
 }
 
-class ManagedZonesResourceApi {
+class ManagedZonesResource {
   final commons.ApiRequester _requester;
 
-  ManagedZonesResourceApi(commons.ApiRequester client) : _requester = client;
+  ManagedZonesResource(commons.ApiRequester client) : _requester = client;
 
   /// Create a new ManagedZone.
   ///
@@ -1099,10 +1098,10 @@
   }
 }
 
-class PoliciesResourceApi {
+class PoliciesResource {
   final commons.ApiRequester _requester;
 
-  PoliciesResourceApi(commons.ApiRequester client) : _requester = client;
+  PoliciesResource(commons.ApiRequester client) : _requester = client;
 
   /// Create a new Policy
   ///
@@ -1525,10 +1524,10 @@
   }
 }
 
-class ProjectsResourceApi {
+class ProjectsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsResourceApi(commons.ApiRequester client) : _requester = client;
+  ProjectsResource(commons.ApiRequester client) : _requester = client;
 
   /// Fetch the representation of an existing Project.
   ///
@@ -1589,11 +1588,10 @@
   }
 }
 
-class ResourceRecordSetsResourceApi {
+class ResourceRecordSetsResource {
   final commons.ApiRequester _requester;
 
-  ResourceRecordSetsResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  ResourceRecordSetsResource(commons.ApiRequester client) : _requester = client;
 
   /// Enumerate ResourceRecordSets that have been created but not yet deleted.
   ///
diff --git a/generated/googleapis/lib/docs/v1.dart b/generated/googleapis/lib/docs/v1.dart
index 8f74a8b..7f661b5 100644
--- a/generated/googleapis/lib/docs/v1.dart
+++ b/generated/googleapis/lib/docs/v1.dart
@@ -23,7 +23,7 @@
 ///
 /// Create an instance of [DocsApi] to access these resources:
 ///
-/// - [DocumentsResourceApi]
+/// - [DocumentsResource]
 library docs.v1;
 
 import 'dart:async' as async;
@@ -60,7 +60,7 @@
 
   final commons.ApiRequester _requester;
 
-  DocumentsResourceApi get documents => DocumentsResourceApi(_requester);
+  DocumentsResource get documents => DocumentsResource(_requester);
 
   DocsApi(http.Client client,
       {core.String rootUrl = 'https://docs.googleapis.com/',
@@ -69,10 +69,10 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class DocumentsResourceApi {
+class DocumentsResource {
   final commons.ApiRequester _requester;
 
-  DocumentsResourceApi(commons.ApiRequester client) : _requester = client;
+  DocumentsResource(commons.ApiRequester client) : _requester = client;
 
   /// Applies one or more updates to the document. Each request is validated
   /// before being applied. If any request is not valid, then the entire request
diff --git a/generated/googleapis/lib/domainsrdap/v1.dart b/generated/googleapis/lib/domainsrdap/v1.dart
index 8f04590..d78a4d0 100644
--- a/generated/googleapis/lib/domainsrdap/v1.dart
+++ b/generated/googleapis/lib/domainsrdap/v1.dart
@@ -24,12 +24,12 @@
 ///
 /// Create an instance of [DomainsRDAPApi] to access these resources:
 ///
-/// - [AutnumResourceApi]
-/// - [DomainResourceApi]
-/// - [EntityResourceApi]
-/// - [IpResourceApi]
-/// - [NameserverResourceApi]
-/// - [V1ResourceApi]
+/// - [AutnumResource]
+/// - [DomainResource]
+/// - [EntityResource]
+/// - [IpResource]
+/// - [NameserverResource]
+/// - [V1Resource]
 library domainsrdap.v1;
 
 import 'dart:async' as async;
@@ -49,12 +49,12 @@
 class DomainsRDAPApi {
   final commons.ApiRequester _requester;
 
-  AutnumResourceApi get autnum => AutnumResourceApi(_requester);
-  DomainResourceApi get domain => DomainResourceApi(_requester);
-  EntityResourceApi get entity => EntityResourceApi(_requester);
-  IpResourceApi get ip => IpResourceApi(_requester);
-  NameserverResourceApi get nameserver => NameserverResourceApi(_requester);
-  V1ResourceApi get v1 => V1ResourceApi(_requester);
+  AutnumResource get autnum => AutnumResource(_requester);
+  DomainResource get domain => DomainResource(_requester);
+  EntityResource get entity => EntityResource(_requester);
+  IpResource get ip => IpResource(_requester);
+  NameserverResource get nameserver => NameserverResource(_requester);
+  V1Resource get v1 => V1Resource(_requester);
 
   DomainsRDAPApi(http.Client client,
       {core.String rootUrl = 'https://domainsrdap.googleapis.com/',
@@ -63,10 +63,10 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class AutnumResourceApi {
+class AutnumResource {
   final commons.ApiRequester _requester;
 
-  AutnumResourceApi(commons.ApiRequester client) : _requester = client;
+  AutnumResource(commons.ApiRequester client) : _requester = client;
 
   /// The RDAP API recognizes this command from the RDAP specification but does
   /// not support it. The response is a formatted 501 error.
@@ -121,10 +121,10 @@
   }
 }
 
-class DomainResourceApi {
+class DomainResource {
   final commons.ApiRequester _requester;
 
-  DomainResourceApi(commons.ApiRequester client) : _requester = client;
+  DomainResource(commons.ApiRequester client) : _requester = client;
 
   /// Look up RDAP information for a domain by name.
   ///
@@ -178,10 +178,10 @@
   }
 }
 
-class EntityResourceApi {
+class EntityResource {
   final commons.ApiRequester _requester;
 
-  EntityResourceApi(commons.ApiRequester client) : _requester = client;
+  EntityResource(commons.ApiRequester client) : _requester = client;
 
   /// The RDAP API recognizes this command from the RDAP specification but does
   /// not support it. The response is a formatted 501 error.
@@ -236,10 +236,10 @@
   }
 }
 
-class IpResourceApi {
+class IpResource {
   final commons.ApiRequester _requester;
 
-  IpResourceApi(commons.ApiRequester client) : _requester = client;
+  IpResource(commons.ApiRequester client) : _requester = client;
 
   /// The RDAP API recognizes this command from the RDAP specification but does
   /// not support it. The response is a formatted 501 error.
@@ -303,10 +303,10 @@
   }
 }
 
-class NameserverResourceApi {
+class NameserverResource {
   final commons.ApiRequester _requester;
 
-  NameserverResourceApi(commons.ApiRequester client) : _requester = client;
+  NameserverResource(commons.ApiRequester client) : _requester = client;
 
   /// The RDAP API recognizes this command from the RDAP specification but does
   /// not support it. The response is a formatted 501 error.
@@ -361,10 +361,10 @@
   }
 }
 
-class V1ResourceApi {
+class V1Resource {
   final commons.ApiRequester _requester;
 
-  V1ResourceApi(commons.ApiRequester client) : _requester = client;
+  V1Resource(commons.ApiRequester client) : _requester = client;
 
   /// The RDAP API recognizes this command from the RDAP specification but does
   /// not support it. The response is a formatted 501 error.
diff --git a/generated/googleapis/lib/doubleclickbidmanager/v1_1.dart b/generated/googleapis/lib/doubleclickbidmanager/v1_1.dart
index 8a55343..a1803e2 100644
--- a/generated/googleapis/lib/doubleclickbidmanager/v1_1.dart
+++ b/generated/googleapis/lib/doubleclickbidmanager/v1_1.dart
@@ -24,10 +24,10 @@
 ///
 /// Create an instance of [DoubleClickBidManagerApi] to access these resources:
 ///
-/// - [LineitemsResourceApi]
-/// - [QueriesResourceApi]
-/// - [ReportsResourceApi]
-/// - [SdfResourceApi]
+/// - [LineitemsResource]
+/// - [QueriesResource]
+/// - [ReportsResource]
+/// - [SdfResource]
 library doubleclickbidmanager.v1_1;
 
 import 'dart:async' as async;
@@ -51,10 +51,10 @@
 
   final commons.ApiRequester _requester;
 
-  LineitemsResourceApi get lineitems => LineitemsResourceApi(_requester);
-  QueriesResourceApi get queries => QueriesResourceApi(_requester);
-  ReportsResourceApi get reports => ReportsResourceApi(_requester);
-  SdfResourceApi get sdf => SdfResourceApi(_requester);
+  LineitemsResource get lineitems => LineitemsResource(_requester);
+  QueriesResource get queries => QueriesResource(_requester);
+  ReportsResource get reports => ReportsResource(_requester);
+  SdfResource get sdf => SdfResource(_requester);
 
   DoubleClickBidManagerApi(http.Client client,
       {core.String rootUrl = 'https://doubleclickbidmanager.googleapis.com/',
@@ -63,10 +63,10 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class LineitemsResourceApi {
+class LineitemsResource {
   final commons.ApiRequester _requester;
 
-  LineitemsResourceApi(commons.ApiRequester client) : _requester = client;
+  LineitemsResource(commons.ApiRequester client) : _requester = client;
 
   /// Retrieves line items in CSV format. YouTube & partners line items are not
   /// supported.
@@ -173,10 +173,10 @@
   }
 }
 
-class QueriesResourceApi {
+class QueriesResource {
   final commons.ApiRequester _requester;
 
-  QueriesResourceApi(commons.ApiRequester client) : _requester = client;
+  QueriesResource(commons.ApiRequester client) : _requester = client;
 
   /// Creates a query.
   ///
@@ -456,10 +456,10 @@
   }
 }
 
-class ReportsResourceApi {
+class ReportsResource {
   final commons.ApiRequester _requester;
 
-  ReportsResourceApi(commons.ApiRequester client) : _requester = client;
+  ReportsResource(commons.ApiRequester client) : _requester = client;
 
   /// Retrieves stored reports.
   ///
@@ -526,10 +526,10 @@
   }
 }
 
-class SdfResourceApi {
+class SdfResource {
   final commons.ApiRequester _requester;
 
-  SdfResourceApi(commons.ApiRequester client) : _requester = client;
+  SdfResource(commons.ApiRequester client) : _requester = client;
 
   /// Retrieves entities in SDF format.
   ///
diff --git a/generated/googleapis/lib/doubleclicksearch/v2.dart b/generated/googleapis/lib/doubleclicksearch/v2.dart
index e88a5de..4bdd503 100644
--- a/generated/googleapis/lib/doubleclicksearch/v2.dart
+++ b/generated/googleapis/lib/doubleclicksearch/v2.dart
@@ -24,9 +24,9 @@
 ///
 /// Create an instance of [DoubleclicksearchApi] to access these resources:
 ///
-/// - [ConversionResourceApi]
-/// - [ReportsResourceApi]
-/// - [SavedColumnsResourceApi]
+/// - [ConversionResource]
+/// - [ReportsResource]
+/// - [SavedColumnsResource]
 library doubleclicksearch.v2;
 
 import 'dart:async' as async;
@@ -59,10 +59,9 @@
 
   final commons.ApiRequester _requester;
 
-  ConversionResourceApi get conversion => ConversionResourceApi(_requester);
-  ReportsResourceApi get reports => ReportsResourceApi(_requester);
-  SavedColumnsResourceApi get savedColumns =>
-      SavedColumnsResourceApi(_requester);
+  ConversionResource get conversion => ConversionResource(_requester);
+  ReportsResource get reports => ReportsResource(_requester);
+  SavedColumnsResource get savedColumns => SavedColumnsResource(_requester);
 
   DoubleclicksearchApi(http.Client client,
       {core.String rootUrl = 'https://doubleclicksearch.googleapis.com/',
@@ -71,10 +70,10 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class ConversionResourceApi {
+class ConversionResource {
   final commons.ApiRequester _requester;
 
-  ConversionResourceApi(commons.ApiRequester client) : _requester = client;
+  ConversionResource(commons.ApiRequester client) : _requester = client;
 
   /// Retrieves a list of conversions from a DoubleClick Search engine account.
   ///
@@ -358,10 +357,10 @@
   }
 }
 
-class ReportsResourceApi {
+class ReportsResource {
   final commons.ApiRequester _requester;
 
-  ReportsResourceApi(commons.ApiRequester client) : _requester = client;
+  ReportsResource(commons.ApiRequester client) : _requester = client;
 
   /// Generates and returns a report immediately.
   ///
@@ -584,10 +583,10 @@
   }
 }
 
-class SavedColumnsResourceApi {
+class SavedColumnsResource {
   final commons.ApiRequester _requester;
 
-  SavedColumnsResourceApi(commons.ApiRequester client) : _requester = client;
+  SavedColumnsResource(commons.ApiRequester client) : _requester = client;
 
   /// Retrieve the list of saved columns for a specified advertiser.
   ///
diff --git a/generated/googleapis/lib/drive/v2.dart b/generated/googleapis/lib/drive/v2.dart
index 92d418c..1a0ea51 100644
--- a/generated/googleapis/lib/drive/v2.dart
+++ b/generated/googleapis/lib/drive/v2.dart
@@ -24,20 +24,20 @@
 ///
 /// Create an instance of [DriveApi] to access these resources:
 ///
-/// - [AboutResourceApi]
-/// - [AppsResourceApi]
-/// - [ChangesResourceApi]
-/// - [ChannelsResourceApi]
-/// - [ChildrenResourceApi]
-/// - [CommentsResourceApi]
-/// - [DrivesResourceApi]
-/// - [FilesResourceApi]
-/// - [ParentsResourceApi]
-/// - [PermissionsResourceApi]
-/// - [PropertiesResourceApi]
-/// - [RepliesResourceApi]
-/// - [RevisionsResourceApi]
-/// - [TeamdrivesResourceApi]
+/// - [AboutResource]
+/// - [AppsResource]
+/// - [ChangesResource]
+/// - [ChannelsResource]
+/// - [ChildrenResource]
+/// - [CommentsResource]
+/// - [DrivesResource]
+/// - [FilesResource]
+/// - [ParentsResource]
+/// - [PermissionsResource]
+/// - [PropertiesResource]
+/// - [RepliesResource]
+/// - [RevisionsResource]
+/// - [TeamdrivesResource]
 library drive.v2;
 
 import 'dart:async' as async;
@@ -100,20 +100,20 @@
 
   final commons.ApiRequester _requester;
 
-  AboutResourceApi get about => AboutResourceApi(_requester);
-  AppsResourceApi get apps => AppsResourceApi(_requester);
-  ChangesResourceApi get changes => ChangesResourceApi(_requester);
-  ChannelsResourceApi get channels => ChannelsResourceApi(_requester);
-  ChildrenResourceApi get children => ChildrenResourceApi(_requester);
-  CommentsResourceApi get comments => CommentsResourceApi(_requester);
-  DrivesResourceApi get drives => DrivesResourceApi(_requester);
-  FilesResourceApi get files => FilesResourceApi(_requester);
-  ParentsResourceApi get parents => ParentsResourceApi(_requester);
-  PermissionsResourceApi get permissions => PermissionsResourceApi(_requester);
-  PropertiesResourceApi get properties => PropertiesResourceApi(_requester);
-  RepliesResourceApi get replies => RepliesResourceApi(_requester);
-  RevisionsResourceApi get revisions => RevisionsResourceApi(_requester);
-  TeamdrivesResourceApi get teamdrives => TeamdrivesResourceApi(_requester);
+  AboutResource get about => AboutResource(_requester);
+  AppsResource get apps => AppsResource(_requester);
+  ChangesResource get changes => ChangesResource(_requester);
+  ChannelsResource get channels => ChannelsResource(_requester);
+  ChildrenResource get children => ChildrenResource(_requester);
+  CommentsResource get comments => CommentsResource(_requester);
+  DrivesResource get drives => DrivesResource(_requester);
+  FilesResource get files => FilesResource(_requester);
+  ParentsResource get parents => ParentsResource(_requester);
+  PermissionsResource get permissions => PermissionsResource(_requester);
+  PropertiesResource get properties => PropertiesResource(_requester);
+  RepliesResource get replies => RepliesResource(_requester);
+  RevisionsResource get revisions => RevisionsResource(_requester);
+  TeamdrivesResource get teamdrives => TeamdrivesResource(_requester);
 
   DriveApi(http.Client client,
       {core.String rootUrl = 'https://www.googleapis.com/',
@@ -122,10 +122,10 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class AboutResourceApi {
+class AboutResource {
   final commons.ApiRequester _requester;
 
-  AboutResourceApi(commons.ApiRequester client) : _requester = client;
+  AboutResource(commons.ApiRequester client) : _requester = client;
 
   /// Gets the information about the current user along with Drive API settings
   ///
@@ -194,10 +194,10 @@
   }
 }
 
-class AppsResourceApi {
+class AppsResource {
   final commons.ApiRequester _requester;
 
-  AppsResourceApi(commons.ApiRequester client) : _requester = client;
+  AppsResource(commons.ApiRequester client) : _requester = client;
 
   /// Gets a specific app.
   ///
@@ -322,10 +322,10 @@
   }
 }
 
-class ChangesResourceApi {
+class ChangesResource {
   final commons.ApiRequester _requester;
 
-  ChangesResourceApi(commons.ApiRequester client) : _requester = client;
+  ChangesResource(commons.ApiRequester client) : _requester = client;
 
   /// Deprecated - Use changes.getStartPageToken and changes.list to retrieve
   /// recent changes.
@@ -776,10 +776,10 @@
   }
 }
 
-class ChannelsResourceApi {
+class ChannelsResource {
   final commons.ApiRequester _requester;
 
-  ChannelsResourceApi(commons.ApiRequester client) : _requester = client;
+  ChannelsResource(commons.ApiRequester client) : _requester = client;
 
   /// Stop watching resources through this channel
   ///
@@ -832,10 +832,10 @@
   }
 }
 
-class ChildrenResourceApi {
+class ChildrenResource {
   final commons.ApiRequester _requester;
 
-  ChildrenResourceApi(commons.ApiRequester client) : _requester = client;
+  ChildrenResource(commons.ApiRequester client) : _requester = client;
 
   /// Removes a child from a folder.
   ///
@@ -1129,10 +1129,10 @@
   }
 }
 
-class CommentsResourceApi {
+class CommentsResource {
   final commons.ApiRequester _requester;
 
-  CommentsResourceApi(commons.ApiRequester client) : _requester = client;
+  CommentsResource(commons.ApiRequester client) : _requester = client;
 
   /// Deletes a comment.
   ///
@@ -1527,10 +1527,10 @@
   }
 }
 
-class DrivesResourceApi {
+class DrivesResource {
   final commons.ApiRequester _requester;
 
-  DrivesResourceApi(commons.ApiRequester client) : _requester = client;
+  DrivesResource(commons.ApiRequester client) : _requester = client;
 
   /// Permanently deletes a shared drive for which the user is an organizer. The
   /// shared drive cannot contain any untrashed items.
@@ -1938,10 +1938,10 @@
   }
 }
 
-class FilesResourceApi {
+class FilesResource {
   final commons.ApiRequester _requester;
 
-  FilesResourceApi(commons.ApiRequester client) : _requester = client;
+  FilesResource(commons.ApiRequester client) : _requester = client;
 
   /// Creates a copy of the specified file. Folders cannot be copied.
   ///
@@ -3524,10 +3524,10 @@
   }
 }
 
-class ParentsResourceApi {
+class ParentsResource {
   final commons.ApiRequester _requester;
 
-  ParentsResourceApi(commons.ApiRequester client) : _requester = client;
+  ParentsResource(commons.ApiRequester client) : _requester = client;
 
   /// Removes a parent from a file.
   ///
@@ -3791,10 +3791,10 @@
   }
 }
 
-class PermissionsResourceApi {
+class PermissionsResource {
   final commons.ApiRequester _requester;
 
-  PermissionsResourceApi(commons.ApiRequester client) : _requester = client;
+  PermissionsResource(commons.ApiRequester client) : _requester = client;
 
   /// Deletes a permission from a file or shared drive.
   ///
@@ -4428,10 +4428,10 @@
   }
 }
 
-class PropertiesResourceApi {
+class PropertiesResource {
   final commons.ApiRequester _requester;
 
-  PropertiesResourceApi(commons.ApiRequester client) : _requester = client;
+  PropertiesResource(commons.ApiRequester client) : _requester = client;
 
   /// Deletes a property.
   ///
@@ -4815,10 +4815,10 @@
   }
 }
 
-class RepliesResourceApi {
+class RepliesResource {
   final commons.ApiRequester _requester;
 
-  RepliesResourceApi(commons.ApiRequester client) : _requester = client;
+  RepliesResource(commons.ApiRequester client) : _requester = client;
 
   /// Deletes a reply.
   ///
@@ -5262,10 +5262,10 @@
   }
 }
 
-class RevisionsResourceApi {
+class RevisionsResource {
   final commons.ApiRequester _requester;
 
-  RevisionsResourceApi(commons.ApiRequester client) : _requester = client;
+  RevisionsResource(commons.ApiRequester client) : _requester = client;
 
   /// Permanently deletes a file version. You can only delete revisions for
   /// files with binary content, like images or videos. Revisions for other
@@ -5585,10 +5585,10 @@
   }
 }
 
-class TeamdrivesResourceApi {
+class TeamdrivesResource {
   final commons.ApiRequester _requester;
 
-  TeamdrivesResourceApi(commons.ApiRequester client) : _requester = client;
+  TeamdrivesResource(commons.ApiRequester client) : _requester = client;
 
   /// Deprecated use drives.delete instead.
   ///
diff --git a/generated/googleapis/lib/drive/v3.dart b/generated/googleapis/lib/drive/v3.dart
index 817866f..575e943 100644
--- a/generated/googleapis/lib/drive/v3.dart
+++ b/generated/googleapis/lib/drive/v3.dart
@@ -24,16 +24,16 @@
 ///
 /// Create an instance of [DriveApi] to access these resources:
 ///
-/// - [AboutResourceApi]
-/// - [ChangesResourceApi]
-/// - [ChannelsResourceApi]
-/// - [CommentsResourceApi]
-/// - [DrivesResourceApi]
-/// - [FilesResourceApi]
-/// - [PermissionsResourceApi]
-/// - [RepliesResourceApi]
-/// - [RevisionsResourceApi]
-/// - [TeamdrivesResourceApi]
+/// - [AboutResource]
+/// - [ChangesResource]
+/// - [ChannelsResource]
+/// - [CommentsResource]
+/// - [DrivesResource]
+/// - [FilesResource]
+/// - [PermissionsResource]
+/// - [RepliesResource]
+/// - [RevisionsResource]
+/// - [TeamdrivesResource]
 library drive.v3;
 
 import 'dart:async' as async;
@@ -92,16 +92,16 @@
 
   final commons.ApiRequester _requester;
 
-  AboutResourceApi get about => AboutResourceApi(_requester);
-  ChangesResourceApi get changes => ChangesResourceApi(_requester);
-  ChannelsResourceApi get channels => ChannelsResourceApi(_requester);
-  CommentsResourceApi get comments => CommentsResourceApi(_requester);
-  DrivesResourceApi get drives => DrivesResourceApi(_requester);
-  FilesResourceApi get files => FilesResourceApi(_requester);
-  PermissionsResourceApi get permissions => PermissionsResourceApi(_requester);
-  RepliesResourceApi get replies => RepliesResourceApi(_requester);
-  RevisionsResourceApi get revisions => RevisionsResourceApi(_requester);
-  TeamdrivesResourceApi get teamdrives => TeamdrivesResourceApi(_requester);
+  AboutResource get about => AboutResource(_requester);
+  ChangesResource get changes => ChangesResource(_requester);
+  ChannelsResource get channels => ChannelsResource(_requester);
+  CommentsResource get comments => CommentsResource(_requester);
+  DrivesResource get drives => DrivesResource(_requester);
+  FilesResource get files => FilesResource(_requester);
+  PermissionsResource get permissions => PermissionsResource(_requester);
+  RepliesResource get replies => RepliesResource(_requester);
+  RevisionsResource get revisions => RevisionsResource(_requester);
+  TeamdrivesResource get teamdrives => TeamdrivesResource(_requester);
 
   DriveApi(http.Client client,
       {core.String rootUrl = 'https://www.googleapis.com/',
@@ -110,10 +110,10 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class AboutResourceApi {
+class AboutResource {
   final commons.ApiRequester _requester;
 
-  AboutResourceApi(commons.ApiRequester client) : _requester = client;
+  AboutResource(commons.ApiRequester client) : _requester = client;
 
   /// Gets information about the user, the user's Drive, and system
   /// capabilities.
@@ -161,10 +161,10 @@
   }
 }
 
-class ChangesResourceApi {
+class ChangesResource {
   final commons.ApiRequester _requester;
 
-  ChangesResourceApi(commons.ApiRequester client) : _requester = client;
+  ChangesResource(commons.ApiRequester client) : _requester = client;
 
   /// Gets the starting pageToken for listing future changes.
   ///
@@ -531,10 +531,10 @@
   }
 }
 
-class ChannelsResourceApi {
+class ChannelsResource {
   final commons.ApiRequester _requester;
 
-  ChannelsResourceApi(commons.ApiRequester client) : _requester = client;
+  ChannelsResource(commons.ApiRequester client) : _requester = client;
 
   /// Stop watching resources through this channel
   ///
@@ -587,10 +587,10 @@
   }
 }
 
-class CommentsResourceApi {
+class CommentsResource {
   final commons.ApiRequester _requester;
 
-  CommentsResourceApi(commons.ApiRequester client) : _requester = client;
+  CommentsResource(commons.ApiRequester client) : _requester = client;
 
   /// Creates a new comment on a file.
   ///
@@ -919,10 +919,10 @@
   }
 }
 
-class DrivesResourceApi {
+class DrivesResource {
   final commons.ApiRequester _requester;
 
-  DrivesResourceApi(commons.ApiRequester client) : _requester = client;
+  DrivesResource(commons.ApiRequester client) : _requester = client;
 
   /// Creates a new shared drive.
   ///
@@ -1330,10 +1330,10 @@
   }
 }
 
-class FilesResourceApi {
+class FilesResource {
   final commons.ApiRequester _requester;
 
-  FilesResourceApi(commons.ApiRequester client) : _requester = client;
+  FilesResource(commons.ApiRequester client) : _requester = client;
 
   /// Creates a copy of a file and applies any requested updates with patch
   /// semantics. Folders cannot be copied.
@@ -2335,10 +2335,10 @@
   }
 }
 
-class PermissionsResourceApi {
+class PermissionsResource {
   final commons.ApiRequester _requester;
 
-  PermissionsResourceApi(commons.ApiRequester client) : _requester = client;
+  PermissionsResource(commons.ApiRequester client) : _requester = client;
 
   /// Creates a permission for a file or shared drive.
   ///
@@ -2828,10 +2828,10 @@
   }
 }
 
-class RepliesResourceApi {
+class RepliesResource {
   final commons.ApiRequester _requester;
 
-  RepliesResourceApi(commons.ApiRequester client) : _requester = client;
+  RepliesResource(commons.ApiRequester client) : _requester = client;
 
   /// Creates a new reply to a comment.
   ///
@@ -3196,10 +3196,10 @@
   }
 }
 
-class RevisionsResourceApi {
+class RevisionsResource {
   final commons.ApiRequester _requester;
 
-  RevisionsResourceApi(commons.ApiRequester client) : _requester = client;
+  RevisionsResource(commons.ApiRequester client) : _requester = client;
 
   /// Permanently deletes a file version. You can only delete revisions for
   /// files with binary content in Google Drive, like images or videos.
@@ -3479,10 +3479,10 @@
   }
 }
 
-class TeamdrivesResourceApi {
+class TeamdrivesResource {
   final commons.ApiRequester _requester;
 
-  TeamdrivesResourceApi(commons.ApiRequester client) : _requester = client;
+  TeamdrivesResource(commons.ApiRequester client) : _requester = client;
 
   /// Deprecated use drives.create instead.
   ///
diff --git a/generated/googleapis/lib/driveactivity/v2.dart b/generated/googleapis/lib/driveactivity/v2.dart
index ebaa3d3..b0c485d 100644
--- a/generated/googleapis/lib/driveactivity/v2.dart
+++ b/generated/googleapis/lib/driveactivity/v2.dart
@@ -23,7 +23,7 @@
 ///
 /// Create an instance of [DriveActivityApi] to access these resources:
 ///
-/// - [ActivityResourceApi]
+/// - [ActivityResource]
 library driveactivity.v2;
 
 import 'dart:async' as async;
@@ -50,7 +50,7 @@
 
   final commons.ApiRequester _requester;
 
-  ActivityResourceApi get activity => ActivityResourceApi(_requester);
+  ActivityResource get activity => ActivityResource(_requester);
 
   DriveActivityApi(http.Client client,
       {core.String rootUrl = 'https://driveactivity.googleapis.com/',
@@ -59,10 +59,10 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class ActivityResourceApi {
+class ActivityResource {
   final commons.ApiRequester _requester;
 
-  ActivityResourceApi(commons.ApiRequester client) : _requester = client;
+  ActivityResource(commons.ApiRequester client) : _requester = client;
 
   /// Query past activity in Google Drive.
   ///
diff --git a/generated/googleapis/lib/fcm/v1.dart b/generated/googleapis/lib/fcm/v1.dart
index a741690..9e6285c 100644
--- a/generated/googleapis/lib/fcm/v1.dart
+++ b/generated/googleapis/lib/fcm/v1.dart
@@ -24,8 +24,8 @@
 ///
 /// Create an instance of [FirebaseCloudMessagingApi] to access these resources:
 ///
-/// - [ProjectsResourceApi]
-///   - [ProjectsMessagesResourceApi]
+/// - [ProjectsResource]
+///   - [ProjectsMessagesResource]
 library fcm.v1;
 
 import 'dart:async' as async;
@@ -49,7 +49,7 @@
 
   final commons.ApiRequester _requester;
 
-  ProjectsResourceApi get projects => ProjectsResourceApi(_requester);
+  ProjectsResource get projects => ProjectsResource(_requester);
 
   FirebaseCloudMessagingApi(http.Client client,
       {core.String rootUrl = 'https://fcm.googleapis.com/',
@@ -58,20 +58,18 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class ProjectsResourceApi {
+class ProjectsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsMessagesResourceApi get messages =>
-      ProjectsMessagesResourceApi(_requester);
+  ProjectsMessagesResource get messages => ProjectsMessagesResource(_requester);
 
-  ProjectsResourceApi(commons.ApiRequester client) : _requester = client;
+  ProjectsResource(commons.ApiRequester client) : _requester = client;
 }
 
-class ProjectsMessagesResourceApi {
+class ProjectsMessagesResource {
   final commons.ApiRequester _requester;
 
-  ProjectsMessagesResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  ProjectsMessagesResource(commons.ApiRequester client) : _requester = client;
 
   /// Send a message to specified target (a registration token, topic or
   /// condition).
diff --git a/generated/googleapis/lib/file/v1.dart b/generated/googleapis/lib/file/v1.dart
index 5310edc..098e62f 100644
--- a/generated/googleapis/lib/file/v1.dart
+++ b/generated/googleapis/lib/file/v1.dart
@@ -24,10 +24,10 @@
 ///
 /// Create an instance of [CloudFilestoreApi] to access these resources:
 ///
-/// - [ProjectsResourceApi]
-///   - [ProjectsLocationsResourceApi]
-///     - [ProjectsLocationsInstancesResourceApi]
-///     - [ProjectsLocationsOperationsResourceApi]
+/// - [ProjectsResource]
+///   - [ProjectsLocationsResource]
+///     - [ProjectsLocationsInstancesResource]
+///     - [ProjectsLocationsOperationsResource]
 library file.v1;
 
 import 'dart:async' as async;
@@ -51,7 +51,7 @@
 
   final commons.ApiRequester _requester;
 
-  ProjectsResourceApi get projects => ProjectsResourceApi(_requester);
+  ProjectsResource get projects => ProjectsResource(_requester);
 
   CloudFilestoreApi(http.Client client,
       {core.String rootUrl = 'https://file.googleapis.com/',
@@ -60,25 +60,24 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class ProjectsResourceApi {
+class ProjectsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsLocationsResourceApi get locations =>
-      ProjectsLocationsResourceApi(_requester);
+  ProjectsLocationsResource get locations =>
+      ProjectsLocationsResource(_requester);
 
-  ProjectsResourceApi(commons.ApiRequester client) : _requester = client;
+  ProjectsResource(commons.ApiRequester client) : _requester = client;
 }
 
-class ProjectsLocationsResourceApi {
+class ProjectsLocationsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsLocationsInstancesResourceApi get instances =>
-      ProjectsLocationsInstancesResourceApi(_requester);
-  ProjectsLocationsOperationsResourceApi get operations =>
-      ProjectsLocationsOperationsResourceApi(_requester);
+  ProjectsLocationsInstancesResource get instances =>
+      ProjectsLocationsInstancesResource(_requester);
+  ProjectsLocationsOperationsResource get operations =>
+      ProjectsLocationsOperationsResource(_requester);
 
-  ProjectsLocationsResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  ProjectsLocationsResource(commons.ApiRequester client) : _requester = client;
 
   /// Gets information about a location.
   ///
@@ -212,10 +211,10 @@
   }
 }
 
-class ProjectsLocationsInstancesResourceApi {
+class ProjectsLocationsInstancesResource {
   final commons.ApiRequester _requester;
 
-  ProjectsLocationsInstancesResourceApi(commons.ApiRequester client)
+  ProjectsLocationsInstancesResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Creates an instance.
@@ -543,10 +542,10 @@
   }
 }
 
-class ProjectsLocationsOperationsResourceApi {
+class ProjectsLocationsOperationsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsLocationsOperationsResourceApi(commons.ApiRequester client)
+  ProjectsLocationsOperationsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Starts asynchronous cancellation on a long-running operation. The server
diff --git a/generated/googleapis/lib/firebasedynamiclinks/v1.dart b/generated/googleapis/lib/firebasedynamiclinks/v1.dart
index 99504ee..f8cec92 100644
--- a/generated/googleapis/lib/firebasedynamiclinks/v1.dart
+++ b/generated/googleapis/lib/firebasedynamiclinks/v1.dart
@@ -23,9 +23,9 @@
 ///
 /// Create an instance of [FirebaseDynamicLinksApi] to access these resources:
 ///
-/// - [ManagedShortLinksResourceApi]
-/// - [ShortLinksResourceApi]
-/// - [V1ResourceApi]
+/// - [ManagedShortLinksResource]
+/// - [ShortLinksResource]
+/// - [V1Resource]
 library firebasedynamiclinks.v1;
 
 import 'dart:async' as async;
@@ -47,10 +47,10 @@
 
   final commons.ApiRequester _requester;
 
-  ManagedShortLinksResourceApi get managedShortLinks =>
-      ManagedShortLinksResourceApi(_requester);
-  ShortLinksResourceApi get shortLinks => ShortLinksResourceApi(_requester);
-  V1ResourceApi get v1 => V1ResourceApi(_requester);
+  ManagedShortLinksResource get managedShortLinks =>
+      ManagedShortLinksResource(_requester);
+  ShortLinksResource get shortLinks => ShortLinksResource(_requester);
+  V1Resource get v1 => V1Resource(_requester);
 
   FirebaseDynamicLinksApi(http.Client client,
       {core.String rootUrl = 'https://firebasedynamiclinks.googleapis.com/',
@@ -59,11 +59,10 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class ManagedShortLinksResourceApi {
+class ManagedShortLinksResource {
   final commons.ApiRequester _requester;
 
-  ManagedShortLinksResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  ManagedShortLinksResource(commons.ApiRequester client) : _requester = client;
 
   /// Creates a managed short Dynamic Link given either a valid long Dynamic
   /// Link or details such as Dynamic Link domain, Android and iOS app
@@ -125,10 +124,10 @@
   }
 }
 
-class ShortLinksResourceApi {
+class ShortLinksResource {
   final commons.ApiRequester _requester;
 
-  ShortLinksResourceApi(commons.ApiRequester client) : _requester = client;
+  ShortLinksResource(commons.ApiRequester client) : _requester = client;
 
   /// Creates a short Dynamic Link given either a valid long Dynamic Link or
   /// details such as Dynamic Link domain, Android and iOS app information. The
@@ -187,10 +186,10 @@
   }
 }
 
-class V1ResourceApi {
+class V1Resource {
   final commons.ApiRequester _requester;
 
-  V1ResourceApi(commons.ApiRequester client) : _requester = client;
+  V1Resource(commons.ApiRequester client) : _requester = client;
 
   /// Fetches analytics stats of a short Dynamic Link for a given duration.
   /// Metrics include number of clicks, redirects, installs, app first opens,
diff --git a/generated/googleapis/lib/firebaserules/v1.dart b/generated/googleapis/lib/firebaserules/v1.dart
index 1dc60d1..3f87a52 100644
--- a/generated/googleapis/lib/firebaserules/v1.dart
+++ b/generated/googleapis/lib/firebaserules/v1.dart
@@ -25,9 +25,9 @@
 ///
 /// Create an instance of [FirebaseRulesApi] to access these resources:
 ///
-/// - [ProjectsResourceApi]
-///   - [ProjectsReleasesResourceApi]
-///   - [ProjectsRulesetsResourceApi]
+/// - [ProjectsResource]
+///   - [ProjectsReleasesResource]
+///   - [ProjectsRulesetsResource]
 library firebaserules.v1;
 
 import 'dart:async' as async;
@@ -58,7 +58,7 @@
 
   final commons.ApiRequester _requester;
 
-  ProjectsResourceApi get projects => ProjectsResourceApi(_requester);
+  ProjectsResource get projects => ProjectsResource(_requester);
 
   FirebaseRulesApi(http.Client client,
       {core.String rootUrl = 'https://firebaserules.googleapis.com/',
@@ -67,15 +67,13 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class ProjectsResourceApi {
+class ProjectsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsReleasesResourceApi get releases =>
-      ProjectsReleasesResourceApi(_requester);
-  ProjectsRulesetsResourceApi get rulesets =>
-      ProjectsRulesetsResourceApi(_requester);
+  ProjectsReleasesResource get releases => ProjectsReleasesResource(_requester);
+  ProjectsRulesetsResource get rulesets => ProjectsRulesetsResource(_requester);
 
-  ProjectsResourceApi(commons.ApiRequester client) : _requester = client;
+  ProjectsResource(commons.ApiRequester client) : _requester = client;
 
   /// Test `Source` for syntactic and semantic correctness. Issues present, if
   /// any, will be returned to the caller with a description, severity, and
@@ -151,11 +149,10 @@
   }
 }
 
-class ProjectsReleasesResourceApi {
+class ProjectsReleasesResource {
   final commons.ApiRequester _requester;
 
-  ProjectsReleasesResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  ProjectsReleasesResource(commons.ApiRequester client) : _requester = client;
 
   /// Create a `Release`. Release names should reflect the developer's
   /// deployment practices. For example, the release name may include the
@@ -554,11 +551,10 @@
   }
 }
 
-class ProjectsRulesetsResourceApi {
+class ProjectsRulesetsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsRulesetsResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  ProjectsRulesetsResource(commons.ApiRequester client) : _requester = client;
 
   /// Create a `Ruleset` from `Source`. The `Ruleset` is given a unique
   /// generated name which is returned to the caller. `Source` containing
diff --git a/generated/googleapis/lib/firestore/v1.dart b/generated/googleapis/lib/firestore/v1.dart
index 5933867..8c6f9c2 100644
--- a/generated/googleapis/lib/firestore/v1.dart
+++ b/generated/googleapis/lib/firestore/v1.dart
@@ -24,14 +24,14 @@
 ///
 /// Create an instance of [FirestoreApi] to access these resources:
 ///
-/// - [ProjectsResourceApi]
-///   - [ProjectsDatabasesResourceApi]
-///     - [ProjectsDatabasesCollectionGroupsResourceApi]
-///       - [ProjectsDatabasesCollectionGroupsFieldsResourceApi]
-///       - [ProjectsDatabasesCollectionGroupsIndexesResourceApi]
-///     - [ProjectsDatabasesDocumentsResourceApi]
-///     - [ProjectsDatabasesOperationsResourceApi]
-///   - [ProjectsLocationsResourceApi]
+/// - [ProjectsResource]
+///   - [ProjectsDatabasesResource]
+///     - [ProjectsDatabasesCollectionGroupsResource]
+///       - [ProjectsDatabasesCollectionGroupsFieldsResource]
+///       - [ProjectsDatabasesCollectionGroupsIndexesResource]
+///     - [ProjectsDatabasesDocumentsResource]
+///     - [ProjectsDatabasesOperationsResource]
+///   - [ProjectsLocationsResource]
 library firestore.v1;
 
 import 'dart:async' as async;
@@ -58,7 +58,7 @@
 
   final commons.ApiRequester _requester;
 
-  ProjectsResourceApi get projects => ProjectsResourceApi(_requester);
+  ProjectsResource get projects => ProjectsResource(_requester);
 
   FirestoreApi(http.Client client,
       {core.String rootUrl = 'https://firestore.googleapis.com/',
@@ -67,29 +67,28 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class ProjectsResourceApi {
+class ProjectsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsDatabasesResourceApi get databases =>
-      ProjectsDatabasesResourceApi(_requester);
-  ProjectsLocationsResourceApi get locations =>
-      ProjectsLocationsResourceApi(_requester);
+  ProjectsDatabasesResource get databases =>
+      ProjectsDatabasesResource(_requester);
+  ProjectsLocationsResource get locations =>
+      ProjectsLocationsResource(_requester);
 
-  ProjectsResourceApi(commons.ApiRequester client) : _requester = client;
+  ProjectsResource(commons.ApiRequester client) : _requester = client;
 }
 
-class ProjectsDatabasesResourceApi {
+class ProjectsDatabasesResource {
   final commons.ApiRequester _requester;
 
-  ProjectsDatabasesCollectionGroupsResourceApi get collectionGroups =>
-      ProjectsDatabasesCollectionGroupsResourceApi(_requester);
-  ProjectsDatabasesDocumentsResourceApi get documents =>
-      ProjectsDatabasesDocumentsResourceApi(_requester);
-  ProjectsDatabasesOperationsResourceApi get operations =>
-      ProjectsDatabasesOperationsResourceApi(_requester);
+  ProjectsDatabasesCollectionGroupsResource get collectionGroups =>
+      ProjectsDatabasesCollectionGroupsResource(_requester);
+  ProjectsDatabasesDocumentsResource get documents =>
+      ProjectsDatabasesDocumentsResource(_requester);
+  ProjectsDatabasesOperationsResource get operations =>
+      ProjectsDatabasesOperationsResource(_requester);
 
-  ProjectsDatabasesResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  ProjectsDatabasesResource(commons.ApiRequester client) : _requester = client;
 
   /// Exports a copy of all or a subset of documents from Google Cloud Firestore
   /// to another storage system, such as Google Cloud Storage. Recent updates to
@@ -225,23 +224,22 @@
   }
 }
 
-class ProjectsDatabasesCollectionGroupsResourceApi {
+class ProjectsDatabasesCollectionGroupsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsDatabasesCollectionGroupsFieldsResourceApi get fields =>
-      ProjectsDatabasesCollectionGroupsFieldsResourceApi(_requester);
-  ProjectsDatabasesCollectionGroupsIndexesResourceApi get indexes =>
-      ProjectsDatabasesCollectionGroupsIndexesResourceApi(_requester);
+  ProjectsDatabasesCollectionGroupsFieldsResource get fields =>
+      ProjectsDatabasesCollectionGroupsFieldsResource(_requester);
+  ProjectsDatabasesCollectionGroupsIndexesResource get indexes =>
+      ProjectsDatabasesCollectionGroupsIndexesResource(_requester);
 
-  ProjectsDatabasesCollectionGroupsResourceApi(commons.ApiRequester client)
+  ProjectsDatabasesCollectionGroupsResource(commons.ApiRequester client)
       : _requester = client;
 }
 
-class ProjectsDatabasesCollectionGroupsFieldsResourceApi {
+class ProjectsDatabasesCollectionGroupsFieldsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsDatabasesCollectionGroupsFieldsResourceApi(
-      commons.ApiRequester client)
+  ProjectsDatabasesCollectionGroupsFieldsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Gets the metadata and configuration for a Field.
@@ -472,11 +470,10 @@
   }
 }
 
-class ProjectsDatabasesCollectionGroupsIndexesResourceApi {
+class ProjectsDatabasesCollectionGroupsIndexesResource {
   final commons.ApiRequester _requester;
 
-  ProjectsDatabasesCollectionGroupsIndexesResourceApi(
-      commons.ApiRequester client)
+  ProjectsDatabasesCollectionGroupsIndexesResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Creates a composite index. This returns a google.longrunning.Operation
@@ -725,10 +722,10 @@
   }
 }
 
-class ProjectsDatabasesDocumentsResourceApi {
+class ProjectsDatabasesDocumentsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsDatabasesDocumentsResourceApi(commons.ApiRequester client)
+  ProjectsDatabasesDocumentsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Gets multiple documents. Documents returned by this method are not
@@ -1788,10 +1785,10 @@
   }
 }
 
-class ProjectsDatabasesOperationsResourceApi {
+class ProjectsDatabasesOperationsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsDatabasesOperationsResourceApi(commons.ApiRequester client)
+  ProjectsDatabasesOperationsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Starts asynchronous cancellation on a long-running operation. The server
@@ -2050,11 +2047,10 @@
   }
 }
 
-class ProjectsLocationsResourceApi {
+class ProjectsLocationsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsLocationsResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  ProjectsLocationsResource(commons.ApiRequester client) : _requester = client;
 
   /// Gets information about a location.
   ///
diff --git a/generated/googleapis/lib/fitness/v1.dart b/generated/googleapis/lib/fitness/v1.dart
index 556b08d..e8712fe 100644
--- a/generated/googleapis/lib/fitness/v1.dart
+++ b/generated/googleapis/lib/fitness/v1.dart
@@ -24,12 +24,12 @@
 ///
 /// Create an instance of [FitnessApi] to access these resources:
 ///
-/// - [UsersResourceApi]
-///   - [UsersDataSourcesResourceApi]
-///     - [UsersDataSourcesDataPointChangesResourceApi]
-///     - [UsersDataSourcesDatasetsResourceApi]
-///   - [UsersDatasetResourceApi]
-///   - [UsersSessionsResourceApi]
+/// - [UsersResource]
+///   - [UsersDataSourcesResource]
+///     - [UsersDataSourcesDataPointChangesResource]
+///     - [UsersDataSourcesDatasetsResource]
+///   - [UsersDatasetResource]
+///   - [UsersSessionsResource]
 library fitness.v1;
 
 import 'dart:async' as async;
@@ -130,7 +130,7 @@
 
   final commons.ApiRequester _requester;
 
-  UsersResourceApi get users => UsersResourceApi(_requester);
+  UsersResource get users => UsersResource(_requester);
 
   FitnessApi(http.Client client,
       {core.String rootUrl = 'https://fitness.googleapis.com/',
@@ -139,27 +139,26 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class UsersResourceApi {
+class UsersResource {
   final commons.ApiRequester _requester;
 
-  UsersDataSourcesResourceApi get dataSources =>
-      UsersDataSourcesResourceApi(_requester);
-  UsersDatasetResourceApi get dataset => UsersDatasetResourceApi(_requester);
-  UsersSessionsResourceApi get sessions => UsersSessionsResourceApi(_requester);
+  UsersDataSourcesResource get dataSources =>
+      UsersDataSourcesResource(_requester);
+  UsersDatasetResource get dataset => UsersDatasetResource(_requester);
+  UsersSessionsResource get sessions => UsersSessionsResource(_requester);
 
-  UsersResourceApi(commons.ApiRequester client) : _requester = client;
+  UsersResource(commons.ApiRequester client) : _requester = client;
 }
 
-class UsersDataSourcesResourceApi {
+class UsersDataSourcesResource {
   final commons.ApiRequester _requester;
 
-  UsersDataSourcesDataPointChangesResourceApi get dataPointChanges =>
-      UsersDataSourcesDataPointChangesResourceApi(_requester);
-  UsersDataSourcesDatasetsResourceApi get datasets =>
-      UsersDataSourcesDatasetsResourceApi(_requester);
+  UsersDataSourcesDataPointChangesResource get dataPointChanges =>
+      UsersDataSourcesDataPointChangesResource(_requester);
+  UsersDataSourcesDatasetsResource get datasets =>
+      UsersDataSourcesDatasetsResource(_requester);
 
-  UsersDataSourcesResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  UsersDataSourcesResource(commons.ApiRequester client) : _requester = client;
 
   /// Creates a new data source that is unique across all data sources belonging
   /// to this user. A data source is a unique source of sensor data. Data
@@ -496,10 +495,10 @@
   }
 }
 
-class UsersDataSourcesDataPointChangesResourceApi {
+class UsersDataSourcesDataPointChangesResource {
   final commons.ApiRequester _requester;
 
-  UsersDataSourcesDataPointChangesResourceApi(commons.ApiRequester client)
+  UsersDataSourcesDataPointChangesResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Queries for user's data point changes for a particular data source.
@@ -580,10 +579,10 @@
   }
 }
 
-class UsersDataSourcesDatasetsResourceApi {
+class UsersDataSourcesDatasetsResource {
   final commons.ApiRequester _requester;
 
-  UsersDataSourcesDatasetsResourceApi(commons.ApiRequester client)
+  UsersDataSourcesDatasetsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Performs an inclusive delete of all data points whose start and end times
@@ -858,10 +857,10 @@
   }
 }
 
-class UsersDatasetResourceApi {
+class UsersDatasetResource {
   final commons.ApiRequester _requester;
 
-  UsersDatasetResourceApi(commons.ApiRequester client) : _requester = client;
+  UsersDatasetResource(commons.ApiRequester client) : _requester = client;
 
   /// Aggregates data of a certain type or stream into buckets divided by a
   /// given type of boundary. Multiple data sets of multiple types and from
@@ -925,10 +924,10 @@
   }
 }
 
-class UsersSessionsResourceApi {
+class UsersSessionsResource {
   final commons.ApiRequester _requester;
 
-  UsersSessionsResourceApi(commons.ApiRequester client) : _requester = client;
+  UsersSessionsResource(commons.ApiRequester client) : _requester = client;
 
   /// Deletes a session specified by the given session ID.
   ///
diff --git a/generated/googleapis/lib/games/v1.dart b/generated/googleapis/lib/games/v1.dart
index 70077db..fa46c5e 100644
--- a/generated/googleapis/lib/games/v1.dart
+++ b/generated/googleapis/lib/games/v1.dart
@@ -24,17 +24,17 @@
 ///
 /// Create an instance of [GamesApi] to access these resources:
 ///
-/// - [AchievementDefinitionsResourceApi]
-/// - [AchievementsResourceApi]
-/// - [ApplicationsResourceApi]
-/// - [EventsResourceApi]
-/// - [LeaderboardsResourceApi]
-/// - [MetagameResourceApi]
-/// - [PlayersResourceApi]
-/// - [RevisionsResourceApi]
-/// - [ScoresResourceApi]
-/// - [SnapshotsResourceApi]
-/// - [StatsResourceApi]
+/// - [AchievementDefinitionsResource]
+/// - [AchievementsResource]
+/// - [ApplicationsResource]
+/// - [EventsResource]
+/// - [LeaderboardsResource]
+/// - [MetagameResource]
+/// - [PlayersResource]
+/// - [RevisionsResource]
+/// - [ScoresResource]
+/// - [SnapshotsResource]
+/// - [StatsResource]
 library games.v1;
 
 import 'dart:async' as async;
@@ -61,21 +61,18 @@
 
   final commons.ApiRequester _requester;
 
-  AchievementDefinitionsResourceApi get achievementDefinitions =>
-      AchievementDefinitionsResourceApi(_requester);
-  AchievementsResourceApi get achievements =>
-      AchievementsResourceApi(_requester);
-  ApplicationsResourceApi get applications =>
-      ApplicationsResourceApi(_requester);
-  EventsResourceApi get events => EventsResourceApi(_requester);
-  LeaderboardsResourceApi get leaderboards =>
-      LeaderboardsResourceApi(_requester);
-  MetagameResourceApi get metagame => MetagameResourceApi(_requester);
-  PlayersResourceApi get players => PlayersResourceApi(_requester);
-  RevisionsResourceApi get revisions => RevisionsResourceApi(_requester);
-  ScoresResourceApi get scores => ScoresResourceApi(_requester);
-  SnapshotsResourceApi get snapshots => SnapshotsResourceApi(_requester);
-  StatsResourceApi get stats => StatsResourceApi(_requester);
+  AchievementDefinitionsResource get achievementDefinitions =>
+      AchievementDefinitionsResource(_requester);
+  AchievementsResource get achievements => AchievementsResource(_requester);
+  ApplicationsResource get applications => ApplicationsResource(_requester);
+  EventsResource get events => EventsResource(_requester);
+  LeaderboardsResource get leaderboards => LeaderboardsResource(_requester);
+  MetagameResource get metagame => MetagameResource(_requester);
+  PlayersResource get players => PlayersResource(_requester);
+  RevisionsResource get revisions => RevisionsResource(_requester);
+  ScoresResource get scores => ScoresResource(_requester);
+  SnapshotsResource get snapshots => SnapshotsResource(_requester);
+  StatsResource get stats => StatsResource(_requester);
 
   GamesApi(http.Client client,
       {core.String rootUrl = 'https://games.googleapis.com/',
@@ -84,10 +81,10 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class AchievementDefinitionsResourceApi {
+class AchievementDefinitionsResource {
   final commons.ApiRequester _requester;
 
-  AchievementDefinitionsResourceApi(commons.ApiRequester client)
+  AchievementDefinitionsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Lists all the achievement definitions for your application.
@@ -158,10 +155,10 @@
   }
 }
 
-class AchievementsResourceApi {
+class AchievementsResource {
   final commons.ApiRequester _requester;
 
-  AchievementsResourceApi(commons.ApiRequester client) : _requester = client;
+  AchievementsResource(commons.ApiRequester client) : _requester = client;
 
   /// Increments the steps of the achievement with the given ID for the
   /// currently authenticated player.
@@ -543,10 +540,10 @@
   }
 }
 
-class ApplicationsResourceApi {
+class ApplicationsResource {
   final commons.ApiRequester _requester;
 
-  ApplicationsResourceApi(commons.ApiRequester client) : _requester = client;
+  ApplicationsResource(commons.ApiRequester client) : _requester = client;
 
   /// Retrieves the metadata of the application with the given ID. If the
   /// requested application is not available for the specified `platformType`,
@@ -724,10 +721,10 @@
   }
 }
 
-class EventsResourceApi {
+class EventsResource {
   final commons.ApiRequester _requester;
 
-  EventsResourceApi(commons.ApiRequester client) : _requester = client;
+  EventsResource(commons.ApiRequester client) : _requester = client;
 
   /// Returns a list showing the current progress on events in this application
   /// for the currently authenticated user.
@@ -922,10 +919,10 @@
   }
 }
 
-class LeaderboardsResourceApi {
+class LeaderboardsResource {
   final commons.ApiRequester _requester;
 
-  LeaderboardsResourceApi(commons.ApiRequester client) : _requester = client;
+  LeaderboardsResource(commons.ApiRequester client) : _requester = client;
 
   /// Retrieves the metadata of the leaderboard with the given ID.
   ///
@@ -1053,10 +1050,10 @@
   }
 }
 
-class MetagameResourceApi {
+class MetagameResource {
   final commons.ApiRequester _requester;
 
-  MetagameResourceApi(commons.ApiRequester client) : _requester = client;
+  MetagameResource(commons.ApiRequester client) : _requester = client;
 
   /// Return the metagame configuration data for the calling application.
   ///
@@ -1191,10 +1188,10 @@
   }
 }
 
-class PlayersResourceApi {
+class PlayersResource {
   final commons.ApiRequester _requester;
 
-  PlayersResourceApi(commons.ApiRequester client) : _requester = client;
+  PlayersResource(commons.ApiRequester client) : _requester = client;
 
   /// Retrieves the Player resource with the given ID. To retrieve the player
   /// for the currently authenticated user, set `playerId` to `me`.
@@ -1336,10 +1333,10 @@
   }
 }
 
-class RevisionsResourceApi {
+class RevisionsResource {
   final commons.ApiRequester _requester;
 
-  RevisionsResourceApi(commons.ApiRequester client) : _requester = client;
+  RevisionsResource(commons.ApiRequester client) : _requester = client;
 
   /// Checks whether the games client is out of date.
   ///
@@ -1398,10 +1395,10 @@
   }
 }
 
-class ScoresResourceApi {
+class ScoresResource {
   final commons.ApiRequester _requester;
 
-  ScoresResourceApi(commons.ApiRequester client) : _requester = client;
+  ScoresResource(commons.ApiRequester client) : _requester = client;
 
   /// Get high scores, and optionally ranks, in leaderboards for the currently
   /// authenticated player. For a specific time span, `leaderboardId` can be set
@@ -1872,10 +1869,10 @@
   }
 }
 
-class SnapshotsResourceApi {
+class SnapshotsResource {
   final commons.ApiRequester _requester;
 
-  SnapshotsResourceApi(commons.ApiRequester client) : _requester = client;
+  SnapshotsResource(commons.ApiRequester client) : _requester = client;
 
   /// Retrieves the metadata for a given snapshot ID.
   ///
@@ -2011,10 +2008,10 @@
   }
 }
 
-class StatsResourceApi {
+class StatsResource {
   final commons.ApiRequester _requester;
 
-  StatsResourceApi(commons.ApiRequester client) : _requester = client;
+  StatsResource(commons.ApiRequester client) : _requester = client;
 
   /// Returns engagement and spend statistics in this application for the
   /// currently authenticated user.
diff --git a/generated/googleapis/lib/gamesconfiguration/v1configuration.dart b/generated/googleapis/lib/gamesconfiguration/v1configuration.dart
index 0321757..82d19dd 100644
--- a/generated/googleapis/lib/gamesconfiguration/v1configuration.dart
+++ b/generated/googleapis/lib/gamesconfiguration/v1configuration.dart
@@ -24,9 +24,9 @@
 ///
 /// Create an instance of [GamesConfigurationApi] to access these resources:
 ///
-/// - [AchievementConfigurationsResourceApi]
-/// - [ImageConfigurationsResourceApi]
-/// - [LeaderboardConfigurationsResourceApi]
+/// - [AchievementConfigurationsResource]
+/// - [ImageConfigurationsResource]
+/// - [LeaderboardConfigurationsResource]
 library gamesConfiguration.v1configuration;
 
 import 'dart:async' as async;
@@ -58,12 +58,12 @@
 
   final commons.ApiRequester _requester;
 
-  AchievementConfigurationsResourceApi get achievementConfigurations =>
-      AchievementConfigurationsResourceApi(_requester);
-  ImageConfigurationsResourceApi get imageConfigurations =>
-      ImageConfigurationsResourceApi(_requester);
-  LeaderboardConfigurationsResourceApi get leaderboardConfigurations =>
-      LeaderboardConfigurationsResourceApi(_requester);
+  AchievementConfigurationsResource get achievementConfigurations =>
+      AchievementConfigurationsResource(_requester);
+  ImageConfigurationsResource get imageConfigurations =>
+      ImageConfigurationsResource(_requester);
+  LeaderboardConfigurationsResource get leaderboardConfigurations =>
+      LeaderboardConfigurationsResource(_requester);
 
   GamesConfigurationApi(http.Client client,
       {core.String rootUrl = 'https://gamesconfiguration.googleapis.com/',
@@ -72,10 +72,10 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class AchievementConfigurationsResourceApi {
+class AchievementConfigurationsResource {
   final commons.ApiRequester _requester;
 
-  AchievementConfigurationsResourceApi(commons.ApiRequester client)
+  AchievementConfigurationsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Delete the achievement configuration with the given ID.
@@ -368,10 +368,10 @@
   }
 }
 
-class ImageConfigurationsResourceApi {
+class ImageConfigurationsResource {
   final commons.ApiRequester _requester;
 
-  ImageConfigurationsResourceApi(commons.ApiRequester client)
+  ImageConfigurationsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Uploads an image for a resource with the given ID and image type.
@@ -452,10 +452,10 @@
   }
 }
 
-class LeaderboardConfigurationsResourceApi {
+class LeaderboardConfigurationsResource {
   final commons.ApiRequester _requester;
 
-  LeaderboardConfigurationsResourceApi(commons.ApiRequester client)
+  LeaderboardConfigurationsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Delete the leaderboard configuration with the given ID.
diff --git a/generated/googleapis/lib/gamesmanagement/v1management.dart b/generated/googleapis/lib/gamesmanagement/v1management.dart
index 58d6f18..624ed47 100644
--- a/generated/googleapis/lib/gamesmanagement/v1management.dart
+++ b/generated/googleapis/lib/gamesmanagement/v1management.dart
@@ -24,11 +24,11 @@
 ///
 /// Create an instance of [GamesManagementApi] to access these resources:
 ///
-/// - [AchievementsResourceApi]
-/// - [ApplicationsResourceApi]
-/// - [EventsResourceApi]
-/// - [PlayersResourceApi]
-/// - [ScoresResourceApi]
+/// - [AchievementsResource]
+/// - [ApplicationsResource]
+/// - [EventsResource]
+/// - [PlayersResource]
+/// - [ScoresResource]
 library gamesManagement.v1management;
 
 import 'dart:async' as async;
@@ -51,13 +51,11 @@
 
   final commons.ApiRequester _requester;
 
-  AchievementsResourceApi get achievements =>
-      AchievementsResourceApi(_requester);
-  ApplicationsResourceApi get applications =>
-      ApplicationsResourceApi(_requester);
-  EventsResourceApi get events => EventsResourceApi(_requester);
-  PlayersResourceApi get players => PlayersResourceApi(_requester);
-  ScoresResourceApi get scores => ScoresResourceApi(_requester);
+  AchievementsResource get achievements => AchievementsResource(_requester);
+  ApplicationsResource get applications => ApplicationsResource(_requester);
+  EventsResource get events => EventsResource(_requester);
+  PlayersResource get players => PlayersResource(_requester);
+  ScoresResource get scores => ScoresResource(_requester);
 
   GamesManagementApi(http.Client client,
       {core.String rootUrl = 'https://gamesmanagement.googleapis.com/',
@@ -66,10 +64,10 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class AchievementsResourceApi {
+class AchievementsResource {
   final commons.ApiRequester _requester;
 
-  AchievementsResourceApi(commons.ApiRequester client) : _requester = client;
+  AchievementsResource(commons.ApiRequester client) : _requester = client;
 
   /// Resets the achievement with the given ID for the currently authenticated
   /// player. This method is only accessible to whitelisted tester accounts for
@@ -325,10 +323,10 @@
   }
 }
 
-class ApplicationsResourceApi {
+class ApplicationsResource {
   final commons.ApiRequester _requester;
 
-  ApplicationsResourceApi(commons.ApiRequester client) : _requester = client;
+  ApplicationsResource(commons.ApiRequester client) : _requester = client;
 
   /// Get the list of players hidden from the given application. This method is
   /// only available to user accounts for your developer console.
@@ -400,10 +398,10 @@
   }
 }
 
-class EventsResourceApi {
+class EventsResource {
   final commons.ApiRequester _requester;
 
-  EventsResourceApi(commons.ApiRequester client) : _requester = client;
+  EventsResource(commons.ApiRequester client) : _requester = client;
 
   /// Resets all player progress on the event with the given ID for the
   /// currently authenticated player. This method is only accessible to
@@ -657,10 +655,10 @@
   }
 }
 
-class PlayersResourceApi {
+class PlayersResource {
   final commons.ApiRequester _requester;
 
-  PlayersResourceApi(commons.ApiRequester client) : _requester = client;
+  PlayersResource(commons.ApiRequester client) : _requester = client;
 
   /// Hide the given player's leaderboard scores from the given application.
   /// This method is only available to user accounts for your developer console.
@@ -787,10 +785,10 @@
   }
 }
 
-class ScoresResourceApi {
+class ScoresResource {
   final commons.ApiRequester _requester;
 
-  ScoresResourceApi(commons.ApiRequester client) : _requester = client;
+  ScoresResource(commons.ApiRequester client) : _requester = client;
 
   /// Resets scores for the leaderboard with the given ID for the currently
   /// authenticated player. This method is only accessible to whitelisted tester
diff --git a/generated/googleapis/lib/genomics/v1.dart b/generated/googleapis/lib/genomics/v1.dart
index 2e93dfc..55142eb 100644
--- a/generated/googleapis/lib/genomics/v1.dart
+++ b/generated/googleapis/lib/genomics/v1.dart
@@ -23,7 +23,7 @@
 ///
 /// Create an instance of [GenomicsApi] to access these resources:
 ///
-/// - [OperationsResourceApi]
+/// - [OperationsResource]
 library genomics.v1;
 
 import 'dart:async' as async;
@@ -49,7 +49,7 @@
 
   final commons.ApiRequester _requester;
 
-  OperationsResourceApi get operations => OperationsResourceApi(_requester);
+  OperationsResource get operations => OperationsResource(_requester);
 
   GenomicsApi(http.Client client,
       {core.String rootUrl = 'https://genomics.googleapis.com/',
@@ -58,10 +58,10 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class OperationsResourceApi {
+class OperationsResource {
   final commons.ApiRequester _requester;
 
-  OperationsResourceApi(commons.ApiRequester client) : _requester = client;
+  OperationsResource(commons.ApiRequester client) : _requester = client;
 
   /// Starts asynchronous cancellation on a long-running operation. The server
   /// makes a best effort to cancel the operation, but success is not
diff --git a/generated/googleapis/lib/gmail/v1.dart b/generated/googleapis/lib/gmail/v1.dart
index b78170d..5f2a530 100644
--- a/generated/googleapis/lib/gmail/v1.dart
+++ b/generated/googleapis/lib/gmail/v1.dart
@@ -24,19 +24,19 @@
 ///
 /// Create an instance of [GmailApi] to access these resources:
 ///
-/// - [UsersResourceApi]
-///   - [UsersDraftsResourceApi]
-///   - [UsersHistoryResourceApi]
-///   - [UsersLabelsResourceApi]
-///   - [UsersMessagesResourceApi]
-///     - [UsersMessagesAttachmentsResourceApi]
-///   - [UsersSettingsResourceApi]
-///     - [UsersSettingsDelegatesResourceApi]
-///     - [UsersSettingsFiltersResourceApi]
-///     - [UsersSettingsForwardingAddressesResourceApi]
-///     - [UsersSettingsSendAsResourceApi]
-///       - [UsersSettingsSendAsSmimeInfoResourceApi]
-///   - [UsersThreadsResourceApi]
+/// - [UsersResource]
+///   - [UsersDraftsResource]
+///   - [UsersHistoryResource]
+///   - [UsersLabelsResource]
+///   - [UsersMessagesResource]
+///     - [UsersMessagesAttachmentsResource]
+///   - [UsersSettingsResource]
+///     - [UsersSettingsDelegatesResource]
+///     - [UsersSettingsFiltersResource]
+///     - [UsersSettingsForwardingAddressesResource]
+///     - [UsersSettingsSendAsResource]
+///       - [UsersSettingsSendAsSmimeInfoResource]
+///   - [UsersThreadsResource]
 library gmail.v1;
 
 import 'dart:async' as async;
@@ -119,7 +119,7 @@
 
   final commons.ApiRequester _requester;
 
-  UsersResourceApi get users => UsersResourceApi(_requester);
+  UsersResource get users => UsersResource(_requester);
 
   GmailApi(http.Client client,
       {core.String rootUrl = 'https://gmail.googleapis.com/',
@@ -128,17 +128,17 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class UsersResourceApi {
+class UsersResource {
   final commons.ApiRequester _requester;
 
-  UsersDraftsResourceApi get drafts => UsersDraftsResourceApi(_requester);
-  UsersHistoryResourceApi get history => UsersHistoryResourceApi(_requester);
-  UsersLabelsResourceApi get labels => UsersLabelsResourceApi(_requester);
-  UsersMessagesResourceApi get messages => UsersMessagesResourceApi(_requester);
-  UsersSettingsResourceApi get settings => UsersSettingsResourceApi(_requester);
-  UsersThreadsResourceApi get threads => UsersThreadsResourceApi(_requester);
+  UsersDraftsResource get drafts => UsersDraftsResource(_requester);
+  UsersHistoryResource get history => UsersHistoryResource(_requester);
+  UsersLabelsResource get labels => UsersLabelsResource(_requester);
+  UsersMessagesResource get messages => UsersMessagesResource(_requester);
+  UsersSettingsResource get settings => UsersSettingsResource(_requester);
+  UsersThreadsResource get threads => UsersThreadsResource(_requester);
 
-  UsersResourceApi(commons.ApiRequester client) : _requester = client;
+  UsersResource(commons.ApiRequester client) : _requester = client;
 
   /// Gets the current user's Gmail profile.
   ///
@@ -305,10 +305,10 @@
   }
 }
 
-class UsersDraftsResourceApi {
+class UsersDraftsResource {
   final commons.ApiRequester _requester;
 
-  UsersDraftsResourceApi(commons.ApiRequester client) : _requester = client;
+  UsersDraftsResource(commons.ApiRequester client) : _requester = client;
 
   /// Creates a new draft with the `DRAFT` label.
   ///
@@ -781,10 +781,10 @@
   }
 }
 
-class UsersHistoryResourceApi {
+class UsersHistoryResource {
   final commons.ApiRequester _requester;
 
-  UsersHistoryResourceApi(commons.ApiRequester client) : _requester = client;
+  UsersHistoryResource(commons.ApiRequester client) : _requester = client;
 
   /// Lists the history of all changes to the given mailbox. History results are
   /// returned in chronological order (increasing `historyId`).
@@ -883,10 +883,10 @@
   }
 }
 
-class UsersLabelsResourceApi {
+class UsersLabelsResource {
   final commons.ApiRequester _requester;
 
-  UsersLabelsResourceApi(commons.ApiRequester client) : _requester = client;
+  UsersLabelsResource(commons.ApiRequester client) : _requester = client;
 
   /// Creates a new label.
   ///
@@ -1255,13 +1255,13 @@
   }
 }
 
-class UsersMessagesResourceApi {
+class UsersMessagesResource {
   final commons.ApiRequester _requester;
 
-  UsersMessagesAttachmentsResourceApi get attachments =>
-      UsersMessagesAttachmentsResourceApi(_requester);
+  UsersMessagesAttachmentsResource get attachments =>
+      UsersMessagesAttachmentsResource(_requester);
 
-  UsersMessagesResourceApi(commons.ApiRequester client) : _requester = client;
+  UsersMessagesResource(commons.ApiRequester client) : _requester = client;
 
   /// Deletes many messages by message ID. Provides no guarantees that messages
   /// were not already deleted or even existed at all.
@@ -2105,10 +2105,10 @@
   }
 }
 
-class UsersMessagesAttachmentsResourceApi {
+class UsersMessagesAttachmentsResource {
   final commons.ApiRequester _requester;
 
-  UsersMessagesAttachmentsResourceApi(commons.ApiRequester client)
+  UsersMessagesAttachmentsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Gets the specified message attachment.
@@ -2181,19 +2181,19 @@
   }
 }
 
-class UsersSettingsResourceApi {
+class UsersSettingsResource {
   final commons.ApiRequester _requester;
 
-  UsersSettingsDelegatesResourceApi get delegates =>
-      UsersSettingsDelegatesResourceApi(_requester);
-  UsersSettingsFiltersResourceApi get filters =>
-      UsersSettingsFiltersResourceApi(_requester);
-  UsersSettingsForwardingAddressesResourceApi get forwardingAddresses =>
-      UsersSettingsForwardingAddressesResourceApi(_requester);
-  UsersSettingsSendAsResourceApi get sendAs =>
-      UsersSettingsSendAsResourceApi(_requester);
+  UsersSettingsDelegatesResource get delegates =>
+      UsersSettingsDelegatesResource(_requester);
+  UsersSettingsFiltersResource get filters =>
+      UsersSettingsFiltersResource(_requester);
+  UsersSettingsForwardingAddressesResource get forwardingAddresses =>
+      UsersSettingsForwardingAddressesResource(_requester);
+  UsersSettingsSendAsResource get sendAs =>
+      UsersSettingsSendAsResource(_requester);
 
-  UsersSettingsResourceApi(commons.ApiRequester client) : _requester = client;
+  UsersSettingsResource(commons.ApiRequester client) : _requester = client;
 
   /// Gets the auto-forwarding setting for the specified account.
   ///
@@ -2773,10 +2773,10 @@
   }
 }
 
-class UsersSettingsDelegatesResourceApi {
+class UsersSettingsDelegatesResource {
   final commons.ApiRequester _requester;
 
-  UsersSettingsDelegatesResourceApi(commons.ApiRequester client)
+  UsersSettingsDelegatesResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Adds a delegate with its verification status set directly to `accepted`,
@@ -3034,10 +3034,10 @@
   }
 }
 
-class UsersSettingsFiltersResourceApi {
+class UsersSettingsFiltersResource {
   final commons.ApiRequester _requester;
 
-  UsersSettingsFiltersResourceApi(commons.ApiRequester client)
+  UsersSettingsFiltersResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Creates a filter. Note: you can only create a maximum of 1,000 filters.
@@ -3274,10 +3274,10 @@
   }
 }
 
-class UsersSettingsForwardingAddressesResourceApi {
+class UsersSettingsForwardingAddressesResource {
   final commons.ApiRequester _requester;
 
-  UsersSettingsForwardingAddressesResourceApi(commons.ApiRequester client)
+  UsersSettingsForwardingAddressesResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Creates a forwarding address. If ownership verification is required, a
@@ -3522,13 +3522,13 @@
   }
 }
 
-class UsersSettingsSendAsResourceApi {
+class UsersSettingsSendAsResource {
   final commons.ApiRequester _requester;
 
-  UsersSettingsSendAsSmimeInfoResourceApi get smimeInfo =>
-      UsersSettingsSendAsSmimeInfoResourceApi(_requester);
+  UsersSettingsSendAsSmimeInfoResource get smimeInfo =>
+      UsersSettingsSendAsSmimeInfoResource(_requester);
 
-  UsersSettingsSendAsResourceApi(commons.ApiRequester client)
+  UsersSettingsSendAsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Creates a custom "from" send-as alias. If an SMTP MSA is specified, Gmail
@@ -3976,10 +3976,10 @@
   }
 }
 
-class UsersSettingsSendAsSmimeInfoResourceApi {
+class UsersSettingsSendAsSmimeInfoResource {
   final commons.ApiRequester _requester;
 
-  UsersSettingsSendAsSmimeInfoResourceApi(commons.ApiRequester client)
+  UsersSettingsSendAsSmimeInfoResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Deletes the specified S/MIME config for the specified send-as alias.
@@ -4323,10 +4323,10 @@
   }
 }
 
-class UsersThreadsResourceApi {
+class UsersThreadsResource {
   final commons.ApiRequester _requester;
 
-  UsersThreadsResourceApi(commons.ApiRequester client) : _requester = client;
+  UsersThreadsResource(commons.ApiRequester client) : _requester = client;
 
   /// Immediately and permanently deletes the specified thread. This operation
   /// cannot be undone. Prefer `threads.trash` instead.
diff --git a/generated/googleapis/lib/groupsmigration/v1.dart b/generated/googleapis/lib/groupsmigration/v1.dart
index 8750112..a6a57e8 100644
--- a/generated/googleapis/lib/groupsmigration/v1.dart
+++ b/generated/googleapis/lib/groupsmigration/v1.dart
@@ -25,7 +25,7 @@
 ///
 /// Create an instance of [GroupsMigrationApi] to access these resources:
 ///
-/// - [ArchiveResourceApi]
+/// - [ArchiveResource]
 library groupsmigration.v1;
 
 import 'dart:async' as async;
@@ -56,7 +56,7 @@
 
   final commons.ApiRequester _requester;
 
-  ArchiveResourceApi get archive => ArchiveResourceApi(_requester);
+  ArchiveResource get archive => ArchiveResource(_requester);
 
   GroupsMigrationApi(http.Client client,
       {core.String rootUrl = 'https://groupsmigration.googleapis.com/',
@@ -65,10 +65,10 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class ArchiveResourceApi {
+class ArchiveResource {
   final commons.ApiRequester _requester;
 
-  ArchiveResourceApi(commons.ApiRequester client) : _requester = client;
+  ArchiveResource(commons.ApiRequester client) : _requester = client;
 
   /// Inserts a new mail into the archive of the Google group.
   ///
diff --git a/generated/googleapis/lib/groupssettings/v1.dart b/generated/googleapis/lib/groupssettings/v1.dart
index 24b36e5..3a979d3 100644
--- a/generated/googleapis/lib/groupssettings/v1.dart
+++ b/generated/googleapis/lib/groupssettings/v1.dart
@@ -24,7 +24,7 @@
 ///
 /// Create an instance of [GroupssettingsApi] to access these resources:
 ///
-/// - [GroupsResourceApi]
+/// - [GroupsResource]
 library groupssettings.v1;
 
 import 'dart:async' as async;
@@ -47,7 +47,7 @@
 
   final commons.ApiRequester _requester;
 
-  GroupsResourceApi get groups => GroupsResourceApi(_requester);
+  GroupsResource get groups => GroupsResource(_requester);
 
   GroupssettingsApi(http.Client client,
       {core.String rootUrl = 'https://www.googleapis.com/',
@@ -56,10 +56,10 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class GroupsResourceApi {
+class GroupsResource {
   final commons.ApiRequester _requester;
 
-  GroupsResourceApi(commons.ApiRequester client) : _requester = client;
+  GroupsResource(commons.ApiRequester client) : _requester = client;
 
   /// Gets one resource by id.
   ///
diff --git a/generated/googleapis/lib/healthcare/v1.dart b/generated/googleapis/lib/healthcare/v1.dart
index 9205a99..76f5e00 100644
--- a/generated/googleapis/lib/healthcare/v1.dart
+++ b/generated/googleapis/lib/healthcare/v1.dart
@@ -23,20 +23,19 @@
 ///
 /// Create an instance of [CloudHealthcareApi] to access these resources:
 ///
-/// - [ProjectsResourceApi]
-///   - [ProjectsLocationsResourceApi]
-///     - [ProjectsLocationsDatasetsResourceApi]
-///       - [ProjectsLocationsDatasetsDicomStoresResourceApi]
-///         - [ProjectsLocationsDatasetsDicomStoresStudiesResourceApi]
-///           - [ProjectsLocationsDatasetsDicomStoresStudiesSeriesResourceApi]
-/// - [ProjectsLocationsDatasetsDicomStoresStudiesSeriesInstancesResourceApi]
-/// -
-/// [ProjectsLocationsDatasetsDicomStoresStudiesSeriesInstancesFramesResourceApi]
-///       - [ProjectsLocationsDatasetsFhirStoresResourceApi]
-///         - [ProjectsLocationsDatasetsFhirStoresFhirResourceApi]
-///       - [ProjectsLocationsDatasetsHl7V2StoresResourceApi]
-///         - [ProjectsLocationsDatasetsHl7V2StoresMessagesResourceApi]
-///       - [ProjectsLocationsDatasetsOperationsResourceApi]
+/// - [ProjectsResource]
+///   - [ProjectsLocationsResource]
+///     - [ProjectsLocationsDatasetsResource]
+///       - [ProjectsLocationsDatasetsDicomStoresResource]
+///         - [ProjectsLocationsDatasetsDicomStoresStudiesResource]
+///           - [ProjectsLocationsDatasetsDicomStoresStudiesSeriesResource]
+/// - [ProjectsLocationsDatasetsDicomStoresStudiesSeriesInstancesResource]
+/// - [ProjectsLocationsDatasetsDicomStoresStudiesSeriesInstancesFramesResource]
+///       - [ProjectsLocationsDatasetsFhirStoresResource]
+///         - [ProjectsLocationsDatasetsFhirStoresFhirResource]
+///       - [ProjectsLocationsDatasetsHl7V2StoresResource]
+///         - [ProjectsLocationsDatasetsHl7V2StoresMessagesResource]
+///       - [ProjectsLocationsDatasetsOperationsResource]
 library healthcare.v1;
 
 import 'dart:async' as async;
@@ -59,7 +58,7 @@
 
   final commons.ApiRequester _requester;
 
-  ProjectsResourceApi get projects => ProjectsResourceApi(_requester);
+  ProjectsResource get projects => ProjectsResource(_requester);
 
   CloudHealthcareApi(http.Client client,
       {core.String rootUrl = 'https://healthcare.googleapis.com/',
@@ -68,23 +67,22 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class ProjectsResourceApi {
+class ProjectsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsLocationsResourceApi get locations =>
-      ProjectsLocationsResourceApi(_requester);
+  ProjectsLocationsResource get locations =>
+      ProjectsLocationsResource(_requester);
 
-  ProjectsResourceApi(commons.ApiRequester client) : _requester = client;
+  ProjectsResource(commons.ApiRequester client) : _requester = client;
 }
 
-class ProjectsLocationsResourceApi {
+class ProjectsLocationsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsLocationsDatasetsResourceApi get datasets =>
-      ProjectsLocationsDatasetsResourceApi(_requester);
+  ProjectsLocationsDatasetsResource get datasets =>
+      ProjectsLocationsDatasetsResource(_requester);
 
-  ProjectsLocationsResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  ProjectsLocationsResource(commons.ApiRequester client) : _requester = client;
 
   /// Gets information about a location.
   ///
@@ -209,19 +207,19 @@
   }
 }
 
-class ProjectsLocationsDatasetsResourceApi {
+class ProjectsLocationsDatasetsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsLocationsDatasetsDicomStoresResourceApi get dicomStores =>
-      ProjectsLocationsDatasetsDicomStoresResourceApi(_requester);
-  ProjectsLocationsDatasetsFhirStoresResourceApi get fhirStores =>
-      ProjectsLocationsDatasetsFhirStoresResourceApi(_requester);
-  ProjectsLocationsDatasetsHl7V2StoresResourceApi get hl7V2Stores =>
-      ProjectsLocationsDatasetsHl7V2StoresResourceApi(_requester);
-  ProjectsLocationsDatasetsOperationsResourceApi get operations =>
-      ProjectsLocationsDatasetsOperationsResourceApi(_requester);
+  ProjectsLocationsDatasetsDicomStoresResource get dicomStores =>
+      ProjectsLocationsDatasetsDicomStoresResource(_requester);
+  ProjectsLocationsDatasetsFhirStoresResource get fhirStores =>
+      ProjectsLocationsDatasetsFhirStoresResource(_requester);
+  ProjectsLocationsDatasetsHl7V2StoresResource get hl7V2Stores =>
+      ProjectsLocationsDatasetsHl7V2StoresResource(_requester);
+  ProjectsLocationsDatasetsOperationsResource get operations =>
+      ProjectsLocationsDatasetsOperationsResource(_requester);
 
-  ProjectsLocationsDatasetsResourceApi(commons.ApiRequester client)
+  ProjectsLocationsDatasetsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Creates a new health dataset. Results are returned through the Operation
@@ -800,13 +798,13 @@
   }
 }
 
-class ProjectsLocationsDatasetsDicomStoresResourceApi {
+class ProjectsLocationsDatasetsDicomStoresResource {
   final commons.ApiRequester _requester;
 
-  ProjectsLocationsDatasetsDicomStoresStudiesResourceApi get studies =>
-      ProjectsLocationsDatasetsDicomStoresStudiesResourceApi(_requester);
+  ProjectsLocationsDatasetsDicomStoresStudiesResource get studies =>
+      ProjectsLocationsDatasetsDicomStoresStudiesResource(_requester);
 
-  ProjectsLocationsDatasetsDicomStoresResourceApi(commons.ApiRequester client)
+  ProjectsLocationsDatasetsDicomStoresResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Creates a new DICOM store within the parent dataset.
@@ -1821,13 +1819,13 @@
   }
 }
 
-class ProjectsLocationsDatasetsDicomStoresStudiesResourceApi {
+class ProjectsLocationsDatasetsDicomStoresStudiesResource {
   final commons.ApiRequester _requester;
 
-  ProjectsLocationsDatasetsDicomStoresStudiesSeriesResourceApi get series =>
-      ProjectsLocationsDatasetsDicomStoresStudiesSeriesResourceApi(_requester);
+  ProjectsLocationsDatasetsDicomStoresStudiesSeriesResource get series =>
+      ProjectsLocationsDatasetsDicomStoresStudiesSeriesResource(_requester);
 
-  ProjectsLocationsDatasetsDicomStoresStudiesResourceApi(
+  ProjectsLocationsDatasetsDicomStoresStudiesResource(
       commons.ApiRequester client)
       : _requester = client;
 
@@ -2273,15 +2271,15 @@
   }
 }
 
-class ProjectsLocationsDatasetsDicomStoresStudiesSeriesResourceApi {
+class ProjectsLocationsDatasetsDicomStoresStudiesSeriesResource {
   final commons.ApiRequester _requester;
 
-  ProjectsLocationsDatasetsDicomStoresStudiesSeriesInstancesResourceApi
+  ProjectsLocationsDatasetsDicomStoresStudiesSeriesInstancesResource
       get instances =>
-          ProjectsLocationsDatasetsDicomStoresStudiesSeriesInstancesResourceApi(
+          ProjectsLocationsDatasetsDicomStoresStudiesSeriesInstancesResource(
               _requester);
 
-  ProjectsLocationsDatasetsDicomStoresStudiesSeriesResourceApi(
+  ProjectsLocationsDatasetsDicomStoresStudiesSeriesResource(
       commons.ApiRequester client)
       : _requester = client;
 
@@ -2578,15 +2576,15 @@
   }
 }
 
-class ProjectsLocationsDatasetsDicomStoresStudiesSeriesInstancesResourceApi {
+class ProjectsLocationsDatasetsDicomStoresStudiesSeriesInstancesResource {
   final commons.ApiRequester _requester;
 
-  ProjectsLocationsDatasetsDicomStoresStudiesSeriesInstancesFramesResourceApi
+  ProjectsLocationsDatasetsDicomStoresStudiesSeriesInstancesFramesResource
       get frames =>
-          ProjectsLocationsDatasetsDicomStoresStudiesSeriesInstancesFramesResourceApi(
+          ProjectsLocationsDatasetsDicomStoresStudiesSeriesInstancesFramesResource(
               _requester);
 
-  ProjectsLocationsDatasetsDicomStoresStudiesSeriesInstancesResourceApi(
+  ProjectsLocationsDatasetsDicomStoresStudiesSeriesInstancesResource(
       commons.ApiRequester client)
       : _requester = client;
 
@@ -2889,10 +2887,10 @@
   }
 }
 
-class ProjectsLocationsDatasetsDicomStoresStudiesSeriesInstancesFramesResourceApi {
+class ProjectsLocationsDatasetsDicomStoresStudiesSeriesInstancesFramesResource {
   final commons.ApiRequester _requester;
 
-  ProjectsLocationsDatasetsDicomStoresStudiesSeriesInstancesFramesResourceApi(
+  ProjectsLocationsDatasetsDicomStoresStudiesSeriesInstancesFramesResource(
       commons.ApiRequester client)
       : _requester = client;
 
@@ -3046,13 +3044,13 @@
   }
 }
 
-class ProjectsLocationsDatasetsFhirStoresResourceApi {
+class ProjectsLocationsDatasetsFhirStoresResource {
   final commons.ApiRequester _requester;
 
-  ProjectsLocationsDatasetsFhirStoresFhirResourceApi get fhir =>
-      ProjectsLocationsDatasetsFhirStoresFhirResourceApi(_requester);
+  ProjectsLocationsDatasetsFhirStoresFhirResource get fhir =>
+      ProjectsLocationsDatasetsFhirStoresFhirResource(_requester);
 
-  ProjectsLocationsDatasetsFhirStoresResourceApi(commons.ApiRequester client)
+  ProjectsLocationsDatasetsFhirStoresResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Creates a new FHIR store within the parent dataset.
@@ -3813,11 +3811,10 @@
   }
 }
 
-class ProjectsLocationsDatasetsFhirStoresFhirResourceApi {
+class ProjectsLocationsDatasetsFhirStoresFhirResource {
   final commons.ApiRequester _requester;
 
-  ProjectsLocationsDatasetsFhirStoresFhirResourceApi(
-      commons.ApiRequester client)
+  ProjectsLocationsDatasetsFhirStoresFhirResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Retrieves a Patient resource and resources related to that patient.
@@ -4786,13 +4783,13 @@
   }
 }
 
-class ProjectsLocationsDatasetsHl7V2StoresResourceApi {
+class ProjectsLocationsDatasetsHl7V2StoresResource {
   final commons.ApiRequester _requester;
 
-  ProjectsLocationsDatasetsHl7V2StoresMessagesResourceApi get messages =>
-      ProjectsLocationsDatasetsHl7V2StoresMessagesResourceApi(_requester);
+  ProjectsLocationsDatasetsHl7V2StoresMessagesResource get messages =>
+      ProjectsLocationsDatasetsHl7V2StoresMessagesResource(_requester);
 
-  ProjectsLocationsDatasetsHl7V2StoresResourceApi(commons.ApiRequester client)
+  ProjectsLocationsDatasetsHl7V2StoresResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Creates a new HL7v2 store within the parent dataset.
@@ -5315,10 +5312,10 @@
   }
 }
 
-class ProjectsLocationsDatasetsHl7V2StoresMessagesResourceApi {
+class ProjectsLocationsDatasetsHl7V2StoresMessagesResource {
   final commons.ApiRequester _requester;
 
-  ProjectsLocationsDatasetsHl7V2StoresMessagesResourceApi(
+  ProjectsLocationsDatasetsHl7V2StoresMessagesResource(
       commons.ApiRequester client)
       : _requester = client;
 
@@ -5765,10 +5762,10 @@
   }
 }
 
-class ProjectsLocationsDatasetsOperationsResourceApi {
+class ProjectsLocationsDatasetsOperationsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsLocationsDatasetsOperationsResourceApi(commons.ApiRequester client)
+  ProjectsLocationsDatasetsOperationsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Starts asynchronous cancellation on a long-running operation. The server
diff --git a/generated/googleapis/lib/homegraph/v1.dart b/generated/googleapis/lib/homegraph/v1.dart
index ae94336..dbf4d1f 100644
--- a/generated/googleapis/lib/homegraph/v1.dart
+++ b/generated/googleapis/lib/homegraph/v1.dart
@@ -22,8 +22,8 @@
 ///
 /// Create an instance of [HomeGraphServiceApi] to access these resources:
 ///
-/// - [AgentUsersResourceApi]
-/// - [DevicesResourceApi]
+/// - [AgentUsersResource]
+/// - [DevicesResource]
 library homegraph.v1;
 
 import 'dart:async' as async_1;
@@ -44,8 +44,8 @@
 
   final commons.ApiRequester _requester;
 
-  AgentUsersResourceApi get agentUsers => AgentUsersResourceApi(_requester);
-  DevicesResourceApi get devices => DevicesResourceApi(_requester);
+  AgentUsersResource get agentUsers => AgentUsersResource(_requester);
+  DevicesResource get devices => DevicesResource(_requester);
 
   HomeGraphServiceApi(http.Client client,
       {core.String rootUrl = 'https://homegraph.googleapis.com/',
@@ -54,10 +54,10 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class AgentUsersResourceApi {
+class AgentUsersResource {
   final commons.ApiRequester _requester;
 
-  AgentUsersResourceApi(commons.ApiRequester client) : _requester = client;
+  AgentUsersResource(commons.ApiRequester client) : _requester = client;
 
   /// Unlinks the given third-party user from your smart home Action. All data
   /// related to this user will be deleted. For more details on how users link
@@ -123,10 +123,10 @@
   }
 }
 
-class DevicesResourceApi {
+class DevicesResource {
   final commons.ApiRequester _requester;
 
-  DevicesResourceApi(commons.ApiRequester client) : _requester = client;
+  DevicesResource(commons.ApiRequester client) : _requester = client;
 
   /// Gets the current states in Home Graph for the given set of the third-party
   /// user's devices. The third-party user's identity is passed in via the
diff --git a/generated/googleapis/lib/iam/v1.dart b/generated/googleapis/lib/iam/v1.dart
index b8ce991..9e316ef 100644
--- a/generated/googleapis/lib/iam/v1.dart
+++ b/generated/googleapis/lib/iam/v1.dart
@@ -28,15 +28,15 @@
 ///
 /// Create an instance of [IamApi] to access these resources:
 ///
-/// - [IamPoliciesResourceApi]
-/// - [OrganizationsResourceApi]
-///   - [OrganizationsRolesResourceApi]
-/// - [PermissionsResourceApi]
-/// - [ProjectsResourceApi]
-///   - [ProjectsRolesResourceApi]
-///   - [ProjectsServiceAccountsResourceApi]
-///     - [ProjectsServiceAccountsKeysResourceApi]
-/// - [RolesResourceApi]
+/// - [IamPoliciesResource]
+/// - [OrganizationsResource]
+///   - [OrganizationsRolesResource]
+/// - [PermissionsResource]
+/// - [ProjectsResource]
+///   - [ProjectsRolesResource]
+///   - [ProjectsServiceAccountsResource]
+///     - [ProjectsServiceAccountsKeysResource]
+/// - [RolesResource]
 library iam.v1;
 
 import 'dart:async' as async;
@@ -64,12 +64,11 @@
 
   final commons.ApiRequester _requester;
 
-  IamPoliciesResourceApi get iamPolicies => IamPoliciesResourceApi(_requester);
-  OrganizationsResourceApi get organizations =>
-      OrganizationsResourceApi(_requester);
-  PermissionsResourceApi get permissions => PermissionsResourceApi(_requester);
-  ProjectsResourceApi get projects => ProjectsResourceApi(_requester);
-  RolesResourceApi get roles => RolesResourceApi(_requester);
+  IamPoliciesResource get iamPolicies => IamPoliciesResource(_requester);
+  OrganizationsResource get organizations => OrganizationsResource(_requester);
+  PermissionsResource get permissions => PermissionsResource(_requester);
+  ProjectsResource get projects => ProjectsResource(_requester);
+  RolesResource get roles => RolesResource(_requester);
 
   IamApi(http.Client client,
       {core.String rootUrl = 'https://iam.googleapis.com/',
@@ -78,10 +77,10 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class IamPoliciesResourceApi {
+class IamPoliciesResource {
   final commons.ApiRequester _requester;
 
-  IamPoliciesResourceApi(commons.ApiRequester client) : _requester = client;
+  IamPoliciesResource(commons.ApiRequester client) : _requester = client;
 
   /// Lints, or validates, an IAM policy. Currently checks the
   /// google.iam.v1.Binding.condition field, which contains a condition
@@ -192,20 +191,19 @@
   }
 }
 
-class OrganizationsResourceApi {
+class OrganizationsResource {
   final commons.ApiRequester _requester;
 
-  OrganizationsRolesResourceApi get roles =>
-      OrganizationsRolesResourceApi(_requester);
+  OrganizationsRolesResource get roles =>
+      OrganizationsRolesResource(_requester);
 
-  OrganizationsResourceApi(commons.ApiRequester client) : _requester = client;
+  OrganizationsResource(commons.ApiRequester client) : _requester = client;
 }
 
-class OrganizationsRolesResourceApi {
+class OrganizationsRolesResource {
   final commons.ApiRequester _requester;
 
-  OrganizationsRolesResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  OrganizationsRolesResource(commons.ApiRequester client) : _requester = client;
 
   /// Creates a new custom Role.
   ///
@@ -688,10 +686,10 @@
   }
 }
 
-class PermissionsResourceApi {
+class PermissionsResource {
   final commons.ApiRequester _requester;
 
-  PermissionsResourceApi(commons.ApiRequester client) : _requester = client;
+  PermissionsResource(commons.ApiRequester client) : _requester = client;
 
   /// Lists every permission that you can test on a resource. A permission is
   /// testable if you can check whether a member has that permission on the
@@ -747,20 +745,20 @@
   }
 }
 
-class ProjectsResourceApi {
+class ProjectsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsRolesResourceApi get roles => ProjectsRolesResourceApi(_requester);
-  ProjectsServiceAccountsResourceApi get serviceAccounts =>
-      ProjectsServiceAccountsResourceApi(_requester);
+  ProjectsRolesResource get roles => ProjectsRolesResource(_requester);
+  ProjectsServiceAccountsResource get serviceAccounts =>
+      ProjectsServiceAccountsResource(_requester);
 
-  ProjectsResourceApi(commons.ApiRequester client) : _requester = client;
+  ProjectsResource(commons.ApiRequester client) : _requester = client;
 }
 
-class ProjectsRolesResourceApi {
+class ProjectsRolesResource {
   final commons.ApiRequester _requester;
 
-  ProjectsRolesResourceApi(commons.ApiRequester client) : _requester = client;
+  ProjectsRolesResource(commons.ApiRequester client) : _requester = client;
 
   /// Creates a new custom Role.
   ///
@@ -1243,13 +1241,13 @@
   }
 }
 
-class ProjectsServiceAccountsResourceApi {
+class ProjectsServiceAccountsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsServiceAccountsKeysResourceApi get keys =>
-      ProjectsServiceAccountsKeysResourceApi(_requester);
+  ProjectsServiceAccountsKeysResource get keys =>
+      ProjectsServiceAccountsKeysResource(_requester);
 
-  ProjectsServiceAccountsResourceApi(commons.ApiRequester client)
+  ProjectsServiceAccountsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Creates a ServiceAccount.
@@ -2199,10 +2197,10 @@
   }
 }
 
-class ProjectsServiceAccountsKeysResourceApi {
+class ProjectsServiceAccountsKeysResource {
   final commons.ApiRequester _requester;
 
-  ProjectsServiceAccountsKeysResourceApi(commons.ApiRequester client)
+  ProjectsServiceAccountsKeysResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Creates a ServiceAccountKey.
@@ -2523,10 +2521,10 @@
   }
 }
 
-class RolesResourceApi {
+class RolesResource {
   final commons.ApiRequester _requester;
 
-  RolesResourceApi(commons.ApiRequester client) : _requester = client;
+  RolesResource(commons.ApiRequester client) : _requester = client;
 
   /// Gets the definition of a Role.
   ///
diff --git a/generated/googleapis/lib/iamcredentials/v1.dart b/generated/googleapis/lib/iamcredentials/v1.dart
index b9e56b1..fb7973a 100644
--- a/generated/googleapis/lib/iamcredentials/v1.dart
+++ b/generated/googleapis/lib/iamcredentials/v1.dart
@@ -26,8 +26,8 @@
 ///
 /// Create an instance of [IAMCredentialsApi] to access these resources:
 ///
-/// - [ProjectsResourceApi]
-///   - [ProjectsServiceAccountsResourceApi]
+/// - [ProjectsResource]
+///   - [ProjectsServiceAccountsResource]
 library iamcredentials.v1;
 
 import 'dart:async' as async;
@@ -52,7 +52,7 @@
 
   final commons.ApiRequester _requester;
 
-  ProjectsResourceApi get projects => ProjectsResourceApi(_requester);
+  ProjectsResource get projects => ProjectsResource(_requester);
 
   IAMCredentialsApi(http.Client client,
       {core.String rootUrl = 'https://iamcredentials.googleapis.com/',
@@ -61,19 +61,19 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class ProjectsResourceApi {
+class ProjectsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsServiceAccountsResourceApi get serviceAccounts =>
-      ProjectsServiceAccountsResourceApi(_requester);
+  ProjectsServiceAccountsResource get serviceAccounts =>
+      ProjectsServiceAccountsResource(_requester);
 
-  ProjectsResourceApi(commons.ApiRequester client) : _requester = client;
+  ProjectsResource(commons.ApiRequester client) : _requester = client;
 }
 
-class ProjectsServiceAccountsResourceApi {
+class ProjectsServiceAccountsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsServiceAccountsResourceApi(commons.ApiRequester client)
+  ProjectsServiceAccountsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Generates an OAuth 2.0 access token for a service account.
diff --git a/generated/googleapis/lib/iap/v1.dart b/generated/googleapis/lib/iap/v1.dart
index 01b1fd9..6414c1d 100644
--- a/generated/googleapis/lib/iap/v1.dart
+++ b/generated/googleapis/lib/iap/v1.dart
@@ -23,10 +23,10 @@
 ///
 /// Create an instance of [CloudIAPApi] to access these resources:
 ///
-/// - [ProjectsResourceApi]
-///   - [ProjectsBrandsResourceApi]
-///     - [ProjectsBrandsIdentityAwareProxyClientsResourceApi]
-/// - [V1ResourceApi]
+/// - [ProjectsResource]
+///   - [ProjectsBrandsResource]
+///     - [ProjectsBrandsIdentityAwareProxyClientsResource]
+/// - [V1Resource]
 library iap.v1;
 
 import 'dart:async' as async;
@@ -49,8 +49,8 @@
 
   final commons.ApiRequester _requester;
 
-  ProjectsResourceApi get projects => ProjectsResourceApi(_requester);
-  V1ResourceApi get v1 => V1ResourceApi(_requester);
+  ProjectsResource get projects => ProjectsResource(_requester);
+  V1Resource get v1 => V1Resource(_requester);
 
   CloudIAPApi(http.Client client,
       {core.String rootUrl = 'https://iap.googleapis.com/',
@@ -59,22 +59,22 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class ProjectsResourceApi {
+class ProjectsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsBrandsResourceApi get brands => ProjectsBrandsResourceApi(_requester);
+  ProjectsBrandsResource get brands => ProjectsBrandsResource(_requester);
 
-  ProjectsResourceApi(commons.ApiRequester client) : _requester = client;
+  ProjectsResource(commons.ApiRequester client) : _requester = client;
 }
 
-class ProjectsBrandsResourceApi {
+class ProjectsBrandsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsBrandsIdentityAwareProxyClientsResourceApi
+  ProjectsBrandsIdentityAwareProxyClientsResource
       get identityAwareProxyClients =>
-          ProjectsBrandsIdentityAwareProxyClientsResourceApi(_requester);
+          ProjectsBrandsIdentityAwareProxyClientsResource(_requester);
 
-  ProjectsBrandsResourceApi(commons.ApiRequester client) : _requester = client;
+  ProjectsBrandsResource(commons.ApiRequester client) : _requester = client;
 
   /// Constructs a new OAuth brand for the project if one does not exist. The
   /// created brand is "internal only", meaning that OAuth clients created under
@@ -246,11 +246,10 @@
   }
 }
 
-class ProjectsBrandsIdentityAwareProxyClientsResourceApi {
+class ProjectsBrandsIdentityAwareProxyClientsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsBrandsIdentityAwareProxyClientsResourceApi(
-      commons.ApiRequester client)
+  ProjectsBrandsIdentityAwareProxyClientsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Creates an Identity Aware Proxy (IAP) OAuth client. The client is owned by
@@ -567,10 +566,10 @@
   }
 }
 
-class V1ResourceApi {
+class V1Resource {
   final commons.ApiRequester _requester;
 
-  V1ResourceApi(commons.ApiRequester client) : _requester = client;
+  V1Resource(commons.ApiRequester client) : _requester = client;
 
   /// Gets the access control policy for an Identity-Aware Proxy protected
   /// resource. More information about managing access via IAP can be found at:
diff --git a/generated/googleapis/lib/identitytoolkit/v3.dart b/generated/googleapis/lib/identitytoolkit/v3.dart
index b1a2488..8a78b65 100644
--- a/generated/googleapis/lib/identitytoolkit/v3.dart
+++ b/generated/googleapis/lib/identitytoolkit/v3.dart
@@ -24,7 +24,7 @@
 ///
 /// Create an instance of [IdentityToolkitApi] to access these resources:
 ///
-/// - [RelyingpartyResourceApi]
+/// - [RelyingpartyResource]
 library identitytoolkit.v3;
 
 import 'dart:async' as async;
@@ -51,8 +51,7 @@
 
   final commons.ApiRequester _requester;
 
-  RelyingpartyResourceApi get relyingparty =>
-      RelyingpartyResourceApi(_requester);
+  RelyingpartyResource get relyingparty => RelyingpartyResource(_requester);
 
   IdentityToolkitApi(http.Client client,
       {core.String rootUrl = 'https://www.googleapis.com/',
@@ -61,10 +60,10 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class RelyingpartyResourceApi {
+class RelyingpartyResource {
   final commons.ApiRequester _requester;
 
-  RelyingpartyResourceApi(commons.ApiRequester client) : _requester = client;
+  RelyingpartyResource(commons.ApiRequester client) : _requester = client;
 
   /// Creates the URI used by the IdP to authenticate the user.
   ///
diff --git a/generated/googleapis/lib/indexing/v3.dart b/generated/googleapis/lib/indexing/v3.dart
index 91d2ad8..9db857c 100644
--- a/generated/googleapis/lib/indexing/v3.dart
+++ b/generated/googleapis/lib/indexing/v3.dart
@@ -24,7 +24,7 @@
 ///
 /// Create an instance of [IndexingApi] to access these resources:
 ///
-/// - [UrlNotificationsResourceApi]
+/// - [UrlNotificationsResource]
 library indexing.v3;
 
 import 'dart:async' as async;
@@ -46,8 +46,8 @@
 
   final commons.ApiRequester _requester;
 
-  UrlNotificationsResourceApi get urlNotifications =>
-      UrlNotificationsResourceApi(_requester);
+  UrlNotificationsResource get urlNotifications =>
+      UrlNotificationsResource(_requester);
 
   IndexingApi(http.Client client,
       {core.String rootUrl = 'https://indexing.googleapis.com/',
@@ -56,11 +56,10 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class UrlNotificationsResourceApi {
+class UrlNotificationsResource {
   final commons.ApiRequester _requester;
 
-  UrlNotificationsResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  UrlNotificationsResource(commons.ApiRequester client) : _requester = client;
 
   /// Gets metadata about a Web Document. This method can _only_ be used to
   /// query URLs that were previously seen in successful Indexing API
diff --git a/generated/googleapis/lib/jobs/v2.dart b/generated/googleapis/lib/jobs/v2.dart
index 420aa6a..e874e3a 100644
--- a/generated/googleapis/lib/jobs/v2.dart
+++ b/generated/googleapis/lib/jobs/v2.dart
@@ -25,10 +25,10 @@
 ///
 /// Create an instance of [CloudTalentSolutionApi] to access these resources:
 ///
-/// - [CompaniesResourceApi]
-///   - [CompaniesJobsResourceApi]
-/// - [JobsResourceApi]
-/// - [V2ResourceApi]
+/// - [CompaniesResource]
+///   - [CompaniesJobsResource]
+/// - [JobsResource]
+/// - [V2Resource]
 library jobs.v2;
 
 import 'dart:async' as async;
@@ -55,9 +55,9 @@
 
   final commons.ApiRequester _requester;
 
-  CompaniesResourceApi get companies => CompaniesResourceApi(_requester);
-  JobsResourceApi get jobs => JobsResourceApi(_requester);
-  V2ResourceApi get v2 => V2ResourceApi(_requester);
+  CompaniesResource get companies => CompaniesResource(_requester);
+  JobsResource get jobs => JobsResource(_requester);
+  V2Resource get v2 => V2Resource(_requester);
 
   CloudTalentSolutionApi(http.Client client,
       {core.String rootUrl = 'https://jobs.googleapis.com/',
@@ -66,12 +66,12 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class CompaniesResourceApi {
+class CompaniesResource {
   final commons.ApiRequester _requester;
 
-  CompaniesJobsResourceApi get jobs => CompaniesJobsResourceApi(_requester);
+  CompaniesJobsResource get jobs => CompaniesJobsResource(_requester);
 
-  CompaniesResourceApi(commons.ApiRequester client) : _requester = client;
+  CompaniesResource(commons.ApiRequester client) : _requester = client;
 
   /// Creates a new company entity.
   ///
@@ -369,10 +369,10 @@
   }
 }
 
-class CompaniesJobsResourceApi {
+class CompaniesJobsResource {
   final commons.ApiRequester _requester;
 
-  CompaniesJobsResourceApi(commons.ApiRequester client) : _requester = client;
+  CompaniesJobsResource(commons.ApiRequester client) : _requester = client;
 
   /// Deprecated. Use ListJobs instead. Lists all jobs associated with a
   /// company.
@@ -471,10 +471,10 @@
   }
 }
 
-class JobsResourceApi {
+class JobsResource {
   final commons.ApiRequester _requester;
 
-  JobsResourceApi(commons.ApiRequester client) : _requester = client;
+  JobsResource(commons.ApiRequester client) : _requester = client;
 
   /// Deletes a list of Job postings by filter.
   ///
@@ -1052,10 +1052,10 @@
   }
 }
 
-class V2ResourceApi {
+class V2Resource {
   final commons.ApiRequester _requester;
 
-  V2ResourceApi(commons.ApiRequester client) : _requester = client;
+  V2Resource(commons.ApiRequester client) : _requester = client;
 
   /// Completes the specified prefix with job keyword suggestions. Intended for
   /// use by a job search auto-complete search box.
diff --git a/generated/googleapis/lib/jobs/v3.dart b/generated/googleapis/lib/jobs/v3.dart
index de4b6d0..6a65a12 100644
--- a/generated/googleapis/lib/jobs/v3.dart
+++ b/generated/googleapis/lib/jobs/v3.dart
@@ -25,10 +25,10 @@
 ///
 /// Create an instance of [CloudTalentSolutionApi] to access these resources:
 ///
-/// - [ProjectsResourceApi]
-///   - [ProjectsClientEventsResourceApi]
-///   - [ProjectsCompaniesResourceApi]
-///   - [ProjectsJobsResourceApi]
+/// - [ProjectsResource]
+///   - [ProjectsClientEventsResource]
+///   - [ProjectsCompaniesResource]
+///   - [ProjectsJobsResource]
 library jobs.v3;
 
 import 'dart:async' as async;
@@ -55,7 +55,7 @@
 
   final commons.ApiRequester _requester;
 
-  ProjectsResourceApi get projects => ProjectsResourceApi(_requester);
+  ProjectsResource get projects => ProjectsResource(_requester);
 
   CloudTalentSolutionApi(http.Client client,
       {core.String rootUrl = 'https://jobs.googleapis.com/',
@@ -64,16 +64,16 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class ProjectsResourceApi {
+class ProjectsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsClientEventsResourceApi get clientEvents =>
-      ProjectsClientEventsResourceApi(_requester);
-  ProjectsCompaniesResourceApi get companies =>
-      ProjectsCompaniesResourceApi(_requester);
-  ProjectsJobsResourceApi get jobs => ProjectsJobsResourceApi(_requester);
+  ProjectsClientEventsResource get clientEvents =>
+      ProjectsClientEventsResource(_requester);
+  ProjectsCompaniesResource get companies =>
+      ProjectsCompaniesResource(_requester);
+  ProjectsJobsResource get jobs => ProjectsJobsResource(_requester);
 
-  ProjectsResourceApi(commons.ApiRequester client) : _requester = client;
+  ProjectsResource(commons.ApiRequester client) : _requester = client;
 
   /// Completes the specified prefix with keyword suggestions. Intended for use
   /// by a job search auto-complete search box.
@@ -208,10 +208,10 @@
   }
 }
 
-class ProjectsClientEventsResourceApi {
+class ProjectsClientEventsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsClientEventsResourceApi(commons.ApiRequester client)
+  ProjectsClientEventsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Report events issued when end user interacts with customer's application
@@ -280,11 +280,10 @@
   }
 }
 
-class ProjectsCompaniesResourceApi {
+class ProjectsCompaniesResource {
   final commons.ApiRequester _requester;
 
-  ProjectsCompaniesResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  ProjectsCompaniesResource(commons.ApiRequester client) : _requester = client;
 
   /// Creates a new company entity.
   ///
@@ -593,10 +592,10 @@
   }
 }
 
-class ProjectsJobsResourceApi {
+class ProjectsJobsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsJobsResourceApi(commons.ApiRequester client) : _requester = client;
+  ProjectsJobsResource(commons.ApiRequester client) : _requester = client;
 
   /// Deletes a list of Jobs by filter.
   ///
diff --git a/generated/googleapis/lib/kgsearch/v1.dart b/generated/googleapis/lib/kgsearch/v1.dart
index fdb575e..a087e62 100644
--- a/generated/googleapis/lib/kgsearch/v1.dart
+++ b/generated/googleapis/lib/kgsearch/v1.dart
@@ -23,7 +23,7 @@
 ///
 /// Create an instance of [KgsearchApi] to access these resources:
 ///
-/// - [EntitiesResourceApi]
+/// - [EntitiesResource]
 library kgsearch.v1;
 
 import 'dart:async' as async;
@@ -41,7 +41,7 @@
 class KgsearchApi {
   final commons.ApiRequester _requester;
 
-  EntitiesResourceApi get entities => EntitiesResourceApi(_requester);
+  EntitiesResource get entities => EntitiesResource(_requester);
 
   KgsearchApi(http.Client client,
       {core.String rootUrl = 'https://kgsearch.googleapis.com/',
@@ -50,10 +50,10 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class EntitiesResourceApi {
+class EntitiesResource {
   final commons.ApiRequester _requester;
 
-  EntitiesResourceApi(commons.ApiRequester client) : _requester = client;
+  EntitiesResource(commons.ApiRequester client) : _requester = client;
 
   /// Searches Knowledge Graph for entities that match the constraints. A list
   /// of matched entities will be returned in response, which will be in JSON-LD
diff --git a/generated/googleapis/lib/language/v1.dart b/generated/googleapis/lib/language/v1.dart
index da49a01..45182cf 100644
--- a/generated/googleapis/lib/language/v1.dart
+++ b/generated/googleapis/lib/language/v1.dart
@@ -25,7 +25,7 @@
 ///
 /// Create an instance of [CloudNaturalLanguageApi] to access these resources:
 ///
-/// - [DocumentsResourceApi]
+/// - [DocumentsResource]
 library language.v1;
 
 import 'dart:async' as async;
@@ -54,7 +54,7 @@
 
   final commons.ApiRequester _requester;
 
-  DocumentsResourceApi get documents => DocumentsResourceApi(_requester);
+  DocumentsResource get documents => DocumentsResource(_requester);
 
   CloudNaturalLanguageApi(http.Client client,
       {core.String rootUrl = 'https://language.googleapis.com/',
@@ -63,10 +63,10 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class DocumentsResourceApi {
+class DocumentsResource {
   final commons.ApiRequester _requester;
 
-  DocumentsResourceApi(commons.ApiRequester client) : _requester = client;
+  DocumentsResource(commons.ApiRequester client) : _requester = client;
 
   /// Finds named entities (currently proper names and common nouns) in the text
   /// along with entity types, salience, mentions for each entity, and other
diff --git a/generated/googleapis/lib/libraryagent/v1.dart b/generated/googleapis/lib/libraryagent/v1.dart
index f66674a..24bba54 100644
--- a/generated/googleapis/lib/libraryagent/v1.dart
+++ b/generated/googleapis/lib/libraryagent/v1.dart
@@ -23,8 +23,8 @@
 ///
 /// Create an instance of [LibraryagentApi] to access these resources:
 ///
-/// - [ShelvesResourceApi]
-///   - [ShelvesBooksResourceApi]
+/// - [ShelvesResource]
+///   - [ShelvesBooksResource]
 library libraryagent.v1;
 
 import 'dart:async' as async;
@@ -46,7 +46,7 @@
 
   final commons.ApiRequester _requester;
 
-  ShelvesResourceApi get shelves => ShelvesResourceApi(_requester);
+  ShelvesResource get shelves => ShelvesResource(_requester);
 
   LibraryagentApi(http.Client client,
       {core.String rootUrl = 'https://libraryagent.googleapis.com/',
@@ -55,12 +55,12 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class ShelvesResourceApi {
+class ShelvesResource {
   final commons.ApiRequester _requester;
 
-  ShelvesBooksResourceApi get books => ShelvesBooksResourceApi(_requester);
+  ShelvesBooksResource get books => ShelvesBooksResource(_requester);
 
-  ShelvesResourceApi(commons.ApiRequester client) : _requester = client;
+  ShelvesResource(commons.ApiRequester client) : _requester = client;
 
   /// Gets a shelf. Returns NOT_FOUND if the shelf does not exist.
   ///
@@ -177,10 +177,10 @@
   }
 }
 
-class ShelvesBooksResourceApi {
+class ShelvesBooksResource {
   final commons.ApiRequester _requester;
 
-  ShelvesBooksResourceApi(commons.ApiRequester client) : _requester = client;
+  ShelvesBooksResource(commons.ApiRequester client) : _requester = client;
 
   /// Borrow a book from the library. Returns the book if it is borrowed
   /// successfully. Returns NOT_FOUND if the book does not exist in the library.
diff --git a/generated/googleapis/lib/licensing/v1.dart b/generated/googleapis/lib/licensing/v1.dart
index b928c4d..34d2c2c 100644
--- a/generated/googleapis/lib/licensing/v1.dart
+++ b/generated/googleapis/lib/licensing/v1.dart
@@ -25,7 +25,7 @@
 ///
 /// Create an instance of [LicensingApi] to access these resources:
 ///
-/// - [LicenseAssignmentsResourceApi]
+/// - [LicenseAssignmentsResource]
 library licensing.v1;
 
 import 'dart:async' as async;
@@ -49,8 +49,8 @@
 
   final commons.ApiRequester _requester;
 
-  LicenseAssignmentsResourceApi get licenseAssignments =>
-      LicenseAssignmentsResourceApi(_requester);
+  LicenseAssignmentsResource get licenseAssignments =>
+      LicenseAssignmentsResource(_requester);
 
   LicensingApi(http.Client client,
       {core.String rootUrl = 'https://www.googleapis.com/',
@@ -59,11 +59,10 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class LicenseAssignmentsResourceApi {
+class LicenseAssignmentsResource {
   final commons.ApiRequester _requester;
 
-  LicenseAssignmentsResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  LicenseAssignmentsResource(commons.ApiRequester client) : _requester = client;
 
   /// Revoke a license.
   ///
diff --git a/generated/googleapis/lib/logging/v2.dart b/generated/googleapis/lib/logging/v2.dart
index 3a74a3f..461170e 100644
--- a/generated/googleapis/lib/logging/v2.dart
+++ b/generated/googleapis/lib/logging/v2.dart
@@ -26,40 +26,40 @@
 ///
 /// Create an instance of [LoggingApi] to access these resources:
 ///
-/// - [BillingAccountsResourceApi]
-///   - [BillingAccountsBucketsResourceApi]
-///   - [BillingAccountsExclusionsResourceApi]
-///   - [BillingAccountsLocationsResourceApi]
-///     - [BillingAccountsLocationsBucketsResourceApi]
-///   - [BillingAccountsLogsResourceApi]
-///   - [BillingAccountsSinksResourceApi]
-/// - [EntriesResourceApi]
-/// - [ExclusionsResourceApi]
-/// - [FoldersResourceApi]
-///   - [FoldersExclusionsResourceApi]
-///   - [FoldersLocationsResourceApi]
-///     - [FoldersLocationsBucketsResourceApi]
-///   - [FoldersLogsResourceApi]
-///   - [FoldersSinksResourceApi]
-/// - [LocationsResourceApi]
-///   - [LocationsBucketsResourceApi]
-/// - [LogsResourceApi]
-/// - [MonitoredResourceDescriptorsResourceApi]
-/// - [OrganizationsResourceApi]
-///   - [OrganizationsExclusionsResourceApi]
-///   - [OrganizationsLocationsResourceApi]
-///     - [OrganizationsLocationsBucketsResourceApi]
-///   - [OrganizationsLogsResourceApi]
-///   - [OrganizationsSinksResourceApi]
-/// - [ProjectsResourceApi]
-///   - [ProjectsExclusionsResourceApi]
-///   - [ProjectsLocationsResourceApi]
-///     - [ProjectsLocationsBucketsResourceApi]
-///   - [ProjectsLogsResourceApi]
-///   - [ProjectsMetricsResourceApi]
-///   - [ProjectsSinksResourceApi]
-/// - [SinksResourceApi]
-/// - [V2ResourceApi]
+/// - [BillingAccountsResource]
+///   - [BillingAccountsBucketsResource]
+///   - [BillingAccountsExclusionsResource]
+///   - [BillingAccountsLocationsResource]
+///     - [BillingAccountsLocationsBucketsResource]
+///   - [BillingAccountsLogsResource]
+///   - [BillingAccountsSinksResource]
+/// - [EntriesResource]
+/// - [ExclusionsResource]
+/// - [FoldersResource]
+///   - [FoldersExclusionsResource]
+///   - [FoldersLocationsResource]
+///     - [FoldersLocationsBucketsResource]
+///   - [FoldersLogsResource]
+///   - [FoldersSinksResource]
+/// - [LocationsResource]
+///   - [LocationsBucketsResource]
+/// - [LogsResource]
+/// - [MonitoredResourceDescriptorsResource]
+/// - [OrganizationsResource]
+///   - [OrganizationsExclusionsResource]
+///   - [OrganizationsLocationsResource]
+///     - [OrganizationsLocationsBucketsResource]
+///   - [OrganizationsLogsResource]
+///   - [OrganizationsSinksResource]
+/// - [ProjectsResource]
+///   - [ProjectsExclusionsResource]
+///   - [ProjectsLocationsResource]
+///     - [ProjectsLocationsBucketsResource]
+///   - [ProjectsLogsResource]
+///   - [ProjectsMetricsResource]
+///   - [ProjectsSinksResource]
+/// - [SinksResource]
+/// - [V2Resource]
 library logging.v2;
 
 import 'dart:async' as async;
@@ -101,20 +101,19 @@
 
   final commons.ApiRequester _requester;
 
-  BillingAccountsResourceApi get billingAccounts =>
-      BillingAccountsResourceApi(_requester);
-  EntriesResourceApi get entries => EntriesResourceApi(_requester);
-  ExclusionsResourceApi get exclusions => ExclusionsResourceApi(_requester);
-  FoldersResourceApi get folders => FoldersResourceApi(_requester);
-  LocationsResourceApi get locations => LocationsResourceApi(_requester);
-  LogsResourceApi get logs => LogsResourceApi(_requester);
-  MonitoredResourceDescriptorsResourceApi get monitoredResourceDescriptors =>
-      MonitoredResourceDescriptorsResourceApi(_requester);
-  OrganizationsResourceApi get organizations =>
-      OrganizationsResourceApi(_requester);
-  ProjectsResourceApi get projects => ProjectsResourceApi(_requester);
-  SinksResourceApi get sinks => SinksResourceApi(_requester);
-  V2ResourceApi get v2 => V2ResourceApi(_requester);
+  BillingAccountsResource get billingAccounts =>
+      BillingAccountsResource(_requester);
+  EntriesResource get entries => EntriesResource(_requester);
+  ExclusionsResource get exclusions => ExclusionsResource(_requester);
+  FoldersResource get folders => FoldersResource(_requester);
+  LocationsResource get locations => LocationsResource(_requester);
+  LogsResource get logs => LogsResource(_requester);
+  MonitoredResourceDescriptorsResource get monitoredResourceDescriptors =>
+      MonitoredResourceDescriptorsResource(_requester);
+  OrganizationsResource get organizations => OrganizationsResource(_requester);
+  ProjectsResource get projects => ProjectsResource(_requester);
+  SinksResource get sinks => SinksResource(_requester);
+  V2Resource get v2 => V2Resource(_requester);
 
   LoggingApi(http.Client client,
       {core.String rootUrl = 'https://logging.googleapis.com/',
@@ -123,27 +122,27 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class BillingAccountsResourceApi {
+class BillingAccountsResource {
   final commons.ApiRequester _requester;
 
-  BillingAccountsBucketsResourceApi get buckets =>
-      BillingAccountsBucketsResourceApi(_requester);
-  BillingAccountsExclusionsResourceApi get exclusions =>
-      BillingAccountsExclusionsResourceApi(_requester);
-  BillingAccountsLocationsResourceApi get locations =>
-      BillingAccountsLocationsResourceApi(_requester);
-  BillingAccountsLogsResourceApi get logs =>
-      BillingAccountsLogsResourceApi(_requester);
-  BillingAccountsSinksResourceApi get sinks =>
-      BillingAccountsSinksResourceApi(_requester);
+  BillingAccountsBucketsResource get buckets =>
+      BillingAccountsBucketsResource(_requester);
+  BillingAccountsExclusionsResource get exclusions =>
+      BillingAccountsExclusionsResource(_requester);
+  BillingAccountsLocationsResource get locations =>
+      BillingAccountsLocationsResource(_requester);
+  BillingAccountsLogsResource get logs =>
+      BillingAccountsLogsResource(_requester);
+  BillingAccountsSinksResource get sinks =>
+      BillingAccountsSinksResource(_requester);
 
-  BillingAccountsResourceApi(commons.ApiRequester client) : _requester = client;
+  BillingAccountsResource(commons.ApiRequester client) : _requester = client;
 }
 
-class BillingAccountsBucketsResourceApi {
+class BillingAccountsBucketsResource {
   final commons.ApiRequester _requester;
 
-  BillingAccountsBucketsResourceApi(commons.ApiRequester client)
+  BillingAccountsBucketsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Gets a bucket (Beta).
@@ -203,10 +202,10 @@
   }
 }
 
-class BillingAccountsExclusionsResourceApi {
+class BillingAccountsExclusionsResource {
   final commons.ApiRequester _requester;
 
-  BillingAccountsExclusionsResourceApi(commons.ApiRequester client)
+  BillingAccountsExclusionsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Creates a new exclusion in a specified parent resource. Only log entries
@@ -535,20 +534,20 @@
   }
 }
 
-class BillingAccountsLocationsResourceApi {
+class BillingAccountsLocationsResource {
   final commons.ApiRequester _requester;
 
-  BillingAccountsLocationsBucketsResourceApi get buckets =>
-      BillingAccountsLocationsBucketsResourceApi(_requester);
+  BillingAccountsLocationsBucketsResource get buckets =>
+      BillingAccountsLocationsBucketsResource(_requester);
 
-  BillingAccountsLocationsResourceApi(commons.ApiRequester client)
+  BillingAccountsLocationsResource(commons.ApiRequester client)
       : _requester = client;
 }
 
-class BillingAccountsLocationsBucketsResourceApi {
+class BillingAccountsLocationsBucketsResource {
   final commons.ApiRequester _requester;
 
-  BillingAccountsLocationsBucketsResourceApi(commons.ApiRequester client)
+  BillingAccountsLocationsBucketsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Creates a bucket that can be used to store log entries. Once a bucket has
@@ -901,10 +900,10 @@
   }
 }
 
-class BillingAccountsLogsResourceApi {
+class BillingAccountsLogsResource {
   final commons.ApiRequester _requester;
 
-  BillingAccountsLogsResourceApi(commons.ApiRequester client)
+  BillingAccountsLogsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Deletes all the log entries in a log. The log reappears if it receives new
@@ -1041,10 +1040,10 @@
   }
 }
 
-class BillingAccountsSinksResourceApi {
+class BillingAccountsSinksResource {
   final commons.ApiRequester _requester;
 
-  BillingAccountsSinksResourceApi(commons.ApiRequester client)
+  BillingAccountsSinksResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Creates a sink that exports specified log entries to a destination. The
@@ -1497,10 +1496,10 @@
   }
 }
 
-class EntriesResourceApi {
+class EntriesResource {
   final commons.ApiRequester _requester;
 
-  EntriesResourceApi(commons.ApiRequester client) : _requester = client;
+  EntriesResource(commons.ApiRequester client) : _requester = client;
 
   /// Lists log entries. Use this method to retrieve log entries that originated
   /// from a project/folder/organization/billing account. For ways to export log
@@ -1612,10 +1611,10 @@
   }
 }
 
-class ExclusionsResourceApi {
+class ExclusionsResource {
   final commons.ApiRequester _requester;
 
-  ExclusionsResourceApi(commons.ApiRequester client) : _requester = client;
+  ExclusionsResource(commons.ApiRequester client) : _requester = client;
 
   /// Creates a new exclusion in a specified parent resource. Only log entries
   /// belonging to that resource can be excluded. You can have up to 10
@@ -1943,24 +1942,23 @@
   }
 }
 
-class FoldersResourceApi {
+class FoldersResource {
   final commons.ApiRequester _requester;
 
-  FoldersExclusionsResourceApi get exclusions =>
-      FoldersExclusionsResourceApi(_requester);
-  FoldersLocationsResourceApi get locations =>
-      FoldersLocationsResourceApi(_requester);
-  FoldersLogsResourceApi get logs => FoldersLogsResourceApi(_requester);
-  FoldersSinksResourceApi get sinks => FoldersSinksResourceApi(_requester);
+  FoldersExclusionsResource get exclusions =>
+      FoldersExclusionsResource(_requester);
+  FoldersLocationsResource get locations =>
+      FoldersLocationsResource(_requester);
+  FoldersLogsResource get logs => FoldersLogsResource(_requester);
+  FoldersSinksResource get sinks => FoldersSinksResource(_requester);
 
-  FoldersResourceApi(commons.ApiRequester client) : _requester = client;
+  FoldersResource(commons.ApiRequester client) : _requester = client;
 }
 
-class FoldersExclusionsResourceApi {
+class FoldersExclusionsResource {
   final commons.ApiRequester _requester;
 
-  FoldersExclusionsResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  FoldersExclusionsResource(commons.ApiRequester client) : _requester = client;
 
   /// Creates a new exclusion in a specified parent resource. Only log entries
   /// belonging to that resource can be excluded. You can have up to 10
@@ -2288,20 +2286,19 @@
   }
 }
 
-class FoldersLocationsResourceApi {
+class FoldersLocationsResource {
   final commons.ApiRequester _requester;
 
-  FoldersLocationsBucketsResourceApi get buckets =>
-      FoldersLocationsBucketsResourceApi(_requester);
+  FoldersLocationsBucketsResource get buckets =>
+      FoldersLocationsBucketsResource(_requester);
 
-  FoldersLocationsResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  FoldersLocationsResource(commons.ApiRequester client) : _requester = client;
 }
 
-class FoldersLocationsBucketsResourceApi {
+class FoldersLocationsBucketsResource {
   final commons.ApiRequester _requester;
 
-  FoldersLocationsBucketsResourceApi(commons.ApiRequester client)
+  FoldersLocationsBucketsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Creates a bucket that can be used to store log entries. Once a bucket has
@@ -2707,10 +2704,10 @@
   }
 }
 
-class FoldersLogsResourceApi {
+class FoldersLogsResource {
   final commons.ApiRequester _requester;
 
-  FoldersLogsResourceApi(commons.ApiRequester client) : _requester = client;
+  FoldersLogsResource(commons.ApiRequester client) : _requester = client;
 
   /// Deletes all the log entries in a log. The log reappears if it receives new
   /// entries. Log entries written shortly before the delete operation might not
@@ -2846,10 +2843,10 @@
   }
 }
 
-class FoldersSinksResourceApi {
+class FoldersSinksResource {
   final commons.ApiRequester _requester;
 
-  FoldersSinksResourceApi(commons.ApiRequester client) : _requester = client;
+  FoldersSinksResource(commons.ApiRequester client) : _requester = client;
 
   /// Creates a sink that exports specified log entries to a destination. The
   /// export of newly-ingested log entries begins immediately, unless the sink's
@@ -3301,20 +3298,18 @@
   }
 }
 
-class LocationsResourceApi {
+class LocationsResource {
   final commons.ApiRequester _requester;
 
-  LocationsBucketsResourceApi get buckets =>
-      LocationsBucketsResourceApi(_requester);
+  LocationsBucketsResource get buckets => LocationsBucketsResource(_requester);
 
-  LocationsResourceApi(commons.ApiRequester client) : _requester = client;
+  LocationsResource(commons.ApiRequester client) : _requester = client;
 }
 
-class LocationsBucketsResourceApi {
+class LocationsBucketsResource {
   final commons.ApiRequester _requester;
 
-  LocationsBucketsResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  LocationsBucketsResource(commons.ApiRequester client) : _requester = client;
 
   /// Creates a bucket that can be used to store log entries. Once a bucket has
   /// been created, the region cannot be changed.
@@ -3719,10 +3714,10 @@
   }
 }
 
-class LogsResourceApi {
+class LogsResource {
   final commons.ApiRequester _requester;
 
-  LogsResourceApi(commons.ApiRequester client) : _requester = client;
+  LogsResource(commons.ApiRequester client) : _requester = client;
 
   /// Deletes all the log entries in a log. The log reappears if it receives new
   /// entries. Log entries written shortly before the delete operation might not
@@ -3858,10 +3853,10 @@
   }
 }
 
-class MonitoredResourceDescriptorsResourceApi {
+class MonitoredResourceDescriptorsResource {
   final commons.ApiRequester _requester;
 
-  MonitoredResourceDescriptorsResourceApi(commons.ApiRequester client)
+  MonitoredResourceDescriptorsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Lists the descriptors for monitored resource types used by Logging.
@@ -3927,19 +3922,18 @@
   }
 }
 
-class OrganizationsResourceApi {
+class OrganizationsResource {
   final commons.ApiRequester _requester;
 
-  OrganizationsExclusionsResourceApi get exclusions =>
-      OrganizationsExclusionsResourceApi(_requester);
-  OrganizationsLocationsResourceApi get locations =>
-      OrganizationsLocationsResourceApi(_requester);
-  OrganizationsLogsResourceApi get logs =>
-      OrganizationsLogsResourceApi(_requester);
-  OrganizationsSinksResourceApi get sinks =>
-      OrganizationsSinksResourceApi(_requester);
+  OrganizationsExclusionsResource get exclusions =>
+      OrganizationsExclusionsResource(_requester);
+  OrganizationsLocationsResource get locations =>
+      OrganizationsLocationsResource(_requester);
+  OrganizationsLogsResource get logs => OrganizationsLogsResource(_requester);
+  OrganizationsSinksResource get sinks =>
+      OrganizationsSinksResource(_requester);
 
-  OrganizationsResourceApi(commons.ApiRequester client) : _requester = client;
+  OrganizationsResource(commons.ApiRequester client) : _requester = client;
 
   /// Gets the Logs Router CMEK settings for the given resource.Note: CMEK for
   /// the Logs Router can currently only be configured for GCP organizations.
@@ -4092,10 +4086,10 @@
   }
 }
 
-class OrganizationsExclusionsResourceApi {
+class OrganizationsExclusionsResource {
   final commons.ApiRequester _requester;
 
-  OrganizationsExclusionsResourceApi(commons.ApiRequester client)
+  OrganizationsExclusionsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Creates a new exclusion in a specified parent resource. Only log entries
@@ -4424,20 +4418,20 @@
   }
 }
 
-class OrganizationsLocationsResourceApi {
+class OrganizationsLocationsResource {
   final commons.ApiRequester _requester;
 
-  OrganizationsLocationsBucketsResourceApi get buckets =>
-      OrganizationsLocationsBucketsResourceApi(_requester);
+  OrganizationsLocationsBucketsResource get buckets =>
+      OrganizationsLocationsBucketsResource(_requester);
 
-  OrganizationsLocationsResourceApi(commons.ApiRequester client)
+  OrganizationsLocationsResource(commons.ApiRequester client)
       : _requester = client;
 }
 
-class OrganizationsLocationsBucketsResourceApi {
+class OrganizationsLocationsBucketsResource {
   final commons.ApiRequester _requester;
 
-  OrganizationsLocationsBucketsResourceApi(commons.ApiRequester client)
+  OrganizationsLocationsBucketsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Creates a bucket that can be used to store log entries. Once a bucket has
@@ -4847,11 +4841,10 @@
   }
 }
 
-class OrganizationsLogsResourceApi {
+class OrganizationsLogsResource {
   final commons.ApiRequester _requester;
 
-  OrganizationsLogsResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  OrganizationsLogsResource(commons.ApiRequester client) : _requester = client;
 
   /// Deletes all the log entries in a log. The log reappears if it receives new
   /// entries. Log entries written shortly before the delete operation might not
@@ -4987,11 +4980,10 @@
   }
 }
 
-class OrganizationsSinksResourceApi {
+class OrganizationsSinksResource {
   final commons.ApiRequester _requester;
 
-  OrganizationsSinksResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  OrganizationsSinksResource(commons.ApiRequester client) : _requester = client;
 
   /// Creates a sink that exports specified log entries to a destination. The
   /// export of newly-ingested log entries begins immediately, unless the sink's
@@ -5443,26 +5435,24 @@
   }
 }
 
-class ProjectsResourceApi {
+class ProjectsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsExclusionsResourceApi get exclusions =>
-      ProjectsExclusionsResourceApi(_requester);
-  ProjectsLocationsResourceApi get locations =>
-      ProjectsLocationsResourceApi(_requester);
-  ProjectsLogsResourceApi get logs => ProjectsLogsResourceApi(_requester);
-  ProjectsMetricsResourceApi get metrics =>
-      ProjectsMetricsResourceApi(_requester);
-  ProjectsSinksResourceApi get sinks => ProjectsSinksResourceApi(_requester);
+  ProjectsExclusionsResource get exclusions =>
+      ProjectsExclusionsResource(_requester);
+  ProjectsLocationsResource get locations =>
+      ProjectsLocationsResource(_requester);
+  ProjectsLogsResource get logs => ProjectsLogsResource(_requester);
+  ProjectsMetricsResource get metrics => ProjectsMetricsResource(_requester);
+  ProjectsSinksResource get sinks => ProjectsSinksResource(_requester);
 
-  ProjectsResourceApi(commons.ApiRequester client) : _requester = client;
+  ProjectsResource(commons.ApiRequester client) : _requester = client;
 }
 
-class ProjectsExclusionsResourceApi {
+class ProjectsExclusionsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsExclusionsResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  ProjectsExclusionsResource(commons.ApiRequester client) : _requester = client;
 
   /// Creates a new exclusion in a specified parent resource. Only log entries
   /// belonging to that resource can be excluded. You can have up to 10
@@ -5790,20 +5780,19 @@
   }
 }
 
-class ProjectsLocationsResourceApi {
+class ProjectsLocationsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsLocationsBucketsResourceApi get buckets =>
-      ProjectsLocationsBucketsResourceApi(_requester);
+  ProjectsLocationsBucketsResource get buckets =>
+      ProjectsLocationsBucketsResource(_requester);
 
-  ProjectsLocationsResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  ProjectsLocationsResource(commons.ApiRequester client) : _requester = client;
 }
 
-class ProjectsLocationsBucketsResourceApi {
+class ProjectsLocationsBucketsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsLocationsBucketsResourceApi(commons.ApiRequester client)
+  ProjectsLocationsBucketsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Creates a bucket that can be used to store log entries. Once a bucket has
@@ -6209,10 +6198,10 @@
   }
 }
 
-class ProjectsLogsResourceApi {
+class ProjectsLogsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsLogsResourceApi(commons.ApiRequester client) : _requester = client;
+  ProjectsLogsResource(commons.ApiRequester client) : _requester = client;
 
   /// Deletes all the log entries in a log. The log reappears if it receives new
   /// entries. Log entries written shortly before the delete operation might not
@@ -6348,10 +6337,10 @@
   }
 }
 
-class ProjectsMetricsResourceApi {
+class ProjectsMetricsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsMetricsResourceApi(commons.ApiRequester client) : _requester = client;
+  ProjectsMetricsResource(commons.ApiRequester client) : _requester = client;
 
   /// Creates a logs-based metric.
   ///
@@ -6650,10 +6639,10 @@
   }
 }
 
-class ProjectsSinksResourceApi {
+class ProjectsSinksResource {
   final commons.ApiRequester _requester;
 
-  ProjectsSinksResourceApi(commons.ApiRequester client) : _requester = client;
+  ProjectsSinksResource(commons.ApiRequester client) : _requester = client;
 
   /// Creates a sink that exports specified log entries to a destination. The
   /// export of newly-ingested log entries begins immediately, unless the sink's
@@ -7105,10 +7094,10 @@
   }
 }
 
-class SinksResourceApi {
+class SinksResource {
   final commons.ApiRequester _requester;
 
-  SinksResourceApi(commons.ApiRequester client) : _requester = client;
+  SinksResource(commons.ApiRequester client) : _requester = client;
 
   /// Creates a sink that exports specified log entries to a destination. The
   /// export of newly-ingested log entries begins immediately, unless the sink's
@@ -7467,10 +7456,10 @@
   }
 }
 
-class V2ResourceApi {
+class V2Resource {
   final commons.ApiRequester _requester;
 
-  V2ResourceApi(commons.ApiRequester client) : _requester = client;
+  V2Resource(commons.ApiRequester client) : _requester = client;
 
   /// Gets the Logs Router CMEK settings for the given resource.Note: CMEK for
   /// the Logs Router can currently only be configured for GCP organizations.
diff --git a/generated/googleapis/lib/managedidentities/v1.dart b/generated/googleapis/lib/managedidentities/v1.dart
index 2e823eb..dbc7bed 100644
--- a/generated/googleapis/lib/managedidentities/v1.dart
+++ b/generated/googleapis/lib/managedidentities/v1.dart
@@ -26,11 +26,11 @@
 /// Create an instance of [ManagedServiceForMicrosoftActiveDirectoryConsumerApi]
 /// to access these resources:
 ///
-/// - [ProjectsResourceApi]
-///   - [ProjectsLocationsResourceApi]
-///     - [ProjectsLocationsGlobalResourceApi]
-///       - [ProjectsLocationsGlobalDomainsResourceApi]
-///       - [ProjectsLocationsGlobalOperationsResourceApi]
+/// - [ProjectsResource]
+///   - [ProjectsLocationsResource]
+///     - [ProjectsLocationsGlobalResource]
+///       - [ProjectsLocationsGlobalDomainsResource]
+///       - [ProjectsLocationsGlobalOperationsResource]
 library managedidentities.v1;
 
 import 'dart:async' as async;
@@ -55,7 +55,7 @@
 
   final commons.ApiRequester _requester;
 
-  ProjectsResourceApi get projects => ProjectsResourceApi(_requester);
+  ProjectsResource get projects => ProjectsResource(_requester);
 
   ManagedServiceForMicrosoftActiveDirectoryConsumerApi(http.Client client,
       {core.String rootUrl = 'https://managedidentities.googleapis.com/',
@@ -64,23 +64,22 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class ProjectsResourceApi {
+class ProjectsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsLocationsResourceApi get locations =>
-      ProjectsLocationsResourceApi(_requester);
+  ProjectsLocationsResource get locations =>
+      ProjectsLocationsResource(_requester);
 
-  ProjectsResourceApi(commons.ApiRequester client) : _requester = client;
+  ProjectsResource(commons.ApiRequester client) : _requester = client;
 }
 
-class ProjectsLocationsResourceApi {
+class ProjectsLocationsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsLocationsGlobalResourceApi get global =>
-      ProjectsLocationsGlobalResourceApi(_requester);
+  ProjectsLocationsGlobalResource get global =>
+      ProjectsLocationsGlobalResource(_requester);
 
-  ProjectsLocationsResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  ProjectsLocationsResource(commons.ApiRequester client) : _requester = client;
 
   /// Gets information about a location.
   ///
@@ -214,22 +213,22 @@
   }
 }
 
-class ProjectsLocationsGlobalResourceApi {
+class ProjectsLocationsGlobalResource {
   final commons.ApiRequester _requester;
 
-  ProjectsLocationsGlobalDomainsResourceApi get domains =>
-      ProjectsLocationsGlobalDomainsResourceApi(_requester);
-  ProjectsLocationsGlobalOperationsResourceApi get operations =>
-      ProjectsLocationsGlobalOperationsResourceApi(_requester);
+  ProjectsLocationsGlobalDomainsResource get domains =>
+      ProjectsLocationsGlobalDomainsResource(_requester);
+  ProjectsLocationsGlobalOperationsResource get operations =>
+      ProjectsLocationsGlobalOperationsResource(_requester);
 
-  ProjectsLocationsGlobalResourceApi(commons.ApiRequester client)
+  ProjectsLocationsGlobalResource(commons.ApiRequester client)
       : _requester = client;
 }
 
-class ProjectsLocationsGlobalDomainsResourceApi {
+class ProjectsLocationsGlobalDomainsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsLocationsGlobalDomainsResourceApi(commons.ApiRequester client)
+  ProjectsLocationsGlobalDomainsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Adds an AD trust to a domain.
@@ -1065,10 +1064,10 @@
   }
 }
 
-class ProjectsLocationsGlobalOperationsResourceApi {
+class ProjectsLocationsGlobalOperationsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsLocationsGlobalOperationsResourceApi(commons.ApiRequester client)
+  ProjectsLocationsGlobalOperationsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Starts asynchronous cancellation on a long-running operation. The server
diff --git a/generated/googleapis/lib/manufacturers/v1.dart b/generated/googleapis/lib/manufacturers/v1.dart
index c40602e..689555b 100644
--- a/generated/googleapis/lib/manufacturers/v1.dart
+++ b/generated/googleapis/lib/manufacturers/v1.dart
@@ -23,8 +23,8 @@
 ///
 /// Create an instance of [ManufacturerCenterApi] to access these resources:
 ///
-/// - [AccountsResourceApi]
-///   - [AccountsProductsResourceApi]
+/// - [AccountsResource]
+///   - [AccountsProductsResource]
 library manufacturers.v1;
 
 import 'dart:async' as async;
@@ -47,7 +47,7 @@
 
   final commons.ApiRequester _requester;
 
-  AccountsResourceApi get accounts => AccountsResourceApi(_requester);
+  AccountsResource get accounts => AccountsResource(_requester);
 
   ManufacturerCenterApi(http.Client client,
       {core.String rootUrl = 'https://manufacturers.googleapis.com/',
@@ -56,20 +56,18 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class AccountsResourceApi {
+class AccountsResource {
   final commons.ApiRequester _requester;
 
-  AccountsProductsResourceApi get products =>
-      AccountsProductsResourceApi(_requester);
+  AccountsProductsResource get products => AccountsProductsResource(_requester);
 
-  AccountsResourceApi(commons.ApiRequester client) : _requester = client;
+  AccountsResource(commons.ApiRequester client) : _requester = client;
 }
 
-class AccountsProductsResourceApi {
+class AccountsProductsResource {
   final commons.ApiRequester _requester;
 
-  AccountsProductsResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  AccountsProductsResource(commons.ApiRequester client) : _requester = client;
 
   /// Deletes the product from a Manufacturer Center account.
   ///
diff --git a/generated/googleapis/lib/ml/v1.dart b/generated/googleapis/lib/ml/v1.dart
index f9fc6fe..3ab3c92 100644
--- a/generated/googleapis/lib/ml/v1.dart
+++ b/generated/googleapis/lib/ml/v1.dart
@@ -24,15 +24,15 @@
 /// Create an instance of [CloudMachineLearningEngineApi] to access these
 /// resources:
 ///
-/// - [ProjectsResourceApi]
-///   - [ProjectsJobsResourceApi]
-///   - [ProjectsLocationsResourceApi]
-///     - [ProjectsLocationsOperationsResourceApi]
-///     - [ProjectsLocationsStudiesResourceApi]
-///       - [ProjectsLocationsStudiesTrialsResourceApi]
-///   - [ProjectsModelsResourceApi]
-///     - [ProjectsModelsVersionsResourceApi]
-///   - [ProjectsOperationsResourceApi]
+/// - [ProjectsResource]
+///   - [ProjectsJobsResource]
+///   - [ProjectsLocationsResource]
+///     - [ProjectsLocationsOperationsResource]
+///     - [ProjectsLocationsStudiesResource]
+///       - [ProjectsLocationsStudiesTrialsResource]
+///   - [ProjectsModelsResource]
+///     - [ProjectsModelsVersionsResource]
+///   - [ProjectsOperationsResource]
 library ml.v1;
 
 import 'dart:async' as async;
@@ -59,7 +59,7 @@
 
   final commons.ApiRequester _requester;
 
-  ProjectsResourceApi get projects => ProjectsResourceApi(_requester);
+  ProjectsResource get projects => ProjectsResource(_requester);
 
   CloudMachineLearningEngineApi(http.Client client,
       {core.String rootUrl = 'https://ml.googleapis.com/',
@@ -68,17 +68,17 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class ProjectsResourceApi {
+class ProjectsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsJobsResourceApi get jobs => ProjectsJobsResourceApi(_requester);
-  ProjectsLocationsResourceApi get locations =>
-      ProjectsLocationsResourceApi(_requester);
-  ProjectsModelsResourceApi get models => ProjectsModelsResourceApi(_requester);
-  ProjectsOperationsResourceApi get operations =>
-      ProjectsOperationsResourceApi(_requester);
+  ProjectsJobsResource get jobs => ProjectsJobsResource(_requester);
+  ProjectsLocationsResource get locations =>
+      ProjectsLocationsResource(_requester);
+  ProjectsModelsResource get models => ProjectsModelsResource(_requester);
+  ProjectsOperationsResource get operations =>
+      ProjectsOperationsResource(_requester);
 
-  ProjectsResourceApi(commons.ApiRequester client) : _requester = client;
+  ProjectsResource(commons.ApiRequester client) : _requester = client;
 
   /// Performs explanation on the data in the request. {% dynamic include
   /// "/ai-platform/includes/___explain-request" %}
@@ -259,10 +259,10 @@
   }
 }
 
-class ProjectsJobsResourceApi {
+class ProjectsJobsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsJobsResourceApi(commons.ApiRequester client) : _requester = client;
+  ProjectsJobsResource(commons.ApiRequester client) : _requester = client;
 
   /// Cancels a running job.
   ///
@@ -790,16 +790,15 @@
   }
 }
 
-class ProjectsLocationsResourceApi {
+class ProjectsLocationsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsLocationsOperationsResourceApi get operations =>
-      ProjectsLocationsOperationsResourceApi(_requester);
-  ProjectsLocationsStudiesResourceApi get studies =>
-      ProjectsLocationsStudiesResourceApi(_requester);
+  ProjectsLocationsOperationsResource get operations =>
+      ProjectsLocationsOperationsResource(_requester);
+  ProjectsLocationsStudiesResource get studies =>
+      ProjectsLocationsStudiesResource(_requester);
 
-  ProjectsLocationsResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  ProjectsLocationsResource(commons.ApiRequester client) : _requester = client;
 
   /// Get the complete list of CMLE capabilities in a location, along with their
   /// location-specific properties.
@@ -927,10 +926,10 @@
   }
 }
 
-class ProjectsLocationsOperationsResourceApi {
+class ProjectsLocationsOperationsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsLocationsOperationsResourceApi(commons.ApiRequester client)
+  ProjectsLocationsOperationsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Starts asynchronous cancellation on a long-running operation. The server
@@ -1050,13 +1049,13 @@
   }
 }
 
-class ProjectsLocationsStudiesResourceApi {
+class ProjectsLocationsStudiesResource {
   final commons.ApiRequester _requester;
 
-  ProjectsLocationsStudiesTrialsResourceApi get trials =>
-      ProjectsLocationsStudiesTrialsResourceApi(_requester);
+  ProjectsLocationsStudiesTrialsResource get trials =>
+      ProjectsLocationsStudiesTrialsResource(_requester);
 
-  ProjectsLocationsStudiesResourceApi(commons.ApiRequester client)
+  ProjectsLocationsStudiesResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Creates a study.
@@ -1285,10 +1284,10 @@
   }
 }
 
-class ProjectsLocationsStudiesTrialsResourceApi {
+class ProjectsLocationsStudiesTrialsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsLocationsStudiesTrialsResourceApi(commons.ApiRequester client)
+  ProjectsLocationsStudiesTrialsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Adds a measurement of the objective metrics to a trial. This measurement
@@ -1814,13 +1813,13 @@
   }
 }
 
-class ProjectsModelsResourceApi {
+class ProjectsModelsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsModelsVersionsResourceApi get versions =>
-      ProjectsModelsVersionsResourceApi(_requester);
+  ProjectsModelsVersionsResource get versions =>
+      ProjectsModelsVersionsResource(_requester);
 
-  ProjectsModelsResourceApi(commons.ApiRequester client) : _requester = client;
+  ProjectsModelsResource(commons.ApiRequester client) : _requester = client;
 
   /// Creates a model which will later contain one or more versions. You must
   /// add at least one version before you can request predictions from the
@@ -2341,10 +2340,10 @@
   }
 }
 
-class ProjectsModelsVersionsResourceApi {
+class ProjectsModelsVersionsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsModelsVersionsResourceApi(commons.ApiRequester client)
+  ProjectsModelsVersionsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Creates a new version of a model from a trained TensorFlow model. If the
@@ -2742,11 +2741,10 @@
   }
 }
 
-class ProjectsOperationsResourceApi {
+class ProjectsOperationsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsOperationsResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  ProjectsOperationsResource(commons.ApiRequester client) : _requester = client;
 
   /// Starts asynchronous cancellation on a long-running operation. The server
   /// makes a best effort to cancel the operation, but success is not
diff --git a/generated/googleapis/lib/monitoring/v3.dart b/generated/googleapis/lib/monitoring/v3.dart
index 3930fe6..7e76e3a 100644
--- a/generated/googleapis/lib/monitoring/v3.dart
+++ b/generated/googleapis/lib/monitoring/v3.dart
@@ -28,20 +28,20 @@
 ///
 /// Create an instance of [MonitoringApi] to access these resources:
 ///
-/// - [ProjectsResourceApi]
-///   - [ProjectsAlertPoliciesResourceApi]
-///   - [ProjectsCollectdTimeSeriesResourceApi]
-///   - [ProjectsGroupsResourceApi]
-///     - [ProjectsGroupsMembersResourceApi]
-///   - [ProjectsMetricDescriptorsResourceApi]
-///   - [ProjectsMonitoredResourceDescriptorsResourceApi]
-///   - [ProjectsNotificationChannelDescriptorsResourceApi]
-///   - [ProjectsNotificationChannelsResourceApi]
-///   - [ProjectsTimeSeriesResourceApi]
-///   - [ProjectsUptimeCheckConfigsResourceApi]
-/// - [ServicesResourceApi]
-///   - [ServicesServiceLevelObjectivesResourceApi]
-/// - [UptimeCheckIpsResourceApi]
+/// - [ProjectsResource]
+///   - [ProjectsAlertPoliciesResource]
+///   - [ProjectsCollectdTimeSeriesResource]
+///   - [ProjectsGroupsResource]
+///     - [ProjectsGroupsMembersResource]
+///   - [ProjectsMetricDescriptorsResource]
+///   - [ProjectsMonitoredResourceDescriptorsResource]
+///   - [ProjectsNotificationChannelDescriptorsResource]
+///   - [ProjectsNotificationChannelsResource]
+///   - [ProjectsTimeSeriesResource]
+///   - [ProjectsUptimeCheckConfigsResource]
+/// - [ServicesResource]
+///   - [ServicesServiceLevelObjectivesResource]
+/// - [UptimeCheckIpsResource]
 library monitoring.v3;
 
 import 'dart:async' as async;
@@ -81,10 +81,10 @@
 
   final commons.ApiRequester _requester;
 
-  ProjectsResourceApi get projects => ProjectsResourceApi(_requester);
-  ServicesResourceApi get services => ServicesResourceApi(_requester);
-  UptimeCheckIpsResourceApi get uptimeCheckIps =>
-      UptimeCheckIpsResourceApi(_requester);
+  ProjectsResource get projects => ProjectsResource(_requester);
+  ServicesResource get services => ServicesResource(_requester);
+  UptimeCheckIpsResource get uptimeCheckIps =>
+      UptimeCheckIpsResource(_requester);
 
   MonitoringApi(http.Client client,
       {core.String rootUrl = 'https://monitoring.googleapis.com/',
@@ -93,36 +93,36 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class ProjectsResourceApi {
+class ProjectsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsAlertPoliciesResourceApi get alertPolicies =>
-      ProjectsAlertPoliciesResourceApi(_requester);
-  ProjectsCollectdTimeSeriesResourceApi get collectdTimeSeries =>
-      ProjectsCollectdTimeSeriesResourceApi(_requester);
-  ProjectsGroupsResourceApi get groups => ProjectsGroupsResourceApi(_requester);
-  ProjectsMetricDescriptorsResourceApi get metricDescriptors =>
-      ProjectsMetricDescriptorsResourceApi(_requester);
-  ProjectsMonitoredResourceDescriptorsResourceApi
+  ProjectsAlertPoliciesResource get alertPolicies =>
+      ProjectsAlertPoliciesResource(_requester);
+  ProjectsCollectdTimeSeriesResource get collectdTimeSeries =>
+      ProjectsCollectdTimeSeriesResource(_requester);
+  ProjectsGroupsResource get groups => ProjectsGroupsResource(_requester);
+  ProjectsMetricDescriptorsResource get metricDescriptors =>
+      ProjectsMetricDescriptorsResource(_requester);
+  ProjectsMonitoredResourceDescriptorsResource
       get monitoredResourceDescriptors =>
-          ProjectsMonitoredResourceDescriptorsResourceApi(_requester);
-  ProjectsNotificationChannelDescriptorsResourceApi
+          ProjectsMonitoredResourceDescriptorsResource(_requester);
+  ProjectsNotificationChannelDescriptorsResource
       get notificationChannelDescriptors =>
-          ProjectsNotificationChannelDescriptorsResourceApi(_requester);
-  ProjectsNotificationChannelsResourceApi get notificationChannels =>
-      ProjectsNotificationChannelsResourceApi(_requester);
-  ProjectsTimeSeriesResourceApi get timeSeries =>
-      ProjectsTimeSeriesResourceApi(_requester);
-  ProjectsUptimeCheckConfigsResourceApi get uptimeCheckConfigs =>
-      ProjectsUptimeCheckConfigsResourceApi(_requester);
+          ProjectsNotificationChannelDescriptorsResource(_requester);
+  ProjectsNotificationChannelsResource get notificationChannels =>
+      ProjectsNotificationChannelsResource(_requester);
+  ProjectsTimeSeriesResource get timeSeries =>
+      ProjectsTimeSeriesResource(_requester);
+  ProjectsUptimeCheckConfigsResource get uptimeCheckConfigs =>
+      ProjectsUptimeCheckConfigsResource(_requester);
 
-  ProjectsResourceApi(commons.ApiRequester client) : _requester = client;
+  ProjectsResource(commons.ApiRequester client) : _requester = client;
 }
 
-class ProjectsAlertPoliciesResourceApi {
+class ProjectsAlertPoliciesResource {
   final commons.ApiRequester _requester;
 
-  ProjectsAlertPoliciesResourceApi(commons.ApiRequester client)
+  ProjectsAlertPoliciesResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Creates a new alerting policy.
@@ -478,10 +478,10 @@
   }
 }
 
-class ProjectsCollectdTimeSeriesResourceApi {
+class ProjectsCollectdTimeSeriesResource {
   final commons.ApiRequester _requester;
 
-  ProjectsCollectdTimeSeriesResourceApi(commons.ApiRequester client)
+  ProjectsCollectdTimeSeriesResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Stackdriver Monitoring Agent only: Creates a new time series.This method
@@ -548,13 +548,13 @@
   }
 }
 
-class ProjectsGroupsResourceApi {
+class ProjectsGroupsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsGroupsMembersResourceApi get members =>
-      ProjectsGroupsMembersResourceApi(_requester);
+  ProjectsGroupsMembersResource get members =>
+      ProjectsGroupsMembersResource(_requester);
 
-  ProjectsGroupsResourceApi(commons.ApiRequester client) : _requester = client;
+  ProjectsGroupsResource(commons.ApiRequester client) : _requester = client;
 
   /// Creates a new group.
   ///
@@ -901,10 +901,10 @@
   }
 }
 
-class ProjectsGroupsMembersResourceApi {
+class ProjectsGroupsMembersResource {
   final commons.ApiRequester _requester;
 
-  ProjectsGroupsMembersResourceApi(commons.ApiRequester client)
+  ProjectsGroupsMembersResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Lists the monitored resources that are members of a group.
@@ -1002,10 +1002,10 @@
   }
 }
 
-class ProjectsMetricDescriptorsResourceApi {
+class ProjectsMetricDescriptorsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsMetricDescriptorsResourceApi(commons.ApiRequester client)
+  ProjectsMetricDescriptorsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Creates a new metric descriptor. User-created metric descriptors define
@@ -1266,10 +1266,10 @@
   }
 }
 
-class ProjectsMonitoredResourceDescriptorsResourceApi {
+class ProjectsMonitoredResourceDescriptorsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsMonitoredResourceDescriptorsResourceApi(commons.ApiRequester client)
+  ProjectsMonitoredResourceDescriptorsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Gets a single monitored resource descriptor. This method does not require
@@ -1413,10 +1413,10 @@
   }
 }
 
-class ProjectsNotificationChannelDescriptorsResourceApi {
+class ProjectsNotificationChannelDescriptorsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsNotificationChannelDescriptorsResourceApi(commons.ApiRequester client)
+  ProjectsNotificationChannelDescriptorsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Gets a single channel descriptor. The descriptor indicates which fields
@@ -1551,10 +1551,10 @@
   }
 }
 
-class ProjectsNotificationChannelsResourceApi {
+class ProjectsNotificationChannelsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsNotificationChannelsResourceApi(commons.ApiRequester client)
+  ProjectsNotificationChannelsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Creates a new notification channel, representing a single notification
@@ -2107,11 +2107,10 @@
   }
 }
 
-class ProjectsTimeSeriesResourceApi {
+class ProjectsTimeSeriesResource {
   final commons.ApiRequester _requester;
 
-  ProjectsTimeSeriesResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  ProjectsTimeSeriesResource(commons.ApiRequester client) : _requester = client;
 
   /// Creates or adds data to one or more time series. The response is empty if
   /// all time series in the request were written. If any time series could not
@@ -2582,10 +2581,10 @@
   }
 }
 
-class ProjectsUptimeCheckConfigsResourceApi {
+class ProjectsUptimeCheckConfigsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsUptimeCheckConfigsResourceApi(commons.ApiRequester client)
+  ProjectsUptimeCheckConfigsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Creates a new Uptime check configuration.
@@ -2906,13 +2905,13 @@
   }
 }
 
-class ServicesResourceApi {
+class ServicesResource {
   final commons.ApiRequester _requester;
 
-  ServicesServiceLevelObjectivesResourceApi get serviceLevelObjectives =>
-      ServicesServiceLevelObjectivesResourceApi(_requester);
+  ServicesServiceLevelObjectivesResource get serviceLevelObjectives =>
+      ServicesServiceLevelObjectivesResource(_requester);
 
-  ServicesResourceApi(commons.ApiRequester client) : _requester = client;
+  ServicesResource(commons.ApiRequester client) : _requester = client;
 
   /// Create a Service.
   ///
@@ -3240,10 +3239,10 @@
   }
 }
 
-class ServicesServiceLevelObjectivesResourceApi {
+class ServicesServiceLevelObjectivesResource {
   final commons.ApiRequester _requester;
 
-  ServicesServiceLevelObjectivesResourceApi(commons.ApiRequester client)
+  ServicesServiceLevelObjectivesResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Create a ServiceLevelObjective for the given Service.
@@ -3607,10 +3606,10 @@
   }
 }
 
-class UptimeCheckIpsResourceApi {
+class UptimeCheckIpsResource {
   final commons.ApiRequester _requester;
 
-  UptimeCheckIpsResourceApi(commons.ApiRequester client) : _requester = client;
+  UptimeCheckIpsResource(commons.ApiRequester client) : _requester = client;
 
   /// Returns the list of IP addresses that checkers run from
   ///
diff --git a/generated/googleapis/lib/networkmanagement/v1.dart b/generated/googleapis/lib/networkmanagement/v1.dart
index d60e19d..53ea9c7 100644
--- a/generated/googleapis/lib/networkmanagement/v1.dart
+++ b/generated/googleapis/lib/networkmanagement/v1.dart
@@ -24,11 +24,11 @@
 ///
 /// Create an instance of [NetworkManagementApi] to access these resources:
 ///
-/// - [ProjectsResourceApi]
-///   - [ProjectsLocationsResourceApi]
-///     - [ProjectsLocationsGlobalResourceApi]
-///       - [ProjectsLocationsGlobalConnectivityTestsResourceApi]
-///       - [ProjectsLocationsGlobalOperationsResourceApi]
+/// - [ProjectsResource]
+///   - [ProjectsLocationsResource]
+///     - [ProjectsLocationsGlobalResource]
+///       - [ProjectsLocationsGlobalConnectivityTestsResource]
+///       - [ProjectsLocationsGlobalOperationsResource]
 library networkmanagement.v1;
 
 import 'dart:async' as async;
@@ -52,7 +52,7 @@
 
   final commons.ApiRequester _requester;
 
-  ProjectsResourceApi get projects => ProjectsResourceApi(_requester);
+  ProjectsResource get projects => ProjectsResource(_requester);
 
   NetworkManagementApi(http.Client client,
       {core.String rootUrl = 'https://networkmanagement.googleapis.com/',
@@ -61,23 +61,22 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class ProjectsResourceApi {
+class ProjectsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsLocationsResourceApi get locations =>
-      ProjectsLocationsResourceApi(_requester);
+  ProjectsLocationsResource get locations =>
+      ProjectsLocationsResource(_requester);
 
-  ProjectsResourceApi(commons.ApiRequester client) : _requester = client;
+  ProjectsResource(commons.ApiRequester client) : _requester = client;
 }
 
-class ProjectsLocationsResourceApi {
+class ProjectsLocationsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsLocationsGlobalResourceApi get global =>
-      ProjectsLocationsGlobalResourceApi(_requester);
+  ProjectsLocationsGlobalResource get global =>
+      ProjectsLocationsGlobalResource(_requester);
 
-  ProjectsLocationsResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  ProjectsLocationsResource(commons.ApiRequester client) : _requester = client;
 
   /// Gets information about a location.
   ///
@@ -202,23 +201,22 @@
   }
 }
 
-class ProjectsLocationsGlobalResourceApi {
+class ProjectsLocationsGlobalResource {
   final commons.ApiRequester _requester;
 
-  ProjectsLocationsGlobalConnectivityTestsResourceApi get connectivityTests =>
-      ProjectsLocationsGlobalConnectivityTestsResourceApi(_requester);
-  ProjectsLocationsGlobalOperationsResourceApi get operations =>
-      ProjectsLocationsGlobalOperationsResourceApi(_requester);
+  ProjectsLocationsGlobalConnectivityTestsResource get connectivityTests =>
+      ProjectsLocationsGlobalConnectivityTestsResource(_requester);
+  ProjectsLocationsGlobalOperationsResource get operations =>
+      ProjectsLocationsGlobalOperationsResource(_requester);
 
-  ProjectsLocationsGlobalResourceApi(commons.ApiRequester client)
+  ProjectsLocationsGlobalResource(commons.ApiRequester client)
       : _requester = client;
 }
 
-class ProjectsLocationsGlobalConnectivityTestsResourceApi {
+class ProjectsLocationsGlobalConnectivityTestsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsLocationsGlobalConnectivityTestsResourceApi(
-      commons.ApiRequester client)
+  ProjectsLocationsGlobalConnectivityTestsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Creates a new Connectivity Test. After you create a test, the reachability
@@ -842,10 +840,10 @@
   }
 }
 
-class ProjectsLocationsGlobalOperationsResourceApi {
+class ProjectsLocationsGlobalOperationsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsLocationsGlobalOperationsResourceApi(commons.ApiRequester client)
+  ProjectsLocationsGlobalOperationsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Starts asynchronous cancellation on a long-running operation. The server
diff --git a/generated/googleapis/lib/oauth2/v2.dart b/generated/googleapis/lib/oauth2/v2.dart
index f716f12..0a6811d 100644
--- a/generated/googleapis/lib/oauth2/v2.dart
+++ b/generated/googleapis/lib/oauth2/v2.dart
@@ -24,9 +24,9 @@
 ///
 /// Create an instance of [Oauth2Api] to access these resources:
 ///
-/// - [UserinfoResourceApi]
-///   - [UserinfoV2ResourceApi]
-///     - [UserinfoV2MeResourceApi]
+/// - [UserinfoResource]
+///   - [UserinfoV2Resource]
+///     - [UserinfoV2MeResource]
 library oauth2.v2;
 
 import 'dart:async' as async;
@@ -56,7 +56,7 @@
 
   final commons.ApiRequester _requester;
 
-  UserinfoResourceApi get userinfo => UserinfoResourceApi(_requester);
+  UserinfoResource get userinfo => UserinfoResource(_requester);
 
   Oauth2Api(http.Client client,
       {core.String rootUrl = 'https://www.googleapis.com/',
@@ -119,12 +119,12 @@
   }
 }
 
-class UserinfoResourceApi {
+class UserinfoResource {
   final commons.ApiRequester _requester;
 
-  UserinfoV2ResourceApi get v2 => UserinfoV2ResourceApi(_requester);
+  UserinfoV2Resource get v2 => UserinfoV2Resource(_requester);
 
-  UserinfoResourceApi(commons.ApiRequester client) : _requester = client;
+  UserinfoResource(commons.ApiRequester client) : _requester = client;
 
   /// Request parameters:
   ///
@@ -169,18 +169,18 @@
   }
 }
 
-class UserinfoV2ResourceApi {
+class UserinfoV2Resource {
   final commons.ApiRequester _requester;
 
-  UserinfoV2MeResourceApi get me => UserinfoV2MeResourceApi(_requester);
+  UserinfoV2MeResource get me => UserinfoV2MeResource(_requester);
 
-  UserinfoV2ResourceApi(commons.ApiRequester client) : _requester = client;
+  UserinfoV2Resource(commons.ApiRequester client) : _requester = client;
 }
 
-class UserinfoV2MeResourceApi {
+class UserinfoV2MeResource {
   final commons.ApiRequester _requester;
 
-  UserinfoV2MeResourceApi(commons.ApiRequester client) : _requester = client;
+  UserinfoV2MeResource(commons.ApiRequester client) : _requester = client;
 
   /// Request parameters:
   ///
diff --git a/generated/googleapis/lib/osconfig/v1.dart b/generated/googleapis/lib/osconfig/v1.dart
index c2d49ab..1aa484e 100644
--- a/generated/googleapis/lib/osconfig/v1.dart
+++ b/generated/googleapis/lib/osconfig/v1.dart
@@ -24,10 +24,10 @@
 ///
 /// Create an instance of [OSConfigApi] to access these resources:
 ///
-/// - [ProjectsResourceApi]
-///   - [ProjectsPatchDeploymentsResourceApi]
-///   - [ProjectsPatchJobsResourceApi]
-///     - [ProjectsPatchJobsInstanceDetailsResourceApi]
+/// - [ProjectsResource]
+///   - [ProjectsPatchDeploymentsResource]
+///   - [ProjectsPatchJobsResource]
+///     - [ProjectsPatchJobsInstanceDetailsResource]
 library osconfig.v1;
 
 import 'dart:async' as async;
@@ -51,7 +51,7 @@
 
   final commons.ApiRequester _requester;
 
-  ProjectsResourceApi get projects => ProjectsResourceApi(_requester);
+  ProjectsResource get projects => ProjectsResource(_requester);
 
   OSConfigApi(http.Client client,
       {core.String rootUrl = 'https://osconfig.googleapis.com/',
@@ -60,21 +60,21 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class ProjectsResourceApi {
+class ProjectsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsPatchDeploymentsResourceApi get patchDeployments =>
-      ProjectsPatchDeploymentsResourceApi(_requester);
-  ProjectsPatchJobsResourceApi get patchJobs =>
-      ProjectsPatchJobsResourceApi(_requester);
+  ProjectsPatchDeploymentsResource get patchDeployments =>
+      ProjectsPatchDeploymentsResource(_requester);
+  ProjectsPatchJobsResource get patchJobs =>
+      ProjectsPatchJobsResource(_requester);
 
-  ProjectsResourceApi(commons.ApiRequester client) : _requester = client;
+  ProjectsResource(commons.ApiRequester client) : _requester = client;
 }
 
-class ProjectsPatchDeploymentsResourceApi {
+class ProjectsPatchDeploymentsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsPatchDeploymentsResourceApi(commons.ApiRequester client)
+  ProjectsPatchDeploymentsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Create an OS Config patch deployment.
@@ -324,14 +324,13 @@
   }
 }
 
-class ProjectsPatchJobsResourceApi {
+class ProjectsPatchJobsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsPatchJobsInstanceDetailsResourceApi get instanceDetails =>
-      ProjectsPatchJobsInstanceDetailsResourceApi(_requester);
+  ProjectsPatchJobsInstanceDetailsResource get instanceDetails =>
+      ProjectsPatchJobsInstanceDetailsResource(_requester);
 
-  ProjectsPatchJobsResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  ProjectsPatchJobsResource(commons.ApiRequester client) : _requester = client;
 
   /// Cancel a patch job. The patch job must be active. Canceled patch jobs
   /// cannot be restarted.
@@ -580,10 +579,10 @@
   }
 }
 
-class ProjectsPatchJobsInstanceDetailsResourceApi {
+class ProjectsPatchJobsInstanceDetailsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsPatchJobsInstanceDetailsResourceApi(commons.ApiRequester client)
+  ProjectsPatchJobsInstanceDetailsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Get a list of instance details for a given patch job.
diff --git a/generated/googleapis/lib/oslogin/v1.dart b/generated/googleapis/lib/oslogin/v1.dart
index 5ed75a4..66115aa 100644
--- a/generated/googleapis/lib/oslogin/v1.dart
+++ b/generated/googleapis/lib/oslogin/v1.dart
@@ -23,9 +23,9 @@
 ///
 /// Create an instance of [CloudOSLoginApi] to access these resources:
 ///
-/// - [UsersResourceApi]
-///   - [UsersProjectsResourceApi]
-///   - [UsersSshPublicKeysResourceApi]
+/// - [UsersResource]
+///   - [UsersProjectsResource]
+///   - [UsersSshPublicKeysResource]
 library oslogin.v1;
 
 import 'dart:async' as async;
@@ -51,7 +51,7 @@
 
   final commons.ApiRequester _requester;
 
-  UsersResourceApi get users => UsersResourceApi(_requester);
+  UsersResource get users => UsersResource(_requester);
 
   CloudOSLoginApi(http.Client client,
       {core.String rootUrl = 'https://oslogin.googleapis.com/',
@@ -60,14 +60,14 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class UsersResourceApi {
+class UsersResource {
   final commons.ApiRequester _requester;
 
-  UsersProjectsResourceApi get projects => UsersProjectsResourceApi(_requester);
-  UsersSshPublicKeysResourceApi get sshPublicKeys =>
-      UsersSshPublicKeysResourceApi(_requester);
+  UsersProjectsResource get projects => UsersProjectsResource(_requester);
+  UsersSshPublicKeysResource get sshPublicKeys =>
+      UsersSshPublicKeysResource(_requester);
 
-  UsersResourceApi(commons.ApiRequester client) : _requester = client;
+  UsersResource(commons.ApiRequester client) : _requester = client;
 
   /// Retrieves the profile information used for logging in to a virtual machine
   /// on Google Compute Engine.
@@ -205,10 +205,10 @@
   }
 }
 
-class UsersProjectsResourceApi {
+class UsersProjectsResource {
   final commons.ApiRequester _requester;
 
-  UsersProjectsResourceApi(commons.ApiRequester client) : _requester = client;
+  UsersProjectsResource(commons.ApiRequester client) : _requester = client;
 
   /// Deletes a POSIX account.
   ///
@@ -265,11 +265,10 @@
   }
 }
 
-class UsersSshPublicKeysResourceApi {
+class UsersSshPublicKeysResource {
   final commons.ApiRequester _requester;
 
-  UsersSshPublicKeysResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  UsersSshPublicKeysResource(commons.ApiRequester client) : _requester = client;
 
   /// Deletes an SSH public key.
   ///
diff --git a/generated/googleapis/lib/pagespeedonline/v5.dart b/generated/googleapis/lib/pagespeedonline/v5.dart
index 33e4cbf..f4d543d 100644
--- a/generated/googleapis/lib/pagespeedonline/v5.dart
+++ b/generated/googleapis/lib/pagespeedonline/v5.dart
@@ -27,7 +27,7 @@
 ///
 /// Create an instance of [PagespeedInsightsApi] to access these resources:
 ///
-/// - [PagespeedapiResourceApi]
+/// - [PagespeedapiResource]
 library pagespeedonline.v5;
 
 import 'dart:async' as async;
@@ -51,8 +51,7 @@
 
   final commons.ApiRequester _requester;
 
-  PagespeedapiResourceApi get pagespeedapi =>
-      PagespeedapiResourceApi(_requester);
+  PagespeedapiResource get pagespeedapi => PagespeedapiResource(_requester);
 
   PagespeedInsightsApi(http.Client client,
       {core.String rootUrl = 'https://pagespeedonline.googleapis.com/',
@@ -61,10 +60,10 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class PagespeedapiResourceApi {
+class PagespeedapiResource {
   final commons.ApiRequester _requester;
 
-  PagespeedapiResourceApi(commons.ApiRequester client) : _requester = client;
+  PagespeedapiResource(commons.ApiRequester client) : _requester = client;
 
   /// Runs PageSpeed analysis on the page at the specified URL, and returns
   /// PageSpeed scores, a list of suggestions to make that page faster, and
diff --git a/generated/googleapis/lib/people/v1.dart b/generated/googleapis/lib/people/v1.dart
index 0fa8bbb..81bb3af 100644
--- a/generated/googleapis/lib/people/v1.dart
+++ b/generated/googleapis/lib/people/v1.dart
@@ -23,11 +23,11 @@
 ///
 /// Create an instance of [PeopleServiceApi] to access these resources:
 ///
-/// - [ContactGroupsResourceApi]
-///   - [ContactGroupsMembersResourceApi]
-/// - [OtherContactsResourceApi]
-/// - [PeopleResourceApi]
-///   - [PeopleConnectionsResourceApi]
+/// - [ContactGroupsResource]
+///   - [ContactGroupsMembersResource]
+/// - [OtherContactsResource]
+/// - [PeopleResource]
+///   - [PeopleConnectionsResource]
 library people.v1;
 
 import 'dart:async' as async;
@@ -94,11 +94,9 @@
 
   final commons.ApiRequester _requester;
 
-  ContactGroupsResourceApi get contactGroups =>
-      ContactGroupsResourceApi(_requester);
-  OtherContactsResourceApi get otherContacts =>
-      OtherContactsResourceApi(_requester);
-  PeopleResourceApi get people => PeopleResourceApi(_requester);
+  ContactGroupsResource get contactGroups => ContactGroupsResource(_requester);
+  OtherContactsResource get otherContacts => OtherContactsResource(_requester);
+  PeopleResource get people => PeopleResource(_requester);
 
   PeopleServiceApi(http.Client client,
       {core.String rootUrl = 'https://people.googleapis.com/',
@@ -107,13 +105,13 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class ContactGroupsResourceApi {
+class ContactGroupsResource {
   final commons.ApiRequester _requester;
 
-  ContactGroupsMembersResourceApi get members =>
-      ContactGroupsMembersResourceApi(_requester);
+  ContactGroupsMembersResource get members =>
+      ContactGroupsMembersResource(_requester);
 
-  ContactGroupsResourceApi(commons.ApiRequester client) : _requester = client;
+  ContactGroupsResource(commons.ApiRequester client) : _requester = client;
 
   /// Get a list of contact groups owned by the authenticated user by specifying
   /// a list of contact group resource names.
@@ -478,10 +476,10 @@
   }
 }
 
-class ContactGroupsMembersResourceApi {
+class ContactGroupsMembersResource {
   final commons.ApiRequester _requester;
 
-  ContactGroupsMembersResourceApi(commons.ApiRequester client)
+  ContactGroupsMembersResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Modify the members of a contact group owned by the authenticated user. The
@@ -549,10 +547,10 @@
   }
 }
 
-class OtherContactsResourceApi {
+class OtherContactsResource {
   final commons.ApiRequester _requester;
 
-  OtherContactsResourceApi(commons.ApiRequester client) : _requester = client;
+  OtherContactsResource(commons.ApiRequester client) : _requester = client;
 
   /// Copies an "Other contact" to a new contact in the user's "myContacts"
   /// group
@@ -708,13 +706,13 @@
   }
 }
 
-class PeopleResourceApi {
+class PeopleResource {
   final commons.ApiRequester _requester;
 
-  PeopleConnectionsResourceApi get connections =>
-      PeopleConnectionsResourceApi(_requester);
+  PeopleConnectionsResource get connections =>
+      PeopleConnectionsResource(_requester);
 
-  PeopleResourceApi(commons.ApiRequester client) : _requester = client;
+  PeopleResource(commons.ApiRequester client) : _requester = client;
 
   /// Create a new contact and return the person resource for that contact. The
   /// request throws a 400 error if more than one field is specified on a field
@@ -1468,11 +1466,10 @@
   }
 }
 
-class PeopleConnectionsResourceApi {
+class PeopleConnectionsResource {
   final commons.ApiRequester _requester;
 
-  PeopleConnectionsResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  PeopleConnectionsResource(commons.ApiRequester client) : _requester = client;
 
   /// Provides a list of the authenticated user's contacts. The request throws a
   /// 400 error if 'personFields' is not specified.
diff --git a/generated/googleapis/lib/playcustomapp/v1.dart b/generated/googleapis/lib/playcustomapp/v1.dart
index 783a68d..8ddf916 100644
--- a/generated/googleapis/lib/playcustomapp/v1.dart
+++ b/generated/googleapis/lib/playcustomapp/v1.dart
@@ -24,8 +24,8 @@
 ///
 /// Create an instance of [PlaycustomappApi] to access these resources:
 ///
-/// - [AccountsResourceApi]
-///   - [AccountsCustomAppsResourceApi]
+/// - [AccountsResource]
+///   - [AccountsCustomAppsResource]
 library playcustomapp.v1;
 
 import 'dart:async' as async;
@@ -56,7 +56,7 @@
 
   final commons.ApiRequester _requester;
 
-  AccountsResourceApi get accounts => AccountsResourceApi(_requester);
+  AccountsResource get accounts => AccountsResource(_requester);
 
   PlaycustomappApi(http.Client client,
       {core.String rootUrl = 'https://playcustomapp.googleapis.com/',
@@ -65,20 +65,19 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class AccountsResourceApi {
+class AccountsResource {
   final commons.ApiRequester _requester;
 
-  AccountsCustomAppsResourceApi get customApps =>
-      AccountsCustomAppsResourceApi(_requester);
+  AccountsCustomAppsResource get customApps =>
+      AccountsCustomAppsResource(_requester);
 
-  AccountsResourceApi(commons.ApiRequester client) : _requester = client;
+  AccountsResource(commons.ApiRequester client) : _requester = client;
 }
 
-class AccountsCustomAppsResourceApi {
+class AccountsCustomAppsResource {
   final commons.ApiRequester _requester;
 
-  AccountsCustomAppsResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  AccountsCustomAppsResource(commons.ApiRequester client) : _requester = client;
 
   /// Creates a new custom app.
   ///
diff --git a/generated/googleapis/lib/policytroubleshooter/v1.dart b/generated/googleapis/lib/policytroubleshooter/v1.dart
index 2643d5b..5669eb3 100644
--- a/generated/googleapis/lib/policytroubleshooter/v1.dart
+++ b/generated/googleapis/lib/policytroubleshooter/v1.dart
@@ -21,7 +21,7 @@
 ///
 /// Create an instance of [PolicyTroubleshooterApi] to access these resources:
 ///
-/// - [IamResourceApi]
+/// - [IamResource]
 library policytroubleshooter.v1;
 
 import 'dart:async' as async;
@@ -43,7 +43,7 @@
 
   final commons.ApiRequester _requester;
 
-  IamResourceApi get iam => IamResourceApi(_requester);
+  IamResource get iam => IamResource(_requester);
 
   PolicyTroubleshooterApi(http.Client client,
       {core.String rootUrl = 'https://policytroubleshooter.googleapis.com/',
@@ -52,10 +52,10 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class IamResourceApi {
+class IamResource {
   final commons.ApiRequester _requester;
 
-  IamResourceApi(commons.ApiRequester client) : _requester = client;
+  IamResource(commons.ApiRequester client) : _requester = client;
 
   /// Checks whether a member has a specific permission for a specific resource,
   /// and explains why the member does or does not have that permission.
diff --git a/generated/googleapis/lib/poly/v1.dart b/generated/googleapis/lib/poly/v1.dart
index 3dfdc9a..aec0359 100644
--- a/generated/googleapis/lib/poly/v1.dart
+++ b/generated/googleapis/lib/poly/v1.dart
@@ -27,10 +27,10 @@
 ///
 /// Create an instance of [PolyServiceApi] to access these resources:
 ///
-/// - [AssetsResourceApi]
-/// - [UsersResourceApi]
-///   - [UsersAssetsResourceApi]
-///   - [UsersLikedassetsResourceApi]
+/// - [AssetsResource]
+/// - [UsersResource]
+///   - [UsersAssetsResource]
+///   - [UsersLikedassetsResource]
 library poly.v1;
 
 import 'dart:async' as async;
@@ -51,8 +51,8 @@
 class PolyServiceApi {
   final commons.ApiRequester _requester;
 
-  AssetsResourceApi get assets => AssetsResourceApi(_requester);
-  UsersResourceApi get users => UsersResourceApi(_requester);
+  AssetsResource get assets => AssetsResource(_requester);
+  UsersResource get users => UsersResource(_requester);
 
   PolyServiceApi(http.Client client,
       {core.String rootUrl = 'https://poly.googleapis.com/',
@@ -61,10 +61,10 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class AssetsResourceApi {
+class AssetsResource {
   final commons.ApiRequester _requester;
 
-  AssetsResourceApi(commons.ApiRequester client) : _requester = client;
+  AssetsResource(commons.ApiRequester client) : _requester = client;
 
   /// Returns detailed information about an asset given its name.
   /// PRIVATE assets are returned only if
@@ -242,20 +242,20 @@
   }
 }
 
-class UsersResourceApi {
+class UsersResource {
   final commons.ApiRequester _requester;
 
-  UsersAssetsResourceApi get assets => UsersAssetsResourceApi(_requester);
-  UsersLikedassetsResourceApi get likedassets =>
-      UsersLikedassetsResourceApi(_requester);
+  UsersAssetsResource get assets => UsersAssetsResource(_requester);
+  UsersLikedassetsResource get likedassets =>
+      UsersLikedassetsResource(_requester);
 
-  UsersResourceApi(commons.ApiRequester client) : _requester = client;
+  UsersResource(commons.ApiRequester client) : _requester = client;
 }
 
-class UsersAssetsResourceApi {
+class UsersAssetsResource {
   final commons.ApiRequester _requester;
 
-  UsersAssetsResourceApi(commons.ApiRequester client) : _requester = client;
+  UsersAssetsResource(commons.ApiRequester client) : _requester = client;
 
   /// Lists assets authored by the given user. Only the value 'me', representing
   /// the currently-authenticated user, is supported. May include assets with an
@@ -365,11 +365,10 @@
   }
 }
 
-class UsersLikedassetsResourceApi {
+class UsersLikedassetsResource {
   final commons.ApiRequester _requester;
 
-  UsersLikedassetsResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  UsersLikedassetsResource(commons.ApiRequester client) : _requester = client;
 
   /// Lists assets that the user has liked. Only the value 'me', representing
   /// the currently-authenticated user, is supported. May include assets with an
diff --git a/generated/googleapis/lib/pubsub/v1.dart b/generated/googleapis/lib/pubsub/v1.dart
index 7fbc23f..0dda44f 100644
--- a/generated/googleapis/lib/pubsub/v1.dart
+++ b/generated/googleapis/lib/pubsub/v1.dart
@@ -24,12 +24,12 @@
 ///
 /// Create an instance of [PubsubApi] to access these resources:
 ///
-/// - [ProjectsResourceApi]
-///   - [ProjectsSnapshotsResourceApi]
-///   - [ProjectsSubscriptionsResourceApi]
-///   - [ProjectsTopicsResourceApi]
-///     - [ProjectsTopicsSnapshotsResourceApi]
-///     - [ProjectsTopicsSubscriptionsResourceApi]
+/// - [ProjectsResource]
+///   - [ProjectsSnapshotsResource]
+///   - [ProjectsSubscriptionsResource]
+///   - [ProjectsTopicsResource]
+///     - [ProjectsTopicsSnapshotsResource]
+///     - [ProjectsTopicsSubscriptionsResource]
 library pubsub.v1;
 
 import 'dart:async' as async;
@@ -56,7 +56,7 @@
 
   final commons.ApiRequester _requester;
 
-  ProjectsResourceApi get projects => ProjectsResourceApi(_requester);
+  ProjectsResource get projects => ProjectsResource(_requester);
 
   PubsubApi(http.Client client,
       {core.String rootUrl = 'https://pubsub.googleapis.com/',
@@ -65,23 +65,22 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class ProjectsResourceApi {
+class ProjectsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsSnapshotsResourceApi get snapshots =>
-      ProjectsSnapshotsResourceApi(_requester);
-  ProjectsSubscriptionsResourceApi get subscriptions =>
-      ProjectsSubscriptionsResourceApi(_requester);
-  ProjectsTopicsResourceApi get topics => ProjectsTopicsResourceApi(_requester);
+  ProjectsSnapshotsResource get snapshots =>
+      ProjectsSnapshotsResource(_requester);
+  ProjectsSubscriptionsResource get subscriptions =>
+      ProjectsSubscriptionsResource(_requester);
+  ProjectsTopicsResource get topics => ProjectsTopicsResource(_requester);
 
-  ProjectsResourceApi(commons.ApiRequester client) : _requester = client;
+  ProjectsResource(commons.ApiRequester client) : _requester = client;
 }
 
-class ProjectsSnapshotsResourceApi {
+class ProjectsSnapshotsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsSnapshotsResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  ProjectsSnapshotsResource(commons.ApiRequester client) : _requester = client;
 
   /// Creates a snapshot from the requested subscription. Snapshots are used in
   /// [Seek](https://cloud.google.com/pubsub/docs/replay-overview) operations,
@@ -606,10 +605,10 @@
   }
 }
 
-class ProjectsSubscriptionsResourceApi {
+class ProjectsSubscriptionsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsSubscriptionsResourceApi(commons.ApiRequester client)
+  ProjectsSubscriptionsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Acknowledges the messages associated with the `ack_ids` in the
@@ -1504,15 +1503,15 @@
   }
 }
 
-class ProjectsTopicsResourceApi {
+class ProjectsTopicsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsTopicsSnapshotsResourceApi get snapshots =>
-      ProjectsTopicsSnapshotsResourceApi(_requester);
-  ProjectsTopicsSubscriptionsResourceApi get subscriptions =>
-      ProjectsTopicsSubscriptionsResourceApi(_requester);
+  ProjectsTopicsSnapshotsResource get snapshots =>
+      ProjectsTopicsSnapshotsResource(_requester);
+  ProjectsTopicsSubscriptionsResource get subscriptions =>
+      ProjectsTopicsSubscriptionsResource(_requester);
 
-  ProjectsTopicsResourceApi(commons.ApiRequester client) : _requester = client;
+  ProjectsTopicsResource(commons.ApiRequester client) : _requester = client;
 
   /// Creates the given topic with the given name. See the [resource name
   /// rules]( https://cloud.google.com/pubsub/docs/admin#resource_names).
@@ -2076,10 +2075,10 @@
   }
 }
 
-class ProjectsTopicsSnapshotsResourceApi {
+class ProjectsTopicsSnapshotsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsTopicsSnapshotsResourceApi(commons.ApiRequester client)
+  ProjectsTopicsSnapshotsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Lists the names of the snapshots on this topic. Snapshots are used in
@@ -2155,10 +2154,10 @@
   }
 }
 
-class ProjectsTopicsSubscriptionsResourceApi {
+class ProjectsTopicsSubscriptionsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsTopicsSubscriptionsResourceApi(commons.ApiRequester client)
+  ProjectsTopicsSubscriptionsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Lists the names of the attached subscriptions on this topic.
diff --git a/generated/googleapis/lib/recommender/v1.dart b/generated/googleapis/lib/recommender/v1.dart
index e9febfd..75419f3 100644
--- a/generated/googleapis/lib/recommender/v1.dart
+++ b/generated/googleapis/lib/recommender/v1.dart
@@ -21,12 +21,12 @@
 ///
 /// Create an instance of [RecommenderApi] to access these resources:
 ///
-/// - [ProjectsResourceApi]
-///   - [ProjectsLocationsResourceApi]
-///     - [ProjectsLocationsInsightTypesResourceApi]
-///       - [ProjectsLocationsInsightTypesInsightsResourceApi]
-///     - [ProjectsLocationsRecommendersResourceApi]
-///       - [ProjectsLocationsRecommendersRecommendationsResourceApi]
+/// - [ProjectsResource]
+///   - [ProjectsLocationsResource]
+///     - [ProjectsLocationsInsightTypesResource]
+///       - [ProjectsLocationsInsightTypesInsightsResource]
+///     - [ProjectsLocationsRecommendersResource]
+///       - [ProjectsLocationsRecommendersRecommendationsResource]
 library recommender.v1;
 
 import 'dart:async' as async;
@@ -48,7 +48,7 @@
 
   final commons.ApiRequester _requester;
 
-  ProjectsResourceApi get projects => ProjectsResourceApi(_requester);
+  ProjectsResource get projects => ProjectsResource(_requester);
 
   RecommenderApi(http.Client client,
       {core.String rootUrl = 'https://recommender.googleapis.com/',
@@ -57,41 +57,40 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class ProjectsResourceApi {
+class ProjectsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsLocationsResourceApi get locations =>
-      ProjectsLocationsResourceApi(_requester);
+  ProjectsLocationsResource get locations =>
+      ProjectsLocationsResource(_requester);
 
-  ProjectsResourceApi(commons.ApiRequester client) : _requester = client;
+  ProjectsResource(commons.ApiRequester client) : _requester = client;
 }
 
-class ProjectsLocationsResourceApi {
+class ProjectsLocationsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsLocationsInsightTypesResourceApi get insightTypes =>
-      ProjectsLocationsInsightTypesResourceApi(_requester);
-  ProjectsLocationsRecommendersResourceApi get recommenders =>
-      ProjectsLocationsRecommendersResourceApi(_requester);
+  ProjectsLocationsInsightTypesResource get insightTypes =>
+      ProjectsLocationsInsightTypesResource(_requester);
+  ProjectsLocationsRecommendersResource get recommenders =>
+      ProjectsLocationsRecommendersResource(_requester);
 
-  ProjectsLocationsResourceApi(commons.ApiRequester client)
+  ProjectsLocationsResource(commons.ApiRequester client) : _requester = client;
+}
+
+class ProjectsLocationsInsightTypesResource {
+  final commons.ApiRequester _requester;
+
+  ProjectsLocationsInsightTypesInsightsResource get insights =>
+      ProjectsLocationsInsightTypesInsightsResource(_requester);
+
+  ProjectsLocationsInsightTypesResource(commons.ApiRequester client)
       : _requester = client;
 }
 
-class ProjectsLocationsInsightTypesResourceApi {
+class ProjectsLocationsInsightTypesInsightsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsLocationsInsightTypesInsightsResourceApi get insights =>
-      ProjectsLocationsInsightTypesInsightsResourceApi(_requester);
-
-  ProjectsLocationsInsightTypesResourceApi(commons.ApiRequester client)
-      : _requester = client;
-}
-
-class ProjectsLocationsInsightTypesInsightsResourceApi {
-  final commons.ApiRequester _requester;
-
-  ProjectsLocationsInsightTypesInsightsResourceApi(commons.ApiRequester client)
+  ProjectsLocationsInsightTypesInsightsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Gets the requested insight. Requires the recommender.*.get IAM permission
@@ -299,20 +298,20 @@
   }
 }
 
-class ProjectsLocationsRecommendersResourceApi {
+class ProjectsLocationsRecommendersResource {
   final commons.ApiRequester _requester;
 
-  ProjectsLocationsRecommendersRecommendationsResourceApi get recommendations =>
-      ProjectsLocationsRecommendersRecommendationsResourceApi(_requester);
+  ProjectsLocationsRecommendersRecommendationsResource get recommendations =>
+      ProjectsLocationsRecommendersRecommendationsResource(_requester);
 
-  ProjectsLocationsRecommendersResourceApi(commons.ApiRequester client)
+  ProjectsLocationsRecommendersResource(commons.ApiRequester client)
       : _requester = client;
 }
 
-class ProjectsLocationsRecommendersRecommendationsResourceApi {
+class ProjectsLocationsRecommendersRecommendationsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsLocationsRecommendersRecommendationsResourceApi(
+  ProjectsLocationsRecommendersRecommendationsResource(
       commons.ApiRequester client)
       : _requester = client;
 
diff --git a/generated/googleapis/lib/redis/v1.dart b/generated/googleapis/lib/redis/v1.dart
index fe14778..61dd14e 100644
--- a/generated/googleapis/lib/redis/v1.dart
+++ b/generated/googleapis/lib/redis/v1.dart
@@ -23,10 +23,10 @@
 ///
 /// Create an instance of [CloudRedisApi] to access these resources:
 ///
-/// - [ProjectsResourceApi]
-///   - [ProjectsLocationsResourceApi]
-///     - [ProjectsLocationsInstancesResourceApi]
-///     - [ProjectsLocationsOperationsResourceApi]
+/// - [ProjectsResource]
+///   - [ProjectsLocationsResource]
+///     - [ProjectsLocationsInstancesResource]
+///     - [ProjectsLocationsOperationsResource]
 library redis.v1;
 
 import 'dart:async' as async;
@@ -49,7 +49,7 @@
 
   final commons.ApiRequester _requester;
 
-  ProjectsResourceApi get projects => ProjectsResourceApi(_requester);
+  ProjectsResource get projects => ProjectsResource(_requester);
 
   CloudRedisApi(http.Client client,
       {core.String rootUrl = 'https://redis.googleapis.com/',
@@ -58,25 +58,24 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class ProjectsResourceApi {
+class ProjectsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsLocationsResourceApi get locations =>
-      ProjectsLocationsResourceApi(_requester);
+  ProjectsLocationsResource get locations =>
+      ProjectsLocationsResource(_requester);
 
-  ProjectsResourceApi(commons.ApiRequester client) : _requester = client;
+  ProjectsResource(commons.ApiRequester client) : _requester = client;
 }
 
-class ProjectsLocationsResourceApi {
+class ProjectsLocationsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsLocationsInstancesResourceApi get instances =>
-      ProjectsLocationsInstancesResourceApi(_requester);
-  ProjectsLocationsOperationsResourceApi get operations =>
-      ProjectsLocationsOperationsResourceApi(_requester);
+  ProjectsLocationsInstancesResource get instances =>
+      ProjectsLocationsInstancesResource(_requester);
+  ProjectsLocationsOperationsResource get operations =>
+      ProjectsLocationsOperationsResource(_requester);
 
-  ProjectsLocationsResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  ProjectsLocationsResource(commons.ApiRequester client) : _requester = client;
 
   /// Gets information about a location.
   ///
@@ -201,10 +200,10 @@
   }
 }
 
-class ProjectsLocationsInstancesResourceApi {
+class ProjectsLocationsInstancesResource {
   final commons.ApiRequester _requester;
 
-  ProjectsLocationsInstancesResourceApi(commons.ApiRequester client)
+  ProjectsLocationsInstancesResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Creates a Redis instance based on the specified tier and memory size. By
@@ -796,10 +795,10 @@
   }
 }
 
-class ProjectsLocationsOperationsResourceApi {
+class ProjectsLocationsOperationsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsLocationsOperationsResourceApi(commons.ApiRequester client)
+  ProjectsLocationsOperationsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Starts asynchronous cancellation on a long-running operation. The server
diff --git a/generated/googleapis/lib/remotebuildexecution/v2.dart b/generated/googleapis/lib/remotebuildexecution/v2.dart
index 9d89d9c..3daab9e 100644
--- a/generated/googleapis/lib/remotebuildexecution/v2.dart
+++ b/generated/googleapis/lib/remotebuildexecution/v2.dart
@@ -24,11 +24,11 @@
 ///
 /// Create an instance of [RemoteBuildExecutionApi] to access these resources:
 ///
-/// - [ActionResultsResourceApi]
-/// - [ActionsResourceApi]
-/// - [BlobsResourceApi]
-/// - [OperationsResourceApi]
-/// - [V2ResourceApi]
+/// - [ActionResultsResource]
+/// - [ActionsResource]
+/// - [BlobsResource]
+/// - [OperationsResource]
+/// - [V2Resource]
 library remotebuildexecution.v2;
 
 import 'dart:async' as async;
@@ -51,12 +51,11 @@
 
   final commons.ApiRequester _requester;
 
-  ActionResultsResourceApi get actionResults =>
-      ActionResultsResourceApi(_requester);
-  ActionsResourceApi get actions => ActionsResourceApi(_requester);
-  BlobsResourceApi get blobs => BlobsResourceApi(_requester);
-  OperationsResourceApi get operations => OperationsResourceApi(_requester);
-  V2ResourceApi get v2 => V2ResourceApi(_requester);
+  ActionResultsResource get actionResults => ActionResultsResource(_requester);
+  ActionsResource get actions => ActionsResource(_requester);
+  BlobsResource get blobs => BlobsResource(_requester);
+  OperationsResource get operations => OperationsResource(_requester);
+  V2Resource get v2 => V2Resource(_requester);
 
   RemoteBuildExecutionApi(http.Client client,
       {core.String rootUrl = 'https://remotebuildexecution.googleapis.com/',
@@ -65,10 +64,10 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class ActionResultsResourceApi {
+class ActionResultsResource {
   final commons.ApiRequester _requester;
 
-  ActionResultsResourceApi(commons.ApiRequester client) : _requester = client;
+  ActionResultsResource(commons.ApiRequester client) : _requester = client;
 
   /// Retrieve a cached execution result. Implementations SHOULD ensure that any
   /// blobs referenced from the ContentAddressableStorage are available at the
@@ -273,10 +272,10 @@
   }
 }
 
-class ActionsResourceApi {
+class ActionsResource {
   final commons.ApiRequester _requester;
 
-  ActionsResourceApi(commons.ApiRequester client) : _requester = client;
+  ActionsResource(commons.ApiRequester client) : _requester = client;
 
   /// Execute an action remotely. In order to execute an action, the client must
   /// first upload all of the inputs, the Command to run, and the Action into
@@ -383,10 +382,10 @@
   }
 }
 
-class BlobsResourceApi {
+class BlobsResource {
   final commons.ApiRequester _requester;
 
-  BlobsResourceApi(commons.ApiRequester client) : _requester = client;
+  BlobsResource(commons.ApiRequester client) : _requester = client;
 
   /// Download many blobs at once. The server may enforce a limit of the
   /// combined total size of blobs to be downloaded using this API. This limit
@@ -709,10 +708,10 @@
   }
 }
 
-class OperationsResourceApi {
+class OperationsResource {
   final commons.ApiRequester _requester;
 
-  OperationsResourceApi(commons.ApiRequester client) : _requester = client;
+  OperationsResource(commons.ApiRequester client) : _requester = client;
 
   /// Wait for an execution operation to complete. When the client initially
   /// makes the request, the server immediately responds with the current status
@@ -780,10 +779,10 @@
   }
 }
 
-class V2ResourceApi {
+class V2Resource {
   final commons.ApiRequester _requester;
 
-  V2ResourceApi(commons.ApiRequester client) : _requester = client;
+  V2Resource(commons.ApiRequester client) : _requester = client;
 
   /// GetCapabilities returns the server capabilities configuration of the
   /// remote endpoint. Only the capabilities of the services supported by the
diff --git a/generated/googleapis/lib/reseller/v1.dart b/generated/googleapis/lib/reseller/v1.dart
index 44960bb..543dc5a 100644
--- a/generated/googleapis/lib/reseller/v1.dart
+++ b/generated/googleapis/lib/reseller/v1.dart
@@ -24,9 +24,9 @@
 ///
 /// Create an instance of [ResellerApi] to access these resources:
 ///
-/// - [CustomersResourceApi]
-/// - [ResellernotifyResourceApi]
-/// - [SubscriptionsResourceApi]
+/// - [CustomersResource]
+/// - [ResellernotifyResource_1]
+/// - [SubscriptionsResource]
 library reseller.v1;
 
 import 'dart:async' as async;
@@ -52,11 +52,10 @@
 
   final commons.ApiRequester _requester;
 
-  CustomersResourceApi get customers => CustomersResourceApi(_requester);
-  ResellernotifyResourceApi get resellernotify =>
-      ResellernotifyResourceApi(_requester);
-  SubscriptionsResourceApi get subscriptions =>
-      SubscriptionsResourceApi(_requester);
+  CustomersResource get customers => CustomersResource(_requester);
+  ResellernotifyResource_1 get resellernotify =>
+      ResellernotifyResource_1(_requester);
+  SubscriptionsResource get subscriptions => SubscriptionsResource(_requester);
 
   ResellerApi(http.Client client,
       {core.String rootUrl = 'https://www.googleapis.com/',
@@ -65,10 +64,10 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class CustomersResourceApi {
+class CustomersResource {
   final commons.ApiRequester _requester;
 
-  CustomersResourceApi(commons.ApiRequester client) : _requester = client;
+  CustomersResource(commons.ApiRequester client) : _requester = client;
 
   /// Get a customer account.
   ///
@@ -304,10 +303,10 @@
   }
 }
 
-class ResellernotifyResourceApi {
+class ResellernotifyResource_1 {
   final commons.ApiRequester _requester;
 
-  ResellernotifyResourceApi(commons.ApiRequester client) : _requester = client;
+  ResellernotifyResource_1(commons.ApiRequester client) : _requester = client;
 
   /// Returns all the details of the watch corresponding to the reseller.
   ///
@@ -459,10 +458,10 @@
   }
 }
 
-class SubscriptionsResourceApi {
+class SubscriptionsResource {
   final commons.ApiRequester _requester;
 
-  SubscriptionsResourceApi(commons.ApiRequester client) : _requester = client;
+  SubscriptionsResource(commons.ApiRequester client) : _requester = client;
 
   /// Activates a subscription previously suspended by the reseller
   ///
diff --git a/generated/googleapis/lib/run/v1.dart b/generated/googleapis/lib/run/v1.dart
index c67b401..fee3e96 100644
--- a/generated/googleapis/lib/run/v1.dart
+++ b/generated/googleapis/lib/run/v1.dart
@@ -24,22 +24,22 @@
 ///
 /// Create an instance of [CloudRunApi] to access these resources:
 ///
-/// - [NamespacesResourceApi]
-///   - [NamespacesAuthorizeddomainsResourceApi]
-///   - [NamespacesConfigurationsResourceApi]
-///   - [NamespacesDomainmappingsResourceApi]
-///   - [NamespacesRevisionsResourceApi]
-///   - [NamespacesRoutesResourceApi]
-///   - [NamespacesServicesResourceApi]
-/// - [ProjectsResourceApi]
-///   - [ProjectsAuthorizeddomainsResourceApi]
-///   - [ProjectsLocationsResourceApi]
-///     - [ProjectsLocationsAuthorizeddomainsResourceApi]
-///     - [ProjectsLocationsConfigurationsResourceApi]
-///     - [ProjectsLocationsDomainmappingsResourceApi]
-///     - [ProjectsLocationsRevisionsResourceApi]
-///     - [ProjectsLocationsRoutesResourceApi]
-///     - [ProjectsLocationsServicesResourceApi]
+/// - [NamespacesResource]
+///   - [NamespacesAuthorizeddomainsResource]
+///   - [NamespacesConfigurationsResource]
+///   - [NamespacesDomainmappingsResource]
+///   - [NamespacesRevisionsResource]
+///   - [NamespacesRoutesResource]
+///   - [NamespacesServicesResource]
+/// - [ProjectsResource]
+///   - [ProjectsAuthorizeddomainsResource]
+///   - [ProjectsLocationsResource]
+///     - [ProjectsLocationsAuthorizeddomainsResource]
+///     - [ProjectsLocationsConfigurationsResource]
+///     - [ProjectsLocationsDomainmappingsResource]
+///     - [ProjectsLocationsRevisionsResource]
+///     - [ProjectsLocationsRoutesResource]
+///     - [ProjectsLocationsServicesResource]
 library run.v1;
 
 import 'dart:async' as async;
@@ -63,8 +63,8 @@
 
   final commons.ApiRequester _requester;
 
-  NamespacesResourceApi get namespaces => NamespacesResourceApi(_requester);
-  ProjectsResourceApi get projects => ProjectsResourceApi(_requester);
+  NamespacesResource get namespaces => NamespacesResource(_requester);
+  ProjectsResource get projects => ProjectsResource(_requester);
 
   CloudRunApi(http.Client client,
       {core.String rootUrl = 'https://run.googleapis.com/',
@@ -73,29 +73,28 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class NamespacesResourceApi {
+class NamespacesResource {
   final commons.ApiRequester _requester;
 
-  NamespacesAuthorizeddomainsResourceApi get authorizeddomains =>
-      NamespacesAuthorizeddomainsResourceApi(_requester);
-  NamespacesConfigurationsResourceApi get configurations =>
-      NamespacesConfigurationsResourceApi(_requester);
-  NamespacesDomainmappingsResourceApi get domainmappings =>
-      NamespacesDomainmappingsResourceApi(_requester);
-  NamespacesRevisionsResourceApi get revisions =>
-      NamespacesRevisionsResourceApi(_requester);
-  NamespacesRoutesResourceApi get routes =>
-      NamespacesRoutesResourceApi(_requester);
-  NamespacesServicesResourceApi get services =>
-      NamespacesServicesResourceApi(_requester);
+  NamespacesAuthorizeddomainsResource get authorizeddomains =>
+      NamespacesAuthorizeddomainsResource(_requester);
+  NamespacesConfigurationsResource get configurations =>
+      NamespacesConfigurationsResource(_requester);
+  NamespacesDomainmappingsResource get domainmappings =>
+      NamespacesDomainmappingsResource(_requester);
+  NamespacesRevisionsResource get revisions =>
+      NamespacesRevisionsResource(_requester);
+  NamespacesRoutesResource get routes => NamespacesRoutesResource(_requester);
+  NamespacesServicesResource get services =>
+      NamespacesServicesResource(_requester);
 
-  NamespacesResourceApi(commons.ApiRequester client) : _requester = client;
+  NamespacesResource(commons.ApiRequester client) : _requester = client;
 }
 
-class NamespacesAuthorizeddomainsResourceApi {
+class NamespacesAuthorizeddomainsResource {
   final commons.ApiRequester _requester;
 
-  NamespacesAuthorizeddomainsResourceApi(commons.ApiRequester client)
+  NamespacesAuthorizeddomainsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// List authorized domains.
@@ -166,10 +165,10 @@
   }
 }
 
-class NamespacesConfigurationsResourceApi {
+class NamespacesConfigurationsResource {
   final commons.ApiRequester _requester;
 
-  NamespacesConfigurationsResourceApi(commons.ApiRequester client)
+  NamespacesConfigurationsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Get information about a configuration.
@@ -330,10 +329,10 @@
   }
 }
 
-class NamespacesDomainmappingsResourceApi {
+class NamespacesDomainmappingsResource {
   final commons.ApiRequester _requester;
 
-  NamespacesDomainmappingsResourceApi(commons.ApiRequester client)
+  NamespacesDomainmappingsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Create a new domain mapping.
@@ -630,10 +629,10 @@
   }
 }
 
-class NamespacesRevisionsResourceApi {
+class NamespacesRevisionsResource {
   final commons.ApiRequester _requester;
 
-  NamespacesRevisionsResourceApi(commons.ApiRequester client)
+  NamespacesRevisionsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Delete a revision.
@@ -867,11 +866,10 @@
   }
 }
 
-class NamespacesRoutesResourceApi {
+class NamespacesRoutesResource {
   final commons.ApiRequester _requester;
 
-  NamespacesRoutesResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  NamespacesRoutesResource(commons.ApiRequester client) : _requester = client;
 
   /// Get information about a route.
   ///
@@ -1029,11 +1027,10 @@
   }
 }
 
-class NamespacesServicesResourceApi {
+class NamespacesServicesResource {
   final commons.ApiRequester _requester;
 
-  NamespacesServicesResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  NamespacesServicesResource(commons.ApiRequester client) : _requester = client;
 
   /// Create a service.
   ///
@@ -1389,21 +1386,21 @@
   }
 }
 
-class ProjectsResourceApi {
+class ProjectsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsAuthorizeddomainsResourceApi get authorizeddomains =>
-      ProjectsAuthorizeddomainsResourceApi(_requester);
-  ProjectsLocationsResourceApi get locations =>
-      ProjectsLocationsResourceApi(_requester);
+  ProjectsAuthorizeddomainsResource get authorizeddomains =>
+      ProjectsAuthorizeddomainsResource(_requester);
+  ProjectsLocationsResource get locations =>
+      ProjectsLocationsResource(_requester);
 
-  ProjectsResourceApi(commons.ApiRequester client) : _requester = client;
+  ProjectsResource(commons.ApiRequester client) : _requester = client;
 }
 
-class ProjectsAuthorizeddomainsResourceApi {
+class ProjectsAuthorizeddomainsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsAuthorizeddomainsResourceApi(commons.ApiRequester client)
+  ProjectsAuthorizeddomainsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// List authorized domains.
@@ -1474,24 +1471,23 @@
   }
 }
 
-class ProjectsLocationsResourceApi {
+class ProjectsLocationsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsLocationsAuthorizeddomainsResourceApi get authorizeddomains =>
-      ProjectsLocationsAuthorizeddomainsResourceApi(_requester);
-  ProjectsLocationsConfigurationsResourceApi get configurations =>
-      ProjectsLocationsConfigurationsResourceApi(_requester);
-  ProjectsLocationsDomainmappingsResourceApi get domainmappings =>
-      ProjectsLocationsDomainmappingsResourceApi(_requester);
-  ProjectsLocationsRevisionsResourceApi get revisions =>
-      ProjectsLocationsRevisionsResourceApi(_requester);
-  ProjectsLocationsRoutesResourceApi get routes =>
-      ProjectsLocationsRoutesResourceApi(_requester);
-  ProjectsLocationsServicesResourceApi get services =>
-      ProjectsLocationsServicesResourceApi(_requester);
+  ProjectsLocationsAuthorizeddomainsResource get authorizeddomains =>
+      ProjectsLocationsAuthorizeddomainsResource(_requester);
+  ProjectsLocationsConfigurationsResource get configurations =>
+      ProjectsLocationsConfigurationsResource(_requester);
+  ProjectsLocationsDomainmappingsResource get domainmappings =>
+      ProjectsLocationsDomainmappingsResource(_requester);
+  ProjectsLocationsRevisionsResource get revisions =>
+      ProjectsLocationsRevisionsResource(_requester);
+  ProjectsLocationsRoutesResource get routes =>
+      ProjectsLocationsRoutesResource(_requester);
+  ProjectsLocationsServicesResource get services =>
+      ProjectsLocationsServicesResource(_requester);
 
-  ProjectsLocationsResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  ProjectsLocationsResource(commons.ApiRequester client) : _requester = client;
 
   /// Lists information about the supported locations for this service.
   ///
@@ -1565,10 +1561,10 @@
   }
 }
 
-class ProjectsLocationsAuthorizeddomainsResourceApi {
+class ProjectsLocationsAuthorizeddomainsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsLocationsAuthorizeddomainsResourceApi(commons.ApiRequester client)
+  ProjectsLocationsAuthorizeddomainsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// List authorized domains.
@@ -1639,10 +1635,10 @@
   }
 }
 
-class ProjectsLocationsConfigurationsResourceApi {
+class ProjectsLocationsConfigurationsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsLocationsConfigurationsResourceApi(commons.ApiRequester client)
+  ProjectsLocationsConfigurationsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Get information about a configuration.
@@ -1803,10 +1799,10 @@
   }
 }
 
-class ProjectsLocationsDomainmappingsResourceApi {
+class ProjectsLocationsDomainmappingsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsLocationsDomainmappingsResourceApi(commons.ApiRequester client)
+  ProjectsLocationsDomainmappingsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Create a new domain mapping.
@@ -2103,10 +2099,10 @@
   }
 }
 
-class ProjectsLocationsRevisionsResourceApi {
+class ProjectsLocationsRevisionsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsLocationsRevisionsResourceApi(commons.ApiRequester client)
+  ProjectsLocationsRevisionsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Delete a revision.
@@ -2339,10 +2335,10 @@
   }
 }
 
-class ProjectsLocationsRoutesResourceApi {
+class ProjectsLocationsRoutesResource {
   final commons.ApiRequester _requester;
 
-  ProjectsLocationsRoutesResourceApi(commons.ApiRequester client)
+  ProjectsLocationsRoutesResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Get information about a route.
@@ -2498,10 +2494,10 @@
   }
 }
 
-class ProjectsLocationsServicesResourceApi {
+class ProjectsLocationsServicesResource {
   final commons.ApiRequester _requester;
 
-  ProjectsLocationsServicesResourceApi(commons.ApiRequester client)
+  ProjectsLocationsServicesResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Create a service.
diff --git a/generated/googleapis/lib/runtimeconfig/v1.dart b/generated/googleapis/lib/runtimeconfig/v1.dart
index 38f6495..6c161d4 100644
--- a/generated/googleapis/lib/runtimeconfig/v1.dart
+++ b/generated/googleapis/lib/runtimeconfig/v1.dart
@@ -27,7 +27,7 @@
 ///
 /// Create an instance of [CloudRuntimeConfigApi] to access these resources:
 ///
-/// - [OperationsResourceApi]
+/// - [OperationsResource]
 library runtimeconfig.v1;
 
 import 'dart:async' as async;
@@ -57,7 +57,7 @@
 
   final commons.ApiRequester _requester;
 
-  OperationsResourceApi get operations => OperationsResourceApi(_requester);
+  OperationsResource get operations => OperationsResource(_requester);
 
   CloudRuntimeConfigApi(http.Client client,
       {core.String rootUrl = 'https://runtimeconfig.googleapis.com/',
@@ -66,10 +66,10 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class OperationsResourceApi {
+class OperationsResource {
   final commons.ApiRequester _requester;
 
-  OperationsResourceApi(commons.ApiRequester client) : _requester = client;
+  OperationsResource(commons.ApiRequester client) : _requester = client;
 
   /// Starts asynchronous cancellation on a long-running operation. The server
   /// makes a best effort to cancel the operation, but success is not
diff --git a/generated/googleapis/lib/safebrowsing/v4.dart b/generated/googleapis/lib/safebrowsing/v4.dart
index d411990..ff4012f 100644
--- a/generated/googleapis/lib/safebrowsing/v4.dart
+++ b/generated/googleapis/lib/safebrowsing/v4.dart
@@ -27,13 +27,13 @@
 ///
 /// Create an instance of [SafebrowsingApi] to access these resources:
 ///
-/// - [EncodedFullHashesResourceApi]
-/// - [EncodedUpdatesResourceApi]
-/// - [FullHashesResourceApi]
-/// - [ThreatHitsResourceApi]
-/// - [ThreatListUpdatesResourceApi]
-/// - [ThreatListsResourceApi]
-/// - [ThreatMatchesResourceApi]
+/// - [EncodedFullHashesResource]
+/// - [EncodedUpdatesResource]
+/// - [FullHashesResource]
+/// - [ThreatHitsResource]
+/// - [ThreatListUpdatesResource]
+/// - [ThreatListsResource]
+/// - [ThreatMatchesResource]
 library safebrowsing.v4;
 
 import 'dart:async' as async;
@@ -56,17 +56,16 @@
 class SafebrowsingApi {
   final commons.ApiRequester _requester;
 
-  EncodedFullHashesResourceApi get encodedFullHashes =>
-      EncodedFullHashesResourceApi(_requester);
-  EncodedUpdatesResourceApi get encodedUpdates =>
-      EncodedUpdatesResourceApi(_requester);
-  FullHashesResourceApi get fullHashes => FullHashesResourceApi(_requester);
-  ThreatHitsResourceApi get threatHits => ThreatHitsResourceApi(_requester);
-  ThreatListUpdatesResourceApi get threatListUpdates =>
-      ThreatListUpdatesResourceApi(_requester);
-  ThreatListsResourceApi get threatLists => ThreatListsResourceApi(_requester);
-  ThreatMatchesResourceApi get threatMatches =>
-      ThreatMatchesResourceApi(_requester);
+  EncodedFullHashesResource get encodedFullHashes =>
+      EncodedFullHashesResource(_requester);
+  EncodedUpdatesResource get encodedUpdates =>
+      EncodedUpdatesResource(_requester);
+  FullHashesResource get fullHashes => FullHashesResource(_requester);
+  ThreatHitsResource get threatHits => ThreatHitsResource(_requester);
+  ThreatListUpdatesResource get threatListUpdates =>
+      ThreatListUpdatesResource(_requester);
+  ThreatListsResource get threatLists => ThreatListsResource(_requester);
+  ThreatMatchesResource get threatMatches => ThreatMatchesResource(_requester);
 
   SafebrowsingApi(http.Client client,
       {core.String rootUrl = 'https://safebrowsing.googleapis.com/',
@@ -75,11 +74,10 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class EncodedFullHashesResourceApi {
+class EncodedFullHashesResource {
   final commons.ApiRequester _requester;
 
-  EncodedFullHashesResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  EncodedFullHashesResource(commons.ApiRequester client) : _requester = client;
 
   /// Request parameters:
   ///
@@ -145,10 +143,10 @@
   }
 }
 
-class EncodedUpdatesResourceApi {
+class EncodedUpdatesResource {
   final commons.ApiRequester _requester;
 
-  EncodedUpdatesResourceApi(commons.ApiRequester client) : _requester = client;
+  EncodedUpdatesResource(commons.ApiRequester client) : _requester = client;
 
   /// Request parameters:
   ///
@@ -214,10 +212,10 @@
   }
 }
 
-class FullHashesResourceApi {
+class FullHashesResource {
   final commons.ApiRequester _requester;
 
-  FullHashesResourceApi(commons.ApiRequester client) : _requester = client;
+  FullHashesResource(commons.ApiRequester client) : _requester = client;
 
   /// Finds the full hashes that match the requested hash prefixes.
   ///
@@ -271,10 +269,10 @@
   }
 }
 
-class ThreatHitsResourceApi {
+class ThreatHitsResource {
   final commons.ApiRequester _requester;
 
-  ThreatHitsResourceApi(commons.ApiRequester client) : _requester = client;
+  ThreatHitsResource(commons.ApiRequester client) : _requester = client;
 
   /// Reports a Safe Browsing threat list hit to Google. Only projects with
   /// TRUSTED_REPORTER visibility can use this method.
@@ -328,11 +326,10 @@
   }
 }
 
-class ThreatListUpdatesResourceApi {
+class ThreatListUpdatesResource {
   final commons.ApiRequester _requester;
 
-  ThreatListUpdatesResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  ThreatListUpdatesResource(commons.ApiRequester client) : _requester = client;
 
   /// Fetches the most recent threat list updates. A client can request updates
   /// for multiple lists at once.
@@ -387,10 +384,10 @@
   }
 }
 
-class ThreatListsResourceApi {
+class ThreatListsResource {
   final commons.ApiRequester _requester;
 
-  ThreatListsResourceApi(commons.ApiRequester client) : _requester = client;
+  ThreatListsResource(commons.ApiRequester client) : _requester = client;
 
   /// Lists the Safe Browsing threat lists available for download.
   ///
@@ -438,10 +435,10 @@
   }
 }
 
-class ThreatMatchesResourceApi {
+class ThreatMatchesResource {
   final commons.ApiRequester _requester;
 
-  ThreatMatchesResourceApi(commons.ApiRequester client) : _requester = client;
+  ThreatMatchesResource(commons.ApiRequester client) : _requester = client;
 
   /// Finds the threat entries that match the Safe Browsing lists.
   ///
diff --git a/generated/googleapis/lib/script/v1.dart b/generated/googleapis/lib/script/v1.dart
index 58c2b24..75b9af9 100644
--- a/generated/googleapis/lib/script/v1.dart
+++ b/generated/googleapis/lib/script/v1.dart
@@ -23,11 +23,11 @@
 ///
 /// Create an instance of [ScriptApi] to access these resources:
 ///
-/// - [ProcessesResourceApi]
-/// - [ProjectsResourceApi]
-///   - [ProjectsDeploymentsResourceApi]
-///   - [ProjectsVersionsResourceApi]
-/// - [ScriptsResourceApi]
+/// - [ProcessesResource]
+/// - [ProjectsResource]
+///   - [ProjectsDeploymentsResource]
+///   - [ProjectsVersionsResource]
+/// - [ScriptsResource]
 library script.v1;
 
 import 'dart:async' as async;
@@ -113,9 +113,9 @@
 
   final commons.ApiRequester _requester;
 
-  ProcessesResourceApi get processes => ProcessesResourceApi(_requester);
-  ProjectsResourceApi get projects => ProjectsResourceApi(_requester);
-  ScriptsResourceApi get scripts => ScriptsResourceApi(_requester);
+  ProcessesResource get processes => ProcessesResource(_requester);
+  ProjectsResource get projects => ProjectsResource(_requester);
+  ScriptsResource get scripts => ScriptsResource(_requester);
 
   ScriptApi(http.Client client,
       {core.String rootUrl = 'https://script.googleapis.com/',
@@ -124,10 +124,10 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class ProcessesResourceApi {
+class ProcessesResource {
   final commons.ApiRequester _requester;
 
-  ProcessesResourceApi(commons.ApiRequester client) : _requester = client;
+  ProcessesResource(commons.ApiRequester client) : _requester = client;
 
   /// List information about processes made by or on behalf of a user, such as
   /// process type and current status.
@@ -396,15 +396,14 @@
   }
 }
 
-class ProjectsResourceApi {
+class ProjectsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsDeploymentsResourceApi get deployments =>
-      ProjectsDeploymentsResourceApi(_requester);
-  ProjectsVersionsResourceApi get versions =>
-      ProjectsVersionsResourceApi(_requester);
+  ProjectsDeploymentsResource get deployments =>
+      ProjectsDeploymentsResource(_requester);
+  ProjectsVersionsResource get versions => ProjectsVersionsResource(_requester);
 
-  ProjectsResourceApi(commons.ApiRequester client) : _requester = client;
+  ProjectsResource(commons.ApiRequester client) : _requester = client;
 
   /// Creates a new, empty script project with no script files and a base
   /// manifest file.
@@ -702,10 +701,10 @@
   }
 }
 
-class ProjectsDeploymentsResourceApi {
+class ProjectsDeploymentsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsDeploymentsResourceApi(commons.ApiRequester client)
+  ProjectsDeploymentsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Creates a deployment of an Apps Script project.
@@ -1021,11 +1020,10 @@
   }
 }
 
-class ProjectsVersionsResourceApi {
+class ProjectsVersionsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsVersionsResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  ProjectsVersionsResource(commons.ApiRequester client) : _requester = client;
 
   /// Creates a new immutable version using the current code, with a unique
   /// version number.
@@ -1214,10 +1212,10 @@
   }
 }
 
-class ScriptsResourceApi {
+class ScriptsResource {
   final commons.ApiRequester _requester;
 
-  ScriptsResourceApi(commons.ApiRequester client) : _requester = client;
+  ScriptsResource(commons.ApiRequester client) : _requester = client;
 
   /// Runs a function in an Apps Script project. The script project must be
   /// deployed for use with the Apps Script API and the calling application must
diff --git a/generated/googleapis/lib/searchconsole/v1.dart b/generated/googleapis/lib/searchconsole/v1.dart
index a89fc65..b3ad878 100644
--- a/generated/googleapis/lib/searchconsole/v1.dart
+++ b/generated/googleapis/lib/searchconsole/v1.dart
@@ -25,11 +25,11 @@
 ///
 /// Create an instance of [SearchConsoleApi] to access these resources:
 ///
-/// - [SearchanalyticsResourceApi]
-/// - [SitemapsResourceApi]
-/// - [SitesResourceApi]
-/// - [UrlTestingToolsResourceApi]
-///   - [UrlTestingToolsMobileFriendlyTestResourceApi]
+/// - [SearchanalyticsResource]
+/// - [SitemapsResource]
+/// - [SitesResource]
+/// - [UrlTestingToolsResource]
+///   - [UrlTestingToolsMobileFriendlyTestResource]
 library searchconsole.v1;
 
 import 'dart:async' as async;
@@ -56,12 +56,12 @@
 
   final commons.ApiRequester _requester;
 
-  SearchanalyticsResourceApi get searchanalytics =>
-      SearchanalyticsResourceApi(_requester);
-  SitemapsResourceApi get sitemaps => SitemapsResourceApi(_requester);
-  SitesResourceApi get sites => SitesResourceApi(_requester);
-  UrlTestingToolsResourceApi get urlTestingTools =>
-      UrlTestingToolsResourceApi(_requester);
+  SearchanalyticsResource get searchanalytics =>
+      SearchanalyticsResource(_requester);
+  SitemapsResource get sitemaps => SitemapsResource(_requester);
+  SitesResource get sites => SitesResource(_requester);
+  UrlTestingToolsResource get urlTestingTools =>
+      UrlTestingToolsResource(_requester);
 
   SearchConsoleApi(http.Client client,
       {core.String rootUrl = 'https://searchconsole.googleapis.com/',
@@ -70,10 +70,10 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class SearchanalyticsResourceApi {
+class SearchanalyticsResource {
   final commons.ApiRequester _requester;
 
-  SearchanalyticsResourceApi(commons.ApiRequester client) : _requester = client;
+  SearchanalyticsResource(commons.ApiRequester client) : _requester = client;
 
   /// Query your data with filters and parameters that you define. Returns zero
   /// or more rows grouped by the row keys that you define. You must define a
@@ -141,10 +141,10 @@
   }
 }
 
-class SitemapsResourceApi {
+class SitemapsResource {
   final commons.ApiRequester _requester;
 
-  SitemapsResourceApi(commons.ApiRequester client) : _requester = client;
+  SitemapsResource(commons.ApiRequester client) : _requester = client;
 
   /// Deletes a sitemap from this site.
   ///
@@ -394,10 +394,10 @@
   }
 }
 
-class SitesResourceApi {
+class SitesResource {
   final commons.ApiRequester _requester;
 
-  SitesResourceApi(commons.ApiRequester client) : _requester = client;
+  SitesResource(commons.ApiRequester client) : _requester = client;
 
   ///  Adds a site to the set of the user's sites in Search Console.
   ///
@@ -597,19 +597,19 @@
   }
 }
 
-class UrlTestingToolsResourceApi {
+class UrlTestingToolsResource {
   final commons.ApiRequester _requester;
 
-  UrlTestingToolsMobileFriendlyTestResourceApi get mobileFriendlyTest =>
-      UrlTestingToolsMobileFriendlyTestResourceApi(_requester);
+  UrlTestingToolsMobileFriendlyTestResource get mobileFriendlyTest =>
+      UrlTestingToolsMobileFriendlyTestResource(_requester);
 
-  UrlTestingToolsResourceApi(commons.ApiRequester client) : _requester = client;
+  UrlTestingToolsResource(commons.ApiRequester client) : _requester = client;
 }
 
-class UrlTestingToolsMobileFriendlyTestResourceApi {
+class UrlTestingToolsMobileFriendlyTestResource {
   final commons.ApiRequester _requester;
 
-  UrlTestingToolsMobileFriendlyTestResourceApi(commons.ApiRequester client)
+  UrlTestingToolsMobileFriendlyTestResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Runs Mobile-Friendly Test for a given URL.
diff --git a/generated/googleapis/lib/secretmanager/v1.dart b/generated/googleapis/lib/secretmanager/v1.dart
index ec27add..36a75b3 100644
--- a/generated/googleapis/lib/secretmanager/v1.dart
+++ b/generated/googleapis/lib/secretmanager/v1.dart
@@ -24,10 +24,10 @@
 ///
 /// Create an instance of [SecretManagerApi] to access these resources:
 ///
-/// - [ProjectsResourceApi]
-///   - [ProjectsLocationsResourceApi]
-///   - [ProjectsSecretsResourceApi]
-///     - [ProjectsSecretsVersionsResourceApi]
+/// - [ProjectsResource]
+///   - [ProjectsLocationsResource]
+///   - [ProjectsSecretsResource]
+///     - [ProjectsSecretsVersionsResource]
 library secretmanager.v1;
 
 import 'dart:async' as async;
@@ -51,7 +51,7 @@
 
   final commons.ApiRequester _requester;
 
-  ProjectsResourceApi get projects => ProjectsResourceApi(_requester);
+  ProjectsResource get projects => ProjectsResource(_requester);
 
   SecretManagerApi(http.Client client,
       {core.String rootUrl = 'https://secretmanager.googleapis.com/',
@@ -60,22 +60,20 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class ProjectsResourceApi {
+class ProjectsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsLocationsResourceApi get locations =>
-      ProjectsLocationsResourceApi(_requester);
-  ProjectsSecretsResourceApi get secrets =>
-      ProjectsSecretsResourceApi(_requester);
+  ProjectsLocationsResource get locations =>
+      ProjectsLocationsResource(_requester);
+  ProjectsSecretsResource get secrets => ProjectsSecretsResource(_requester);
 
-  ProjectsResourceApi(commons.ApiRequester client) : _requester = client;
+  ProjectsResource(commons.ApiRequester client) : _requester = client;
 }
 
-class ProjectsLocationsResourceApi {
+class ProjectsLocationsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsLocationsResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  ProjectsLocationsResource(commons.ApiRequester client) : _requester = client;
 
   /// Gets information about a location.
   ///
@@ -200,13 +198,13 @@
   }
 }
 
-class ProjectsSecretsResourceApi {
+class ProjectsSecretsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsSecretsVersionsResourceApi get versions =>
-      ProjectsSecretsVersionsResourceApi(_requester);
+  ProjectsSecretsVersionsResource get versions =>
+      ProjectsSecretsVersionsResource(_requester);
 
-  ProjectsSecretsResourceApi(commons.ApiRequester client) : _requester = client;
+  ProjectsSecretsResource(commons.ApiRequester client) : _requester = client;
 
   /// Creates a new SecretVersion containing secret data and attaches it to an
   /// existing Secret.
@@ -775,10 +773,10 @@
   }
 }
 
-class ProjectsSecretsVersionsResourceApi {
+class ProjectsSecretsVersionsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsSecretsVersionsResourceApi(commons.ApiRequester client)
+  ProjectsSecretsVersionsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Accesses a SecretVersion. This call returns the secret data. `projects / *
diff --git a/generated/googleapis/lib/securitycenter/v1.dart b/generated/googleapis/lib/securitycenter/v1.dart
index beb3769..cbbab4e 100644
--- a/generated/googleapis/lib/securitycenter/v1.dart
+++ b/generated/googleapis/lib/securitycenter/v1.dart
@@ -25,12 +25,12 @@
 ///
 /// Create an instance of [SecurityCommandCenterApi] to access these resources:
 ///
-/// - [OrganizationsResourceApi]
-///   - [OrganizationsAssetsResourceApi]
-///   - [OrganizationsNotificationConfigsResourceApi]
-///   - [OrganizationsOperationsResourceApi]
-///   - [OrganizationsSourcesResourceApi]
-///     - [OrganizationsSourcesFindingsResourceApi]
+/// - [OrganizationsResource]
+///   - [OrganizationsAssetsResource]
+///   - [OrganizationsNotificationConfigsResource]
+///   - [OrganizationsOperationsResource]
+///   - [OrganizationsSourcesResource]
+///     - [OrganizationsSourcesFindingsResource]
 library securitycenter.v1;
 
 import 'dart:async' as async;
@@ -54,8 +54,7 @@
 
   final commons.ApiRequester _requester;
 
-  OrganizationsResourceApi get organizations =>
-      OrganizationsResourceApi(_requester);
+  OrganizationsResource get organizations => OrganizationsResource(_requester);
 
   SecurityCommandCenterApi(http.Client client,
       {core.String rootUrl = 'https://securitycenter.googleapis.com/',
@@ -64,19 +63,19 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class OrganizationsResourceApi {
+class OrganizationsResource {
   final commons.ApiRequester _requester;
 
-  OrganizationsAssetsResourceApi get assets =>
-      OrganizationsAssetsResourceApi(_requester);
-  OrganizationsNotificationConfigsResourceApi get notificationConfigs =>
-      OrganizationsNotificationConfigsResourceApi(_requester);
-  OrganizationsOperationsResourceApi get operations =>
-      OrganizationsOperationsResourceApi(_requester);
-  OrganizationsSourcesResourceApi get sources =>
-      OrganizationsSourcesResourceApi(_requester);
+  OrganizationsAssetsResource get assets =>
+      OrganizationsAssetsResource(_requester);
+  OrganizationsNotificationConfigsResource get notificationConfigs =>
+      OrganizationsNotificationConfigsResource(_requester);
+  OrganizationsOperationsResource get operations =>
+      OrganizationsOperationsResource(_requester);
+  OrganizationsSourcesResource get sources =>
+      OrganizationsSourcesResource(_requester);
 
-  OrganizationsResourceApi(commons.ApiRequester client) : _requester = client;
+  OrganizationsResource(commons.ApiRequester client) : _requester = client;
 
   /// Gets the settings for an organization.
   ///
@@ -199,10 +198,10 @@
   }
 }
 
-class OrganizationsAssetsResourceApi {
+class OrganizationsAssetsResource {
   final commons.ApiRequester _requester;
 
-  OrganizationsAssetsResourceApi(commons.ApiRequester client)
+  OrganizationsAssetsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Filters an organization's assets and groups them by their specified
@@ -576,10 +575,10 @@
   }
 }
 
-class OrganizationsNotificationConfigsResourceApi {
+class OrganizationsNotificationConfigsResource {
   final commons.ApiRequester _requester;
 
-  OrganizationsNotificationConfigsResourceApi(commons.ApiRequester client)
+  OrganizationsNotificationConfigsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Creates a notification config.
@@ -897,10 +896,10 @@
   }
 }
 
-class OrganizationsOperationsResourceApi {
+class OrganizationsOperationsResource {
   final commons.ApiRequester _requester;
 
-  OrganizationsOperationsResourceApi(commons.ApiRequester client)
+  OrganizationsOperationsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Starts asynchronous cancellation on a long-running operation. The server
@@ -1148,13 +1147,13 @@
   }
 }
 
-class OrganizationsSourcesResourceApi {
+class OrganizationsSourcesResource {
   final commons.ApiRequester _requester;
 
-  OrganizationsSourcesFindingsResourceApi get findings =>
-      OrganizationsSourcesFindingsResourceApi(_requester);
+  OrganizationsSourcesFindingsResource get findings =>
+      OrganizationsSourcesFindingsResource(_requester);
 
-  OrganizationsSourcesResourceApi(commons.ApiRequester client)
+  OrganizationsSourcesResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Creates a source.
@@ -1588,10 +1587,10 @@
   }
 }
 
-class OrganizationsSourcesFindingsResourceApi {
+class OrganizationsSourcesFindingsResource {
   final commons.ApiRequester _requester;
 
-  OrganizationsSourcesFindingsResourceApi(commons.ApiRequester client)
+  OrganizationsSourcesFindingsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Creates a finding. The corresponding source must exist for finding
diff --git a/generated/googleapis/lib/serviceconsumermanagement/v1.dart b/generated/googleapis/lib/serviceconsumermanagement/v1.dart
index f1f9f44..6367523 100644
--- a/generated/googleapis/lib/serviceconsumermanagement/v1.dart
+++ b/generated/googleapis/lib/serviceconsumermanagement/v1.dart
@@ -25,9 +25,9 @@
 /// Create an instance of [ServiceConsumerManagementApi] to access these
 /// resources:
 ///
-/// - [OperationsResourceApi]
-/// - [ServicesResourceApi]
-///   - [ServicesTenancyUnitsResourceApi]
+/// - [OperationsResource]
+/// - [ServicesResource]
+///   - [ServicesTenancyUnitsResource]
 library serviceconsumermanagement.v1;
 
 import 'dart:async' as async;
@@ -50,8 +50,8 @@
 
   final commons.ApiRequester _requester;
 
-  OperationsResourceApi get operations => OperationsResourceApi(_requester);
-  ServicesResourceApi get services => ServicesResourceApi(_requester);
+  OperationsResource get operations => OperationsResource(_requester);
+  ServicesResource get services => ServicesResource(_requester);
 
   ServiceConsumerManagementApi(http_1.Client client,
       {core.String rootUrl =
@@ -61,10 +61,10 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class OperationsResourceApi {
+class OperationsResource {
   final commons.ApiRequester _requester;
 
-  OperationsResourceApi(commons.ApiRequester client) : _requester = client;
+  OperationsResource(commons.ApiRequester client) : _requester = client;
 
   /// Starts asynchronous cancellation on a long-running operation. The server
   /// makes a best effort to cancel the operation, but success is not
@@ -317,13 +317,13 @@
   }
 }
 
-class ServicesResourceApi {
+class ServicesResource {
   final commons.ApiRequester _requester;
 
-  ServicesTenancyUnitsResourceApi get tenancyUnits =>
-      ServicesTenancyUnitsResourceApi(_requester);
+  ServicesTenancyUnitsResource get tenancyUnits =>
+      ServicesTenancyUnitsResource(_requester);
 
-  ServicesResourceApi(commons.ApiRequester client) : _requester = client;
+  ServicesResource(commons.ApiRequester client) : _requester = client;
 
   /// Search tenancy units for a managed service.
   ///
@@ -414,10 +414,10 @@
   }
 }
 
-class ServicesTenancyUnitsResourceApi {
+class ServicesTenancyUnitsResource {
   final commons.ApiRequester _requester;
 
-  ServicesTenancyUnitsResourceApi(commons.ApiRequester client)
+  ServicesTenancyUnitsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Add a new tenant project to the tenancy unit. There can be a maximum of
diff --git a/generated/googleapis/lib/servicecontrol/v1.dart b/generated/googleapis/lib/servicecontrol/v1.dart
index 5f7663d..a6f4a22 100644
--- a/generated/googleapis/lib/servicecontrol/v1.dart
+++ b/generated/googleapis/lib/servicecontrol/v1.dart
@@ -24,7 +24,7 @@
 ///
 /// Create an instance of [ServiceControlApi] to access these resources:
 ///
-/// - [ServicesResourceApi]
+/// - [ServicesResource]
 library servicecontrol.v1;
 
 import 'dart:async' as async;
@@ -52,7 +52,7 @@
 
   final commons.ApiRequester _requester;
 
-  ServicesResourceApi get services => ServicesResourceApi(_requester);
+  ServicesResource get services => ServicesResource(_requester);
 
   ServiceControlApi(http.Client client,
       {core.String rootUrl = 'https://servicecontrol.googleapis.com/',
@@ -61,10 +61,10 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class ServicesResourceApi {
+class ServicesResource {
   final commons.ApiRequester _requester;
 
-  ServicesResourceApi(commons.ApiRequester client) : _requester = client;
+  ServicesResource(commons.ApiRequester client) : _requester = client;
 
   /// Attempts to allocate quota for the specified consumer. It should be called
   /// before the operation is executed. This method requires the
diff --git a/generated/googleapis/lib/servicemanagement/v1.dart b/generated/googleapis/lib/servicemanagement/v1.dart
index 8d055f6..1e2a468 100644
--- a/generated/googleapis/lib/servicemanagement/v1.dart
+++ b/generated/googleapis/lib/servicemanagement/v1.dart
@@ -25,11 +25,11 @@
 ///
 /// Create an instance of [ServiceManagementApi] to access these resources:
 ///
-/// - [OperationsResourceApi]
-/// - [ServicesResourceApi]
-///   - [ServicesConfigsResourceApi]
-///   - [ServicesConsumersResourceApi]
-///   - [ServicesRolloutsResourceApi]
+/// - [OperationsResource]
+/// - [ServicesResource]
+///   - [ServicesConfigsResource]
+///   - [ServicesConsumersResource]
+///   - [ServicesRolloutsResource]
 library servicemanagement.v1;
 
 import 'dart:async' as async;
@@ -66,8 +66,8 @@
 
   final commons.ApiRequester _requester;
 
-  OperationsResourceApi get operations => OperationsResourceApi(_requester);
-  ServicesResourceApi get services => ServicesResourceApi(_requester);
+  OperationsResource get operations => OperationsResource(_requester);
+  ServicesResource get services => ServicesResource(_requester);
 
   ServiceManagementApi(http_1.Client client,
       {core.String rootUrl = 'https://servicemanagement.googleapis.com/',
@@ -76,10 +76,10 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class OperationsResourceApi {
+class OperationsResource {
   final commons.ApiRequester _requester;
 
-  OperationsResourceApi(commons.ApiRequester client) : _requester = client;
+  OperationsResource(commons.ApiRequester client) : _requester = client;
 
   /// Gets the latest state of a long-running operation. Clients can use this
   /// method to poll the operation result at intervals as recommended by the API
@@ -217,17 +217,15 @@
   }
 }
 
-class ServicesResourceApi {
+class ServicesResource {
   final commons.ApiRequester _requester;
 
-  ServicesConfigsResourceApi get configs =>
-      ServicesConfigsResourceApi(_requester);
-  ServicesConsumersResourceApi get consumers =>
-      ServicesConsumersResourceApi(_requester);
-  ServicesRolloutsResourceApi get rollouts =>
-      ServicesRolloutsResourceApi(_requester);
+  ServicesConfigsResource get configs => ServicesConfigsResource(_requester);
+  ServicesConsumersResource get consumers =>
+      ServicesConsumersResource(_requester);
+  ServicesRolloutsResource get rollouts => ServicesRolloutsResource(_requester);
 
-  ServicesResourceApi(commons.ApiRequester client) : _requester = client;
+  ServicesResource(commons.ApiRequester client) : _requester = client;
 
   /// Creates a new managed service. A managed service is immutable, and is
   /// subject to mandatory 30-day data retention. You cannot move a service or
@@ -915,10 +913,10 @@
   }
 }
 
-class ServicesConfigsResourceApi {
+class ServicesConfigsResource {
   final commons.ApiRequester _requester;
 
-  ServicesConfigsResourceApi(commons.ApiRequester client) : _requester = client;
+  ServicesConfigsResource(commons.ApiRequester client) : _requester = client;
 
   /// Creates a new service configuration (version) for a managed service. This
   /// method only stores the service configuration. To roll out the service
@@ -1197,11 +1195,10 @@
   }
 }
 
-class ServicesConsumersResourceApi {
+class ServicesConsumersResource {
   final commons.ApiRequester _requester;
 
-  ServicesConsumersResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  ServicesConsumersResource(commons.ApiRequester client) : _requester = client;
 
   /// Gets the access control policy for a resource. Returns an empty policy if
   /// the resource exists and does not have a policy set.
@@ -1395,11 +1392,10 @@
   }
 }
 
-class ServicesRolloutsResourceApi {
+class ServicesRolloutsResource {
   final commons.ApiRequester _requester;
 
-  ServicesRolloutsResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  ServicesRolloutsResource(commons.ApiRequester client) : _requester = client;
 
   /// Creates a new service configuration rollout. Based on rollout, the Google
   /// Service Management will roll out the service configurations to different
diff --git a/generated/googleapis/lib/servicenetworking/v1.dart b/generated/googleapis/lib/servicenetworking/v1.dart
index c3f743b..39f8e42 100644
--- a/generated/googleapis/lib/servicenetworking/v1.dart
+++ b/generated/googleapis/lib/servicenetworking/v1.dart
@@ -25,16 +25,16 @@
 ///
 /// Create an instance of [ServiceNetworkingApi] to access these resources:
 ///
-/// - [OperationsResourceApi]
-/// - [ServicesResourceApi]
-///   - [ServicesConnectionsResourceApi]
-///   - [ServicesDnsRecordSetsResourceApi]
-///   - [ServicesDnsZonesResourceApi]
-///   - [ServicesProjectsResourceApi]
-///     - [ServicesProjectsGlobalResourceApi]
-///       - [ServicesProjectsGlobalNetworksResourceApi]
-///         - [ServicesProjectsGlobalNetworksPeeredDnsDomainsResourceApi]
-///   - [ServicesRolesResourceApi]
+/// - [OperationsResource]
+/// - [ServicesResource]
+///   - [ServicesConnectionsResource]
+///   - [ServicesDnsRecordSetsResource]
+///   - [ServicesDnsZonesResource]
+///   - [ServicesProjectsResource]
+///     - [ServicesProjectsGlobalResource]
+///       - [ServicesProjectsGlobalNetworksResource]
+///         - [ServicesProjectsGlobalNetworksPeeredDnsDomainsResource]
+///   - [ServicesRolesResource]
 library servicenetworking.v1;
 
 import 'dart:async' as async;
@@ -62,8 +62,8 @@
 
   final commons.ApiRequester _requester;
 
-  OperationsResourceApi get operations => OperationsResourceApi(_requester);
-  ServicesResourceApi get services => ServicesResourceApi(_requester);
+  OperationsResource get operations => OperationsResource(_requester);
+  ServicesResource get services => ServicesResource(_requester);
 
   ServiceNetworkingApi(http_1.Client client,
       {core.String rootUrl = 'https://servicenetworking.googleapis.com/',
@@ -72,10 +72,10 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class OperationsResourceApi {
+class OperationsResource {
   final commons.ApiRequester _requester;
 
-  OperationsResourceApi(commons.ApiRequester client) : _requester = client;
+  OperationsResource(commons.ApiRequester client) : _requester = client;
 
   /// Starts asynchronous cancellation on a long-running operation. The server
   /// makes a best effort to cancel the operation, but success is not
@@ -328,20 +328,18 @@
   }
 }
 
-class ServicesResourceApi {
+class ServicesResource {
   final commons.ApiRequester _requester;
 
-  ServicesConnectionsResourceApi get connections =>
-      ServicesConnectionsResourceApi(_requester);
-  ServicesDnsRecordSetsResourceApi get dnsRecordSets =>
-      ServicesDnsRecordSetsResourceApi(_requester);
-  ServicesDnsZonesResourceApi get dnsZones =>
-      ServicesDnsZonesResourceApi(_requester);
-  ServicesProjectsResourceApi get projects =>
-      ServicesProjectsResourceApi(_requester);
-  ServicesRolesResourceApi get roles => ServicesRolesResourceApi(_requester);
+  ServicesConnectionsResource get connections =>
+      ServicesConnectionsResource(_requester);
+  ServicesDnsRecordSetsResource get dnsRecordSets =>
+      ServicesDnsRecordSetsResource(_requester);
+  ServicesDnsZonesResource get dnsZones => ServicesDnsZonesResource(_requester);
+  ServicesProjectsResource get projects => ServicesProjectsResource(_requester);
+  ServicesRolesResource get roles => ServicesRolesResource(_requester);
 
-  ServicesResourceApi(commons.ApiRequester client) : _requester = client;
+  ServicesResource(commons.ApiRequester client) : _requester = client;
 
   /// For service producers, provisions a new subnet in a peered service's
   /// shared VPC network in the requested region and with the requested size
@@ -670,10 +668,10 @@
   }
 }
 
-class ServicesConnectionsResourceApi {
+class ServicesConnectionsResource {
   final commons.ApiRequester _requester;
 
-  ServicesConnectionsResourceApi(commons.ApiRequester client)
+  ServicesConnectionsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Creates a private connection that establishes a VPC Network Peering
@@ -890,10 +888,10 @@
   }
 }
 
-class ServicesDnsRecordSetsResourceApi {
+class ServicesDnsRecordSetsResource {
   final commons.ApiRequester _requester;
 
-  ServicesDnsRecordSetsResourceApi(commons.ApiRequester client)
+  ServicesDnsRecordSetsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Service producers can use this method to add DNS record sets to private
@@ -1083,11 +1081,10 @@
   }
 }
 
-class ServicesDnsZonesResourceApi {
+class ServicesDnsZonesResource {
   final commons.ApiRequester _requester;
 
-  ServicesDnsZonesResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  ServicesDnsZonesResource(commons.ApiRequester client) : _requester = client;
 
   /// Service producers can use this method to add private DNS zones in the
   /// shared producer host project and matching peering zones in the consumer
@@ -1216,41 +1213,39 @@
   }
 }
 
-class ServicesProjectsResourceApi {
+class ServicesProjectsResource {
   final commons.ApiRequester _requester;
 
-  ServicesProjectsGlobalResourceApi get global =>
-      ServicesProjectsGlobalResourceApi(_requester);
+  ServicesProjectsGlobalResource get global =>
+      ServicesProjectsGlobalResource(_requester);
 
-  ServicesProjectsResourceApi(commons.ApiRequester client)
+  ServicesProjectsResource(commons.ApiRequester client) : _requester = client;
+}
+
+class ServicesProjectsGlobalResource {
+  final commons.ApiRequester _requester;
+
+  ServicesProjectsGlobalNetworksResource get networks =>
+      ServicesProjectsGlobalNetworksResource(_requester);
+
+  ServicesProjectsGlobalResource(commons.ApiRequester client)
       : _requester = client;
 }
 
-class ServicesProjectsGlobalResourceApi {
+class ServicesProjectsGlobalNetworksResource {
   final commons.ApiRequester _requester;
 
-  ServicesProjectsGlobalNetworksResourceApi get networks =>
-      ServicesProjectsGlobalNetworksResourceApi(_requester);
+  ServicesProjectsGlobalNetworksPeeredDnsDomainsResource get peeredDnsDomains =>
+      ServicesProjectsGlobalNetworksPeeredDnsDomainsResource(_requester);
 
-  ServicesProjectsGlobalResourceApi(commons.ApiRequester client)
+  ServicesProjectsGlobalNetworksResource(commons.ApiRequester client)
       : _requester = client;
 }
 
-class ServicesProjectsGlobalNetworksResourceApi {
+class ServicesProjectsGlobalNetworksPeeredDnsDomainsResource {
   final commons.ApiRequester _requester;
 
-  ServicesProjectsGlobalNetworksPeeredDnsDomainsResourceApi
-      get peeredDnsDomains =>
-          ServicesProjectsGlobalNetworksPeeredDnsDomainsResourceApi(_requester);
-
-  ServicesProjectsGlobalNetworksResourceApi(commons.ApiRequester client)
-      : _requester = client;
-}
-
-class ServicesProjectsGlobalNetworksPeeredDnsDomainsResourceApi {
-  final commons.ApiRequester _requester;
-
-  ServicesProjectsGlobalNetworksPeeredDnsDomainsResourceApi(
+  ServicesProjectsGlobalNetworksPeeredDnsDomainsResource(
       commons.ApiRequester client)
       : _requester = client;
 
@@ -1447,10 +1442,10 @@
   }
 }
 
-class ServicesRolesResourceApi {
+class ServicesRolesResource {
   final commons.ApiRequester _requester;
 
-  ServicesRolesResourceApi(commons.ApiRequester client) : _requester = client;
+  ServicesRolesResource(commons.ApiRequester client) : _requester = client;
 
   /// Service producers can use this method to add roles in the shared VPC host
   /// project. Each role is bound to the provided member. Each role must be
diff --git a/generated/googleapis/lib/serviceusage/v1.dart b/generated/googleapis/lib/serviceusage/v1.dart
index f2cec28..462b65c 100644
--- a/generated/googleapis/lib/serviceusage/v1.dart
+++ b/generated/googleapis/lib/serviceusage/v1.dart
@@ -25,8 +25,8 @@
 ///
 /// Create an instance of [ServiceUsageApi] to access these resources:
 ///
-/// - [OperationsResourceApi]
-/// - [ServicesResourceApi]
+/// - [OperationsResource]
+/// - [ServicesResource]
 library serviceusage.v1;
 
 import 'dart:async' as async;
@@ -59,8 +59,8 @@
 
   final commons.ApiRequester _requester;
 
-  OperationsResourceApi get operations => OperationsResourceApi(_requester);
-  ServicesResourceApi get services => ServicesResourceApi(_requester);
+  OperationsResource get operations => OperationsResource(_requester);
+  ServicesResource get services => ServicesResource(_requester);
 
   ServiceUsageApi(http_1.Client client,
       {core.String rootUrl = 'https://serviceusage.googleapis.com/',
@@ -69,10 +69,10 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class OperationsResourceApi {
+class OperationsResource {
   final commons.ApiRequester _requester;
 
-  OperationsResourceApi(commons.ApiRequester client) : _requester = client;
+  OperationsResource(commons.ApiRequester client) : _requester = client;
 
   /// Starts asynchronous cancellation on a long-running operation. The server
   /// makes a best effort to cancel the operation, but success is not
@@ -324,10 +324,10 @@
   }
 }
 
-class ServicesResourceApi {
+class ServicesResource {
   final commons.ApiRequester _requester;
 
-  ServicesResourceApi(commons.ApiRequester client) : _requester = client;
+  ServicesResource(commons.ApiRequester client) : _requester = client;
 
   /// Enable multiple services on a project. The operation is atomic: if
   /// enabling any service fails, then the entire batch fails, and no state
diff --git a/generated/googleapis/lib/sheets/v4.dart b/generated/googleapis/lib/sheets/v4.dart
index 7a58689..bb3c691 100644
--- a/generated/googleapis/lib/sheets/v4.dart
+++ b/generated/googleapis/lib/sheets/v4.dart
@@ -23,10 +23,10 @@
 ///
 /// Create an instance of [SheetsApi] to access these resources:
 ///
-/// - [SpreadsheetsResourceApi]
-///   - [SpreadsheetsDeveloperMetadataResourceApi]
-///   - [SpreadsheetsSheetsResourceApi]
-///   - [SpreadsheetsValuesResourceApi]
+/// - [SpreadsheetsResource]
+///   - [SpreadsheetsDeveloperMetadataResource]
+///   - [SpreadsheetsSheetsResource]
+///   - [SpreadsheetsValuesResource]
 library sheets.v4;
 
 import 'dart:async' as async;
@@ -64,8 +64,7 @@
 
   final commons.ApiRequester _requester;
 
-  SpreadsheetsResourceApi get spreadsheets =>
-      SpreadsheetsResourceApi(_requester);
+  SpreadsheetsResource get spreadsheets => SpreadsheetsResource(_requester);
 
   SheetsApi(http.Client client,
       {core.String rootUrl = 'https://sheets.googleapis.com/',
@@ -74,17 +73,17 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class SpreadsheetsResourceApi {
+class SpreadsheetsResource {
   final commons.ApiRequester _requester;
 
-  SpreadsheetsDeveloperMetadataResourceApi get developerMetadata =>
-      SpreadsheetsDeveloperMetadataResourceApi(_requester);
-  SpreadsheetsSheetsResourceApi get sheets =>
-      SpreadsheetsSheetsResourceApi(_requester);
-  SpreadsheetsValuesResourceApi get values =>
-      SpreadsheetsValuesResourceApi(_requester);
+  SpreadsheetsDeveloperMetadataResource get developerMetadata =>
+      SpreadsheetsDeveloperMetadataResource(_requester);
+  SpreadsheetsSheetsResource get sheets =>
+      SpreadsheetsSheetsResource(_requester);
+  SpreadsheetsValuesResource get values =>
+      SpreadsheetsValuesResource(_requester);
 
-  SpreadsheetsResourceApi(commons.ApiRequester client) : _requester = client;
+  SpreadsheetsResource(commons.ApiRequester client) : _requester = client;
 
   /// Applies one or more updates to the spreadsheet. Each request is validated
   /// before being applied. If any request is not valid then the entire request
@@ -352,10 +351,10 @@
   }
 }
 
-class SpreadsheetsDeveloperMetadataResourceApi {
+class SpreadsheetsDeveloperMetadataResource {
   final commons.ApiRequester _requester;
 
-  SpreadsheetsDeveloperMetadataResourceApi(commons.ApiRequester client)
+  SpreadsheetsDeveloperMetadataResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Returns the developer metadata with the specified ID. The caller must
@@ -483,11 +482,10 @@
   }
 }
 
-class SpreadsheetsSheetsResourceApi {
+class SpreadsheetsSheetsResource {
   final commons.ApiRequester _requester;
 
-  SpreadsheetsSheetsResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  SpreadsheetsSheetsResource(commons.ApiRequester client) : _requester = client;
 
   /// Copies a single sheet from a spreadsheet to another spreadsheet. Returns
   /// the properties of the newly created sheet.
@@ -558,11 +556,10 @@
   }
 }
 
-class SpreadsheetsValuesResourceApi {
+class SpreadsheetsValuesResource {
   final commons.ApiRequester _requester;
 
-  SpreadsheetsValuesResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  SpreadsheetsValuesResource(commons.ApiRequester client) : _requester = client;
 
   /// Appends values to a spreadsheet. The input range is used to search for
   /// existing data and find a "table" within that range. Values will be
diff --git a/generated/googleapis/lib/siteverification/v1.dart b/generated/googleapis/lib/siteverification/v1.dart
index b64bc73..ef756bf 100644
--- a/generated/googleapis/lib/siteverification/v1.dart
+++ b/generated/googleapis/lib/siteverification/v1.dart
@@ -23,7 +23,7 @@
 ///
 /// Create an instance of [SiteVerificationApi] to access these resources:
 ///
-/// - [WebResourceResourceApi]
+/// - [WebResourceResource]
 library siteVerification.v1;
 
 import 'dart:async' as async;
@@ -50,7 +50,7 @@
 
   final commons.ApiRequester _requester;
 
-  WebResourceResourceApi get webResource => WebResourceResourceApi(_requester);
+  WebResourceResource get webResource => WebResourceResource(_requester);
 
   SiteVerificationApi(http.Client client,
       {core.String rootUrl = 'https://www.googleapis.com/',
@@ -59,10 +59,10 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class WebResourceResourceApi {
+class WebResourceResource {
   final commons.ApiRequester _requester;
 
-  WebResourceResourceApi(commons.ApiRequester client) : _requester = client;
+  WebResourceResource(commons.ApiRequester client) : _requester = client;
 
   /// Relinquish ownership of a website or domain.
   ///
diff --git a/generated/googleapis/lib/slides/v1.dart b/generated/googleapis/lib/slides/v1.dart
index f0ed995..5f99ff6 100644
--- a/generated/googleapis/lib/slides/v1.dart
+++ b/generated/googleapis/lib/slides/v1.dart
@@ -23,8 +23,8 @@
 ///
 /// Create an instance of [SlidesApi] to access these resources:
 ///
-/// - [PresentationsResourceApi]
-///   - [PresentationsPagesResourceApi]
+/// - [PresentationsResource]
+///   - [PresentationsPagesResource]
 library slides.v1;
 
 import 'dart:async' as async;
@@ -70,8 +70,7 @@
 
   final commons.ApiRequester _requester;
 
-  PresentationsResourceApi get presentations =>
-      PresentationsResourceApi(_requester);
+  PresentationsResource get presentations => PresentationsResource(_requester);
 
   SlidesApi(http.Client client,
       {core.String rootUrl = 'https://slides.googleapis.com/',
@@ -80,13 +79,13 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class PresentationsResourceApi {
+class PresentationsResource {
   final commons.ApiRequester _requester;
 
-  PresentationsPagesResourceApi get pages =>
-      PresentationsPagesResourceApi(_requester);
+  PresentationsPagesResource get pages =>
+      PresentationsPagesResource(_requester);
 
-  PresentationsResourceApi(commons.ApiRequester client) : _requester = client;
+  PresentationsResource(commons.ApiRequester client) : _requester = client;
 
   /// Applies one or more updates to the presentation. Each request is validated
   /// before being applied. If any request is not valid, then the entire request
@@ -269,11 +268,10 @@
   }
 }
 
-class PresentationsPagesResourceApi {
+class PresentationsPagesResource {
   final commons.ApiRequester _requester;
 
-  PresentationsPagesResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  PresentationsPagesResource(commons.ApiRequester client) : _requester = client;
 
   /// Gets the latest version of the specified page in the presentation.
   ///
diff --git a/generated/googleapis/lib/sourcerepo/v1.dart b/generated/googleapis/lib/sourcerepo/v1.dart
index 79aa5bf..c335500 100644
--- a/generated/googleapis/lib/sourcerepo/v1.dart
+++ b/generated/googleapis/lib/sourcerepo/v1.dart
@@ -25,8 +25,8 @@
 /// Create an instance of [CloudSourceRepositoriesApi] to access these
 /// resources:
 ///
-/// - [ProjectsResourceApi]
-///   - [ProjectsReposResourceApi]
+/// - [ProjectsResource]
+///   - [ProjectsReposResource]
 library sourcerepo.v1;
 
 import 'dart:async' as async;
@@ -61,7 +61,7 @@
 
   final commons.ApiRequester _requester;
 
-  ProjectsResourceApi get projects => ProjectsResourceApi(_requester);
+  ProjectsResource get projects => ProjectsResource(_requester);
 
   CloudSourceRepositoriesApi(http.Client client,
       {core.String rootUrl = 'https://sourcerepo.googleapis.com/',
@@ -70,12 +70,12 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class ProjectsResourceApi {
+class ProjectsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsReposResourceApi get repos => ProjectsReposResourceApi(_requester);
+  ProjectsReposResource get repos => ProjectsReposResource(_requester);
 
-  ProjectsResourceApi(commons.ApiRequester client) : _requester = client;
+  ProjectsResource(commons.ApiRequester client) : _requester = client;
 
   /// Returns the Cloud Source Repositories configuration of the project.
   ///
@@ -190,10 +190,10 @@
   }
 }
 
-class ProjectsReposResourceApi {
+class ProjectsReposResource {
   final commons.ApiRequester _requester;
 
-  ProjectsReposResourceApi(commons.ApiRequester client) : _requester = client;
+  ProjectsReposResource(commons.ApiRequester client) : _requester = client;
 
   /// Creates a repo in the given project with the given name. If the named
   /// repository already exists, `CreateRepo` returns `ALREADY_EXISTS`.
diff --git a/generated/googleapis/lib/spanner/v1.dart b/generated/googleapis/lib/spanner/v1.dart
index f5baf1f..5c3245c 100644
--- a/generated/googleapis/lib/spanner/v1.dart
+++ b/generated/googleapis/lib/spanner/v1.dart
@@ -24,17 +24,17 @@
 ///
 /// Create an instance of [SpannerApi] to access these resources:
 ///
-/// - [ProjectsResourceApi]
-///   - [ProjectsInstanceConfigsResourceApi]
-///   - [ProjectsInstancesResourceApi]
-///     - [ProjectsInstancesBackupOperationsResourceApi]
-///     - [ProjectsInstancesBackupsResourceApi]
-///       - [ProjectsInstancesBackupsOperationsResourceApi]
-///     - [ProjectsInstancesDatabaseOperationsResourceApi]
-///     - [ProjectsInstancesDatabasesResourceApi]
-///       - [ProjectsInstancesDatabasesOperationsResourceApi]
-///       - [ProjectsInstancesDatabasesSessionsResourceApi]
-///     - [ProjectsInstancesOperationsResourceApi]
+/// - [ProjectsResource]
+///   - [ProjectsInstanceConfigsResource]
+///   - [ProjectsInstancesResource]
+///     - [ProjectsInstancesBackupOperationsResource]
+///     - [ProjectsInstancesBackupsResource]
+///       - [ProjectsInstancesBackupsOperationsResource]
+///     - [ProjectsInstancesDatabaseOperationsResource]
+///     - [ProjectsInstancesDatabasesResource]
+///       - [ProjectsInstancesDatabasesOperationsResource]
+///       - [ProjectsInstancesDatabasesSessionsResource]
+///     - [ProjectsInstancesOperationsResource]
 library spanner.v1;
 
 import 'dart:async' as async;
@@ -66,7 +66,7 @@
 
   final commons.ApiRequester _requester;
 
-  ProjectsResourceApi get projects => ProjectsResourceApi(_requester);
+  ProjectsResource get projects => ProjectsResource(_requester);
 
   SpannerApi(http.Client client,
       {core.String rootUrl = 'https://spanner.googleapis.com/',
@@ -75,21 +75,21 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class ProjectsResourceApi {
+class ProjectsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsInstanceConfigsResourceApi get instanceConfigs =>
-      ProjectsInstanceConfigsResourceApi(_requester);
-  ProjectsInstancesResourceApi get instances =>
-      ProjectsInstancesResourceApi(_requester);
+  ProjectsInstanceConfigsResource get instanceConfigs =>
+      ProjectsInstanceConfigsResource(_requester);
+  ProjectsInstancesResource get instances =>
+      ProjectsInstancesResource(_requester);
 
-  ProjectsResourceApi(commons.ApiRequester client) : _requester = client;
+  ProjectsResource(commons.ApiRequester client) : _requester = client;
 }
 
-class ProjectsInstanceConfigsResourceApi {
+class ProjectsInstanceConfigsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsInstanceConfigsResourceApi(commons.ApiRequester client)
+  ProjectsInstanceConfigsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Gets information about a particular instance configuration.
@@ -216,22 +216,21 @@
   }
 }
 
-class ProjectsInstancesResourceApi {
+class ProjectsInstancesResource {
   final commons.ApiRequester _requester;
 
-  ProjectsInstancesBackupOperationsResourceApi get backupOperations =>
-      ProjectsInstancesBackupOperationsResourceApi(_requester);
-  ProjectsInstancesBackupsResourceApi get backups =>
-      ProjectsInstancesBackupsResourceApi(_requester);
-  ProjectsInstancesDatabaseOperationsResourceApi get databaseOperations =>
-      ProjectsInstancesDatabaseOperationsResourceApi(_requester);
-  ProjectsInstancesDatabasesResourceApi get databases =>
-      ProjectsInstancesDatabasesResourceApi(_requester);
-  ProjectsInstancesOperationsResourceApi get operations =>
-      ProjectsInstancesOperationsResourceApi(_requester);
+  ProjectsInstancesBackupOperationsResource get backupOperations =>
+      ProjectsInstancesBackupOperationsResource(_requester);
+  ProjectsInstancesBackupsResource get backups =>
+      ProjectsInstancesBackupsResource(_requester);
+  ProjectsInstancesDatabaseOperationsResource get databaseOperations =>
+      ProjectsInstancesDatabaseOperationsResource(_requester);
+  ProjectsInstancesDatabasesResource get databases =>
+      ProjectsInstancesDatabasesResource(_requester);
+  ProjectsInstancesOperationsResource get operations =>
+      ProjectsInstancesOperationsResource(_requester);
 
-  ProjectsInstancesResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  ProjectsInstancesResource(commons.ApiRequester client) : _requester = client;
 
   /// Creates an instance and begins preparing it to begin serving. The returned
   /// long-running operation can be used to track the progress of preparing the
@@ -781,10 +780,10 @@
   }
 }
 
-class ProjectsInstancesBackupOperationsResourceApi {
+class ProjectsInstancesBackupOperationsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsInstancesBackupOperationsResourceApi(commons.ApiRequester client)
+  ProjectsInstancesBackupOperationsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Lists the backup long-running operations in the given instance. A backup
@@ -896,13 +895,13 @@
   }
 }
 
-class ProjectsInstancesBackupsResourceApi {
+class ProjectsInstancesBackupsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsInstancesBackupsOperationsResourceApi get operations =>
-      ProjectsInstancesBackupsOperationsResourceApi(_requester);
+  ProjectsInstancesBackupsOperationsResource get operations =>
+      ProjectsInstancesBackupsOperationsResource(_requester);
 
-  ProjectsInstancesBackupsResourceApi(commons.ApiRequester client)
+  ProjectsInstancesBackupsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Starts creating a new Cloud Spanner Backup. The returned backup
@@ -1455,10 +1454,10 @@
   }
 }
 
-class ProjectsInstancesBackupsOperationsResourceApi {
+class ProjectsInstancesBackupsOperationsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsInstancesBackupsOperationsResourceApi(commons.ApiRequester client)
+  ProjectsInstancesBackupsOperationsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Starts asynchronous cancellation on a long-running operation. The server
@@ -1710,10 +1709,10 @@
   }
 }
 
-class ProjectsInstancesDatabaseOperationsResourceApi {
+class ProjectsInstancesDatabaseOperationsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsInstancesDatabaseOperationsResourceApi(commons.ApiRequester client)
+  ProjectsInstancesDatabaseOperationsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Lists database longrunning-operations. A database operation has a name of
@@ -1823,15 +1822,15 @@
   }
 }
 
-class ProjectsInstancesDatabasesResourceApi {
+class ProjectsInstancesDatabasesResource {
   final commons.ApiRequester _requester;
 
-  ProjectsInstancesDatabasesOperationsResourceApi get operations =>
-      ProjectsInstancesDatabasesOperationsResourceApi(_requester);
-  ProjectsInstancesDatabasesSessionsResourceApi get sessions =>
-      ProjectsInstancesDatabasesSessionsResourceApi(_requester);
+  ProjectsInstancesDatabasesOperationsResource get operations =>
+      ProjectsInstancesDatabasesOperationsResource(_requester);
+  ProjectsInstancesDatabasesSessionsResource get sessions =>
+      ProjectsInstancesDatabasesSessionsResource(_requester);
 
-  ProjectsInstancesDatabasesResourceApi(commons.ApiRequester client)
+  ProjectsInstancesDatabasesResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Creates a new Cloud Spanner database and starts to prepare it for serving.
@@ -2464,10 +2463,10 @@
   }
 }
 
-class ProjectsInstancesDatabasesOperationsResourceApi {
+class ProjectsInstancesDatabasesOperationsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsInstancesDatabasesOperationsResourceApi(commons.ApiRequester client)
+  ProjectsInstancesDatabasesOperationsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Starts asynchronous cancellation on a long-running operation. The server
@@ -2719,10 +2718,10 @@
   }
 }
 
-class ProjectsInstancesDatabasesSessionsResourceApi {
+class ProjectsInstancesDatabasesSessionsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsInstancesDatabasesSessionsResourceApi(commons.ApiRequester client)
+  ProjectsInstancesDatabasesSessionsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Creates multiple new sessions. This API can be used to initialize a
@@ -3718,10 +3717,10 @@
   }
 }
 
-class ProjectsInstancesOperationsResourceApi {
+class ProjectsInstancesOperationsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsInstancesOperationsResourceApi(commons.ApiRequester client)
+  ProjectsInstancesOperationsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Starts asynchronous cancellation on a long-running operation. The server
diff --git a/generated/googleapis/lib/speech/v1.dart b/generated/googleapis/lib/speech/v1.dart
index ab284f1..8aff80a 100644
--- a/generated/googleapis/lib/speech/v1.dart
+++ b/generated/googleapis/lib/speech/v1.dart
@@ -24,11 +24,11 @@
 ///
 /// Create an instance of [SpeechApi] to access these resources:
 ///
-/// - [OperationsResourceApi]
-/// - [ProjectsResourceApi]
-///   - [ProjectsLocationsResourceApi]
-///     - [ProjectsLocationsOperationsResourceApi]
-/// - [SpeechResourceApi]
+/// - [OperationsResource]
+/// - [ProjectsResource]
+///   - [ProjectsLocationsResource]
+///     - [ProjectsLocationsOperationsResource]
+/// - [SpeechResource]
 library speech.v1;
 
 import 'dart:async' as async;
@@ -51,9 +51,9 @@
 
   final commons.ApiRequester _requester;
 
-  OperationsResourceApi get operations => OperationsResourceApi(_requester);
-  ProjectsResourceApi get projects => ProjectsResourceApi(_requester);
-  SpeechResourceApi get speech => SpeechResourceApi(_requester);
+  OperationsResource get operations => OperationsResource(_requester);
+  ProjectsResource get projects => ProjectsResource(_requester);
+  SpeechResource get speech => SpeechResource(_requester);
 
   SpeechApi(http.Client client,
       {core.String rootUrl = 'https://speech.googleapis.com/',
@@ -62,10 +62,10 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class OperationsResourceApi {
+class OperationsResource {
   final commons.ApiRequester _requester;
 
-  OperationsResourceApi(commons.ApiRequester client) : _requester = client;
+  OperationsResource(commons.ApiRequester client) : _requester = client;
 
   /// Gets the latest state of a long-running operation. Clients can use this
   /// method to poll the operation result at intervals as recommended by the API
@@ -198,29 +198,28 @@
   }
 }
 
-class ProjectsResourceApi {
+class ProjectsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsLocationsResourceApi get locations =>
-      ProjectsLocationsResourceApi(_requester);
+  ProjectsLocationsResource get locations =>
+      ProjectsLocationsResource(_requester);
 
-  ProjectsResourceApi(commons.ApiRequester client) : _requester = client;
+  ProjectsResource(commons.ApiRequester client) : _requester = client;
 }
 
-class ProjectsLocationsResourceApi {
+class ProjectsLocationsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsLocationsOperationsResourceApi get operations =>
-      ProjectsLocationsOperationsResourceApi(_requester);
+  ProjectsLocationsOperationsResource get operations =>
+      ProjectsLocationsOperationsResource(_requester);
 
-  ProjectsLocationsResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  ProjectsLocationsResource(commons.ApiRequester client) : _requester = client;
 }
 
-class ProjectsLocationsOperationsResourceApi {
+class ProjectsLocationsOperationsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsLocationsOperationsResourceApi(commons.ApiRequester client)
+  ProjectsLocationsOperationsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Gets the latest state of a long-running operation. Clients can use this
@@ -357,10 +356,10 @@
   }
 }
 
-class SpeechResourceApi {
+class SpeechResource {
   final commons.ApiRequester _requester;
 
-  SpeechResourceApi(commons.ApiRequester client) : _requester = client;
+  SpeechResource(commons.ApiRequester client) : _requester = client;
 
   /// Performs asynchronous speech recognition: receive results via the
   /// google.longrunning.Operations interface. Returns either an
diff --git a/generated/googleapis/lib/storage/v1.dart b/generated/googleapis/lib/storage/v1.dart
index c6082c4..944c1f8 100644
--- a/generated/googleapis/lib/storage/v1.dart
+++ b/generated/googleapis/lib/storage/v1.dart
@@ -24,16 +24,16 @@
 ///
 /// Create an instance of [StorageApi] to access these resources:
 ///
-/// - [BucketAccessControlsResourceApi]
-/// - [BucketsResourceApi]
-/// - [ChannelsResourceApi]
-/// - [DefaultObjectAccessControlsResourceApi]
-/// - [NotificationsResourceApi]
-/// - [ObjectAccessControlsResourceApi]
-/// - [ObjectsResourceApi]
-/// - [ProjectsResourceApi]
-///   - [ProjectsHmacKeysResourceApi]
-///   - [ProjectsServiceAccountResourceApi]
+/// - [BucketAccessControlsResource]
+/// - [BucketsResource]
+/// - [ChannelsResource]
+/// - [DefaultObjectAccessControlsResource]
+/// - [NotificationsResource]
+/// - [ObjectAccessControlsResource]
+/// - [ObjectsResource]
+/// - [ProjectsResource]
+///   - [ProjectsHmacKeysResource]
+///   - [ProjectsServiceAccountResource]
 library storage.v1;
 
 import 'dart:async' as async;
@@ -80,18 +80,17 @@
 
   final commons.ApiRequester _requester;
 
-  BucketAccessControlsResourceApi get bucketAccessControls =>
-      BucketAccessControlsResourceApi(_requester);
-  BucketsResourceApi get buckets => BucketsResourceApi(_requester);
-  ChannelsResourceApi get channels => ChannelsResourceApi(_requester);
-  DefaultObjectAccessControlsResourceApi get defaultObjectAccessControls =>
-      DefaultObjectAccessControlsResourceApi(_requester);
-  NotificationsResourceApi get notifications =>
-      NotificationsResourceApi(_requester);
-  ObjectAccessControlsResourceApi get objectAccessControls =>
-      ObjectAccessControlsResourceApi(_requester);
-  ObjectsResourceApi get objects => ObjectsResourceApi(_requester);
-  ProjectsResourceApi get projects => ProjectsResourceApi(_requester);
+  BucketAccessControlsResource get bucketAccessControls =>
+      BucketAccessControlsResource(_requester);
+  BucketsResource get buckets => BucketsResource(_requester);
+  ChannelsResource get channels => ChannelsResource(_requester);
+  DefaultObjectAccessControlsResource get defaultObjectAccessControls =>
+      DefaultObjectAccessControlsResource(_requester);
+  NotificationsResource get notifications => NotificationsResource(_requester);
+  ObjectAccessControlsResource get objectAccessControls =>
+      ObjectAccessControlsResource(_requester);
+  ObjectsResource get objects => ObjectsResource(_requester);
+  ProjectsResource get projects => ProjectsResource(_requester);
 
   StorageApi(http.Client client,
       {core.String rootUrl = 'https://storage.googleapis.com/',
@@ -100,10 +99,10 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class BucketAccessControlsResourceApi {
+class BucketAccessControlsResource {
   final commons.ApiRequester _requester;
 
-  BucketAccessControlsResourceApi(commons.ApiRequester client)
+  BucketAccessControlsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Permanently deletes the ACL entry for the specified entity on the
@@ -559,10 +558,10 @@
   }
 }
 
-class BucketsResourceApi {
+class BucketsResource {
   final commons.ApiRequester _requester;
 
-  BucketsResourceApi(commons.ApiRequester client) : _requester = client;
+  BucketsResource(commons.ApiRequester client) : _requester = client;
 
   /// Permanently deletes an empty bucket.
   ///
@@ -1499,10 +1498,10 @@
   }
 }
 
-class ChannelsResourceApi {
+class ChannelsResource {
   final commons.ApiRequester _requester;
 
-  ChannelsResourceApi(commons.ApiRequester client) : _requester = client;
+  ChannelsResource(commons.ApiRequester client) : _requester = client;
 
   /// Stop watching resources through this channel
   ///
@@ -1555,10 +1554,10 @@
   }
 }
 
-class DefaultObjectAccessControlsResourceApi {
+class DefaultObjectAccessControlsResource {
   final commons.ApiRequester _requester;
 
-  DefaultObjectAccessControlsResourceApi(commons.ApiRequester client)
+  DefaultObjectAccessControlsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Permanently deletes the default object ACL entry for the specified entity
@@ -2031,10 +2030,10 @@
   }
 }
 
-class NotificationsResourceApi {
+class NotificationsResource {
   final commons.ApiRequester _requester;
 
-  NotificationsResourceApi(commons.ApiRequester client) : _requester = client;
+  NotificationsResource(commons.ApiRequester client) : _requester = client;
 
   /// Permanently deletes a notification subscription.
   ///
@@ -2324,10 +2323,10 @@
   }
 }
 
-class ObjectAccessControlsResourceApi {
+class ObjectAccessControlsResource {
   final commons.ApiRequester _requester;
 
-  ObjectAccessControlsResourceApi(commons.ApiRequester client)
+  ObjectAccessControlsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Permanently deletes the ACL entry for the specified entity on the
@@ -2883,10 +2882,10 @@
   }
 }
 
-class ObjectsResourceApi {
+class ObjectsResource {
   final commons.ApiRequester _requester;
 
-  ObjectsResourceApi(commons.ApiRequester client) : _requester = client;
+  ObjectsResource(commons.ApiRequester client) : _requester = client;
 
   /// Concatenates a list of existing objects into a new object in the same
   /// bucket.
@@ -4729,22 +4728,20 @@
   }
 }
 
-class ProjectsResourceApi {
+class ProjectsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsHmacKeysResourceApi get hmacKeys =>
-      ProjectsHmacKeysResourceApi(_requester);
-  ProjectsServiceAccountResourceApi get serviceAccount =>
-      ProjectsServiceAccountResourceApi(_requester);
+  ProjectsHmacKeysResource get hmacKeys => ProjectsHmacKeysResource(_requester);
+  ProjectsServiceAccountResource get serviceAccount =>
+      ProjectsServiceAccountResource(_requester);
 
-  ProjectsResourceApi(commons.ApiRequester client) : _requester = client;
+  ProjectsResource(commons.ApiRequester client) : _requester = client;
 }
 
-class ProjectsHmacKeysResourceApi {
+class ProjectsHmacKeysResource {
   final commons.ApiRequester _requester;
 
-  ProjectsHmacKeysResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  ProjectsHmacKeysResource(commons.ApiRequester client) : _requester = client;
 
   /// Creates a new HMAC key for the specified service account.
   ///
@@ -5104,10 +5101,10 @@
   }
 }
 
-class ProjectsServiceAccountResourceApi {
+class ProjectsServiceAccountResource {
   final commons.ApiRequester _requester;
 
-  ProjectsServiceAccountResourceApi(commons.ApiRequester client)
+  ProjectsServiceAccountResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Get the email address of this project's Google Cloud Storage service
diff --git a/generated/googleapis/lib/storagetransfer/v1.dart b/generated/googleapis/lib/storagetransfer/v1.dart
index c48521c..6c95eca 100644
--- a/generated/googleapis/lib/storagetransfer/v1.dart
+++ b/generated/googleapis/lib/storagetransfer/v1.dart
@@ -24,9 +24,9 @@
 ///
 /// Create an instance of [StoragetransferApi] to access these resources:
 ///
-/// - [GoogleServiceAccountsResourceApi]
-/// - [TransferJobsResourceApi]
-/// - [TransferOperationsResourceApi]
+/// - [GoogleServiceAccountsResource]
+/// - [TransferJobsResource]
+/// - [TransferOperationsResource]
 library storagetransfer.v1;
 
 import 'dart:async' as async;
@@ -50,12 +50,11 @@
 
   final commons.ApiRequester _requester;
 
-  GoogleServiceAccountsResourceApi get googleServiceAccounts =>
-      GoogleServiceAccountsResourceApi(_requester);
-  TransferJobsResourceApi get transferJobs =>
-      TransferJobsResourceApi(_requester);
-  TransferOperationsResourceApi get transferOperations =>
-      TransferOperationsResourceApi(_requester);
+  GoogleServiceAccountsResource get googleServiceAccounts =>
+      GoogleServiceAccountsResource(_requester);
+  TransferJobsResource get transferJobs => TransferJobsResource(_requester);
+  TransferOperationsResource get transferOperations =>
+      TransferOperationsResource(_requester);
 
   StoragetransferApi(http.Client client,
       {core.String rootUrl = 'https://storagetransfer.googleapis.com/',
@@ -64,10 +63,10 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class GoogleServiceAccountsResourceApi {
+class GoogleServiceAccountsResource {
   final commons.ApiRequester _requester;
 
-  GoogleServiceAccountsResourceApi(commons.ApiRequester client)
+  GoogleServiceAccountsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Returns the Google service account that is used by Storage Transfer
@@ -130,10 +129,10 @@
   }
 }
 
-class TransferJobsResourceApi {
+class TransferJobsResource {
   final commons.ApiRequester _requester;
 
-  TransferJobsResourceApi(commons.ApiRequester client) : _requester = client;
+  TransferJobsResource(commons.ApiRequester client) : _requester = client;
 
   /// Creates a transfer job that runs periodically.
   ///
@@ -377,11 +376,10 @@
   }
 }
 
-class TransferOperationsResourceApi {
+class TransferOperationsResource {
   final commons.ApiRequester _requester;
 
-  TransferOperationsResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  TransferOperationsResource(commons.ApiRequester client) : _requester = client;
 
   /// Cancels a transfer. Use the transferOperations.get method to check if the
   /// cancellation succeeded or if the operation completed despite the `cancel`
diff --git a/generated/googleapis/lib/streetviewpublish/v1.dart b/generated/googleapis/lib/streetviewpublish/v1.dart
index 1f98585..575d7c9 100644
--- a/generated/googleapis/lib/streetviewpublish/v1.dart
+++ b/generated/googleapis/lib/streetviewpublish/v1.dart
@@ -26,8 +26,8 @@
 ///
 /// Create an instance of [StreetViewPublishApi] to access these resources:
 ///
-/// - [PhotoResourceApi]
-/// - [PhotosResourceApi]
+/// - [PhotoResource]
+/// - [PhotosResource]
 library streetviewpublish.v1;
 
 import 'dart:async' as async;
@@ -52,8 +52,8 @@
 
   final commons.ApiRequester _requester;
 
-  PhotoResourceApi get photo => PhotoResourceApi(_requester);
-  PhotosResourceApi get photos => PhotosResourceApi(_requester);
+  PhotoResource get photo => PhotoResource(_requester);
+  PhotosResource get photos => PhotosResource(_requester);
 
   StreetViewPublishApi(http.Client client,
       {core.String rootUrl = 'https://streetviewpublish.googleapis.com/',
@@ -62,10 +62,10 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class PhotoResourceApi {
+class PhotoResource {
   final commons.ApiRequester _requester;
 
-  PhotoResourceApi(commons.ApiRequester client) : _requester = client;
+  PhotoResource(commons.ApiRequester client) : _requester = client;
 
   /// After the client finishes uploading the photo with the returned UploadRef,
   /// CreatePhoto publishes the uploaded Photo to Street View on Google Maps.
@@ -400,10 +400,10 @@
   }
 }
 
-class PhotosResourceApi {
+class PhotosResource {
   final commons.ApiRequester _requester;
 
-  PhotosResourceApi(commons.ApiRequester client) : _requester = client;
+  PhotosResource(commons.ApiRequester client) : _requester = client;
 
   /// Deletes a list of Photos and their metadata. Note that if
   /// BatchDeletePhotos fails, either critical fields are missing or there is an
diff --git a/generated/googleapis/lib/tagmanager/v1.dart b/generated/googleapis/lib/tagmanager/v1.dart
index 4bf3689..618564c 100644
--- a/generated/googleapis/lib/tagmanager/v1.dart
+++ b/generated/googleapis/lib/tagmanager/v1.dart
@@ -24,18 +24,18 @@
 ///
 /// Create an instance of [TagManagerApi] to access these resources:
 ///
-/// - [AccountsResourceApi]
-///   - [AccountsContainersResourceApi]
-///     - [AccountsContainersEnvironmentsResourceApi]
-///     - [AccountsContainersFoldersResourceApi]
-///       - [AccountsContainersFoldersEntitiesResourceApi]
-///     - [AccountsContainersMoveFoldersResourceApi]
-///     - [AccountsContainersReauthorizeEnvironmentsResourceApi]
-///     - [AccountsContainersTagsResourceApi]
-///     - [AccountsContainersTriggersResourceApi]
-///     - [AccountsContainersVariablesResourceApi]
-///     - [AccountsContainersVersionsResourceApi]
-///   - [AccountsPermissionsResourceApi]
+/// - [AccountsResource]
+///   - [AccountsContainersResource]
+///     - [AccountsContainersEnvironmentsResource]
+///     - [AccountsContainersFoldersResource]
+///       - [AccountsContainersFoldersEntitiesResource]
+///     - [AccountsContainersMoveFoldersResource]
+///     - [AccountsContainersReauthorizeEnvironmentsResource]
+///     - [AccountsContainersTagsResource]
+///     - [AccountsContainersTriggersResource]
+///     - [AccountsContainersVariablesResource]
+///     - [AccountsContainersVersionsResource]
+///   - [AccountsPermissionsResource]
 library tagmanager.v1;
 
 import 'dart:async' as async;
@@ -84,7 +84,7 @@
 
   final commons.ApiRequester _requester;
 
-  AccountsResourceApi get accounts => AccountsResourceApi(_requester);
+  AccountsResource get accounts => AccountsResource(_requester);
 
   TagManagerApi(http.Client client,
       {core.String rootUrl = 'https://tagmanager.googleapis.com/',
@@ -93,15 +93,15 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class AccountsResourceApi {
+class AccountsResource {
   final commons.ApiRequester _requester;
 
-  AccountsContainersResourceApi get containers =>
-      AccountsContainersResourceApi(_requester);
-  AccountsPermissionsResourceApi get permissions =>
-      AccountsPermissionsResourceApi(_requester);
+  AccountsContainersResource get containers =>
+      AccountsContainersResource(_requester);
+  AccountsPermissionsResource get permissions =>
+      AccountsPermissionsResource(_requester);
 
-  AccountsResourceApi(commons.ApiRequester client) : _requester = client;
+  AccountsResource(commons.ApiRequester client) : _requester = client;
 
   /// Gets a GTM Account.
   ///
@@ -264,29 +264,28 @@
   }
 }
 
-class AccountsContainersResourceApi {
+class AccountsContainersResource {
   final commons.ApiRequester _requester;
 
-  AccountsContainersEnvironmentsResourceApi get environments =>
-      AccountsContainersEnvironmentsResourceApi(_requester);
-  AccountsContainersFoldersResourceApi get folders =>
-      AccountsContainersFoldersResourceApi(_requester);
-  AccountsContainersMoveFoldersResourceApi get moveFolders =>
-      AccountsContainersMoveFoldersResourceApi(_requester);
-  AccountsContainersReauthorizeEnvironmentsResourceApi
+  AccountsContainersEnvironmentsResource get environments =>
+      AccountsContainersEnvironmentsResource(_requester);
+  AccountsContainersFoldersResource get folders =>
+      AccountsContainersFoldersResource(_requester);
+  AccountsContainersMoveFoldersResource get moveFolders =>
+      AccountsContainersMoveFoldersResource(_requester);
+  AccountsContainersReauthorizeEnvironmentsResource
       get reauthorizeEnvironments =>
-          AccountsContainersReauthorizeEnvironmentsResourceApi(_requester);
-  AccountsContainersTagsResourceApi get tags =>
-      AccountsContainersTagsResourceApi(_requester);
-  AccountsContainersTriggersResourceApi get triggers =>
-      AccountsContainersTriggersResourceApi(_requester);
-  AccountsContainersVariablesResourceApi get variables =>
-      AccountsContainersVariablesResourceApi(_requester);
-  AccountsContainersVersionsResourceApi get versions =>
-      AccountsContainersVersionsResourceApi(_requester);
+          AccountsContainersReauthorizeEnvironmentsResource(_requester);
+  AccountsContainersTagsResource get tags =>
+      AccountsContainersTagsResource(_requester);
+  AccountsContainersTriggersResource get triggers =>
+      AccountsContainersTriggersResource(_requester);
+  AccountsContainersVariablesResource get variables =>
+      AccountsContainersVariablesResource(_requester);
+  AccountsContainersVersionsResource get versions =>
+      AccountsContainersVersionsResource(_requester);
 
-  AccountsContainersResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  AccountsContainersResource(commons.ApiRequester client) : _requester = client;
 
   /// Creates a Container.
   ///
@@ -590,10 +589,10 @@
   }
 }
 
-class AccountsContainersEnvironmentsResourceApi {
+class AccountsContainersEnvironmentsResource {
   final commons.ApiRequester _requester;
 
-  AccountsContainersEnvironmentsResourceApi(commons.ApiRequester client)
+  AccountsContainersEnvironmentsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Creates a GTM Environment.
@@ -941,13 +940,13 @@
   }
 }
 
-class AccountsContainersFoldersResourceApi {
+class AccountsContainersFoldersResource {
   final commons.ApiRequester _requester;
 
-  AccountsContainersFoldersEntitiesResourceApi get entities =>
-      AccountsContainersFoldersEntitiesResourceApi(_requester);
+  AccountsContainersFoldersEntitiesResource get entities =>
+      AccountsContainersFoldersEntitiesResource(_requester);
 
-  AccountsContainersFoldersResourceApi(commons.ApiRequester client)
+  AccountsContainersFoldersResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Creates a GTM Folder.
@@ -1292,10 +1291,10 @@
   }
 }
 
-class AccountsContainersFoldersEntitiesResourceApi {
+class AccountsContainersFoldersEntitiesResource {
   final commons.ApiRequester _requester;
 
-  AccountsContainersFoldersEntitiesResourceApi(commons.ApiRequester client)
+  AccountsContainersFoldersEntitiesResource(commons.ApiRequester client)
       : _requester = client;
 
   /// List all entities in a GTM Folder.
@@ -1368,10 +1367,10 @@
   }
 }
 
-class AccountsContainersMoveFoldersResourceApi {
+class AccountsContainersMoveFoldersResource {
   final commons.ApiRequester _requester;
 
-  AccountsContainersMoveFoldersResourceApi(commons.ApiRequester client)
+  AccountsContainersMoveFoldersResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Moves entities to a GTM Folder.
@@ -1466,11 +1465,10 @@
   }
 }
 
-class AccountsContainersReauthorizeEnvironmentsResourceApi {
+class AccountsContainersReauthorizeEnvironmentsResource {
   final commons.ApiRequester _requester;
 
-  AccountsContainersReauthorizeEnvironmentsResourceApi(
-      commons.ApiRequester client)
+  AccountsContainersReauthorizeEnvironmentsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Re-generates the authorization code for a GTM Environment.
@@ -1548,10 +1546,10 @@
   }
 }
 
-class AccountsContainersTagsResourceApi {
+class AccountsContainersTagsResource {
   final commons.ApiRequester _requester;
 
-  AccountsContainersTagsResourceApi(commons.ApiRequester client)
+  AccountsContainersTagsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Creates a GTM Tag.
@@ -1896,10 +1894,10 @@
   }
 }
 
-class AccountsContainersTriggersResourceApi {
+class AccountsContainersTriggersResource {
   final commons.ApiRequester _requester;
 
-  AccountsContainersTriggersResourceApi(commons.ApiRequester client)
+  AccountsContainersTriggersResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Creates a GTM Trigger.
@@ -2244,10 +2242,10 @@
   }
 }
 
-class AccountsContainersVariablesResourceApi {
+class AccountsContainersVariablesResource {
   final commons.ApiRequester _requester;
 
-  AccountsContainersVariablesResourceApi(commons.ApiRequester client)
+  AccountsContainersVariablesResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Creates a GTM Variable.
@@ -2592,10 +2590,10 @@
   }
 }
 
-class AccountsContainersVersionsResourceApi {
+class AccountsContainersVersionsResource {
   final commons.ApiRequester _requester;
 
-  AccountsContainersVersionsResourceApi(commons.ApiRequester client)
+  AccountsContainersVersionsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Creates a Container Version.
@@ -3173,10 +3171,10 @@
   }
 }
 
-class AccountsPermissionsResourceApi {
+class AccountsPermissionsResource {
   final commons.ApiRequester _requester;
 
-  AccountsPermissionsResourceApi(commons.ApiRequester client)
+  AccountsPermissionsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Creates a user's Account & Container Permissions.
diff --git a/generated/googleapis/lib/tagmanager/v2.dart b/generated/googleapis/lib/tagmanager/v2.dart
index 863a352..c50f476 100644
--- a/generated/googleapis/lib/tagmanager/v2.dart
+++ b/generated/googleapis/lib/tagmanager/v2.dart
@@ -24,20 +24,20 @@
 ///
 /// Create an instance of [TagManagerApi] to access these resources:
 ///
-/// - [AccountsResourceApi]
-///   - [AccountsContainersResourceApi]
-///     - [AccountsContainersEnvironmentsResourceApi]
-///     - [AccountsContainersVersionHeadersResourceApi]
-///     - [AccountsContainersVersionsResourceApi]
-///     - [AccountsContainersWorkspacesResourceApi]
-///       - [AccountsContainersWorkspacesBuiltInVariablesResourceApi]
-///       - [AccountsContainersWorkspacesFoldersResourceApi]
-///       - [AccountsContainersWorkspacesTagsResourceApi]
-///       - [AccountsContainersWorkspacesTemplatesResourceApi]
-///       - [AccountsContainersWorkspacesTriggersResourceApi]
-///       - [AccountsContainersWorkspacesVariablesResourceApi]
-///       - [AccountsContainersWorkspacesZonesResourceApi]
-///   - [AccountsUserPermissionsResourceApi]
+/// - [AccountsResource]
+///   - [AccountsContainersResource]
+///     - [AccountsContainersEnvironmentsResource]
+///     - [AccountsContainersVersionHeadersResource]
+///     - [AccountsContainersVersionsResource]
+///     - [AccountsContainersWorkspacesResource]
+///       - [AccountsContainersWorkspacesBuiltInVariablesResource]
+///       - [AccountsContainersWorkspacesFoldersResource]
+///       - [AccountsContainersWorkspacesTagsResource]
+///       - [AccountsContainersWorkspacesTemplatesResource]
+///       - [AccountsContainersWorkspacesTriggersResource]
+///       - [AccountsContainersWorkspacesVariablesResource]
+///       - [AccountsContainersWorkspacesZonesResource]
+///   - [AccountsUserPermissionsResource]
 library tagmanager.v2;
 
 import 'dart:async' as async;
@@ -86,7 +86,7 @@
 
   final commons.ApiRequester _requester;
 
-  AccountsResourceApi get accounts => AccountsResourceApi(_requester);
+  AccountsResource get accounts => AccountsResource(_requester);
 
   TagManagerApi(http.Client client,
       {core.String rootUrl = 'https://tagmanager.googleapis.com/',
@@ -95,15 +95,15 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class AccountsResourceApi {
+class AccountsResource {
   final commons.ApiRequester _requester;
 
-  AccountsContainersResourceApi get containers =>
-      AccountsContainersResourceApi(_requester);
-  AccountsUserPermissionsResourceApi get userPermissions =>
-      AccountsUserPermissionsResourceApi(_requester);
+  AccountsContainersResource get containers =>
+      AccountsContainersResource(_requester);
+  AccountsUserPermissionsResource get userPermissions =>
+      AccountsUserPermissionsResource(_requester);
 
-  AccountsResourceApi(commons.ApiRequester client) : _requester = client;
+  AccountsResource(commons.ApiRequester client) : _requester = client;
 
   /// Gets a GTM Account.
   ///
@@ -272,20 +272,19 @@
   }
 }
 
-class AccountsContainersResourceApi {
+class AccountsContainersResource {
   final commons.ApiRequester _requester;
 
-  AccountsContainersEnvironmentsResourceApi get environments =>
-      AccountsContainersEnvironmentsResourceApi(_requester);
-  AccountsContainersVersionHeadersResourceApi get versionHeaders =>
-      AccountsContainersVersionHeadersResourceApi(_requester);
-  AccountsContainersVersionsResourceApi get versions =>
-      AccountsContainersVersionsResourceApi(_requester);
-  AccountsContainersWorkspacesResourceApi get workspaces =>
-      AccountsContainersWorkspacesResourceApi(_requester);
+  AccountsContainersEnvironmentsResource get environments =>
+      AccountsContainersEnvironmentsResource(_requester);
+  AccountsContainersVersionHeadersResource get versionHeaders =>
+      AccountsContainersVersionHeadersResource(_requester);
+  AccountsContainersVersionsResource get versions =>
+      AccountsContainersVersionsResource(_requester);
+  AccountsContainersWorkspacesResource get workspaces =>
+      AccountsContainersWorkspacesResource(_requester);
 
-  AccountsContainersResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  AccountsContainersResource(commons.ApiRequester client) : _requester = client;
 
   /// Creates a Container.
   ///
@@ -578,10 +577,10 @@
   }
 }
 
-class AccountsContainersEnvironmentsResourceApi {
+class AccountsContainersEnvironmentsResource {
   final commons.ApiRequester _requester;
 
-  AccountsContainersEnvironmentsResourceApi(commons.ApiRequester client)
+  AccountsContainersEnvironmentsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Creates a GTM Environment.
@@ -943,10 +942,10 @@
   }
 }
 
-class AccountsContainersVersionHeadersResourceApi {
+class AccountsContainersVersionHeadersResource {
   final commons.ApiRequester _requester;
 
-  AccountsContainersVersionHeadersResourceApi(commons.ApiRequester client)
+  AccountsContainersVersionHeadersResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Gets the latest container version header
@@ -1072,10 +1071,10 @@
   }
 }
 
-class AccountsContainersVersionsResourceApi {
+class AccountsContainersVersionsResource {
   final commons.ApiRequester _requester;
 
-  AccountsContainersVersionsResourceApi(commons.ApiRequester client)
+  AccountsContainersVersionsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Deletes a Container Version.
@@ -1491,26 +1490,25 @@
   }
 }
 
-class AccountsContainersWorkspacesResourceApi {
+class AccountsContainersWorkspacesResource {
   final commons.ApiRequester _requester;
 
-  AccountsContainersWorkspacesBuiltInVariablesResourceApi
-      get builtInVariables =>
-          AccountsContainersWorkspacesBuiltInVariablesResourceApi(_requester);
-  AccountsContainersWorkspacesFoldersResourceApi get folders =>
-      AccountsContainersWorkspacesFoldersResourceApi(_requester);
-  AccountsContainersWorkspacesTagsResourceApi get tags =>
-      AccountsContainersWorkspacesTagsResourceApi(_requester);
-  AccountsContainersWorkspacesTemplatesResourceApi get templates =>
-      AccountsContainersWorkspacesTemplatesResourceApi(_requester);
-  AccountsContainersWorkspacesTriggersResourceApi get triggers =>
-      AccountsContainersWorkspacesTriggersResourceApi(_requester);
-  AccountsContainersWorkspacesVariablesResourceApi get variables =>
-      AccountsContainersWorkspacesVariablesResourceApi(_requester);
-  AccountsContainersWorkspacesZonesResourceApi get zones =>
-      AccountsContainersWorkspacesZonesResourceApi(_requester);
+  AccountsContainersWorkspacesBuiltInVariablesResource get builtInVariables =>
+      AccountsContainersWorkspacesBuiltInVariablesResource(_requester);
+  AccountsContainersWorkspacesFoldersResource get folders =>
+      AccountsContainersWorkspacesFoldersResource(_requester);
+  AccountsContainersWorkspacesTagsResource get tags =>
+      AccountsContainersWorkspacesTagsResource(_requester);
+  AccountsContainersWorkspacesTemplatesResource get templates =>
+      AccountsContainersWorkspacesTemplatesResource(_requester);
+  AccountsContainersWorkspacesTriggersResource get triggers =>
+      AccountsContainersWorkspacesTriggersResource(_requester);
+  AccountsContainersWorkspacesVariablesResource get variables =>
+      AccountsContainersWorkspacesVariablesResource(_requester);
+  AccountsContainersWorkspacesZonesResource get zones =>
+      AccountsContainersWorkspacesZonesResource(_requester);
 
-  AccountsContainersWorkspacesResourceApi(commons.ApiRequester client)
+  AccountsContainersWorkspacesResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Creates a Workspace.
@@ -2111,10 +2109,10 @@
   }
 }
 
-class AccountsContainersWorkspacesBuiltInVariablesResourceApi {
+class AccountsContainersWorkspacesBuiltInVariablesResource {
   final commons.ApiRequester _requester;
 
-  AccountsContainersWorkspacesBuiltInVariablesResourceApi(
+  AccountsContainersWorkspacesBuiltInVariablesResource(
       commons.ApiRequester client)
       : _requester = client;
 
@@ -2475,10 +2473,10 @@
   }
 }
 
-class AccountsContainersWorkspacesFoldersResourceApi {
+class AccountsContainersWorkspacesFoldersResource {
   final commons.ApiRequester _requester;
 
-  AccountsContainersWorkspacesFoldersResourceApi(commons.ApiRequester client)
+  AccountsContainersWorkspacesFoldersResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Creates a GTM Folder.
@@ -2981,10 +2979,10 @@
   }
 }
 
-class AccountsContainersWorkspacesTagsResourceApi {
+class AccountsContainersWorkspacesTagsResource {
   final commons.ApiRequester _requester;
 
-  AccountsContainersWorkspacesTagsResourceApi(commons.ApiRequester client)
+  AccountsContainersWorkspacesTagsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Creates a GTM Tag.
@@ -3346,10 +3344,10 @@
   }
 }
 
-class AccountsContainersWorkspacesTemplatesResourceApi {
+class AccountsContainersWorkspacesTemplatesResource {
   final commons.ApiRequester _requester;
 
-  AccountsContainersWorkspacesTemplatesResourceApi(commons.ApiRequester client)
+  AccountsContainersWorkspacesTemplatesResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Creates a GTM Custom Template.
@@ -3714,10 +3712,10 @@
   }
 }
 
-class AccountsContainersWorkspacesTriggersResourceApi {
+class AccountsContainersWorkspacesTriggersResource {
   final commons.ApiRequester _requester;
 
-  AccountsContainersWorkspacesTriggersResourceApi(commons.ApiRequester client)
+  AccountsContainersWorkspacesTriggersResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Creates a GTM Trigger.
@@ -4079,10 +4077,10 @@
   }
 }
 
-class AccountsContainersWorkspacesVariablesResourceApi {
+class AccountsContainersWorkspacesVariablesResource {
   final commons.ApiRequester _requester;
 
-  AccountsContainersWorkspacesVariablesResourceApi(commons.ApiRequester client)
+  AccountsContainersWorkspacesVariablesResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Creates a GTM Variable.
@@ -4444,10 +4442,10 @@
   }
 }
 
-class AccountsContainersWorkspacesZonesResourceApi {
+class AccountsContainersWorkspacesZonesResource {
   final commons.ApiRequester _requester;
 
-  AccountsContainersWorkspacesZonesResourceApi(commons.ApiRequester client)
+  AccountsContainersWorkspacesZonesResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Creates a GTM Zone.
@@ -4809,10 +4807,10 @@
   }
 }
 
-class AccountsUserPermissionsResourceApi {
+class AccountsUserPermissionsResource {
   final commons.ApiRequester _requester;
 
-  AccountsUserPermissionsResourceApi(commons.ApiRequester client)
+  AccountsUserPermissionsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Creates a user's Account & Container access.
diff --git a/generated/googleapis/lib/tasks/v1.dart b/generated/googleapis/lib/tasks/v1.dart
index 85414d6..d587207 100644
--- a/generated/googleapis/lib/tasks/v1.dart
+++ b/generated/googleapis/lib/tasks/v1.dart
@@ -23,8 +23,8 @@
 ///
 /// Create an instance of [TasksApi] to access these resources:
 ///
-/// - [TasklistsResourceApi]
-/// - [TasksResourceApi]
+/// - [TasklistsResource]
+/// - [TasksResource]
 library tasks.v1;
 
 import 'dart:async' as async;
@@ -50,8 +50,8 @@
 
   final commons.ApiRequester _requester;
 
-  TasklistsResourceApi get tasklists => TasklistsResourceApi(_requester);
-  TasksResourceApi get tasks => TasksResourceApi(_requester);
+  TasklistsResource get tasklists => TasklistsResource(_requester);
+  TasksResource get tasks => TasksResource(_requester);
 
   TasksApi(http.Client client,
       {core.String rootUrl = 'https://tasks.googleapis.com/',
@@ -60,10 +60,10 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class TasklistsResourceApi {
+class TasklistsResource {
   final commons.ApiRequester _requester;
 
-  TasklistsResourceApi(commons.ApiRequester client) : _requester = client;
+  TasklistsResource(commons.ApiRequester client) : _requester = client;
 
   /// Deletes the authenticated user's specified task list.
   ///
@@ -391,10 +391,10 @@
   }
 }
 
-class TasksResourceApi {
+class TasksResource {
   final commons.ApiRequester _requester;
 
-  TasksResourceApi(commons.ApiRequester client) : _requester = client;
+  TasksResource(commons.ApiRequester client) : _requester = client;
 
   /// Clears all completed tasks from the specified task list. The affected
   /// tasks will be marked as 'hidden' and no longer be returned by default when
diff --git a/generated/googleapis/lib/testing/v1.dart b/generated/googleapis/lib/testing/v1.dart
index 93c4535..42fdff3 100644
--- a/generated/googleapis/lib/testing/v1.dart
+++ b/generated/googleapis/lib/testing/v1.dart
@@ -24,10 +24,10 @@
 ///
 /// Create an instance of [TestingApi] to access these resources:
 ///
-/// - [ApplicationDetailServiceResourceApi]
-/// - [ProjectsResourceApi]
-///   - [ProjectsTestMatricesResourceApi]
-/// - [TestEnvironmentCatalogResourceApi]
+/// - [ApplicationDetailServiceResource]
+/// - [ProjectsResource]
+///   - [ProjectsTestMatricesResource]
+/// - [TestEnvironmentCatalogResource]
 library testing.v1;
 
 import 'dart:async' as async;
@@ -55,11 +55,11 @@
 
   final commons.ApiRequester _requester;
 
-  ApplicationDetailServiceResourceApi get applicationDetailService =>
-      ApplicationDetailServiceResourceApi(_requester);
-  ProjectsResourceApi get projects => ProjectsResourceApi(_requester);
-  TestEnvironmentCatalogResourceApi get testEnvironmentCatalog =>
-      TestEnvironmentCatalogResourceApi(_requester);
+  ApplicationDetailServiceResource get applicationDetailService =>
+      ApplicationDetailServiceResource(_requester);
+  ProjectsResource get projects => ProjectsResource(_requester);
+  TestEnvironmentCatalogResource get testEnvironmentCatalog =>
+      TestEnvironmentCatalogResource(_requester);
 
   TestingApi(http.Client client,
       {core.String rootUrl = 'https://testing.googleapis.com/',
@@ -68,10 +68,10 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class ApplicationDetailServiceResourceApi {
+class ApplicationDetailServiceResource {
   final commons.ApiRequester _requester;
 
-  ApplicationDetailServiceResourceApi(commons.ApiRequester client)
+  ApplicationDetailServiceResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Gets the details of an Android application APK.
@@ -126,19 +126,19 @@
   }
 }
 
-class ProjectsResourceApi {
+class ProjectsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsTestMatricesResourceApi get testMatrices =>
-      ProjectsTestMatricesResourceApi(_requester);
+  ProjectsTestMatricesResource get testMatrices =>
+      ProjectsTestMatricesResource(_requester);
 
-  ProjectsResourceApi(commons.ApiRequester client) : _requester = client;
+  ProjectsResource(commons.ApiRequester client) : _requester = client;
 }
 
-class ProjectsTestMatricesResourceApi {
+class ProjectsTestMatricesResource {
   final commons.ApiRequester _requester;
 
-  ProjectsTestMatricesResourceApi(commons.ApiRequester client)
+  ProjectsTestMatricesResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Cancels unfinished test executions in a test matrix. This call returns
@@ -344,10 +344,10 @@
   }
 }
 
-class TestEnvironmentCatalogResourceApi {
+class TestEnvironmentCatalogResource {
   final commons.ApiRequester _requester;
 
-  TestEnvironmentCatalogResourceApi(commons.ApiRequester client)
+  TestEnvironmentCatalogResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Gets the catalog of supported test environments. May return any of the
diff --git a/generated/googleapis/lib/texttospeech/v1.dart b/generated/googleapis/lib/texttospeech/v1.dart
index 3f771a8..f877644 100644
--- a/generated/googleapis/lib/texttospeech/v1.dart
+++ b/generated/googleapis/lib/texttospeech/v1.dart
@@ -24,8 +24,8 @@
 ///
 /// Create an instance of [TexttospeechApi] to access these resources:
 ///
-/// - [TextResourceApi]
-/// - [VoicesResourceApi]
+/// - [TextResource]
+/// - [VoicesResource]
 library texttospeech.v1;
 
 import 'dart:async' as async;
@@ -49,8 +49,8 @@
 
   final commons.ApiRequester _requester;
 
-  TextResourceApi get text => TextResourceApi(_requester);
-  VoicesResourceApi get voices => VoicesResourceApi(_requester);
+  TextResource get text => TextResource(_requester);
+  VoicesResource get voices => VoicesResource(_requester);
 
   TexttospeechApi(http.Client client,
       {core.String rootUrl = 'https://texttospeech.googleapis.com/',
@@ -59,10 +59,10 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class TextResourceApi {
+class TextResource {
   final commons.ApiRequester _requester;
 
-  TextResourceApi(commons.ApiRequester client) : _requester = client;
+  TextResource(commons.ApiRequester client) : _requester = client;
 
   /// Synthesizes speech synchronously: receive results after all text input has
   /// been processed.
@@ -117,10 +117,10 @@
   }
 }
 
-class VoicesResourceApi {
+class VoicesResource {
   final commons.ApiRequester _requester;
 
-  VoicesResourceApi(commons.ApiRequester client) : _requester = client;
+  VoicesResource(commons.ApiRequester client) : _requester = client;
 
   /// Returns a list of Voice supported for synthesis.
   ///
diff --git a/generated/googleapis/lib/tpu/v1.dart b/generated/googleapis/lib/tpu/v1.dart
index 6f1a12e..146f463 100644
--- a/generated/googleapis/lib/tpu/v1.dart
+++ b/generated/googleapis/lib/tpu/v1.dart
@@ -23,12 +23,12 @@
 ///
 /// Create an instance of [TPUApi] to access these resources:
 ///
-/// - [ProjectsResourceApi]
-///   - [ProjectsLocationsResourceApi]
-///     - [ProjectsLocationsAcceleratorTypesResourceApi]
-///     - [ProjectsLocationsNodesResourceApi]
-///     - [ProjectsLocationsOperationsResourceApi]
-///     - [ProjectsLocationsTensorflowVersionsResourceApi]
+/// - [ProjectsResource]
+///   - [ProjectsLocationsResource]
+///     - [ProjectsLocationsAcceleratorTypesResource]
+///     - [ProjectsLocationsNodesResource]
+///     - [ProjectsLocationsOperationsResource]
+///     - [ProjectsLocationsTensorflowVersionsResource]
 library tpu.v1;
 
 import 'dart:async' as async;
@@ -51,7 +51,7 @@
 
   final commons.ApiRequester _requester;
 
-  ProjectsResourceApi get projects => ProjectsResourceApi(_requester);
+  ProjectsResource get projects => ProjectsResource(_requester);
 
   TPUApi(http.Client client,
       {core.String rootUrl = 'https://tpu.googleapis.com/',
@@ -60,29 +60,28 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class ProjectsResourceApi {
+class ProjectsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsLocationsResourceApi get locations =>
-      ProjectsLocationsResourceApi(_requester);
+  ProjectsLocationsResource get locations =>
+      ProjectsLocationsResource(_requester);
 
-  ProjectsResourceApi(commons.ApiRequester client) : _requester = client;
+  ProjectsResource(commons.ApiRequester client) : _requester = client;
 }
 
-class ProjectsLocationsResourceApi {
+class ProjectsLocationsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsLocationsAcceleratorTypesResourceApi get acceleratorTypes =>
-      ProjectsLocationsAcceleratorTypesResourceApi(_requester);
-  ProjectsLocationsNodesResourceApi get nodes =>
-      ProjectsLocationsNodesResourceApi(_requester);
-  ProjectsLocationsOperationsResourceApi get operations =>
-      ProjectsLocationsOperationsResourceApi(_requester);
-  ProjectsLocationsTensorflowVersionsResourceApi get tensorflowVersions =>
-      ProjectsLocationsTensorflowVersionsResourceApi(_requester);
+  ProjectsLocationsAcceleratorTypesResource get acceleratorTypes =>
+      ProjectsLocationsAcceleratorTypesResource(_requester);
+  ProjectsLocationsNodesResource get nodes =>
+      ProjectsLocationsNodesResource(_requester);
+  ProjectsLocationsOperationsResource get operations =>
+      ProjectsLocationsOperationsResource(_requester);
+  ProjectsLocationsTensorflowVersionsResource get tensorflowVersions =>
+      ProjectsLocationsTensorflowVersionsResource(_requester);
 
-  ProjectsLocationsResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  ProjectsLocationsResource(commons.ApiRequester client) : _requester = client;
 
   /// Gets information about a location.
   ///
@@ -207,10 +206,10 @@
   }
 }
 
-class ProjectsLocationsAcceleratorTypesResourceApi {
+class ProjectsLocationsAcceleratorTypesResource {
   final commons.ApiRequester _requester;
 
-  ProjectsLocationsAcceleratorTypesResourceApi(commons.ApiRequester client)
+  ProjectsLocationsAcceleratorTypesResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Gets AcceleratorType.
@@ -346,10 +345,10 @@
   }
 }
 
-class ProjectsLocationsNodesResourceApi {
+class ProjectsLocationsNodesResource {
   final commons.ApiRequester _requester;
 
-  ProjectsLocationsNodesResourceApi(commons.ApiRequester client)
+  ProjectsLocationsNodesResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Creates a node.
@@ -754,10 +753,10 @@
   }
 }
 
-class ProjectsLocationsOperationsResourceApi {
+class ProjectsLocationsOperationsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsLocationsOperationsResourceApi(commons.ApiRequester client)
+  ProjectsLocationsOperationsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Starts asynchronous cancellation on a long-running operation. The server
@@ -1009,10 +1008,10 @@
   }
 }
 
-class ProjectsLocationsTensorflowVersionsResourceApi {
+class ProjectsLocationsTensorflowVersionsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsLocationsTensorflowVersionsResourceApi(commons.ApiRequester client)
+  ProjectsLocationsTensorflowVersionsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Gets TensorFlow Version.
diff --git a/generated/googleapis/lib/translate/v3.dart b/generated/googleapis/lib/translate/v3.dart
index 75293d4..e306bd0 100644
--- a/generated/googleapis/lib/translate/v3.dart
+++ b/generated/googleapis/lib/translate/v3.dart
@@ -24,10 +24,10 @@
 ///
 /// Create an instance of [TranslateApi] to access these resources:
 ///
-/// - [ProjectsResourceApi]
-///   - [ProjectsLocationsResourceApi]
-///     - [ProjectsLocationsGlossariesResourceApi]
-///     - [ProjectsLocationsOperationsResourceApi]
+/// - [ProjectsResource]
+///   - [ProjectsLocationsResource]
+///     - [ProjectsLocationsGlossariesResource]
+///     - [ProjectsLocationsOperationsResource]
 library translate.v3;
 
 import 'dart:async' as async;
@@ -54,7 +54,7 @@
 
   final commons.ApiRequester _requester;
 
-  ProjectsResourceApi get projects => ProjectsResourceApi(_requester);
+  ProjectsResource get projects => ProjectsResource(_requester);
 
   TranslateApi(http.Client client,
       {core.String rootUrl = 'https://translation.googleapis.com/',
@@ -63,13 +63,13 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class ProjectsResourceApi {
+class ProjectsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsLocationsResourceApi get locations =>
-      ProjectsLocationsResourceApi(_requester);
+  ProjectsLocationsResource get locations =>
+      ProjectsLocationsResource(_requester);
 
-  ProjectsResourceApi(commons.ApiRequester client) : _requester = client;
+  ProjectsResource(commons.ApiRequester client) : _requester = client;
 
   /// Detects the language of text within a request.
   ///
@@ -287,16 +287,15 @@
   }
 }
 
-class ProjectsLocationsResourceApi {
+class ProjectsLocationsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsLocationsGlossariesResourceApi get glossaries =>
-      ProjectsLocationsGlossariesResourceApi(_requester);
-  ProjectsLocationsOperationsResourceApi get operations =>
-      ProjectsLocationsOperationsResourceApi(_requester);
+  ProjectsLocationsGlossariesResource get glossaries =>
+      ProjectsLocationsGlossariesResource(_requester);
+  ProjectsLocationsOperationsResource get operations =>
+      ProjectsLocationsOperationsResource(_requester);
 
-  ProjectsLocationsResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  ProjectsLocationsResource(commons.ApiRequester client) : _requester = client;
 
   /// Translates a large volume of text in asynchronous batch mode. This
   /// function provides real-time output as the inputs are being processed. If
@@ -705,10 +704,10 @@
   }
 }
 
-class ProjectsLocationsGlossariesResourceApi {
+class ProjectsLocationsGlossariesResource {
   final commons.ApiRequester _requester;
 
-  ProjectsLocationsGlossariesResourceApi(commons.ApiRequester client)
+  ProjectsLocationsGlossariesResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Creates a glossary and returns the long-running operation. Returns
@@ -971,10 +970,10 @@
   }
 }
 
-class ProjectsLocationsOperationsResourceApi {
+class ProjectsLocationsOperationsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsLocationsOperationsResourceApi(commons.ApiRequester client)
+  ProjectsLocationsOperationsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Starts asynchronous cancellation on a long-running operation. The server
diff --git a/generated/googleapis/lib/vault/v1.dart b/generated/googleapis/lib/vault/v1.dart
index f770805..73ff525 100644
--- a/generated/googleapis/lib/vault/v1.dart
+++ b/generated/googleapis/lib/vault/v1.dart
@@ -23,12 +23,12 @@
 ///
 /// Create an instance of [VaultApi] to access these resources:
 ///
-/// - [MattersResourceApi]
-///   - [MattersExportsResourceApi]
-///   - [MattersHoldsResourceApi]
-///     - [MattersHoldsAccountsResourceApi]
-///   - [MattersSavedQueriesResourceApi]
-/// - [OperationsResourceApi]
+/// - [MattersResource]
+///   - [MattersExportsResource]
+///   - [MattersHoldsResource]
+///     - [MattersHoldsAccountsResource]
+///   - [MattersSavedQueriesResource]
+/// - [OperationsResource]
 library vault.v1;
 
 import 'dart:async' as async;
@@ -54,8 +54,8 @@
 
   final commons.ApiRequester _requester;
 
-  MattersResourceApi get matters => MattersResourceApi(_requester);
-  OperationsResourceApi get operations => OperationsResourceApi(_requester);
+  MattersResource get matters => MattersResource(_requester);
+  OperationsResource get operations => OperationsResource(_requester);
 
   VaultApi(http.Client client,
       {core.String rootUrl = 'https://vault.googleapis.com/',
@@ -64,16 +64,15 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class MattersResourceApi {
+class MattersResource {
   final commons.ApiRequester _requester;
 
-  MattersExportsResourceApi get exports =>
-      MattersExportsResourceApi(_requester);
-  MattersHoldsResourceApi get holds => MattersHoldsResourceApi(_requester);
-  MattersSavedQueriesResourceApi get savedQueries =>
-      MattersSavedQueriesResourceApi(_requester);
+  MattersExportsResource get exports => MattersExportsResource(_requester);
+  MattersHoldsResource get holds => MattersHoldsResource(_requester);
+  MattersSavedQueriesResource get savedQueries =>
+      MattersSavedQueriesResource(_requester);
 
-  MattersResourceApi(commons.ApiRequester client) : _requester = client;
+  MattersResource(commons.ApiRequester client) : _requester = client;
 
   /// Adds an account as a matter collaborator.
   ///
@@ -671,10 +670,10 @@
   }
 }
 
-class MattersExportsResourceApi {
+class MattersExportsResource {
   final commons.ApiRequester _requester;
 
-  MattersExportsResourceApi(commons.ApiRequester client) : _requester = client;
+  MattersExportsResource(commons.ApiRequester client) : _requester = client;
 
   /// Creates an Export.
   ///
@@ -916,13 +915,13 @@
   }
 }
 
-class MattersHoldsResourceApi {
+class MattersHoldsResource {
   final commons.ApiRequester _requester;
 
-  MattersHoldsAccountsResourceApi get accounts =>
-      MattersHoldsAccountsResourceApi(_requester);
+  MattersHoldsAccountsResource get accounts =>
+      MattersHoldsAccountsResource(_requester);
 
-  MattersHoldsResourceApi(commons.ApiRequester client) : _requester = client;
+  MattersHoldsResource(commons.ApiRequester client) : _requester = client;
 
   /// Adds HeldAccounts to a hold. Returns a list of accounts that have been
   /// successfully added. Accounts can only be added to an existing
@@ -1401,10 +1400,10 @@
   }
 }
 
-class MattersHoldsAccountsResourceApi {
+class MattersHoldsAccountsResource {
   final commons.ApiRequester _requester;
 
-  MattersHoldsAccountsResourceApi(commons.ApiRequester client)
+  MattersHoldsAccountsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Adds a HeldAccount to a hold. Accounts can only be added to a hold that
@@ -1608,10 +1607,10 @@
   }
 }
 
-class MattersSavedQueriesResourceApi {
+class MattersSavedQueriesResource {
   final commons.ApiRequester _requester;
 
-  MattersSavedQueriesResourceApi(commons.ApiRequester client)
+  MattersSavedQueriesResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Creates a saved query.
@@ -1864,10 +1863,10 @@
   }
 }
 
-class OperationsResourceApi {
+class OperationsResource {
   final commons.ApiRequester _requester;
 
-  OperationsResourceApi(commons.ApiRequester client) : _requester = client;
+  OperationsResource(commons.ApiRequester client) : _requester = client;
 
   /// Deletes a long-running operation. This method indicates that the client is
   /// no longer interested in the operation result. It does not cancel the
diff --git a/generated/googleapis/lib/verifiedaccess/v1.dart b/generated/googleapis/lib/verifiedaccess/v1.dart
index 061f82d..fcaad38 100644
--- a/generated/googleapis/lib/verifiedaccess/v1.dart
+++ b/generated/googleapis/lib/verifiedaccess/v1.dart
@@ -25,7 +25,7 @@
 ///
 /// Create an instance of [VerifiedaccessApi] to access these resources:
 ///
-/// - [ChallengeResourceApi]
+/// - [ChallengeResource]
 library verifiedaccess.v1;
 
 import 'dart:async' as async;
@@ -49,7 +49,7 @@
 
   final commons.ApiRequester _requester;
 
-  ChallengeResourceApi get challenge => ChallengeResourceApi(_requester);
+  ChallengeResource get challenge => ChallengeResource(_requester);
 
   VerifiedaccessApi(http.Client client,
       {core.String rootUrl = 'https://verifiedaccess.googleapis.com/',
@@ -58,10 +58,10 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class ChallengeResourceApi {
+class ChallengeResource {
   final commons.ApiRequester _requester;
 
-  ChallengeResourceApi(commons.ApiRequester client) : _requester = client;
+  ChallengeResource(commons.ApiRequester client) : _requester = client;
 
   /// CreateChallenge API
   ///
diff --git a/generated/googleapis/lib/videointelligence/v1.dart b/generated/googleapis/lib/videointelligence/v1.dart
index d8fe238..efbcf2a 100644
--- a/generated/googleapis/lib/videointelligence/v1.dart
+++ b/generated/googleapis/lib/videointelligence/v1.dart
@@ -26,18 +26,18 @@
 ///
 /// Create an instance of [CloudVideoIntelligenceApi] to access these resources:
 ///
-/// - [OperationsResourceApi]
-///   - [OperationsProjectsResourceApi]
-///     - [OperationsProjectsLocationsResourceApi]
-///       - [OperationsProjectsLocationsOperationsResourceApi]
-/// - [ProjectsResourceApi]
-///   - [ProjectsLocationsResourceApi]
-///     - [ProjectsLocationsCorporaResourceApi]
-///       - [ProjectsLocationsCorporaOperationsResourceApi]
-///     - [ProjectsLocationsCorpuraResourceApi]
-///       - [ProjectsLocationsCorpuraOperationsResourceApi]
-///     - [ProjectsLocationsOperationsResourceApi]
-/// - [VideosResourceApi]
+/// - [OperationsResource]
+///   - [OperationsProjectsResource]
+///     - [OperationsProjectsLocationsResource]
+///       - [OperationsProjectsLocationsOperationsResource]
+/// - [ProjectsResource]
+///   - [ProjectsLocationsResource]
+///     - [ProjectsLocationsCorporaResource]
+///       - [ProjectsLocationsCorporaOperationsResource]
+///     - [ProjectsLocationsCorpuraResource]
+///       - [ProjectsLocationsCorpuraOperationsResource]
+///     - [ProjectsLocationsOperationsResource]
+/// - [VideosResource]
 library videointelligence.v1;
 
 import 'dart:async' as async;
@@ -62,9 +62,9 @@
 
   final commons.ApiRequester _requester;
 
-  OperationsResourceApi get operations => OperationsResourceApi(_requester);
-  ProjectsResourceApi get projects => ProjectsResourceApi(_requester);
-  VideosResourceApi get videos => VideosResourceApi(_requester);
+  OperationsResource get operations => OperationsResource(_requester);
+  ProjectsResource get projects => ProjectsResource(_requester);
+  VideosResource get videos => VideosResource(_requester);
 
   CloudVideoIntelligenceApi(http.Client client,
       {core.String rootUrl = 'https://videointelligence.googleapis.com/',
@@ -73,39 +73,38 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class OperationsResourceApi {
+class OperationsResource {
   final commons.ApiRequester _requester;
 
-  OperationsProjectsResourceApi get projects =>
-      OperationsProjectsResourceApi(_requester);
+  OperationsProjectsResource get projects =>
+      OperationsProjectsResource(_requester);
 
-  OperationsResourceApi(commons.ApiRequester client) : _requester = client;
+  OperationsResource(commons.ApiRequester client) : _requester = client;
 }
 
-class OperationsProjectsResourceApi {
+class OperationsProjectsResource {
   final commons.ApiRequester _requester;
 
-  OperationsProjectsLocationsResourceApi get locations =>
-      OperationsProjectsLocationsResourceApi(_requester);
+  OperationsProjectsLocationsResource get locations =>
+      OperationsProjectsLocationsResource(_requester);
 
-  OperationsProjectsResourceApi(commons.ApiRequester client)
+  OperationsProjectsResource(commons.ApiRequester client) : _requester = client;
+}
+
+class OperationsProjectsLocationsResource {
+  final commons.ApiRequester _requester;
+
+  OperationsProjectsLocationsOperationsResource get operations =>
+      OperationsProjectsLocationsOperationsResource(_requester);
+
+  OperationsProjectsLocationsResource(commons.ApiRequester client)
       : _requester = client;
 }
 
-class OperationsProjectsLocationsResourceApi {
+class OperationsProjectsLocationsOperationsResource {
   final commons.ApiRequester _requester;
 
-  OperationsProjectsLocationsOperationsResourceApi get operations =>
-      OperationsProjectsLocationsOperationsResourceApi(_requester);
-
-  OperationsProjectsLocationsResourceApi(commons.ApiRequester client)
-      : _requester = client;
-}
-
-class OperationsProjectsLocationsOperationsResourceApi {
-  final commons.ApiRequester _requester;
-
-  OperationsProjectsLocationsOperationsResourceApi(commons.ApiRequester client)
+  OperationsProjectsLocationsOperationsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Starts asynchronous cancellation on a long-running operation. The server
@@ -283,43 +282,42 @@
   }
 }
 
-class ProjectsResourceApi {
+class ProjectsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsLocationsResourceApi get locations =>
-      ProjectsLocationsResourceApi(_requester);
+  ProjectsLocationsResource get locations =>
+      ProjectsLocationsResource(_requester);
 
-  ProjectsResourceApi(commons.ApiRequester client) : _requester = client;
+  ProjectsResource(commons.ApiRequester client) : _requester = client;
 }
 
-class ProjectsLocationsResourceApi {
+class ProjectsLocationsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsLocationsCorporaResourceApi get corpora =>
-      ProjectsLocationsCorporaResourceApi(_requester);
-  ProjectsLocationsCorpuraResourceApi get corpura =>
-      ProjectsLocationsCorpuraResourceApi(_requester);
-  ProjectsLocationsOperationsResourceApi get operations =>
-      ProjectsLocationsOperationsResourceApi(_requester);
+  ProjectsLocationsCorporaResource get corpora =>
+      ProjectsLocationsCorporaResource(_requester);
+  ProjectsLocationsCorpuraResource get corpura =>
+      ProjectsLocationsCorpuraResource(_requester);
+  ProjectsLocationsOperationsResource get operations =>
+      ProjectsLocationsOperationsResource(_requester);
 
-  ProjectsLocationsResourceApi(commons.ApiRequester client)
+  ProjectsLocationsResource(commons.ApiRequester client) : _requester = client;
+}
+
+class ProjectsLocationsCorporaResource {
+  final commons.ApiRequester _requester;
+
+  ProjectsLocationsCorporaOperationsResource get operations =>
+      ProjectsLocationsCorporaOperationsResource(_requester);
+
+  ProjectsLocationsCorporaResource(commons.ApiRequester client)
       : _requester = client;
 }
 
-class ProjectsLocationsCorporaResourceApi {
+class ProjectsLocationsCorporaOperationsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsLocationsCorporaOperationsResourceApi get operations =>
-      ProjectsLocationsCorporaOperationsResourceApi(_requester);
-
-  ProjectsLocationsCorporaResourceApi(commons.ApiRequester client)
-      : _requester = client;
-}
-
-class ProjectsLocationsCorporaOperationsResourceApi {
-  final commons.ApiRequester _requester;
-
-  ProjectsLocationsCorporaOperationsResourceApi(commons.ApiRequester client)
+  ProjectsLocationsCorporaOperationsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Gets the latest state of a long-running operation. Clients can use this
@@ -378,20 +376,20 @@
   }
 }
 
-class ProjectsLocationsCorpuraResourceApi {
+class ProjectsLocationsCorpuraResource {
   final commons.ApiRequester _requester;
 
-  ProjectsLocationsCorpuraOperationsResourceApi get operations =>
-      ProjectsLocationsCorpuraOperationsResourceApi(_requester);
+  ProjectsLocationsCorpuraOperationsResource get operations =>
+      ProjectsLocationsCorpuraOperationsResource(_requester);
 
-  ProjectsLocationsCorpuraResourceApi(commons.ApiRequester client)
+  ProjectsLocationsCorpuraResource(commons.ApiRequester client)
       : _requester = client;
 }
 
-class ProjectsLocationsCorpuraOperationsResourceApi {
+class ProjectsLocationsCorpuraOperationsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsLocationsCorpuraOperationsResourceApi(commons.ApiRequester client)
+  ProjectsLocationsCorpuraOperationsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Gets the latest state of a long-running operation. Clients can use this
@@ -450,10 +448,10 @@
   }
 }
 
-class ProjectsLocationsOperationsResourceApi {
+class ProjectsLocationsOperationsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsLocationsOperationsResourceApi(commons.ApiRequester client)
+  ProjectsLocationsOperationsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Starts asynchronous cancellation on a long-running operation. The server
@@ -714,10 +712,10 @@
   }
 }
 
-class VideosResourceApi {
+class VideosResource {
   final commons.ApiRequester _requester;
 
-  VideosResourceApi(commons.ApiRequester client) : _requester = client;
+  VideosResource(commons.ApiRequester client) : _requester = client;
 
   /// Performs asynchronous video annotation. Progress and results can be
   /// retrieved through the `google.longrunning.Operations` interface.
diff --git a/generated/googleapis/lib/vision/v1.dart b/generated/googleapis/lib/vision/v1.dart
index fa6407b..c565011 100644
--- a/generated/googleapis/lib/vision/v1.dart
+++ b/generated/googleapis/lib/vision/v1.dart
@@ -25,23 +25,23 @@
 ///
 /// Create an instance of [VisionApi] to access these resources:
 ///
-/// - [FilesResourceApi]
-/// - [ImagesResourceApi]
-/// - [LocationsResourceApi]
-///   - [LocationsOperationsResourceApi]
-/// - [OperationsResourceApi]
-/// - [ProjectsResourceApi]
-///   - [ProjectsFilesResourceApi]
-///   - [ProjectsImagesResourceApi]
-///   - [ProjectsLocationsResourceApi]
-///     - [ProjectsLocationsFilesResourceApi]
-///     - [ProjectsLocationsImagesResourceApi]
-///     - [ProjectsLocationsOperationsResourceApi]
-///     - [ProjectsLocationsProductSetsResourceApi]
-///       - [ProjectsLocationsProductSetsProductsResourceApi]
-///     - [ProjectsLocationsProductsResourceApi]
-///       - [ProjectsLocationsProductsReferenceImagesResourceApi]
-///   - [ProjectsOperationsResourceApi]
+/// - [FilesResource]
+/// - [ImagesResource]
+/// - [LocationsResource]
+///   - [LocationsOperationsResource]
+/// - [OperationsResource]
+/// - [ProjectsResource]
+///   - [ProjectsFilesResource]
+///   - [ProjectsImagesResource]
+///   - [ProjectsLocationsResource]
+///     - [ProjectsLocationsFilesResource]
+///     - [ProjectsLocationsImagesResource]
+///     - [ProjectsLocationsOperationsResource]
+///     - [ProjectsLocationsProductSetsResource]
+///       - [ProjectsLocationsProductSetsProductsResource]
+///     - [ProjectsLocationsProductsResource]
+///       - [ProjectsLocationsProductsReferenceImagesResource]
+///   - [ProjectsOperationsResource]
 library vision.v1;
 
 import 'dart:async' as async;
@@ -70,11 +70,11 @@
 
   final commons.ApiRequester _requester;
 
-  FilesResourceApi get files => FilesResourceApi(_requester);
-  ImagesResourceApi get images => ImagesResourceApi(_requester);
-  LocationsResourceApi get locations => LocationsResourceApi(_requester);
-  OperationsResourceApi get operations => OperationsResourceApi(_requester);
-  ProjectsResourceApi get projects => ProjectsResourceApi(_requester);
+  FilesResource get files => FilesResource(_requester);
+  ImagesResource get images => ImagesResource(_requester);
+  LocationsResource get locations => LocationsResource(_requester);
+  OperationsResource get operations => OperationsResource(_requester);
+  ProjectsResource get projects => ProjectsResource(_requester);
 
   VisionApi(http.Client client,
       {core.String rootUrl = 'https://vision.googleapis.com/',
@@ -83,10 +83,10 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class FilesResourceApi {
+class FilesResource {
   final commons.ApiRequester _requester;
 
-  FilesResourceApi(commons.ApiRequester client) : _requester = client;
+  FilesResource(commons.ApiRequester client) : _requester = client;
 
   /// Service that performs image detection and annotation for a batch of files.
   /// Now only "application/pdf", "image/tiff" and "image/gif" are supported.
@@ -200,10 +200,10 @@
   }
 }
 
-class ImagesResourceApi {
+class ImagesResource {
   final commons.ApiRequester _requester;
 
-  ImagesResourceApi(commons.ApiRequester client) : _requester = client;
+  ImagesResource(commons.ApiRequester client) : _requester = client;
 
   /// Run image detection and annotation for a batch of images.
   ///
@@ -313,19 +313,19 @@
   }
 }
 
-class LocationsResourceApi {
+class LocationsResource {
   final commons.ApiRequester _requester;
 
-  LocationsOperationsResourceApi get operations =>
-      LocationsOperationsResourceApi(_requester);
+  LocationsOperationsResource get operations =>
+      LocationsOperationsResource(_requester);
 
-  LocationsResourceApi(commons.ApiRequester client) : _requester = client;
+  LocationsResource(commons.ApiRequester client) : _requester = client;
 }
 
-class LocationsOperationsResourceApi {
+class LocationsOperationsResource {
   final commons.ApiRequester _requester;
 
-  LocationsOperationsResourceApi(commons.ApiRequester client)
+  LocationsOperationsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Gets the latest state of a long-running operation. Clients can use this
@@ -382,10 +382,10 @@
   }
 }
 
-class OperationsResourceApi {
+class OperationsResource {
   final commons.ApiRequester _requester;
 
-  OperationsResourceApi(commons.ApiRequester client) : _requester = client;
+  OperationsResource(commons.ApiRequester client) : _requester = client;
 
   /// Starts asynchronous cancellation on a long-running operation. The server
   /// makes a best effort to cancel the operation, but success is not
@@ -638,23 +638,23 @@
   }
 }
 
-class ProjectsResourceApi {
+class ProjectsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsFilesResourceApi get files => ProjectsFilesResourceApi(_requester);
-  ProjectsImagesResourceApi get images => ProjectsImagesResourceApi(_requester);
-  ProjectsLocationsResourceApi get locations =>
-      ProjectsLocationsResourceApi(_requester);
-  ProjectsOperationsResourceApi get operations =>
-      ProjectsOperationsResourceApi(_requester);
+  ProjectsFilesResource get files => ProjectsFilesResource(_requester);
+  ProjectsImagesResource get images => ProjectsImagesResource(_requester);
+  ProjectsLocationsResource get locations =>
+      ProjectsLocationsResource(_requester);
+  ProjectsOperationsResource get operations =>
+      ProjectsOperationsResource(_requester);
 
-  ProjectsResourceApi(commons.ApiRequester client) : _requester = client;
+  ProjectsResource(commons.ApiRequester client) : _requester = client;
 }
 
-class ProjectsFilesResourceApi {
+class ProjectsFilesResource {
   final commons.ApiRequester _requester;
 
-  ProjectsFilesResourceApi(commons.ApiRequester client) : _requester = client;
+  ProjectsFilesResource(commons.ApiRequester client) : _requester = client;
 
   /// Service that performs image detection and annotation for a batch of files.
   /// Now only "application/pdf", "image/tiff" and "image/gif" are supported.
@@ -794,10 +794,10 @@
   }
 }
 
-class ProjectsImagesResourceApi {
+class ProjectsImagesResource {
   final commons.ApiRequester _requester;
 
-  ProjectsImagesResourceApi(commons.ApiRequester client) : _requester = client;
+  ProjectsImagesResource(commons.ApiRequester client) : _requester = client;
 
   /// Run image detection and annotation for a batch of images.
   ///
@@ -933,28 +933,27 @@
   }
 }
 
-class ProjectsLocationsResourceApi {
+class ProjectsLocationsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsLocationsFilesResourceApi get files =>
-      ProjectsLocationsFilesResourceApi(_requester);
-  ProjectsLocationsImagesResourceApi get images =>
-      ProjectsLocationsImagesResourceApi(_requester);
-  ProjectsLocationsOperationsResourceApi get operations =>
-      ProjectsLocationsOperationsResourceApi(_requester);
-  ProjectsLocationsProductSetsResourceApi get productSets =>
-      ProjectsLocationsProductSetsResourceApi(_requester);
-  ProjectsLocationsProductsResourceApi get products =>
-      ProjectsLocationsProductsResourceApi(_requester);
+  ProjectsLocationsFilesResource get files =>
+      ProjectsLocationsFilesResource(_requester);
+  ProjectsLocationsImagesResource get images =>
+      ProjectsLocationsImagesResource(_requester);
+  ProjectsLocationsOperationsResource get operations =>
+      ProjectsLocationsOperationsResource(_requester);
+  ProjectsLocationsProductSetsResource get productSets =>
+      ProjectsLocationsProductSetsResource(_requester);
+  ProjectsLocationsProductsResource get products =>
+      ProjectsLocationsProductsResource(_requester);
 
-  ProjectsLocationsResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  ProjectsLocationsResource(commons.ApiRequester client) : _requester = client;
 }
 
-class ProjectsLocationsFilesResourceApi {
+class ProjectsLocationsFilesResource {
   final commons.ApiRequester _requester;
 
-  ProjectsLocationsFilesResourceApi(commons.ApiRequester client)
+  ProjectsLocationsFilesResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Service that performs image detection and annotation for a batch of files.
@@ -1095,10 +1094,10 @@
   }
 }
 
-class ProjectsLocationsImagesResourceApi {
+class ProjectsLocationsImagesResource {
   final commons.ApiRequester _requester;
 
-  ProjectsLocationsImagesResourceApi(commons.ApiRequester client)
+  ProjectsLocationsImagesResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Run image detection and annotation for a batch of images.
@@ -1235,10 +1234,10 @@
   }
 }
 
-class ProjectsLocationsOperationsResourceApi {
+class ProjectsLocationsOperationsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsLocationsOperationsResourceApi(commons.ApiRequester client)
+  ProjectsLocationsOperationsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Gets the latest state of a long-running operation. Clients can use this
@@ -1296,13 +1295,13 @@
   }
 }
 
-class ProjectsLocationsProductSetsResourceApi {
+class ProjectsLocationsProductSetsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsLocationsProductSetsProductsResourceApi get products =>
-      ProjectsLocationsProductSetsProductsResourceApi(_requester);
+  ProjectsLocationsProductSetsProductsResource get products =>
+      ProjectsLocationsProductSetsProductsResource(_requester);
 
-  ProjectsLocationsProductSetsResourceApi(commons.ApiRequester client)
+  ProjectsLocationsProductSetsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Adds a Product to the specified ProductSet. If the Product is already
@@ -1821,10 +1820,10 @@
   }
 }
 
-class ProjectsLocationsProductSetsProductsResourceApi {
+class ProjectsLocationsProductSetsProductsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsLocationsProductSetsProductsResourceApi(commons.ApiRequester client)
+  ProjectsLocationsProductSetsProductsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Lists the Products in a ProductSet, in an unspecified order. If the
@@ -1900,13 +1899,13 @@
   }
 }
 
-class ProjectsLocationsProductsResourceApi {
+class ProjectsLocationsProductsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsLocationsProductsReferenceImagesResourceApi get referenceImages =>
-      ProjectsLocationsProductsReferenceImagesResourceApi(_requester);
+  ProjectsLocationsProductsReferenceImagesResource get referenceImages =>
+      ProjectsLocationsProductsReferenceImagesResource(_requester);
 
-  ProjectsLocationsProductsResourceApi(commons.ApiRequester client)
+  ProjectsLocationsProductsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Creates and returns a new product resource. Possible errors: * Returns
@@ -2310,11 +2309,10 @@
   }
 }
 
-class ProjectsLocationsProductsReferenceImagesResourceApi {
+class ProjectsLocationsProductsReferenceImagesResource {
   final commons.ApiRequester _requester;
 
-  ProjectsLocationsProductsReferenceImagesResourceApi(
-      commons.ApiRequester client)
+  ProjectsLocationsProductsReferenceImagesResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Creates and returns a new ReferenceImage resource. The `bounding_poly`
@@ -2587,11 +2585,10 @@
   }
 }
 
-class ProjectsOperationsResourceApi {
+class ProjectsOperationsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsOperationsResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  ProjectsOperationsResource(commons.ApiRequester client) : _requester = client;
 
   /// Gets the latest state of a long-running operation. Clients can use this
   /// method to poll the operation result at intervals as recommended by the API
diff --git a/generated/googleapis/lib/webfonts/v1.dart b/generated/googleapis/lib/webfonts/v1.dart
index 45f0d30..42a3678 100644
--- a/generated/googleapis/lib/webfonts/v1.dart
+++ b/generated/googleapis/lib/webfonts/v1.dart
@@ -25,7 +25,7 @@
 ///
 /// Create an instance of [WebfontsApi] to access these resources:
 ///
-/// - [WebfontsResourceApi]
+/// - [WebfontsResource]
 library webfonts.v1;
 
 import 'dart:async' as async;
@@ -44,7 +44,7 @@
 class WebfontsApi {
   final commons.ApiRequester _requester;
 
-  WebfontsResourceApi get webfonts => WebfontsResourceApi(_requester);
+  WebfontsResource get webfonts => WebfontsResource(_requester);
 
   WebfontsApi(http.Client client,
       {core.String rootUrl = 'https://webfonts.googleapis.com/',
@@ -53,10 +53,10 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class WebfontsResourceApi {
+class WebfontsResource {
   final commons.ApiRequester _requester;
 
-  WebfontsResourceApi(commons.ApiRequester client) : _requester = client;
+  WebfontsResource(commons.ApiRequester client) : _requester = client;
 
   /// Retrieves the list of fonts currently served by the Google Fonts Developer
   /// API.
diff --git a/generated/googleapis/lib/webmasters/v3.dart b/generated/googleapis/lib/webmasters/v3.dart
index 000916e..2e39dcf 100644
--- a/generated/googleapis/lib/webmasters/v3.dart
+++ b/generated/googleapis/lib/webmasters/v3.dart
@@ -23,9 +23,9 @@
 ///
 /// Create an instance of [WebmastersApi] to access these resources:
 ///
-/// - [SearchanalyticsResourceApi]
-/// - [SitemapsResourceApi]
-/// - [SitesResourceApi]
+/// - [SearchanalyticsResource]
+/// - [SitemapsResource]
+/// - [SitesResource]
 library webmasters.v3;
 
 import 'dart:async' as async;
@@ -51,10 +51,10 @@
 
   final commons.ApiRequester _requester;
 
-  SearchanalyticsResourceApi get searchanalytics =>
-      SearchanalyticsResourceApi(_requester);
-  SitemapsResourceApi get sitemaps => SitemapsResourceApi(_requester);
-  SitesResourceApi get sites => SitesResourceApi(_requester);
+  SearchanalyticsResource get searchanalytics =>
+      SearchanalyticsResource(_requester);
+  SitemapsResource get sitemaps => SitemapsResource(_requester);
+  SitesResource get sites => SitesResource(_requester);
 
   WebmastersApi(http.Client client,
       {core.String rootUrl = 'https://www.googleapis.com/',
@@ -63,10 +63,10 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class SearchanalyticsResourceApi {
+class SearchanalyticsResource {
   final commons.ApiRequester _requester;
 
-  SearchanalyticsResourceApi(commons.ApiRequester client) : _requester = client;
+  SearchanalyticsResource(commons.ApiRequester client) : _requester = client;
 
   /// Query your data with filters and parameters that you define. Returns zero
   /// or more rows grouped by the row keys that you define. You must define a
@@ -136,10 +136,10 @@
   }
 }
 
-class SitemapsResourceApi {
+class SitemapsResource {
   final commons.ApiRequester _requester;
 
-  SitemapsResourceApi(commons.ApiRequester client) : _requester = client;
+  SitemapsResource(commons.ApiRequester client) : _requester = client;
 
   /// Deletes a sitemap from this site.
   ///
@@ -386,10 +386,10 @@
   }
 }
 
-class SitesResourceApi {
+class SitesResource {
   final commons.ApiRequester _requester;
 
-  SitesResourceApi(commons.ApiRequester client) : _requester = client;
+  SitesResource(commons.ApiRequester client) : _requester = client;
 
   /// Adds a site to the set of the user's sites in Search Console.
   ///
diff --git a/generated/googleapis/lib/websecurityscanner/v1.dart b/generated/googleapis/lib/websecurityscanner/v1.dart
index 9d33772..a222b99 100644
--- a/generated/googleapis/lib/websecurityscanner/v1.dart
+++ b/generated/googleapis/lib/websecurityscanner/v1.dart
@@ -24,12 +24,12 @@
 ///
 /// Create an instance of [WebSecurityScannerApi] to access these resources:
 ///
-/// - [ProjectsResourceApi]
-///   - [ProjectsScanConfigsResourceApi]
-///     - [ProjectsScanConfigsScanRunsResourceApi]
-///       - [ProjectsScanConfigsScanRunsCrawledUrlsResourceApi]
-///       - [ProjectsScanConfigsScanRunsFindingTypeStatsResourceApi]
-///       - [ProjectsScanConfigsScanRunsFindingsResourceApi]
+/// - [ProjectsResource]
+///   - [ProjectsScanConfigsResource]
+///     - [ProjectsScanConfigsScanRunsResource]
+///       - [ProjectsScanConfigsScanRunsCrawledUrlsResource]
+///       - [ProjectsScanConfigsScanRunsFindingTypeStatsResource]
+///       - [ProjectsScanConfigsScanRunsFindingsResource]
 library websecurityscanner.v1;
 
 import 'dart:async' as async;
@@ -52,7 +52,7 @@
 
   final commons.ApiRequester _requester;
 
-  ProjectsResourceApi get projects => ProjectsResourceApi(_requester);
+  ProjectsResource get projects => ProjectsResource(_requester);
 
   WebSecurityScannerApi(http.Client client,
       {core.String rootUrl = 'https://websecurityscanner.googleapis.com/',
@@ -61,22 +61,22 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class ProjectsResourceApi {
+class ProjectsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsScanConfigsResourceApi get scanConfigs =>
-      ProjectsScanConfigsResourceApi(_requester);
+  ProjectsScanConfigsResource get scanConfigs =>
+      ProjectsScanConfigsResource(_requester);
 
-  ProjectsResourceApi(commons.ApiRequester client) : _requester = client;
+  ProjectsResource(commons.ApiRequester client) : _requester = client;
 }
 
-class ProjectsScanConfigsResourceApi {
+class ProjectsScanConfigsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsScanConfigsScanRunsResourceApi get scanRuns =>
-      ProjectsScanConfigsScanRunsResourceApi(_requester);
+  ProjectsScanConfigsScanRunsResource get scanRuns =>
+      ProjectsScanConfigsScanRunsResource(_requester);
 
-  ProjectsScanConfigsResourceApi(commons.ApiRequester client)
+  ProjectsScanConfigsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Creates a new ScanConfig.
@@ -447,17 +447,17 @@
   }
 }
 
-class ProjectsScanConfigsScanRunsResourceApi {
+class ProjectsScanConfigsScanRunsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsScanConfigsScanRunsCrawledUrlsResourceApi get crawledUrls =>
-      ProjectsScanConfigsScanRunsCrawledUrlsResourceApi(_requester);
-  ProjectsScanConfigsScanRunsFindingTypeStatsResourceApi get findingTypeStats =>
-      ProjectsScanConfigsScanRunsFindingTypeStatsResourceApi(_requester);
-  ProjectsScanConfigsScanRunsFindingsResourceApi get findings =>
-      ProjectsScanConfigsScanRunsFindingsResourceApi(_requester);
+  ProjectsScanConfigsScanRunsCrawledUrlsResource get crawledUrls =>
+      ProjectsScanConfigsScanRunsCrawledUrlsResource(_requester);
+  ProjectsScanConfigsScanRunsFindingTypeStatsResource get findingTypeStats =>
+      ProjectsScanConfigsScanRunsFindingTypeStatsResource(_requester);
+  ProjectsScanConfigsScanRunsFindingsResource get findings =>
+      ProjectsScanConfigsScanRunsFindingsResource(_requester);
 
-  ProjectsScanConfigsScanRunsResourceApi(commons.ApiRequester client)
+  ProjectsScanConfigsScanRunsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Gets a ScanRun.
@@ -647,10 +647,10 @@
   }
 }
 
-class ProjectsScanConfigsScanRunsCrawledUrlsResourceApi {
+class ProjectsScanConfigsScanRunsCrawledUrlsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsScanConfigsScanRunsCrawledUrlsResourceApi(commons.ApiRequester client)
+  ProjectsScanConfigsScanRunsCrawledUrlsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// List CrawledUrls under a given ScanRun.
@@ -727,10 +727,10 @@
   }
 }
 
-class ProjectsScanConfigsScanRunsFindingTypeStatsResourceApi {
+class ProjectsScanConfigsScanRunsFindingTypeStatsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsScanConfigsScanRunsFindingTypeStatsResourceApi(
+  ProjectsScanConfigsScanRunsFindingTypeStatsResource(
       commons.ApiRequester client)
       : _requester = client;
 
@@ -792,10 +792,10 @@
   }
 }
 
-class ProjectsScanConfigsScanRunsFindingsResourceApi {
+class ProjectsScanConfigsScanRunsFindingsResource {
   final commons.ApiRequester _requester;
 
-  ProjectsScanConfigsScanRunsFindingsResourceApi(commons.ApiRequester client)
+  ProjectsScanConfigsScanRunsFindingsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Gets a Finding.
diff --git a/generated/googleapis/lib/youtube/v3.dart b/generated/googleapis/lib/youtube/v3.dart
index 916659c..d66e2d7 100644
--- a/generated/googleapis/lib/youtube/v3.dart
+++ b/generated/googleapis/lib/youtube/v3.dart
@@ -24,36 +24,36 @@
 ///
 /// Create an instance of [YouTubeApi] to access these resources:
 ///
-/// - [AbuseReportsResourceApi]
-/// - [ActivitiesResourceApi]
-/// - [CaptionsResourceApi]
-/// - [ChannelBannersResourceApi]
-/// - [ChannelSectionsResourceApi]
-/// - [ChannelsResourceApi]
-/// - [CommentThreadsResourceApi]
-/// - [CommentsResourceApi]
-/// - [I18nLanguagesResourceApi]
-/// - [I18nRegionsResourceApi]
-/// - [LiveBroadcastsResourceApi]
-/// - [LiveChatBansResourceApi]
-/// - [LiveChatMessagesResourceApi]
-/// - [LiveChatModeratorsResourceApi]
-/// - [LiveStreamsResourceApi]
-/// - [MembersResourceApi]
-/// - [MembershipsLevelsResourceApi]
-/// - [PlaylistItemsResourceApi]
-/// - [PlaylistsResourceApi]
-/// - [SearchResourceApi]
-/// - [SponsorsResourceApi]
-/// - [SubscriptionsResourceApi]
-/// - [SuperChatEventsResourceApi]
-/// - [TestsResourceApi]
-/// - [ThirdPartyLinksResourceApi]
-/// - [ThumbnailsResourceApi]
-/// - [VideoAbuseReportReasonsResourceApi]
-/// - [VideoCategoriesResourceApi]
-/// - [VideosResourceApi]
-/// - [WatermarksResourceApi]
+/// - [AbuseReportsResource]
+/// - [ActivitiesResource]
+/// - [CaptionsResource]
+/// - [ChannelBannersResource]
+/// - [ChannelSectionsResource]
+/// - [ChannelsResource]
+/// - [CommentThreadsResource]
+/// - [CommentsResource]
+/// - [I18nLanguagesResource]
+/// - [I18nRegionsResource]
+/// - [LiveBroadcastsResource]
+/// - [LiveChatBansResource]
+/// - [LiveChatMessagesResource]
+/// - [LiveChatModeratorsResource]
+/// - [LiveStreamsResource]
+/// - [MembersResource]
+/// - [MembershipsLevelsResource]
+/// - [PlaylistItemsResource]
+/// - [PlaylistsResource]
+/// - [SearchResource]
+/// - [SponsorsResource]
+/// - [SubscriptionsResource]
+/// - [SuperChatEventsResource]
+/// - [TestsResource]
+/// - [ThirdPartyLinksResource]
+/// - [ThumbnailsResource]
+/// - [VideoAbuseReportReasonsResource]
+/// - [VideoCategoriesResource]
+/// - [VideosResource]
+/// - [WatermarksResource]
 library youtube.v3;
 
 import 'dart:async' as async;
@@ -111,52 +111,47 @@
 
   final commons.ApiRequester _requester;
 
-  AbuseReportsResourceApi get abuseReports =>
-      AbuseReportsResourceApi(_requester);
-  ActivitiesResourceApi get activities => ActivitiesResourceApi(_requester);
-  CaptionsResourceApi get captions => CaptionsResourceApi(_requester);
-  ChannelBannersResourceApi get channelBanners =>
-      ChannelBannersResourceApi(_requester);
-  ChannelSectionsResourceApi get channelSections =>
-      ChannelSectionsResourceApi(_requester);
-  ChannelsResourceApi get channels => ChannelsResourceApi(_requester);
-  CommentThreadsResourceApi get commentThreads =>
-      CommentThreadsResourceApi(_requester);
-  CommentsResourceApi get comments => CommentsResourceApi(_requester);
-  I18nLanguagesResourceApi get i18nLanguages =>
-      I18nLanguagesResourceApi(_requester);
-  I18nRegionsResourceApi get i18nRegions => I18nRegionsResourceApi(_requester);
-  LiveBroadcastsResourceApi get liveBroadcasts =>
-      LiveBroadcastsResourceApi(_requester);
-  LiveChatBansResourceApi get liveChatBans =>
-      LiveChatBansResourceApi(_requester);
-  LiveChatMessagesResourceApi get liveChatMessages =>
-      LiveChatMessagesResourceApi(_requester);
-  LiveChatModeratorsResourceApi get liveChatModerators =>
-      LiveChatModeratorsResourceApi(_requester);
-  LiveStreamsResourceApi get liveStreams => LiveStreamsResourceApi(_requester);
-  MembersResourceApi get members => MembersResourceApi(_requester);
-  MembershipsLevelsResourceApi get membershipsLevels =>
-      MembershipsLevelsResourceApi(_requester);
-  PlaylistItemsResourceApi get playlistItems =>
-      PlaylistItemsResourceApi(_requester);
-  PlaylistsResourceApi get playlists => PlaylistsResourceApi(_requester);
-  SearchResourceApi get search => SearchResourceApi(_requester);
-  SponsorsResourceApi get sponsors => SponsorsResourceApi(_requester);
-  SubscriptionsResourceApi get subscriptions =>
-      SubscriptionsResourceApi(_requester);
-  SuperChatEventsResourceApi get superChatEvents =>
-      SuperChatEventsResourceApi(_requester);
-  TestsResourceApi get tests => TestsResourceApi(_requester);
-  ThirdPartyLinksResourceApi get thirdPartyLinks =>
-      ThirdPartyLinksResourceApi(_requester);
-  ThumbnailsResourceApi get thumbnails => ThumbnailsResourceApi(_requester);
-  VideoAbuseReportReasonsResourceApi get videoAbuseReportReasons =>
-      VideoAbuseReportReasonsResourceApi(_requester);
-  VideoCategoriesResourceApi get videoCategories =>
-      VideoCategoriesResourceApi(_requester);
-  VideosResourceApi get videos => VideosResourceApi(_requester);
-  WatermarksResourceApi get watermarks => WatermarksResourceApi(_requester);
+  AbuseReportsResource get abuseReports => AbuseReportsResource(_requester);
+  ActivitiesResource get activities => ActivitiesResource(_requester);
+  CaptionsResource get captions => CaptionsResource(_requester);
+  ChannelBannersResource get channelBanners =>
+      ChannelBannersResource(_requester);
+  ChannelSectionsResource get channelSections =>
+      ChannelSectionsResource(_requester);
+  ChannelsResource get channels => ChannelsResource(_requester);
+  CommentThreadsResource get commentThreads =>
+      CommentThreadsResource(_requester);
+  CommentsResource get comments => CommentsResource(_requester);
+  I18nLanguagesResource get i18nLanguages => I18nLanguagesResource(_requester);
+  I18nRegionsResource get i18nRegions => I18nRegionsResource(_requester);
+  LiveBroadcastsResource get liveBroadcasts =>
+      LiveBroadcastsResource(_requester);
+  LiveChatBansResource get liveChatBans => LiveChatBansResource(_requester);
+  LiveChatMessagesResource get liveChatMessages =>
+      LiveChatMessagesResource(_requester);
+  LiveChatModeratorsResource get liveChatModerators =>
+      LiveChatModeratorsResource(_requester);
+  LiveStreamsResource get liveStreams => LiveStreamsResource(_requester);
+  MembersResource get members => MembersResource(_requester);
+  MembershipsLevelsResource get membershipsLevels =>
+      MembershipsLevelsResource(_requester);
+  PlaylistItemsResource get playlistItems => PlaylistItemsResource(_requester);
+  PlaylistsResource get playlists => PlaylistsResource(_requester);
+  SearchResource get search => SearchResource(_requester);
+  SponsorsResource get sponsors => SponsorsResource(_requester);
+  SubscriptionsResource get subscriptions => SubscriptionsResource(_requester);
+  SuperChatEventsResource get superChatEvents =>
+      SuperChatEventsResource(_requester);
+  TestsResource get tests => TestsResource(_requester);
+  ThirdPartyLinksResource get thirdPartyLinks =>
+      ThirdPartyLinksResource(_requester);
+  ThumbnailsResource get thumbnails => ThumbnailsResource(_requester);
+  VideoAbuseReportReasonsResource get videoAbuseReportReasons =>
+      VideoAbuseReportReasonsResource(_requester);
+  VideoCategoriesResource get videoCategories =>
+      VideoCategoriesResource(_requester);
+  VideosResource get videos => VideosResource(_requester);
+  WatermarksResource get watermarks => WatermarksResource(_requester);
 
   YouTubeApi(http.Client client,
       {core.String rootUrl = 'https://www.googleapis.com/',
@@ -165,10 +160,10 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class AbuseReportsResourceApi {
+class AbuseReportsResource {
   final commons.ApiRequester _requester;
 
-  AbuseReportsResourceApi(commons.ApiRequester client) : _requester = client;
+  AbuseReportsResource(commons.ApiRequester client) : _requester = client;
 
   /// Inserts a new resource into this collection.
   ///
@@ -231,10 +226,10 @@
   }
 }
 
-class ActivitiesResourceApi {
+class ActivitiesResource {
   final commons.ApiRequester _requester;
 
-  ActivitiesResourceApi(commons.ApiRequester client) : _requester = client;
+  ActivitiesResource(commons.ApiRequester client) : _requester = client;
 
   /// Retrieves a list of resources, possibly filtered.
   ///
@@ -347,10 +342,10 @@
   }
 }
 
-class CaptionsResourceApi {
+class CaptionsResource {
   final commons.ApiRequester _requester;
 
-  CaptionsResourceApi(commons.ApiRequester client) : _requester = client;
+  CaptionsResource(commons.ApiRequester client) : _requester = client;
 
   /// Deletes a resource.
   ///
@@ -820,10 +815,10 @@
   }
 }
 
-class ChannelBannersResourceApi {
+class ChannelBannersResource {
   final commons.ApiRequester _requester;
 
-  ChannelBannersResourceApi(commons.ApiRequester client) : _requester = client;
+  ChannelBannersResource(commons.ApiRequester client) : _requester = client;
 
   /// Inserts a new resource into this collection.
   ///
@@ -939,10 +934,10 @@
   }
 }
 
-class ChannelSectionsResourceApi {
+class ChannelSectionsResource {
   final commons.ApiRequester _requester;
 
-  ChannelSectionsResourceApi(commons.ApiRequester client) : _requester = client;
+  ChannelSectionsResource(commons.ApiRequester client) : _requester = client;
 
   /// Deletes a resource.
   ///
@@ -1286,10 +1281,10 @@
   }
 }
 
-class ChannelsResourceApi {
+class ChannelsResource {
   final commons.ApiRequester _requester;
 
-  ChannelsResourceApi(commons.ApiRequester client) : _requester = client;
+  ChannelsResource(commons.ApiRequester client) : _requester = client;
 
   /// Retrieves a list of resources, possibly filtered.
   ///
@@ -1504,10 +1499,10 @@
   }
 }
 
-class CommentThreadsResourceApi {
+class CommentThreadsResource {
   final commons.ApiRequester _requester;
 
-  CommentThreadsResourceApi(commons.ApiRequester client) : _requester = client;
+  CommentThreadsResource(commons.ApiRequester client) : _requester = client;
 
   /// Inserts a new resource into this collection.
   ///
@@ -1768,10 +1763,10 @@
   }
 }
 
-class CommentsResourceApi {
+class CommentsResource {
   final commons.ApiRequester _requester;
 
-  CommentsResourceApi(commons.ApiRequester client) : _requester = client;
+  CommentsResource(commons.ApiRequester client) : _requester = client;
 
   /// Deletes a resource.
   ///
@@ -2164,10 +2159,10 @@
   }
 }
 
-class I18nLanguagesResourceApi {
+class I18nLanguagesResource {
   final commons.ApiRequester _requester;
 
-  I18nLanguagesResourceApi(commons.ApiRequester client) : _requester = client;
+  I18nLanguagesResource(commons.ApiRequester client) : _requester = client;
 
   /// Retrieves a list of resources, possibly filtered.
   ///
@@ -2230,10 +2225,10 @@
   }
 }
 
-class I18nRegionsResourceApi {
+class I18nRegionsResource {
   final commons.ApiRequester _requester;
 
-  I18nRegionsResourceApi(commons.ApiRequester client) : _requester = client;
+  I18nRegionsResource(commons.ApiRequester client) : _requester = client;
 
   /// Retrieves a list of resources, possibly filtered.
   ///
@@ -2295,10 +2290,10 @@
   }
 }
 
-class LiveBroadcastsResourceApi {
+class LiveBroadcastsResource {
   final commons.ApiRequester _requester;
 
-  LiveBroadcastsResourceApi(commons.ApiRequester client) : _requester = client;
+  LiveBroadcastsResource(commons.ApiRequester client) : _requester = client;
 
   /// Bind a broadcast to a stream.
   ///
@@ -3089,10 +3084,10 @@
   }
 }
 
-class LiveChatBansResourceApi {
+class LiveChatBansResource {
   final commons.ApiRequester _requester;
 
-  LiveChatBansResourceApi(commons.ApiRequester client) : _requester = client;
+  LiveChatBansResource(commons.ApiRequester client) : _requester = client;
 
   /// Deletes a chat ban.
   ///
@@ -3207,11 +3202,10 @@
   }
 }
 
-class LiveChatMessagesResourceApi {
+class LiveChatMessagesResource {
   final commons.ApiRequester _requester;
 
-  LiveChatMessagesResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  LiveChatMessagesResource(commons.ApiRequester client) : _requester = client;
 
   /// Deletes a chat message.
   ///
@@ -3415,11 +3409,10 @@
   }
 }
 
-class LiveChatModeratorsResourceApi {
+class LiveChatModeratorsResource {
   final commons.ApiRequester _requester;
 
-  LiveChatModeratorsResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  LiveChatModeratorsResource(commons.ApiRequester client) : _requester = client;
 
   /// Deletes a chat moderator.
   ///
@@ -3611,10 +3604,10 @@
   }
 }
 
-class LiveStreamsResourceApi {
+class LiveStreamsResource {
   final commons.ApiRequester _requester;
 
-  LiveStreamsResourceApi(commons.ApiRequester client) : _requester = client;
+  LiveStreamsResource(commons.ApiRequester client) : _requester = client;
 
   /// Deletes an existing stream for the authenticated user.
   ///
@@ -4028,10 +4021,10 @@
   }
 }
 
-class MembersResourceApi {
+class MembersResource {
   final commons.ApiRequester _requester;
 
-  MembersResourceApi(commons.ApiRequester client) : _requester = client;
+  MembersResource(commons.ApiRequester client) : _requester = client;
 
   /// Retrieves a list of members that match the request criteria for a channel.
   ///
@@ -4127,11 +4120,10 @@
   }
 }
 
-class MembershipsLevelsResourceApi {
+class MembershipsLevelsResource {
   final commons.ApiRequester _requester;
 
-  MembershipsLevelsResourceApi(commons.ApiRequester client)
-      : _requester = client;
+  MembershipsLevelsResource(commons.ApiRequester client) : _requester = client;
 
   /// Retrieves a list of all pricing levels offered by a creator to the fans.
   ///
@@ -4188,10 +4180,10 @@
   }
 }
 
-class PlaylistItemsResourceApi {
+class PlaylistItemsResource {
   final commons.ApiRequester _requester;
 
-  PlaylistItemsResourceApi(commons.ApiRequester client) : _requester = client;
+  PlaylistItemsResource(commons.ApiRequester client) : _requester = client;
 
   /// Deletes a resource.
   ///
@@ -4527,10 +4519,10 @@
   }
 }
 
-class PlaylistsResourceApi {
+class PlaylistsResource {
   final commons.ApiRequester _requester;
 
-  PlaylistsResourceApi(commons.ApiRequester client) : _requester = client;
+  PlaylistsResource(commons.ApiRequester client) : _requester = client;
 
   /// Deletes a resource.
   ///
@@ -4911,10 +4903,10 @@
   }
 }
 
-class SearchResourceApi {
+class SearchResource {
   final commons.ApiRequester _requester;
 
-  SearchResourceApi(commons.ApiRequester client) : _requester = client;
+  SearchResource(commons.ApiRequester client) : _requester = client;
 
   /// Retrieves a list of search resources
   ///
@@ -5238,10 +5230,10 @@
   }
 }
 
-class SponsorsResourceApi {
+class SponsorsResource {
   final commons.ApiRequester _requester;
 
-  SponsorsResourceApi(commons.ApiRequester client) : _requester = client;
+  SponsorsResource(commons.ApiRequester client) : _requester = client;
 
   /// Retrieves a list of sponsors that match the request criteria for a
   /// channel.
@@ -5323,10 +5315,10 @@
   }
 }
 
-class SubscriptionsResourceApi {
+class SubscriptionsResource {
   final commons.ApiRequester _requester;
 
-  SubscriptionsResourceApi(commons.ApiRequester client) : _requester = client;
+  SubscriptionsResource(commons.ApiRequester client) : _requester = client;
 
   /// Deletes a resource.
   ///
@@ -5599,10 +5591,10 @@
   }
 }
 
-class SuperChatEventsResourceApi {
+class SuperChatEventsResource {
   final commons.ApiRequester _requester;
 
-  SuperChatEventsResourceApi(commons.ApiRequester client) : _requester = client;
+  SuperChatEventsResource(commons.ApiRequester client) : _requester = client;
 
   /// Retrieves a list of resources, possibly filtered.
   ///
@@ -5679,10 +5671,10 @@
   }
 }
 
-class TestsResourceApi {
+class TestsResource {
   final commons.ApiRequester _requester;
 
-  TestsResourceApi(commons.ApiRequester client) : _requester = client;
+  TestsResource(commons.ApiRequester client) : _requester = client;
 
   /// POST method.
   ///
@@ -5742,10 +5734,10 @@
   }
 }
 
-class ThirdPartyLinksResourceApi {
+class ThirdPartyLinksResource {
   final commons.ApiRequester _requester;
 
-  ThirdPartyLinksResourceApi(commons.ApiRequester client) : _requester = client;
+  ThirdPartyLinksResource(commons.ApiRequester client) : _requester = client;
 
   /// Deletes a resource.
   ///
@@ -6008,10 +6000,10 @@
   }
 }
 
-class ThumbnailsResourceApi {
+class ThumbnailsResource {
   final commons.ApiRequester _requester;
 
-  ThumbnailsResourceApi(commons.ApiRequester client) : _requester = client;
+  ThumbnailsResource(commons.ApiRequester client) : _requester = client;
 
   /// As this is not an insert in a strict sense (it supports uploading/setting
   /// of a thumbnail for multiple videos, which doesn't result in creation of a
@@ -6101,10 +6093,10 @@
   }
 }
 
-class VideoAbuseReportReasonsResourceApi {
+class VideoAbuseReportReasonsResource {
   final commons.ApiRequester _requester;
 
-  VideoAbuseReportReasonsResourceApi(commons.ApiRequester client)
+  VideoAbuseReportReasonsResource(commons.ApiRequester client)
       : _requester = client;
 
   /// Retrieves a list of resources, possibly filtered.
@@ -6167,10 +6159,10 @@
   }
 }
 
-class VideoCategoriesResourceApi {
+class VideoCategoriesResource {
   final commons.ApiRequester _requester;
 
-  VideoCategoriesResourceApi(commons.ApiRequester client) : _requester = client;
+  VideoCategoriesResource(commons.ApiRequester client) : _requester = client;
 
   /// Retrieves a list of resources, possibly filtered.
   ///
@@ -6246,10 +6238,10 @@
   }
 }
 
-class VideosResourceApi {
+class VideosResource {
   final commons.ApiRequester _requester;
 
-  VideosResourceApi(commons.ApiRequester client) : _requester = client;
+  VideosResource(commons.ApiRequester client) : _requester = client;
 
   /// Deletes a resource.
   ///
@@ -6900,10 +6892,10 @@
   }
 }
 
-class WatermarksResourceApi {
+class WatermarksResource {
   final commons.ApiRequester _requester;
 
-  WatermarksResourceApi(commons.ApiRequester client) : _requester = client;
+  WatermarksResource(commons.ApiRequester client) : _requester = client;
 
   /// Allows upload of watermark image and setting it for a channel.
   ///
diff --git a/generated/googleapis/lib/youtubeanalytics/v2.dart b/generated/googleapis/lib/youtubeanalytics/v2.dart
index ffd827e..c690c24 100644
--- a/generated/googleapis/lib/youtubeanalytics/v2.dart
+++ b/generated/googleapis/lib/youtubeanalytics/v2.dart
@@ -23,9 +23,9 @@
 ///
 /// Create an instance of [YouTubeAnalyticsApi] to access these resources:
 ///
-/// - [GroupItemsResourceApi]
-/// - [GroupsResourceApi]
-/// - [ReportsResourceApi]
+/// - [GroupItemsResource]
+/// - [GroupsResource]
+/// - [ReportsResource]
 library youtubeAnalytics.v2;
 
 import 'dart:async' as async;
@@ -64,9 +64,9 @@
 
   final commons.ApiRequester _requester;
 
-  GroupItemsResourceApi get groupItems => GroupItemsResourceApi(_requester);
-  GroupsResourceApi get groups => GroupsResourceApi(_requester);
-  ReportsResourceApi get reports => ReportsResourceApi(_requester);
+  GroupItemsResource get groupItems => GroupItemsResource(_requester);
+  GroupsResource get groups => GroupsResource(_requester);
+  ReportsResource get reports => ReportsResource(_requester);
 
   YouTubeAnalyticsApi(http.Client client,
       {core.String rootUrl = 'https://youtubeanalytics.googleapis.com/',
@@ -75,10 +75,10 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class GroupItemsResourceApi {
+class GroupItemsResource {
   final commons.ApiRequester _requester;
 
-  GroupItemsResourceApi(commons.ApiRequester client) : _requester = client;
+  GroupItemsResource(commons.ApiRequester client) : _requester = client;
 
   /// Removes an item from a group.
   ///
@@ -280,10 +280,10 @@
   }
 }
 
-class GroupsResourceApi {
+class GroupsResource {
   final commons.ApiRequester _requester;
 
-  GroupsResourceApi(commons.ApiRequester client) : _requester = client;
+  GroupsResource(commons.ApiRequester client) : _requester = client;
 
   /// Deletes a group.
   ///
@@ -572,10 +572,10 @@
   }
 }
 
-class ReportsResourceApi {
+class ReportsResource {
   final commons.ApiRequester _requester;
 
-  ReportsResourceApi(commons.ApiRequester client) : _requester = client;
+  ReportsResource(commons.ApiRequester client) : _requester = client;
 
   /// Retrieve your YouTube Analytics reports.
   ///
diff --git a/generated/googleapis/lib/youtubereporting/v1.dart b/generated/googleapis/lib/youtubereporting/v1.dart
index 1ddf2bc..f31949b 100644
--- a/generated/googleapis/lib/youtubereporting/v1.dart
+++ b/generated/googleapis/lib/youtubereporting/v1.dart
@@ -25,10 +25,10 @@
 ///
 /// Create an instance of [YouTubeReportingApi] to access these resources:
 ///
-/// - [JobsResourceApi]
-///   - [JobsReportsResourceApi]
-/// - [MediaResourceApi]
-/// - [ReportTypesResourceApi]
+/// - [JobsResource]
+///   - [JobsReportsResource]
+/// - [MediaResource]
+/// - [ReportTypesResource]
 library youtubereporting.v1;
 
 import 'dart:async' as async;
@@ -65,9 +65,9 @@
 
   final commons.ApiRequester _requester;
 
-  JobsResourceApi get jobs => JobsResourceApi(_requester);
-  MediaResourceApi get media => MediaResourceApi(_requester);
-  ReportTypesResourceApi get reportTypes => ReportTypesResourceApi(_requester);
+  JobsResource get jobs => JobsResource(_requester);
+  MediaResource get media => MediaResource(_requester);
+  ReportTypesResource get reportTypes => ReportTypesResource(_requester);
 
   YouTubeReportingApi(http.Client client,
       {core.String rootUrl = 'https://youtubereporting.googleapis.com/',
@@ -76,12 +76,12 @@
             commons.ApiRequester(client, rootUrl, servicePath, userAgent);
 }
 
-class JobsResourceApi {
+class JobsResource {
   final commons.ApiRequester _requester;
 
-  JobsReportsResourceApi get reports => JobsReportsResourceApi(_requester);
+  JobsReportsResource get reports => JobsReportsResource(_requester);
 
-  JobsResourceApi(commons.ApiRequester client) : _requester = client;
+  JobsResource(commons.ApiRequester client) : _requester = client;
 
   /// Creates a job and returns it.
   ///
@@ -335,10 +335,10 @@
   }
 }
 
-class JobsReportsResourceApi {
+class JobsReportsResource {
   final commons.ApiRequester _requester;
 
-  JobsReportsResourceApi(commons.ApiRequester client) : _requester = client;
+  JobsReportsResource(commons.ApiRequester client) : _requester = client;
 
   /// Gets the metadata of a specific report.
   ///
@@ -505,10 +505,10 @@
   }
 }
 
-class MediaResourceApi {
+class MediaResource {
   final commons.ApiRequester _requester;
 
-  MediaResourceApi(commons.ApiRequester client) : _requester = client;
+  MediaResource(commons.ApiRequester client) : _requester = client;
 
   /// Method for media download. Download is supported on the URI
   /// `/v1/media/{+name}?alt=media`.
@@ -580,10 +580,10 @@
   }
 }
 
-class ReportTypesResourceApi {
+class ReportTypesResource {
   final commons.ApiRequester _requester;
 
-  ReportTypesResourceApi(commons.ApiRequester client) : _requester = client;
+  ReportTypesResource(commons.ApiRequester client) : _requester = client;
 
   /// Lists report types.
   ///
diff --git a/generated/googleapis/test/abusiveexperiencereport/v1_test.dart b/generated/googleapis/test/abusiveexperiencereport/v1_test.dart
index 81f1a97..0b72a0c 100644
--- a/generated/googleapis/test/abusiveexperiencereport/v1_test.dart
+++ b/generated/googleapis/test/abusiveexperiencereport/v1_test.dart
@@ -107,7 +107,7 @@
     });
   });
 
-  unittest.group('resource-SitesResourceApi', () {
+  unittest.group('resource-SitesResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.AbusiveExperienceReportApi(mock).sites;
@@ -157,7 +157,7 @@
     });
   });
 
-  unittest.group('resource-ViolatingSitesResourceApi', () {
+  unittest.group('resource-ViolatingSitesResource', () {
     unittest.test('method--list', () {
       var mock = HttpServerMock();
       var res = api.AbusiveExperienceReportApi(mock).violatingSites;
diff --git a/generated/googleapis/test/acceleratedmobilepageurl/v1_test.dart b/generated/googleapis/test/acceleratedmobilepageurl/v1_test.dart
index bca662f..bb990fa 100644
--- a/generated/googleapis/test/acceleratedmobilepageurl/v1_test.dart
+++ b/generated/googleapis/test/acceleratedmobilepageurl/v1_test.dart
@@ -187,7 +187,7 @@
     });
   });
 
-  unittest.group('resource-AmpUrlsResourceApi', () {
+  unittest.group('resource-AmpUrlsResource', () {
     unittest.test('method--batchGet', () {
       var mock = HttpServerMock();
       var res = api.AcceleratedmobilepageurlApi(mock).ampUrls;
diff --git a/generated/googleapis/test/accessapproval/v1_test.dart b/generated/googleapis/test/accessapproval/v1_test.dart
index 178687b..705d6be 100644
--- a/generated/googleapis/test/accessapproval/v1_test.dart
+++ b/generated/googleapis/test/accessapproval/v1_test.dart
@@ -420,7 +420,7 @@
     });
   });
 
-  unittest.group('resource-FoldersResourceApi', () {
+  unittest.group('resource-FoldersResource', () {
     unittest.test('method--deleteAccessApprovalSettings', () {
       var mock = HttpServerMock();
       var res = api.AccessApprovalApi(mock).folders;
@@ -575,7 +575,7 @@
     });
   });
 
-  unittest.group('resource-FoldersApprovalRequestsResourceApi', () {
+  unittest.group('resource-FoldersApprovalRequestsResource', () {
     unittest.test('method--approve', () {
       var mock = HttpServerMock();
       var res = api.AccessApprovalApi(mock).folders.approvalRequests;
@@ -794,7 +794,7 @@
     });
   });
 
-  unittest.group('resource-OrganizationsResourceApi', () {
+  unittest.group('resource-OrganizationsResource', () {
     unittest.test('method--deleteAccessApprovalSettings', () {
       var mock = HttpServerMock();
       var res = api.AccessApprovalApi(mock).organizations;
@@ -949,7 +949,7 @@
     });
   });
 
-  unittest.group('resource-OrganizationsApprovalRequestsResourceApi', () {
+  unittest.group('resource-OrganizationsApprovalRequestsResource', () {
     unittest.test('method--approve', () {
       var mock = HttpServerMock();
       var res = api.AccessApprovalApi(mock).organizations.approvalRequests;
@@ -1168,7 +1168,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsResourceApi', () {
+  unittest.group('resource-ProjectsResource', () {
     unittest.test('method--deleteAccessApprovalSettings', () {
       var mock = HttpServerMock();
       var res = api.AccessApprovalApi(mock).projects;
@@ -1323,7 +1323,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsApprovalRequestsResourceApi', () {
+  unittest.group('resource-ProjectsApprovalRequestsResource', () {
     unittest.test('method--approve', () {
       var mock = HttpServerMock();
       var res = api.AccessApprovalApi(mock).projects.approvalRequests;
diff --git a/generated/googleapis/test/accesscontextmanager/v1_test.dart b/generated/googleapis/test/accesscontextmanager/v1_test.dart
index 55e3aeb..27aa3a5 100644
--- a/generated/googleapis/test/accesscontextmanager/v1_test.dart
+++ b/generated/googleapis/test/accesscontextmanager/v1_test.dart
@@ -1255,7 +1255,7 @@
     });
   });
 
-  unittest.group('resource-AccessPoliciesResourceApi', () {
+  unittest.group('resource-AccessPoliciesResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.AccessContextManagerApi(mock).accessPolicies;
@@ -1520,7 +1520,7 @@
     });
   });
 
-  unittest.group('resource-AccessPoliciesAccessLevelsResourceApi', () {
+  unittest.group('resource-AccessPoliciesAccessLevelsResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.AccessContextManagerApi(mock).accessPolicies.accessLevels;
@@ -1846,7 +1846,7 @@
     });
   });
 
-  unittest.group('resource-AccessPoliciesServicePerimetersResourceApi', () {
+  unittest.group('resource-AccessPoliciesServicePerimetersResource', () {
     unittest.test('method--commit', () {
       var mock = HttpServerMock();
       var res =
@@ -2227,7 +2227,7 @@
     });
   });
 
-  unittest.group('resource-OperationsResourceApi', () {
+  unittest.group('resource-OperationsResource', () {
     unittest.test('method--cancel', () {
       var mock = HttpServerMock();
       var res = api.AccessContextManagerApi(mock).operations;
@@ -2438,7 +2438,7 @@
     });
   });
 
-  unittest.group('resource-OrganizationsGcpUserAccessBindingsResourceApi', () {
+  unittest.group('resource-OrganizationsGcpUserAccessBindingsResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res =
diff --git a/generated/googleapis/test/adexchangebuyer/v1_3_test.dart b/generated/googleapis/test/adexchangebuyer/v1_3_test.dart
index 887caee..88bce7a 100644
--- a/generated/googleapis/test/adexchangebuyer/v1_3_test.dart
+++ b/generated/googleapis/test/adexchangebuyer/v1_3_test.dart
@@ -1678,7 +1678,7 @@
     });
   });
 
-  unittest.group('resource-AccountsResourceApi', () {
+  unittest.group('resource-AccountsResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.AdExchangeBuyerApi(mock).accounts;
@@ -1896,7 +1896,7 @@
     });
   });
 
-  unittest.group('resource-BillingInfoResourceApi', () {
+  unittest.group('resource-BillingInfoResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.AdExchangeBuyerApi(mock).billingInfo;
@@ -1998,7 +1998,7 @@
     });
   });
 
-  unittest.group('resource-BudgetResourceApi', () {
+  unittest.group('resource-BudgetResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.AdExchangeBuyerApi(mock).budget;
@@ -2201,7 +2201,7 @@
     });
   });
 
-  unittest.group('resource-CreativesResourceApi', () {
+  unittest.group('resource-CreativesResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.AdExchangeBuyerApi(mock).creatives;
@@ -2390,7 +2390,7 @@
     });
   });
 
-  unittest.group('resource-DirectDealsResourceApi', () {
+  unittest.group('resource-DirectDealsResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.AdExchangeBuyerApi(mock).directDeals;
@@ -2492,7 +2492,7 @@
     });
   });
 
-  unittest.group('resource-PerformanceReportResourceApi', () {
+  unittest.group('resource-PerformanceReportResource', () {
     unittest.test('method--list', () {
       var mock = HttpServerMock();
       var res = api.AdExchangeBuyerApi(mock).performanceReport;
@@ -2561,7 +2561,7 @@
     });
   });
 
-  unittest.group('resource-PretargetingConfigResourceApi', () {
+  unittest.group('resource-PretargetingConfigResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.AdExchangeBuyerApi(mock).pretargetingConfig;
diff --git a/generated/googleapis/test/adexchangebuyer/v1_4_test.dart b/generated/googleapis/test/adexchangebuyer/v1_4_test.dart
index 35ee369..6fff649 100644
--- a/generated/googleapis/test/adexchangebuyer/v1_4_test.dart
+++ b/generated/googleapis/test/adexchangebuyer/v1_4_test.dart
@@ -4366,7 +4366,7 @@
     });
   });
 
-  unittest.group('resource-AccountsResourceApi', () {
+  unittest.group('resource-AccountsResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.AdExchangeBuyerApi(mock).accounts;
@@ -4594,7 +4594,7 @@
     });
   });
 
-  unittest.group('resource-BillingInfoResourceApi', () {
+  unittest.group('resource-BillingInfoResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.AdExchangeBuyerApi(mock).billingInfo;
@@ -4696,7 +4696,7 @@
     });
   });
 
-  unittest.group('resource-BudgetResourceApi', () {
+  unittest.group('resource-BudgetResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.AdExchangeBuyerApi(mock).budget;
@@ -4899,7 +4899,7 @@
     });
   });
 
-  unittest.group('resource-CreativesResourceApi', () {
+  unittest.group('resource-CreativesResource', () {
     unittest.test('method--addDeal', () {
       var mock = HttpServerMock();
       var res = api.AdExchangeBuyerApi(mock).creatives;
@@ -5305,7 +5305,7 @@
     });
   });
 
-  unittest.group('resource-MarketplacedealsResourceApi', () {
+  unittest.group('resource-MarketplacedealsResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.AdExchangeBuyerApi(mock).marketplacedeals;
@@ -5562,7 +5562,7 @@
     });
   });
 
-  unittest.group('resource-MarketplacenotesResourceApi', () {
+  unittest.group('resource-MarketplacenotesResource', () {
     unittest.test('method--insert', () {
       var mock = HttpServerMock();
       var res = api.AdExchangeBuyerApi(mock).marketplacenotes;
@@ -5690,7 +5690,7 @@
     });
   });
 
-  unittest.group('resource-MarketplaceprivateauctionResourceApi', () {
+  unittest.group('resource-MarketplaceprivateauctionResource', () {
     unittest.test('method--updateproposal', () {
       var mock = HttpServerMock();
       var res = api.AdExchangeBuyerApi(mock).marketplaceprivateauction;
@@ -5756,7 +5756,7 @@
     });
   });
 
-  unittest.group('resource-PerformanceReportResourceApi', () {
+  unittest.group('resource-PerformanceReportResource', () {
     unittest.test('method--list', () {
       var mock = HttpServerMock();
       var res = api.AdExchangeBuyerApi(mock).performanceReport;
@@ -5825,7 +5825,7 @@
     });
   });
 
-  unittest.group('resource-PretargetingConfigResourceApi', () {
+  unittest.group('resource-PretargetingConfigResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.AdExchangeBuyerApi(mock).pretargetingConfig;
@@ -6199,7 +6199,7 @@
     });
   });
 
-  unittest.group('resource-ProductsResourceApi', () {
+  unittest.group('resource-ProductsResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.AdExchangeBuyerApi(mock).products;
@@ -6306,7 +6306,7 @@
     });
   });
 
-  unittest.group('resource-ProposalsResourceApi', () {
+  unittest.group('resource-ProposalsResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.AdExchangeBuyerApi(mock).proposals;
@@ -6684,7 +6684,7 @@
     });
   });
 
-  unittest.group('resource-PubprofilesResourceApi', () {
+  unittest.group('resource-PubprofilesResource', () {
     unittest.test('method--list', () {
       var mock = HttpServerMock();
       var res = api.AdExchangeBuyerApi(mock).pubprofiles;
diff --git a/generated/googleapis/test/adexperiencereport/v1_test.dart b/generated/googleapis/test/adexperiencereport/v1_test.dart
index d639111..2ff748c 100644
--- a/generated/googleapis/test/adexperiencereport/v1_test.dart
+++ b/generated/googleapis/test/adexperiencereport/v1_test.dart
@@ -151,7 +151,7 @@
     });
   });
 
-  unittest.group('resource-SitesResourceApi', () {
+  unittest.group('resource-SitesResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.AdExperienceReportApi(mock).sites;
@@ -201,7 +201,7 @@
     });
   });
 
-  unittest.group('resource-ViolatingSitesResourceApi', () {
+  unittest.group('resource-ViolatingSitesResource', () {
     unittest.test('method--list', () {
       var mock = HttpServerMock();
       var res = api.AdExperienceReportApi(mock).violatingSites;
diff --git a/generated/googleapis/test/admin/datatransfer_v1_test.dart b/generated/googleapis/test/admin/datatransfer_v1_test.dart
index 216ff7c..d9bbffc 100644
--- a/generated/googleapis/test/admin/datatransfer_v1_test.dart
+++ b/generated/googleapis/test/admin/datatransfer_v1_test.dart
@@ -309,7 +309,7 @@
     });
   });
 
-  unittest.group('resource-ApplicationsResourceApi', () {
+  unittest.group('resource-ApplicationsResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.DataTransferApi(mock).applications;
@@ -420,7 +420,7 @@
     });
   });
 
-  unittest.group('resource-TransfersResourceApi', () {
+  unittest.group('resource-TransfersResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.DataTransferApi(mock).transfers;
diff --git a/generated/googleapis/test/admin/directory_v1_test.dart b/generated/googleapis/test/admin/directory_v1_test.dart
index 7e9b561..23d9cd8 100644
--- a/generated/googleapis/test/admin/directory_v1_test.dart
+++ b/generated/googleapis/test/admin/directory_v1_test.dart
@@ -3928,7 +3928,7 @@
     });
   });
 
-  unittest.group('resource-AspsResourceApi', () {
+  unittest.group('resource-AspsResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.DirectoryApi(mock).asps;
@@ -4104,7 +4104,7 @@
     });
   });
 
-  unittest.group('resource-ChannelsResourceApi', () {
+  unittest.group('resource-ChannelsResource', () {
     unittest.test('method--stop', () {
       var mock = HttpServerMock();
       var res = api.DirectoryApi(mock).channels;
@@ -4155,7 +4155,7 @@
     });
   });
 
-  unittest.group('resource-ChromeosdevicesResourceApi', () {
+  unittest.group('resource-ChromeosdevicesResource', () {
     unittest.test('method--action', () {
       var mock = HttpServerMock();
       var res = api.DirectoryApi(mock).chromeosdevices;
@@ -4576,7 +4576,7 @@
     });
   });
 
-  unittest.group('resource-CustomersResourceApi', () {
+  unittest.group('resource-CustomersResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.DirectoryApi(mock).customers;
@@ -4738,7 +4738,7 @@
     });
   });
 
-  unittest.group('resource-DomainAliasesResourceApi', () {
+  unittest.group('resource-DomainAliasesResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.DirectoryApi(mock).domainAliases;
@@ -4979,7 +4979,7 @@
     });
   });
 
-  unittest.group('resource-DomainsResourceApi', () {
+  unittest.group('resource-DomainsResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.DirectoryApi(mock).domains;
@@ -5216,7 +5216,7 @@
     });
   });
 
-  unittest.group('resource-GroupsResourceApi', () {
+  unittest.group('resource-GroupsResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.DirectoryApi(mock).groups;
@@ -5554,7 +5554,7 @@
     });
   });
 
-  unittest.group('resource-GroupsAliasesResourceApi', () {
+  unittest.group('resource-GroupsAliasesResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.DirectoryApi(mock).groups.aliases;
@@ -5731,7 +5731,7 @@
     });
   });
 
-  unittest.group('resource-MembersResourceApi', () {
+  unittest.group('resource-MembersResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.DirectoryApi(mock).members;
@@ -6175,7 +6175,7 @@
     });
   });
 
-  unittest.group('resource-MobiledevicesResourceApi', () {
+  unittest.group('resource-MobiledevicesResource', () {
     unittest.test('method--action', () {
       var mock = HttpServerMock();
       var res = api.DirectoryApi(mock).mobiledevices;
@@ -6449,7 +6449,7 @@
     });
   });
 
-  unittest.group('resource-OrgunitsResourceApi', () {
+  unittest.group('resource-OrgunitsResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.DirectoryApi(mock).orgunits;
@@ -6818,7 +6818,7 @@
     });
   });
 
-  unittest.group('resource-PrivilegesResourceApi', () {
+  unittest.group('resource-PrivilegesResource', () {
     unittest.test('method--list', () {
       var mock = HttpServerMock();
       var res = api.DirectoryApi(mock).privileges;
@@ -6876,7 +6876,7 @@
     });
   });
 
-  unittest.group('resource-ResourcesBuildingsResourceApi', () {
+  unittest.group('resource-ResourcesBuildingsResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.DirectoryApi(mock).resources.buildings;
@@ -7264,7 +7264,7 @@
     });
   });
 
-  unittest.group('resource-ResourcesCalendarsResourceApi', () {
+  unittest.group('resource-ResourcesCalendarsResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.DirectoryApi(mock).resources.calendars;
@@ -7649,7 +7649,7 @@
     });
   });
 
-  unittest.group('resource-ResourcesFeaturesResourceApi', () {
+  unittest.group('resource-ResourcesFeaturesResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.DirectoryApi(mock).resources.features;
@@ -8096,7 +8096,7 @@
     });
   });
 
-  unittest.group('resource-RoleAssignmentsResourceApi', () {
+  unittest.group('resource-RoleAssignmentsResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.DirectoryApi(mock).roleAssignments;
@@ -8349,7 +8349,7 @@
     });
   });
 
-  unittest.group('resource-RolesResourceApi', () {
+  unittest.group('resource-RolesResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.DirectoryApi(mock).roles;
@@ -8725,7 +8725,7 @@
     });
   });
 
-  unittest.group('resource-SchemasResourceApi', () {
+  unittest.group('resource-SchemasResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.DirectoryApi(mock).schemas;
@@ -9094,7 +9094,7 @@
     });
   });
 
-  unittest.group('resource-TokensResourceApi', () {
+  unittest.group('resource-TokensResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.DirectoryApi(mock).tokens;
@@ -9270,7 +9270,7 @@
     });
   });
 
-  unittest.group('resource-TwoStepVerificationResourceApi', () {
+  unittest.group('resource-TwoStepVerificationResource', () {
     unittest.test('method--turnOff', () {
       var mock = HttpServerMock();
       var res = api.DirectoryApi(mock).twoStepVerification;
@@ -9326,7 +9326,7 @@
     });
   });
 
-  unittest.group('resource-UsersResourceApi', () {
+  unittest.group('resource-UsersResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.DirectoryApi(mock).users;
@@ -9958,7 +9958,7 @@
     });
   });
 
-  unittest.group('resource-UsersAliasesResourceApi', () {
+  unittest.group('resource-UsersAliasesResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.DirectoryApi(mock).users.aliases;
@@ -10199,7 +10199,7 @@
     });
   });
 
-  unittest.group('resource-UsersPhotosResourceApi', () {
+  unittest.group('resource-UsersPhotosResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.DirectoryApi(mock).users.photos;
@@ -10433,7 +10433,7 @@
     });
   });
 
-  unittest.group('resource-VerificationCodesResourceApi', () {
+  unittest.group('resource-VerificationCodesResource', () {
     unittest.test('method--generate', () {
       var mock = HttpServerMock();
       var res = api.DirectoryApi(mock).verificationCodes;
diff --git a/generated/googleapis/test/admin/reports_v1_test.dart b/generated/googleapis/test/admin/reports_v1_test.dart
index 5160855..c65fd98 100644
--- a/generated/googleapis/test/admin/reports_v1_test.dart
+++ b/generated/googleapis/test/admin/reports_v1_test.dart
@@ -841,7 +841,7 @@
     });
   });
 
-  unittest.group('resource-ActivitiesResourceApi', () {
+  unittest.group('resource-ActivitiesResource', () {
     unittest.test('method--list', () {
       var mock = HttpServerMock();
       var res = api.ReportsApi(mock).activities;
@@ -1048,7 +1048,7 @@
     });
   });
 
-  unittest.group('resource-ChannelsResourceApi', () {
+  unittest.group('resource-ChannelsResource', () {
     unittest.test('method--stop', () {
       var mock = HttpServerMock();
       var res = api.ReportsApi(mock).channels;
@@ -1099,7 +1099,7 @@
     });
   });
 
-  unittest.group('resource-CustomerUsageReportsResourceApi', () {
+  unittest.group('resource-CustomerUsageReportsResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.ReportsApi(mock).customerUsageReports;
@@ -1164,7 +1164,7 @@
     });
   });
 
-  unittest.group('resource-EntityUsageReportsResourceApi', () {
+  unittest.group('resource-EntityUsageReportsResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.ReportsApi(mock).entityUsageReports;
@@ -1257,7 +1257,7 @@
     });
   });
 
-  unittest.group('resource-UserUsageReportResourceApi', () {
+  unittest.group('resource-UserUsageReportResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.ReportsApi(mock).userUsageReport;
diff --git a/generated/googleapis/test/admob/v1_test.dart b/generated/googleapis/test/admob/v1_test.dart
index 5de63c8..600a731 100644
--- a/generated/googleapis/test/admob/v1_test.dart
+++ b/generated/googleapis/test/admob/v1_test.dart
@@ -895,7 +895,7 @@
     });
   });
 
-  unittest.group('resource-AccountsResourceApi', () {
+  unittest.group('resource-AccountsResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.AdMobApi(mock).accounts;
@@ -1001,7 +1001,7 @@
     });
   });
 
-  unittest.group('resource-AccountsMediationReportResourceApi', () {
+  unittest.group('resource-AccountsMediationReportResource', () {
     unittest.test('method--generate', () {
       var mock = HttpServerMock();
       var res = api.AdMobApi(mock).accounts.mediationReport;
@@ -1058,7 +1058,7 @@
     });
   });
 
-  unittest.group('resource-AccountsNetworkReportResourceApi', () {
+  unittest.group('resource-AccountsNetworkReportResource', () {
     unittest.test('method--generate', () {
       var mock = HttpServerMock();
       var res = api.AdMobApi(mock).accounts.networkReport;
diff --git a/generated/googleapis/test/adsense/v1_4_test.dart b/generated/googleapis/test/adsense/v1_4_test.dart
index e553d10..1df217e 100644
--- a/generated/googleapis/test/adsense/v1_4_test.dart
+++ b/generated/googleapis/test/adsense/v1_4_test.dart
@@ -1488,7 +1488,7 @@
     });
   });
 
-  unittest.group('resource-AccountsResourceApi', () {
+  unittest.group('resource-AccountsResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.AdSenseApi(mock).accounts;
@@ -1603,7 +1603,7 @@
     });
   });
 
-  unittest.group('resource-AccountsAdclientsResourceApi', () {
+  unittest.group('resource-AccountsAdclientsResource', () {
     unittest.test('method--getAdCode', () {
       var mock = HttpServerMock();
       var res = api.AdSenseApi(mock).accounts.adclients;
@@ -1746,7 +1746,7 @@
     });
   });
 
-  unittest.group('resource-AccountsAdunitsResourceApi', () {
+  unittest.group('resource-AccountsAdunitsResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.AdSenseApi(mock).accounts.adunits;
@@ -1984,7 +1984,7 @@
     });
   });
 
-  unittest.group('resource-AccountsAdunitsCustomchannelsResourceApi', () {
+  unittest.group('resource-AccountsAdunitsCustomchannelsResource', () {
     unittest.test('method--list', () {
       var mock = HttpServerMock();
       var res = api.AdSenseApi(mock).accounts.adunits.customchannels;
@@ -2074,7 +2074,7 @@
     });
   });
 
-  unittest.group('resource-AccountsAlertsResourceApi', () {
+  unittest.group('resource-AccountsAlertsResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.AdSenseApi(mock).accounts.alerts;
@@ -2198,7 +2198,7 @@
     });
   });
 
-  unittest.group('resource-AccountsCustomchannelsResourceApi', () {
+  unittest.group('resource-AccountsCustomchannelsResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.AdSenseApi(mock).accounts.customchannels;
@@ -2352,7 +2352,7 @@
     });
   });
 
-  unittest.group('resource-AccountsCustomchannelsAdunitsResourceApi', () {
+  unittest.group('resource-AccountsCustomchannelsAdunitsResource', () {
     unittest.test('method--list', () {
       var mock = HttpServerMock();
       var res = api.AdSenseApi(mock).accounts.customchannels.adunits;
@@ -2446,7 +2446,7 @@
     });
   });
 
-  unittest.group('resource-AccountsPaymentsResourceApi', () {
+  unittest.group('resource-AccountsPaymentsResource', () {
     unittest.test('method--list', () {
       var mock = HttpServerMock();
       var res = api.AdSenseApi(mock).accounts.payments;
@@ -2507,7 +2507,7 @@
     });
   });
 
-  unittest.group('resource-AccountsReportsResourceApi', () {
+  unittest.group('resource-AccountsReportsResource', () {
     unittest.test('method--generate', () {
       // TODO: Implement tests for media upload;
       // TODO: Implement tests for media download;
@@ -2610,7 +2610,7 @@
     });
   });
 
-  unittest.group('resource-AccountsReportsSavedResourceApi', () {
+  unittest.group('resource-AccountsReportsSavedResource', () {
     unittest.test('method--generate', () {
       var mock = HttpServerMock();
       var res = api.AdSenseApi(mock).accounts.reports.saved;
@@ -2756,7 +2756,7 @@
     });
   });
 
-  unittest.group('resource-AccountsSavedadstylesResourceApi', () {
+  unittest.group('resource-AccountsSavedadstylesResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.AdSenseApi(mock).accounts.savedadstyles;
@@ -2889,7 +2889,7 @@
     });
   });
 
-  unittest.group('resource-AccountsUrlchannelsResourceApi', () {
+  unittest.group('resource-AccountsUrlchannelsResource', () {
     unittest.test('method--list', () {
       var mock = HttpServerMock();
       var res = api.AdSenseApi(mock).accounts.urlchannels;
@@ -2969,7 +2969,7 @@
     });
   });
 
-  unittest.group('resource-AdclientsResourceApi', () {
+  unittest.group('resource-AdclientsResource', () {
     unittest.test('method--list', () {
       var mock = HttpServerMock();
       var res = api.AdSenseApi(mock).adclients;
@@ -3029,7 +3029,7 @@
     });
   });
 
-  unittest.group('resource-AdunitsResourceApi', () {
+  unittest.group('resource-AdunitsResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.AdSenseApi(mock).adunits;
@@ -3235,7 +3235,7 @@
     });
   });
 
-  unittest.group('resource-AdunitsCustomchannelsResourceApi', () {
+  unittest.group('resource-AdunitsCustomchannelsResource', () {
     unittest.test('method--list', () {
       var mock = HttpServerMock();
       var res = api.AdSenseApi(mock).adunits.customchannels;
@@ -3315,7 +3315,7 @@
     });
   });
 
-  unittest.group('resource-AlertsResourceApi', () {
+  unittest.group('resource-AlertsResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.AdSenseApi(mock).alerts;
@@ -3419,7 +3419,7 @@
     });
   });
 
-  unittest.group('resource-CustomchannelsResourceApi', () {
+  unittest.group('resource-CustomchannelsResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.AdSenseApi(mock).customchannels;
@@ -3552,7 +3552,7 @@
     });
   });
 
-  unittest.group('resource-CustomchannelsAdunitsResourceApi', () {
+  unittest.group('resource-CustomchannelsAdunitsResource', () {
     unittest.test('method--list', () {
       var mock = HttpServerMock();
       var res = api.AdSenseApi(mock).customchannels.adunits;
@@ -3636,7 +3636,7 @@
     });
   });
 
-  unittest.group('resource-MetadataDimensionsResourceApi', () {
+  unittest.group('resource-MetadataDimensionsResource', () {
     unittest.test('method--list', () {
       var mock = HttpServerMock();
       var res = api.AdSenseApi(mock).metadata.dimensions;
@@ -3685,7 +3685,7 @@
     });
   });
 
-  unittest.group('resource-MetadataMetricsResourceApi', () {
+  unittest.group('resource-MetadataMetricsResource', () {
     unittest.test('method--list', () {
       var mock = HttpServerMock();
       var res = api.AdSenseApi(mock).metadata.metrics;
@@ -3734,7 +3734,7 @@
     });
   });
 
-  unittest.group('resource-PaymentsResourceApi', () {
+  unittest.group('resource-PaymentsResource', () {
     unittest.test('method--list', () {
       var mock = HttpServerMock();
       var res = api.AdSenseApi(mock).payments;
@@ -3783,7 +3783,7 @@
     });
   });
 
-  unittest.group('resource-ReportsResourceApi', () {
+  unittest.group('resource-ReportsResource', () {
     unittest.test('method--generate', () {
       // TODO: Implement tests for media upload;
       // TODO: Implement tests for media download;
@@ -3879,7 +3879,7 @@
     });
   });
 
-  unittest.group('resource-ReportsSavedResourceApi', () {
+  unittest.group('resource-ReportsSavedResource', () {
     unittest.test('method--generate', () {
       var mock = HttpServerMock();
       var res = api.AdSenseApi(mock).reports.saved;
@@ -4005,7 +4005,7 @@
     });
   });
 
-  unittest.group('resource-SavedadstylesResourceApi', () {
+  unittest.group('resource-SavedadstylesResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.AdSenseApi(mock).savedadstyles;
@@ -4118,7 +4118,7 @@
     });
   });
 
-  unittest.group('resource-UrlchannelsResourceApi', () {
+  unittest.group('resource-UrlchannelsResource', () {
     unittest.test('method--list', () {
       var mock = HttpServerMock();
       var res = api.AdSenseApi(mock).urlchannels;
diff --git a/generated/googleapis/test/adsensehost/v4_1_test.dart b/generated/googleapis/test/adsensehost/v4_1_test.dart
index 0620967..c08671f 100644
--- a/generated/googleapis/test/adsensehost/v4_1_test.dart
+++ b/generated/googleapis/test/adsensehost/v4_1_test.dart
@@ -1004,7 +1004,7 @@
     });
   });
 
-  unittest.group('resource-AccountsResourceApi', () {
+  unittest.group('resource-AccountsResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.AdSenseHostApi(mock).accounts;
@@ -1111,7 +1111,7 @@
     });
   });
 
-  unittest.group('resource-AccountsAdclientsResourceApi', () {
+  unittest.group('resource-AccountsAdclientsResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.AdSenseHostApi(mock).accounts.adclients;
@@ -1244,7 +1244,7 @@
     });
   });
 
-  unittest.group('resource-AccountsAdunitsResourceApi', () {
+  unittest.group('resource-AccountsAdunitsResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.AdSenseHostApi(mock).accounts.adunits;
@@ -1788,7 +1788,7 @@
     });
   });
 
-  unittest.group('resource-AccountsReportsResourceApi', () {
+  unittest.group('resource-AccountsReportsResource', () {
     unittest.test('method--generate', () {
       var mock = HttpServerMock();
       var res = api.AdSenseHostApi(mock).accounts.reports;
@@ -1879,7 +1879,7 @@
     });
   });
 
-  unittest.group('resource-AdclientsResourceApi', () {
+  unittest.group('resource-AdclientsResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.AdSenseHostApi(mock).adclients;
@@ -1992,7 +1992,7 @@
     });
   });
 
-  unittest.group('resource-AssociationsessionsResourceApi', () {
+  unittest.group('resource-AssociationsessionsResource', () {
     unittest.test('method--start', () {
       var mock = HttpServerMock();
       var res = api.AdSenseHostApi(mock).associationsessions;
@@ -2113,7 +2113,7 @@
     });
   });
 
-  unittest.group('resource-CustomchannelsResourceApi', () {
+  unittest.group('resource-CustomchannelsResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.AdSenseHostApi(mock).customchannels;
@@ -2505,7 +2505,7 @@
     });
   });
 
-  unittest.group('resource-ReportsResourceApi', () {
+  unittest.group('resource-ReportsResource', () {
     unittest.test('method--generate', () {
       var mock = HttpServerMock();
       var res = api.AdSenseHostApi(mock).reports;
@@ -2586,7 +2586,7 @@
     });
   });
 
-  unittest.group('resource-UrlchannelsResourceApi', () {
+  unittest.group('resource-UrlchannelsResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.AdSenseHostApi(mock).urlchannels;
diff --git a/generated/googleapis/test/analytics/v3_test.dart b/generated/googleapis/test/analytics/v3_test.dart
index 39fd27c..15f14a7 100644
--- a/generated/googleapis/test/analytics/v3_test.dart
+++ b/generated/googleapis/test/analytics/v3_test.dart
@@ -4896,7 +4896,7 @@
     });
   });
 
-  unittest.group('resource-DataGaResourceApi', () {
+  unittest.group('resource-DataGaResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.AnalyticsApi(mock).data.ga;
@@ -4993,7 +4993,7 @@
     });
   });
 
-  unittest.group('resource-DataMcfResourceApi', () {
+  unittest.group('resource-DataMcfResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.AnalyticsApi(mock).data.mcf;
@@ -5079,7 +5079,7 @@
     });
   });
 
-  unittest.group('resource-DataRealtimeResourceApi', () {
+  unittest.group('resource-DataRealtimeResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.AnalyticsApi(mock).data.realtime;
@@ -5151,7 +5151,7 @@
     });
   });
 
-  unittest.group('resource-ManagementAccountSummariesResourceApi', () {
+  unittest.group('resource-ManagementAccountSummariesResource', () {
     unittest.test('method--list', () {
       var mock = HttpServerMock();
       var res = api.AnalyticsApi(mock).management.accountSummaries;
@@ -5211,7 +5211,7 @@
     });
   });
 
-  unittest.group('resource-ManagementAccountUserLinksResourceApi', () {
+  unittest.group('resource-ManagementAccountUserLinksResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.AnalyticsApi(mock).management.accountUserLinks;
@@ -5474,7 +5474,7 @@
     });
   });
 
-  unittest.group('resource-ManagementAccountsResourceApi', () {
+  unittest.group('resource-ManagementAccountsResource', () {
     unittest.test('method--list', () {
       var mock = HttpServerMock();
       var res = api.AnalyticsApi(mock).management.accounts;
@@ -5534,7 +5534,7 @@
     });
   });
 
-  unittest.group('resource-ManagementClientIdResourceApi', () {
+  unittest.group('resource-ManagementClientIdResource', () {
     unittest.test('method--hashClientId', () {
       var mock = HttpServerMock();
       var res = api.AnalyticsApi(mock).management.clientId;
@@ -5590,7 +5590,7 @@
     });
   });
 
-  unittest.group('resource-ManagementCustomDataSourcesResourceApi', () {
+  unittest.group('resource-ManagementCustomDataSourcesResource', () {
     unittest.test('method--list', () {
       var mock = HttpServerMock();
       var res = api.AnalyticsApi(mock).management.customDataSources;
@@ -5670,7 +5670,7 @@
     });
   });
 
-  unittest.group('resource-ManagementCustomDimensionsResourceApi', () {
+  unittest.group('resource-ManagementCustomDimensionsResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.AnalyticsApi(mock).management.customDimensions;
@@ -6067,7 +6067,7 @@
     });
   });
 
-  unittest.group('resource-ManagementCustomMetricsResourceApi', () {
+  unittest.group('resource-ManagementCustomMetricsResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.AnalyticsApi(mock).management.customMetrics;
@@ -6464,7 +6464,7 @@
     });
   });
 
-  unittest.group('resource-ManagementExperimentsResourceApi', () {
+  unittest.group('resource-ManagementExperimentsResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.AnalyticsApi(mock).management.experiments;
@@ -6987,7 +6987,7 @@
     });
   });
 
-  unittest.group('resource-ManagementFiltersResourceApi', () {
+  unittest.group('resource-ManagementFiltersResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.AnalyticsApi(mock).management.filters;
@@ -7384,7 +7384,7 @@
     });
   });
 
-  unittest.group('resource-ManagementGoalsResourceApi', () {
+  unittest.group('resource-ManagementGoalsResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.AnalyticsApi(mock).management.goals;
@@ -7823,7 +7823,7 @@
     });
   });
 
-  unittest.group('resource-ManagementProfileFilterLinksResourceApi', () {
+  unittest.group('resource-ManagementProfileFilterLinksResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.AnalyticsApi(mock).management.profileFilterLinks;
@@ -8344,7 +8344,7 @@
     });
   });
 
-  unittest.group('resource-ManagementProfileUserLinksResourceApi', () {
+  unittest.group('resource-ManagementProfileUserLinksResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.AnalyticsApi(mock).management.profileUserLinks;
@@ -8691,7 +8691,7 @@
     });
   });
 
-  unittest.group('resource-ManagementProfilesResourceApi', () {
+  unittest.group('resource-ManagementProfilesResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.AnalyticsApi(mock).management.profiles;
@@ -9150,7 +9150,7 @@
     });
   });
 
-  unittest.group('resource-ManagementRemarketingAudienceResourceApi', () {
+  unittest.group('resource-ManagementRemarketingAudienceResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.AnalyticsApi(mock).management.remarketingAudience;
@@ -9614,7 +9614,7 @@
     });
   });
 
-  unittest.group('resource-ManagementSegmentsResourceApi', () {
+  unittest.group('resource-ManagementSegmentsResource', () {
     unittest.test('method--list', () {
       var mock = HttpServerMock();
       var res = api.AnalyticsApi(mock).management.segments;
@@ -9674,7 +9674,7 @@
     });
   });
 
-  unittest.group('resource-ManagementUnsampledReportsResourceApi', () {
+  unittest.group('resource-ManagementUnsampledReportsResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.AnalyticsApi(mock).management.unsampledReports;
@@ -10017,7 +10017,7 @@
     });
   });
 
-  unittest.group('resource-ManagementUploadsResourceApi', () {
+  unittest.group('resource-ManagementUploadsResource', () {
     unittest.test('method--deleteUploadData', () {
       var mock = HttpServerMock();
       var res = api.AnalyticsApi(mock).management.uploads;
@@ -10360,7 +10360,7 @@
     });
   });
 
-  unittest.group('resource-ManagementWebPropertyAdWordsLinksResourceApi', () {
+  unittest.group('resource-ManagementWebPropertyAdWordsLinksResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.AnalyticsApi(mock).management.webPropertyAdWordsLinks;
@@ -10826,7 +10826,7 @@
     });
   });
 
-  unittest.group('resource-ManagementWebpropertiesResourceApi', () {
+  unittest.group('resource-ManagementWebpropertiesResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.AnalyticsApi(mock).management.webproperties;
@@ -11161,7 +11161,7 @@
     });
   });
 
-  unittest.group('resource-ManagementWebpropertyUserLinksResourceApi', () {
+  unittest.group('resource-ManagementWebpropertyUserLinksResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.AnalyticsApi(mock).management.webpropertyUserLinks;
@@ -11467,7 +11467,7 @@
     });
   });
 
-  unittest.group('resource-MetadataColumnsResourceApi', () {
+  unittest.group('resource-MetadataColumnsResource', () {
     unittest.test('method--list', () {
       var mock = HttpServerMock();
       var res = api.AnalyticsApi(mock).metadata.columns;
@@ -11528,7 +11528,7 @@
     });
   });
 
-  unittest.group('resource-ProvisioningResourceApi', () {
+  unittest.group('resource-ProvisioningResource', () {
     unittest.test('method--createAccountTicket', () {
       var mock = HttpServerMock();
       var res = api.AnalyticsApi(mock).provisioning;
@@ -11638,7 +11638,7 @@
     });
   });
 
-  unittest.group('resource-UserDeletionUserDeletionRequestResourceApi', () {
+  unittest.group('resource-UserDeletionUserDeletionRequestResource', () {
     unittest.test('method--upsert', () {
       var mock = HttpServerMock();
       var res = api.AnalyticsApi(mock).userDeletion.userDeletionRequest;
diff --git a/generated/googleapis/test/analyticsreporting/v4_test.dart b/generated/googleapis/test/analyticsreporting/v4_test.dart
index 3acfcd5..e1a38b6 100644
--- a/generated/googleapis/test/analyticsreporting/v4_test.dart
+++ b/generated/googleapis/test/analyticsreporting/v4_test.dart
@@ -2253,7 +2253,7 @@
     });
   });
 
-  unittest.group('resource-ReportsResourceApi', () {
+  unittest.group('resource-ReportsResource', () {
     unittest.test('method--batchGet', () {
       var mock = HttpServerMock();
       var res = api.AnalyticsReportingApi(mock).reports;
@@ -2306,7 +2306,7 @@
     });
   });
 
-  unittest.group('resource-UserActivityResourceApi', () {
+  unittest.group('resource-UserActivityResource', () {
     unittest.test('method--search', () {
       var mock = HttpServerMock();
       var res = api.AnalyticsReportingApi(mock).userActivity;
diff --git a/generated/googleapis/test/androiddeviceprovisioning/v1_test.dart b/generated/googleapis/test/androiddeviceprovisioning/v1_test.dart
index 97a4697..54287a1 100644
--- a/generated/googleapis/test/androiddeviceprovisioning/v1_test.dart
+++ b/generated/googleapis/test/androiddeviceprovisioning/v1_test.dart
@@ -1623,7 +1623,7 @@
     });
   });
 
-  unittest.group('resource-CustomersResourceApi', () {
+  unittest.group('resource-CustomersResource', () {
     unittest.test('method--list', () {
       var mock = HttpServerMock();
       var res = api.AndroidProvisioningPartnerApi(mock).customers;
@@ -1681,7 +1681,7 @@
     });
   });
 
-  unittest.group('resource-CustomersConfigurationsResourceApi', () {
+  unittest.group('resource-CustomersConfigurationsResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res =
@@ -1944,7 +1944,7 @@
     });
   });
 
-  unittest.group('resource-CustomersDevicesResourceApi', () {
+  unittest.group('resource-CustomersDevicesResource', () {
     unittest.test('method--applyConfiguration', () {
       var mock = HttpServerMock();
       var res = api.AndroidProvisioningPartnerApi(mock).customers.devices;
@@ -2214,7 +2214,7 @@
     });
   });
 
-  unittest.group('resource-CustomersDpcsResourceApi', () {
+  unittest.group('resource-CustomersDpcsResource', () {
     unittest.test('method--list', () {
       var mock = HttpServerMock();
       var res = api.AndroidProvisioningPartnerApi(mock).customers.dpcs;
@@ -2264,7 +2264,7 @@
     });
   });
 
-  unittest.group('resource-OperationsResourceApi', () {
+  unittest.group('resource-OperationsResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.AndroidProvisioningPartnerApi(mock).operations;
@@ -2314,7 +2314,7 @@
     });
   });
 
-  unittest.group('resource-PartnersCustomersResourceApi', () {
+  unittest.group('resource-PartnersCustomersResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.AndroidProvisioningPartnerApi(mock).partners.customers;
@@ -2426,7 +2426,7 @@
     });
   });
 
-  unittest.group('resource-PartnersDevicesResourceApi', () {
+  unittest.group('resource-PartnersDevicesResource', () {
     unittest.test('method--claim', () {
       var mock = HttpServerMock();
       var res = api.AndroidProvisioningPartnerApi(mock).partners.devices;
@@ -2908,7 +2908,7 @@
     });
   });
 
-  unittest.group('resource-PartnersVendorsResourceApi', () {
+  unittest.group('resource-PartnersVendorsResource', () {
     unittest.test('method--list', () {
       var mock = HttpServerMock();
       var res = api.AndroidProvisioningPartnerApi(mock).partners.vendors;
@@ -2967,7 +2967,7 @@
     });
   });
 
-  unittest.group('resource-PartnersVendorsCustomersResourceApi', () {
+  unittest.group('resource-PartnersVendorsCustomersResource', () {
     unittest.test('method--list', () {
       var mock = HttpServerMock();
       var res =
diff --git a/generated/googleapis/test/androidenterprise/v1_test.dart b/generated/googleapis/test/androidenterprise/v1_test.dart
index c26d937..c19c57f 100644
--- a/generated/googleapis/test/androidenterprise/v1_test.dart
+++ b/generated/googleapis/test/androidenterprise/v1_test.dart
@@ -3356,7 +3356,7 @@
     });
   });
 
-  unittest.group('resource-DevicesResourceApi', () {
+  unittest.group('resource-DevicesResource', () {
     unittest.test('method--forceReportUpload', () {
       var mock = HttpServerMock();
       var res = api.AndroidEnterpriseApi(mock).devices;
@@ -3807,7 +3807,7 @@
     });
   });
 
-  unittest.group('resource-EnterprisesResourceApi', () {
+  unittest.group('resource-EnterprisesResource', () {
     unittest.test('method--acknowledgeNotificationSet', () {
       var mock = HttpServerMock();
       var res = api.AndroidEnterpriseApi(mock).enterprises;
@@ -4577,7 +4577,7 @@
     });
   });
 
-  unittest.group('resource-EntitlementsResourceApi', () {
+  unittest.group('resource-EntitlementsResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.AndroidEnterpriseApi(mock).entitlements;
@@ -4864,7 +4864,7 @@
     });
   });
 
-  unittest.group('resource-GrouplicensesResourceApi', () {
+  unittest.group('resource-GrouplicensesResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.AndroidEnterpriseApi(mock).grouplicenses;
@@ -4983,7 +4983,7 @@
     });
   });
 
-  unittest.group('resource-GrouplicenseusersResourceApi', () {
+  unittest.group('resource-GrouplicenseusersResource', () {
     unittest.test('method--list', () {
       var mock = HttpServerMock();
       var res = api.AndroidEnterpriseApi(mock).grouplicenseusers;
@@ -5052,7 +5052,7 @@
     });
   });
 
-  unittest.group('resource-InstallsResourceApi', () {
+  unittest.group('resource-InstallsResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.AndroidEnterpriseApi(mock).installs;
@@ -5378,7 +5378,7 @@
     });
   });
 
-  unittest.group('resource-ManagedconfigurationsfordeviceResourceApi', () {
+  unittest.group('resource-ManagedconfigurationsfordeviceResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.AndroidEnterpriseApi(mock).managedconfigurationsfordevice;
@@ -5711,7 +5711,7 @@
     });
   });
 
-  unittest.group('resource-ManagedconfigurationsforuserResourceApi', () {
+  unittest.group('resource-ManagedconfigurationsforuserResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.AndroidEnterpriseApi(mock).managedconfigurationsforuser;
@@ -6002,7 +6002,7 @@
     });
   });
 
-  unittest.group('resource-ManagedconfigurationssettingsResourceApi', () {
+  unittest.group('resource-ManagedconfigurationssettingsResource', () {
     unittest.test('method--list', () {
       var mock = HttpServerMock();
       var res = api.AndroidEnterpriseApi(mock).managedconfigurationssettings;
@@ -6072,7 +6072,7 @@
     });
   });
 
-  unittest.group('resource-PermissionsResourceApi', () {
+  unittest.group('resource-PermissionsResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.AndroidEnterpriseApi(mock).permissions;
@@ -6127,7 +6127,7 @@
     });
   });
 
-  unittest.group('resource-ProductsResourceApi', () {
+  unittest.group('resource-ProductsResource', () {
     unittest.test('method--approve', () {
       var mock = HttpServerMock();
       var res = api.AndroidEnterpriseApi(mock).products;
@@ -6610,7 +6610,7 @@
     });
   });
 
-  unittest.group('resource-ServiceaccountkeysResourceApi', () {
+  unittest.group('resource-ServiceaccountkeysResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.AndroidEnterpriseApi(mock).serviceaccountkeys;
@@ -6788,7 +6788,7 @@
     });
   });
 
-  unittest.group('resource-StorelayoutclustersResourceApi', () {
+  unittest.group('resource-StorelayoutclustersResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.AndroidEnterpriseApi(mock).storelayoutclusters;
@@ -7145,7 +7145,7 @@
     });
   });
 
-  unittest.group('resource-StorelayoutpagesResourceApi', () {
+  unittest.group('resource-StorelayoutpagesResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.AndroidEnterpriseApi(mock).storelayoutpages;
@@ -7449,7 +7449,7 @@
     });
   });
 
-  unittest.group('resource-UsersResourceApi', () {
+  unittest.group('resource-UsersResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.AndroidEnterpriseApi(mock).users;
@@ -8025,7 +8025,7 @@
     });
   });
 
-  unittest.group('resource-WebappsResourceApi', () {
+  unittest.group('resource-WebappsResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.AndroidEnterpriseApi(mock).webapps;
diff --git a/generated/googleapis/test/androidmanagement/v1_test.dart b/generated/googleapis/test/androidmanagement/v1_test.dart
index a602c22..2c8958b 100644
--- a/generated/googleapis/test/androidmanagement/v1_test.dart
+++ b/generated/googleapis/test/androidmanagement/v1_test.dart
@@ -3600,7 +3600,7 @@
     });
   });
 
-  unittest.group('resource-EnterprisesResourceApi', () {
+  unittest.group('resource-EnterprisesResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.AndroidManagementApi(mock).enterprises;
@@ -3771,7 +3771,7 @@
     });
   });
 
-  unittest.group('resource-EnterprisesApplicationsResourceApi', () {
+  unittest.group('resource-EnterprisesApplicationsResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.AndroidManagementApi(mock).enterprises.applications;
@@ -3824,7 +3824,7 @@
     });
   });
 
-  unittest.group('resource-EnterprisesDevicesResourceApi', () {
+  unittest.group('resource-EnterprisesDevicesResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.AndroidManagementApi(mock).enterprises.devices;
@@ -4098,7 +4098,7 @@
     });
   });
 
-  unittest.group('resource-EnterprisesDevicesOperationsResourceApi', () {
+  unittest.group('resource-EnterprisesDevicesOperationsResource', () {
     unittest.test('method--cancel', () {
       var mock = HttpServerMock();
       var res = api.AndroidManagementApi(mock).enterprises.devices.operations;
@@ -4304,7 +4304,7 @@
     });
   });
 
-  unittest.group('resource-EnterprisesEnrollmentTokensResourceApi', () {
+  unittest.group('resource-EnterprisesEnrollmentTokensResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.AndroidManagementApi(mock).enterprises.enrollmentTokens;
@@ -4407,7 +4407,7 @@
     });
   });
 
-  unittest.group('resource-EnterprisesPoliciesResourceApi', () {
+  unittest.group('resource-EnterprisesPoliciesResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.AndroidManagementApi(mock).enterprises.policies;
@@ -4619,7 +4619,7 @@
     });
   });
 
-  unittest.group('resource-EnterprisesWebAppsResourceApi', () {
+  unittest.group('resource-EnterprisesWebAppsResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.AndroidManagementApi(mock).enterprises.webApps;
@@ -4884,7 +4884,7 @@
     });
   });
 
-  unittest.group('resource-EnterprisesWebTokensResourceApi', () {
+  unittest.group('resource-EnterprisesWebTokensResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.AndroidManagementApi(mock).enterprises.webTokens;
@@ -4939,7 +4939,7 @@
     });
   });
 
-  unittest.group('resource-SignupUrlsResourceApi', () {
+  unittest.group('resource-SignupUrlsResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.AndroidManagementApi(mock).signupUrls;
diff --git a/generated/googleapis/test/androidpublisher/v3_test.dart b/generated/googleapis/test/androidpublisher/v3_test.dart
index f0be0d8..f53e071 100644
--- a/generated/googleapis/test/androidpublisher/v3_test.dart
+++ b/generated/googleapis/test/androidpublisher/v3_test.dart
@@ -2270,7 +2270,7 @@
     });
   });
 
-  unittest.group('resource-EditsResourceApi', () {
+  unittest.group('resource-EditsResource', () {
     unittest.test('method--commit', () {
       var mock = HttpServerMock();
       var res = api.AndroidPublisherApi(mock).edits;
@@ -2583,7 +2583,7 @@
     });
   });
 
-  unittest.group('resource-EditsApksResourceApi', () {
+  unittest.group('resource-EditsApksResource', () {
     unittest.test('method--addexternallyhosted', () {
       var mock = HttpServerMock();
       var res = api.AndroidPublisherApi(mock).edits.apks;
@@ -2794,7 +2794,7 @@
     });
   });
 
-  unittest.group('resource-EditsBundlesResourceApi', () {
+  unittest.group('resource-EditsBundlesResource', () {
     unittest.test('method--list', () {
       var mock = HttpServerMock();
       var res = api.AndroidPublisherApi(mock).edits.bundles;
@@ -2936,7 +2936,7 @@
     });
   });
 
-  unittest.group('resource-EditsDeobfuscationfilesResourceApi', () {
+  unittest.group('resource-EditsDeobfuscationfilesResource', () {
     unittest.test('method--upload', () {
       // TODO: Implement tests for media upload;
       // TODO: Implement tests for media download;
@@ -3024,7 +3024,7 @@
     });
   });
 
-  unittest.group('resource-EditsDetailsResourceApi', () {
+  unittest.group('resource-EditsDetailsResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.AndroidPublisherApi(mock).edits.details;
@@ -3235,7 +3235,7 @@
     });
   });
 
-  unittest.group('resource-EditsExpansionfilesResourceApi', () {
+  unittest.group('resource-EditsExpansionfilesResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.AndroidPublisherApi(mock).edits.expansionfiles;
@@ -3579,7 +3579,7 @@
     });
   });
 
-  unittest.group('resource-EditsImagesResourceApi', () {
+  unittest.group('resource-EditsImagesResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.AndroidPublisherApi(mock).edits.images;
@@ -3917,7 +3917,7 @@
     });
   });
 
-  unittest.group('resource-EditsListingsResourceApi', () {
+  unittest.group('resource-EditsListingsResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.AndroidPublisherApi(mock).edits.listings;
@@ -4340,7 +4340,7 @@
     });
   });
 
-  unittest.group('resource-EditsTestersResourceApi', () {
+  unittest.group('resource-EditsTestersResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.AndroidPublisherApi(mock).edits.testers;
@@ -4564,7 +4564,7 @@
     });
   });
 
-  unittest.group('resource-EditsTracksResourceApi', () {
+  unittest.group('resource-EditsTracksResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.AndroidPublisherApi(mock).edits.tracks;
@@ -4854,7 +4854,7 @@
     });
   });
 
-  unittest.group('resource-InappproductsResourceApi', () {
+  unittest.group('resource-InappproductsResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.AndroidPublisherApi(mock).inappproducts;
@@ -5249,7 +5249,7 @@
     });
   });
 
-  unittest.group('resource-InternalappsharingartifactsResourceApi', () {
+  unittest.group('resource-InternalappsharingartifactsResource', () {
     unittest.test('method--uploadapk', () {
       // TODO: Implement tests for media upload;
       // TODO: Implement tests for media download;
@@ -5375,7 +5375,7 @@
     });
   });
 
-  unittest.group('resource-OrdersResourceApi', () {
+  unittest.group('resource-OrdersResource', () {
     unittest.test('method--refund', () {
       var mock = HttpServerMock();
       var res = api.AndroidPublisherApi(mock).orders;
@@ -5445,7 +5445,7 @@
     });
   });
 
-  unittest.group('resource-PurchasesProductsResourceApi', () {
+  unittest.group('resource-PurchasesProductsResource', () {
     unittest.test('method--acknowledge', () {
       var mock = HttpServerMock();
       var res = api.AndroidPublisherApi(mock).purchases.products;
@@ -5598,7 +5598,7 @@
     });
   });
 
-  unittest.group('resource-PurchasesSubscriptionsResourceApi', () {
+  unittest.group('resource-PurchasesSubscriptionsResource', () {
     unittest.test('method--acknowledge', () {
       var mock = HttpServerMock();
       var res = api.AndroidPublisherApi(mock).purchases.subscriptions;
@@ -6052,7 +6052,7 @@
     });
   });
 
-  unittest.group('resource-PurchasesVoidedpurchasesResourceApi', () {
+  unittest.group('resource-PurchasesVoidedpurchasesResource', () {
     unittest.test('method--list', () {
       var mock = HttpServerMock();
       var res = api.AndroidPublisherApi(mock).purchases.voidedpurchases;
@@ -6135,7 +6135,7 @@
     });
   });
 
-  unittest.group('resource-ReviewsResourceApi', () {
+  unittest.group('resource-ReviewsResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.AndroidPublisherApi(mock).reviews;
@@ -6346,7 +6346,7 @@
     });
   });
 
-  unittest.group('resource-SystemapksVariantsResourceApi', () {
+  unittest.group('resource-SystemapksVariantsResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.AndroidPublisherApi(mock).systemapks.variants;
diff --git a/generated/googleapis/test/apigee/v1_test.dart b/generated/googleapis/test/apigee/v1_test.dart
index 52cd483..90e28c2 100644
--- a/generated/googleapis/test/apigee/v1_test.dart
+++ b/generated/googleapis/test/apigee/v1_test.dart
@@ -7786,7 +7786,7 @@
     });
   });
 
-  unittest.group('resource-HybridIssuersResourceApi', () {
+  unittest.group('resource-HybridIssuersResource', () {
     unittest.test('method--list', () {
       var mock = HttpServerMock();
       var res = api.ApigeeApi(mock).hybrid.issuers;
@@ -7838,7 +7838,7 @@
     });
   });
 
-  unittest.group('resource-OrganizationsResourceApi', () {
+  unittest.group('resource-OrganizationsResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.ApigeeApi(mock).organizations;
@@ -8213,7 +8213,7 @@
     });
   });
 
-  unittest.group('resource-OrganizationsAnalyticsDatastoresResourceApi', () {
+  unittest.group('resource-OrganizationsAnalyticsDatastoresResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.ApigeeApi(mock).organizations.analytics.datastores;
@@ -8531,7 +8531,7 @@
     });
   });
 
-  unittest.group('resource-OrganizationsApiproductsResourceApi', () {
+  unittest.group('resource-OrganizationsApiproductsResource', () {
     unittest.test('method--attributes', () {
       var mock = HttpServerMock();
       var res = api.ApigeeApi(mock).organizations.apiproducts;
@@ -8866,7 +8866,7 @@
     });
   });
 
-  unittest.group('resource-OrganizationsApiproductsAttributesResourceApi', () {
+  unittest.group('resource-OrganizationsApiproductsAttributesResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.ApigeeApi(mock).organizations.apiproducts.attributes_1;
@@ -9071,7 +9071,7 @@
     });
   });
 
-  unittest.group('resource-OrganizationsApisResourceApi', () {
+  unittest.group('resource-OrganizationsApisResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.ApigeeApi(mock).organizations.apis;
@@ -9296,7 +9296,7 @@
     });
   });
 
-  unittest.group('resource-OrganizationsApisDeploymentsResourceApi', () {
+  unittest.group('resource-OrganizationsApisDeploymentsResource', () {
     unittest.test('method--list', () {
       var mock = HttpServerMock();
       var res = api.ApigeeApi(mock).organizations.apis.deployments;
@@ -9348,7 +9348,7 @@
     });
   });
 
-  unittest.group('resource-OrganizationsApisKeyvaluemapsResourceApi', () {
+  unittest.group('resource-OrganizationsApisKeyvaluemapsResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.ApigeeApi(mock).organizations.apis.keyvaluemaps;
@@ -9454,7 +9454,7 @@
     });
   });
 
-  unittest.group('resource-OrganizationsApisRevisionsResourceApi', () {
+  unittest.group('resource-OrganizationsApisRevisionsResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.ApigeeApi(mock).organizations.apis.revisions;
@@ -9615,8 +9615,7 @@
     });
   });
 
-  unittest.group('resource-OrganizationsApisRevisionsDeploymentsResourceApi',
-      () {
+  unittest.group('resource-OrganizationsApisRevisionsDeploymentsResource', () {
     unittest.test('method--list', () {
       var mock = HttpServerMock();
       var res = api.ApigeeApi(mock).organizations.apis.revisions.deployments;
@@ -9668,7 +9667,7 @@
     });
   });
 
-  unittest.group('resource-OrganizationsAppsResourceApi', () {
+  unittest.group('resource-OrganizationsAppsResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.ApigeeApi(mock).organizations.apps;
@@ -9802,7 +9801,7 @@
     });
   });
 
-  unittest.group('resource-OrganizationsDeploymentsResourceApi', () {
+  unittest.group('resource-OrganizationsDeploymentsResource', () {
     unittest.test('method--list', () {
       var mock = HttpServerMock();
       var res = api.ApigeeApi(mock).organizations.deployments;
@@ -9857,7 +9856,7 @@
     });
   });
 
-  unittest.group('resource-OrganizationsDevelopersResourceApi', () {
+  unittest.group('resource-OrganizationsDevelopersResource', () {
     unittest.test('method--attributes', () {
       var mock = HttpServerMock();
       var res = api.ApigeeApi(mock).organizations.developers;
@@ -10244,7 +10243,7 @@
     });
   });
 
-  unittest.group('resource-OrganizationsDevelopersAppsResourceApi', () {
+  unittest.group('resource-OrganizationsDevelopersAppsResource', () {
     unittest.test('method--attributes', () {
       var mock = HttpServerMock();
       var res = api.ApigeeApi(mock).organizations.developers.apps;
@@ -10638,8 +10637,7 @@
     });
   });
 
-  unittest.group('resource-OrganizationsDevelopersAppsAttributesResourceApi',
-      () {
+  unittest.group('resource-OrganizationsDevelopersAppsAttributesResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.ApigeeApi(mock).organizations.developers.apps.attributes_1;
@@ -10844,7 +10842,7 @@
     });
   });
 
-  unittest.group('resource-OrganizationsDevelopersAppsKeysResourceApi', () {
+  unittest.group('resource-OrganizationsDevelopersAppsKeysResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.ApigeeApi(mock).organizations.developers.apps.keys;
@@ -11117,8 +11115,8 @@
     });
   });
 
-  unittest.group(
-      'resource-OrganizationsDevelopersAppsKeysApiproductsResourceApi', () {
+  unittest.group('resource-OrganizationsDevelopersAppsKeysApiproductsResource',
+      () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res =
@@ -11223,8 +11221,7 @@
     });
   });
 
-  unittest.group('resource-OrganizationsDevelopersAppsKeysCreateResourceApi',
-      () {
+  unittest.group('resource-OrganizationsDevelopersAppsKeysCreateResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.ApigeeApi(mock).organizations.developers.apps.keys.create_1;
@@ -11282,7 +11279,7 @@
     });
   });
 
-  unittest.group('resource-OrganizationsDevelopersAttributesResourceApi', () {
+  unittest.group('resource-OrganizationsDevelopersAttributesResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.ApigeeApi(mock).organizations.developers.attributes_1;
@@ -11486,7 +11483,7 @@
     });
   });
 
-  unittest.group('resource-OrganizationsEnvgroupsResourceApi', () {
+  unittest.group('resource-OrganizationsEnvgroupsResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.ApigeeApi(mock).organizations.envgroups;
@@ -11762,7 +11759,7 @@
     });
   });
 
-  unittest.group('resource-OrganizationsEnvgroupsAttachmentsResourceApi', () {
+  unittest.group('resource-OrganizationsEnvgroupsAttachmentsResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.ApigeeApi(mock).organizations.envgroups.attachments;
@@ -11977,7 +11974,7 @@
     });
   });
 
-  unittest.group('resource-OrganizationsEnvironmentsResourceApi', () {
+  unittest.group('resource-OrganizationsEnvironmentsResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.ApigeeApi(mock).organizations.environments;
@@ -12675,7 +12672,7 @@
     });
   });
 
-  unittest.group('resource-OrganizationsEnvironmentsAnalyticsAdminResourceApi',
+  unittest.group('resource-OrganizationsEnvironmentsAnalyticsAdminResource',
       () {
     unittest.test('method--getSchemav2', () {
       var mock = HttpServerMock();
@@ -12729,8 +12726,8 @@
     });
   });
 
-  unittest.group(
-      'resource-OrganizationsEnvironmentsAnalyticsExportsResourceApi', () {
+  unittest.group('resource-OrganizationsEnvironmentsAnalyticsExportsResource',
+      () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res =
@@ -12889,7 +12886,7 @@
     });
   });
 
-  unittest.group('resource-OrganizationsEnvironmentsApisDeploymentsResourceApi',
+  unittest.group('resource-OrganizationsEnvironmentsApisDeploymentsResource',
       () {
     unittest.test('method--list', () {
       var mock = HttpServerMock();
@@ -12942,8 +12939,7 @@
     });
   });
 
-  unittest.group('resource-OrganizationsEnvironmentsApisRevisionsResourceApi',
-      () {
+  unittest.group('resource-OrganizationsEnvironmentsApisRevisionsResource', () {
     unittest.test('method--deploy', () {
       var mock = HttpServerMock();
       var res = api.ApigeeApi(mock).organizations.environments.apis.revisions;
@@ -13105,7 +13101,7 @@
   });
 
   unittest.group(
-      'resource-OrganizationsEnvironmentsApisRevisionsDebugsessionsResourceApi',
+      'resource-OrganizationsEnvironmentsApisRevisionsDebugsessionsResource',
       () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
@@ -13344,7 +13340,7 @@
   });
 
   unittest.group(
-      'resource-OrganizationsEnvironmentsApisRevisionsDebugsessionsDataResourceApi',
+      'resource-OrganizationsEnvironmentsApisRevisionsDebugsessionsDataResource',
       () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
@@ -13404,8 +13400,7 @@
   });
 
   unittest.group(
-      'resource-OrganizationsEnvironmentsApisRevisionsDeploymentsResourceApi',
-      () {
+      'resource-OrganizationsEnvironmentsApisRevisionsDeploymentsResource', () {
     unittest.test('method--generateDeployChangeReport', () {
       var mock = HttpServerMock();
       var res = api.ApigeeApi(mock)
@@ -13521,7 +13516,7 @@
     });
   });
 
-  unittest.group('resource-OrganizationsEnvironmentsCachesResourceApi', () {
+  unittest.group('resource-OrganizationsEnvironmentsCachesResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.ApigeeApi(mock).organizations.environments.caches;
@@ -13571,8 +13566,7 @@
     });
   });
 
-  unittest.group('resource-OrganizationsEnvironmentsDeploymentsResourceApi',
-      () {
+  unittest.group('resource-OrganizationsEnvironmentsDeploymentsResource', () {
     unittest.test('method--list', () {
       var mock = HttpServerMock();
       var res = api.ApigeeApi(mock).organizations.environments.deployments;
@@ -13627,7 +13621,7 @@
     });
   });
 
-  unittest.group('resource-OrganizationsEnvironmentsFlowhooksResourceApi', () {
+  unittest.group('resource-OrganizationsEnvironmentsFlowhooksResource', () {
     unittest.test('method--attachSharedFlowToFlowHook', () {
       var mock = HttpServerMock();
       var res = api.ApigeeApi(mock).organizations.environments.flowhooks;
@@ -13783,7 +13777,7 @@
     });
   });
 
-  unittest.group('resource-OrganizationsEnvironmentsKeystoresResourceApi', () {
+  unittest.group('resource-OrganizationsEnvironmentsKeystoresResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.ApigeeApi(mock).organizations.environments.keystores;
@@ -13940,8 +13934,8 @@
     });
   });
 
-  unittest.group(
-      'resource-OrganizationsEnvironmentsKeystoresAliasesResourceApi', () {
+  unittest.group('resource-OrganizationsEnvironmentsKeystoresAliasesResource',
+      () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res =
@@ -14275,8 +14269,7 @@
     });
   });
 
-  unittest.group('resource-OrganizationsEnvironmentsKeyvaluemapsResourceApi',
-      () {
+  unittest.group('resource-OrganizationsEnvironmentsKeyvaluemapsResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.ApigeeApi(mock).organizations.environments.keyvaluemaps;
@@ -14382,7 +14375,7 @@
     });
   });
 
-  unittest.group('resource-OrganizationsEnvironmentsOptimizedStatsResourceApi',
+  unittest.group('resource-OrganizationsEnvironmentsOptimizedStatsResource',
       () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
@@ -14487,7 +14480,7 @@
     });
   });
 
-  unittest.group('resource-OrganizationsEnvironmentsQueriesResourceApi', () {
+  unittest.group('resource-OrganizationsEnvironmentsQueriesResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.ApigeeApi(mock).organizations.environments.queries;
@@ -14712,7 +14705,7 @@
     });
   });
 
-  unittest.group('resource-OrganizationsEnvironmentsReferencesResourceApi', () {
+  unittest.group('resource-OrganizationsEnvironmentsReferencesResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.ApigeeApi(mock).organizations.environments.references;
@@ -14922,8 +14915,7 @@
     });
   });
 
-  unittest.group('resource-OrganizationsEnvironmentsResourcefilesResourceApi',
-      () {
+  unittest.group('resource-OrganizationsEnvironmentsResourcefilesResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.ApigeeApi(mock).organizations.environments.resourcefiles;
@@ -15246,8 +15238,7 @@
   });
 
   unittest.group(
-      'resource-OrganizationsEnvironmentsSharedflowsDeploymentsResourceApi',
-      () {
+      'resource-OrganizationsEnvironmentsSharedflowsDeploymentsResource', () {
     unittest.test('method--list', () {
       var mock = HttpServerMock();
       var res = api.ApigeeApi(mock)
@@ -15304,7 +15295,7 @@
   });
 
   unittest.group(
-      'resource-OrganizationsEnvironmentsSharedflowsRevisionsResourceApi', () {
+      'resource-OrganizationsEnvironmentsSharedflowsRevisionsResource', () {
     unittest.test('method--deploy', () {
       var mock = HttpServerMock();
       var res =
@@ -15458,7 +15449,7 @@
     });
   });
 
-  unittest.group('resource-OrganizationsEnvironmentsStatsResourceApi', () {
+  unittest.group('resource-OrganizationsEnvironmentsStatsResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.ApigeeApi(mock).organizations.environments.stats;
@@ -15560,8 +15551,7 @@
     });
   });
 
-  unittest.group('resource-OrganizationsEnvironmentsTargetserversResourceApi',
-      () {
+  unittest.group('resource-OrganizationsEnvironmentsTargetserversResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.ApigeeApi(mock).organizations.environments.targetservers;
@@ -15773,7 +15763,7 @@
     });
   });
 
-  unittest.group('resource-OrganizationsInstancesResourceApi', () {
+  unittest.group('resource-OrganizationsInstancesResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.ApigeeApi(mock).organizations.instances;
@@ -16043,7 +16033,7 @@
     });
   });
 
-  unittest.group('resource-OrganizationsInstancesAttachmentsResourceApi', () {
+  unittest.group('resource-OrganizationsInstancesAttachmentsResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.ApigeeApi(mock).organizations.instances.attachments;
@@ -16258,7 +16248,7 @@
     });
   });
 
-  unittest.group('resource-OrganizationsKeyvaluemapsResourceApi', () {
+  unittest.group('resource-OrganizationsKeyvaluemapsResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.ApigeeApi(mock).organizations.keyvaluemaps;
@@ -16364,7 +16354,7 @@
     });
   });
 
-  unittest.group('resource-OrganizationsOperationsResourceApi', () {
+  unittest.group('resource-OrganizationsOperationsResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.ApigeeApi(mock).organizations.operations;
@@ -16477,7 +16467,7 @@
     });
   });
 
-  unittest.group('resource-OrganizationsReportsResourceApi', () {
+  unittest.group('resource-OrganizationsReportsResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.ApigeeApi(mock).organizations.reports;
@@ -16741,7 +16731,7 @@
     });
   });
 
-  unittest.group('resource-OrganizationsSharedflowsResourceApi', () {
+  unittest.group('resource-OrganizationsSharedflowsResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.ApigeeApi(mock).organizations.sharedflows;
@@ -16960,7 +16950,7 @@
     });
   });
 
-  unittest.group('resource-OrganizationsSharedflowsDeploymentsResourceApi', () {
+  unittest.group('resource-OrganizationsSharedflowsDeploymentsResource', () {
     unittest.test('method--list', () {
       var mock = HttpServerMock();
       var res = api.ApigeeApi(mock).organizations.sharedflows.deployments;
@@ -17012,7 +17002,7 @@
     });
   });
 
-  unittest.group('resource-OrganizationsSharedflowsRevisionsResourceApi', () {
+  unittest.group('resource-OrganizationsSharedflowsRevisionsResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.ApigeeApi(mock).organizations.sharedflows.revisions;
@@ -17174,7 +17164,7 @@
   });
 
   unittest.group(
-      'resource-OrganizationsSharedflowsRevisionsDeploymentsResourceApi', () {
+      'resource-OrganizationsSharedflowsRevisionsDeploymentsResource', () {
     unittest.test('method--list', () {
       var mock = HttpServerMock();
       var res =
@@ -17227,7 +17217,7 @@
     });
   });
 
-  unittest.group('resource-OrganizationsSitesApicategoriesResourceApi', () {
+  unittest.group('resource-OrganizationsSitesApicategoriesResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.ApigeeApi(mock).organizations.sites.apicategories;
@@ -17488,7 +17478,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsResourceApi', () {
+  unittest.group('resource-ProjectsResource', () {
     unittest.test('method--provisionOrganization', () {
       var mock = HttpServerMock();
       var res = api.ApigeeApi(mock).projects;
diff --git a/generated/googleapis/test/appengine/v1_test.dart b/generated/googleapis/test/appengine/v1_test.dart
index d0b491c..b5344a0 100644
--- a/generated/googleapis/test/appengine/v1_test.dart
+++ b/generated/googleapis/test/appengine/v1_test.dart
@@ -2904,7 +2904,7 @@
     });
   });
 
-  unittest.group('resource-AppsResourceApi', () {
+  unittest.group('resource-AppsResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.AppengineApi(mock).apps;
@@ -3127,7 +3127,7 @@
     });
   });
 
-  unittest.group('resource-AppsAuthorizedCertificatesResourceApi', () {
+  unittest.group('resource-AppsAuthorizedCertificatesResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.AppengineApi(mock).apps.authorizedCertificates;
@@ -3456,7 +3456,7 @@
     });
   });
 
-  unittest.group('resource-AppsAuthorizedDomainsResourceApi', () {
+  unittest.group('resource-AppsAuthorizedDomainsResource', () {
     unittest.test('method--list', () {
       var mock = HttpServerMock();
       var res = api.AppengineApi(mock).apps.authorizedDomains;
@@ -3524,7 +3524,7 @@
     });
   });
 
-  unittest.group('resource-AppsDomainMappingsResourceApi', () {
+  unittest.group('resource-AppsDomainMappingsResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.AppengineApi(mock).apps.domainMappings;
@@ -3846,7 +3846,7 @@
     });
   });
 
-  unittest.group('resource-AppsFirewallIngressRulesResourceApi', () {
+  unittest.group('resource-AppsFirewallIngressRulesResource', () {
     unittest.test('method--batchUpdate', () {
       var mock = HttpServerMock();
       var res = api.AppengineApi(mock).apps.firewall.ingressRules;
@@ -4230,7 +4230,7 @@
     });
   });
 
-  unittest.group('resource-AppsLocationsResourceApi', () {
+  unittest.group('resource-AppsLocationsResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.AppengineApi(mock).apps.locations;
@@ -4360,7 +4360,7 @@
     });
   });
 
-  unittest.group('resource-AppsOperationsResourceApi', () {
+  unittest.group('resource-AppsOperationsResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.AppengineApi(mock).apps.operations;
@@ -4490,7 +4490,7 @@
     });
   });
 
-  unittest.group('resource-AppsServicesResourceApi', () {
+  unittest.group('resource-AppsServicesResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.AppengineApi(mock).apps.services;
@@ -4751,7 +4751,7 @@
     });
   });
 
-  unittest.group('resource-AppsServicesVersionsResourceApi', () {
+  unittest.group('resource-AppsServicesVersionsResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.AppengineApi(mock).apps.services.versions;
@@ -5125,7 +5125,7 @@
     });
   });
 
-  unittest.group('resource-AppsServicesVersionsInstancesResourceApi', () {
+  unittest.group('resource-AppsServicesVersionsInstancesResource', () {
     unittest.test('method--debug', () {
       var mock = HttpServerMock();
       var res = api.AppengineApi(mock).apps.services.versions.instances;
diff --git a/generated/googleapis/test/bigquery/v2_test.dart b/generated/googleapis/test/bigquery/v2_test.dart
index 7dfdf74..6517ae9 100644
--- a/generated/googleapis/test/bigquery/v2_test.dart
+++ b/generated/googleapis/test/bigquery/v2_test.dart
@@ -6142,7 +6142,7 @@
     });
   });
 
-  unittest.group('resource-DatasetsResourceApi', () {
+  unittest.group('resource-DatasetsResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.BigqueryApi(mock).datasets;
@@ -6548,7 +6548,7 @@
     });
   });
 
-  unittest.group('resource-JobsResourceApi', () {
+  unittest.group('resource-JobsResource', () {
     unittest.test('method--cancel', () {
       var mock = HttpServerMock();
       var res = api.BigqueryApi(mock).jobs;
@@ -6996,7 +6996,7 @@
     });
   });
 
-  unittest.group('resource-ModelsResourceApi', () {
+  unittest.group('resource-ModelsResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.BigqueryApi(mock).models;
@@ -7223,7 +7223,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsResourceApi', () {
+  unittest.group('resource-ProjectsResource', () {
     unittest.test('method--getServiceAccount', () {
       var mock = HttpServerMock();
       var res = api.BigqueryApi(mock).projects;
@@ -7343,7 +7343,7 @@
     });
   });
 
-  unittest.group('resource-RoutinesResourceApi', () {
+  unittest.group('resource-RoutinesResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.BigqueryApi(mock).routines;
@@ -7639,7 +7639,7 @@
     });
   });
 
-  unittest.group('resource-TabledataResourceApi', () {
+  unittest.group('resource-TabledataResource', () {
     unittest.test('method--insertAll', () {
       var mock = HttpServerMock();
       var res = api.BigqueryApi(mock).tabledata;
@@ -7823,7 +7823,7 @@
     });
   });
 
-  unittest.group('resource-TablesResourceApi', () {
+  unittest.group('resource-TablesResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.BigqueryApi(mock).tables;
diff --git a/generated/googleapis/test/bigquerydatatransfer/v1_test.dart b/generated/googleapis/test/bigquerydatatransfer/v1_test.dart
index 091dd29..94c8658 100644
--- a/generated/googleapis/test/bigquerydatatransfer/v1_test.dart
+++ b/generated/googleapis/test/bigquerydatatransfer/v1_test.dart
@@ -1138,7 +1138,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsDataSourcesResourceApi', () {
+  unittest.group('resource-ProjectsDataSourcesResource', () {
     unittest.test('method--checkValidCreds', () {
       var mock = HttpServerMock();
       var res = api.BigQueryDataTransferApi(mock).projects.dataSources;
@@ -1298,7 +1298,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsLocationsResourceApi', () {
+  unittest.group('resource-ProjectsLocationsResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.BigQueryDataTransferApi(mock).projects.locations;
@@ -1408,7 +1408,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsLocationsDataSourcesResourceApi', () {
+  unittest.group('resource-ProjectsLocationsDataSourcesResource', () {
     unittest.test('method--checkValidCreds', () {
       var mock = HttpServerMock();
       var res =
@@ -1571,7 +1571,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsLocationsTransferConfigsResourceApi', () {
+  unittest.group('resource-ProjectsLocationsTransferConfigsResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res =
@@ -1984,8 +1984,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsLocationsTransferConfigsRunsResourceApi',
-      () {
+  unittest.group('resource-ProjectsLocationsTransferConfigsRunsResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.BigQueryDataTransferApi(mock)
@@ -2160,8 +2159,7 @@
   });
 
   unittest.group(
-      'resource-ProjectsLocationsTransferConfigsRunsTransferLogsResourceApi',
-      () {
+      'resource-ProjectsLocationsTransferConfigsRunsTransferLogsResource', () {
     unittest.test('method--list', () {
       var mock = HttpServerMock();
       var res = api.BigQueryDataTransferApi(mock)
@@ -2229,7 +2227,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsTransferConfigsResourceApi', () {
+  unittest.group('resource-ProjectsTransferConfigsResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.BigQueryDataTransferApi(mock).projects.transferConfigs;
@@ -2635,7 +2633,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsTransferConfigsRunsResourceApi', () {
+  unittest.group('resource-ProjectsTransferConfigsRunsResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.BigQueryDataTransferApi(mock).projects.transferConfigs.runs;
@@ -2797,7 +2795,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsTransferConfigsRunsTransferLogsResourceApi',
+  unittest.group('resource-ProjectsTransferConfigsRunsTransferLogsResource',
       () {
     unittest.test('method--list', () {
       var mock = HttpServerMock();
diff --git a/generated/googleapis/test/bigqueryreservation/v1_test.dart b/generated/googleapis/test/bigqueryreservation/v1_test.dart
index a6c9baf..d0a4ba9 100644
--- a/generated/googleapis/test/bigqueryreservation/v1_test.dart
+++ b/generated/googleapis/test/bigqueryreservation/v1_test.dart
@@ -766,7 +766,7 @@
     });
   });
 
-  unittest.group('resource-OperationsResourceApi', () {
+  unittest.group('resource-OperationsResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.BigQueryReservationApi(mock).operations;
@@ -876,7 +876,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsLocationsResourceApi', () {
+  unittest.group('resource-ProjectsLocationsResource', () {
     unittest.test('method--getBiReservation', () {
       var mock = HttpServerMock();
       var res = api.BigQueryReservationApi(mock).projects.locations;
@@ -1105,8 +1105,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsLocationsCapacityCommitmentsResourceApi',
-      () {
+  unittest.group('resource-ProjectsLocationsCapacityCommitmentsResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.BigQueryReservationApi(mock)
@@ -1508,7 +1507,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsLocationsReservationsResourceApi', () {
+  unittest.group('resource-ProjectsLocationsReservationsResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res =
@@ -1782,7 +1781,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsLocationsReservationsAssignmentsResourceApi',
+  unittest.group('resource-ProjectsLocationsReservationsAssignmentsResource',
       () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
diff --git a/generated/googleapis/test/bigtableadmin/v2_test.dart b/generated/googleapis/test/bigtableadmin/v2_test.dart
index d33a9db..11c0cf0 100644
--- a/generated/googleapis/test/bigtableadmin/v2_test.dart
+++ b/generated/googleapis/test/bigtableadmin/v2_test.dart
@@ -2327,7 +2327,7 @@
     });
   });
 
-  unittest.group('resource-OperationsResourceApi', () {
+  unittest.group('resource-OperationsResource', () {
     unittest.test('method--cancel', () {
       var mock = HttpServerMock();
       var res = api.BigtableAdminApi(mock).operations;
@@ -2473,7 +2473,7 @@
     });
   });
 
-  unittest.group('resource-OperationsProjectsOperationsResourceApi', () {
+  unittest.group('resource-OperationsProjectsOperationsResource', () {
     unittest.test('method--list', () {
       var mock = HttpServerMock();
       var res = api.BigtableAdminApi(mock).operations.projects.operations;
@@ -2535,7 +2535,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsInstancesResourceApi', () {
+  unittest.group('resource-ProjectsInstancesResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.BigtableAdminApi(mock).projects.instances;
@@ -3007,7 +3007,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsInstancesAppProfilesResourceApi', () {
+  unittest.group('resource-ProjectsInstancesAppProfilesResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.BigtableAdminApi(mock).projects.instances.appProfiles;
@@ -3290,7 +3290,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsInstancesClustersResourceApi', () {
+  unittest.group('resource-ProjectsInstancesClustersResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.BigtableAdminApi(mock).projects.instances.clusters;
@@ -3549,7 +3549,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsInstancesClustersBackupsResourceApi', () {
+  unittest.group('resource-ProjectsInstancesClustersBackupsResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.BigtableAdminApi(mock).projects.instances.clusters.backups;
@@ -3985,7 +3985,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsInstancesTablesResourceApi', () {
+  unittest.group('resource-ProjectsInstancesTablesResource', () {
     unittest.test('method--checkConsistency', () {
       var mock = HttpServerMock();
       var res = api.BigtableAdminApi(mock).projects.instances.tables;
@@ -4626,7 +4626,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsLocationsResourceApi', () {
+  unittest.group('resource-ProjectsLocationsResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.BigtableAdminApi(mock).projects.locations;
diff --git a/generated/googleapis/test/binaryauthorization/v1_test.dart b/generated/googleapis/test/binaryauthorization/v1_test.dart
index 8c90d38..645be69 100644
--- a/generated/googleapis/test/binaryauthorization/v1_test.dart
+++ b/generated/googleapis/test/binaryauthorization/v1_test.dart
@@ -778,7 +778,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsResourceApi', () {
+  unittest.group('resource-ProjectsResource', () {
     unittest.test('method--getPolicy', () {
       var mock = HttpServerMock();
       var res = api.BinaryAuthorizationApi(mock).projects;
@@ -881,7 +881,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsAttestorsResourceApi', () {
+  unittest.group('resource-ProjectsAttestorsResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.BinaryAuthorizationApi(mock).projects.attestors;
@@ -1365,7 +1365,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsPolicyResourceApi', () {
+  unittest.group('resource-ProjectsPolicyResource', () {
     unittest.test('method--getIamPolicy', () {
       var mock = HttpServerMock();
       var res = api.BinaryAuthorizationApi(mock).projects.policy;
diff --git a/generated/googleapis/test/blogger/v3_test.dart b/generated/googleapis/test/blogger/v3_test.dart
index c1ca932..24e5dfb 100644
--- a/generated/googleapis/test/blogger/v3_test.dart
+++ b/generated/googleapis/test/blogger/v3_test.dart
@@ -1429,7 +1429,7 @@
     });
   });
 
-  unittest.group('resource-BlogUserInfosResourceApi', () {
+  unittest.group('resource-BlogUserInfosResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.BloggerApi(mock).blogUserInfos;
@@ -1495,7 +1495,7 @@
     });
   });
 
-  unittest.group('resource-BlogsResourceApi', () {
+  unittest.group('resource-BlogsResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.BloggerApi(mock).blogs;
@@ -1673,7 +1673,7 @@
     });
   });
 
-  unittest.group('resource-CommentsResourceApi', () {
+  unittest.group('resource-CommentsResource', () {
     unittest.test('method--approve', () {
       var mock = HttpServerMock();
       var res = api.BloggerApi(mock).comments;
@@ -2219,7 +2219,7 @@
     });
   });
 
-  unittest.group('resource-PageViewsResourceApi', () {
+  unittest.group('resource-PageViewsResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.BloggerApi(mock).pageViews;
@@ -2279,7 +2279,7 @@
     });
   });
 
-  unittest.group('resource-PagesResourceApi', () {
+  unittest.group('resource-PagesResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.BloggerApi(mock).pages;
@@ -2821,7 +2821,7 @@
     });
   });
 
-  unittest.group('resource-PostUserInfosResourceApi', () {
+  unittest.group('resource-PostUserInfosResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.BloggerApi(mock).postUserInfos;
@@ -2997,7 +2997,7 @@
     });
   });
 
-  unittest.group('resource-PostsResourceApi', () {
+  unittest.group('resource-PostsResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.BloggerApi(mock).posts;
@@ -3742,7 +3742,7 @@
     });
   });
 
-  unittest.group('resource-UsersResourceApi', () {
+  unittest.group('resource-UsersResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.BloggerApi(mock).users;
diff --git a/generated/googleapis/test/books/v1_test.dart b/generated/googleapis/test/books/v1_test.dart
index 6bf77fd..a507b40 100644
--- a/generated/googleapis/test/books/v1_test.dart
+++ b/generated/googleapis/test/books/v1_test.dart
@@ -4586,7 +4586,7 @@
     });
   });
 
-  unittest.group('resource-BookshelvesResourceApi', () {
+  unittest.group('resource-BookshelvesResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.BooksApi(mock).bookshelves;
@@ -4708,7 +4708,7 @@
     });
   });
 
-  unittest.group('resource-BookshelvesVolumesResourceApi', () {
+  unittest.group('resource-BookshelvesVolumesResource', () {
     unittest.test('method--list', () {
       var mock = HttpServerMock();
       var res = api.BooksApi(mock).bookshelves.volumes;
@@ -4792,7 +4792,7 @@
     });
   });
 
-  unittest.group('resource-CloudloadingResourceApi', () {
+  unittest.group('resource-CloudloadingResource', () {
     unittest.test('method--addBook', () {
       var mock = HttpServerMock();
       var res = api.BooksApi(mock).cloudloading;
@@ -4958,7 +4958,7 @@
     });
   });
 
-  unittest.group('resource-DictionaryResourceApi', () {
+  unittest.group('resource-DictionaryResource', () {
     unittest.test('method--listOfflineMetadata', () {
       var mock = HttpServerMock();
       var res = api.BooksApi(mock).dictionary;
@@ -5009,7 +5009,7 @@
     });
   });
 
-  unittest.group('resource-FamilysharingResourceApi', () {
+  unittest.group('resource-FamilysharingResource', () {
     unittest.test('method--getFamilyInfo', () {
       var mock = HttpServerMock();
       var res = api.BooksApi(mock).familysharing;
@@ -5173,7 +5173,7 @@
     });
   });
 
-  unittest.group('resource-LayersResourceApi', () {
+  unittest.group('resource-LayersResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.BooksApi(mock).layers;
@@ -5315,7 +5315,7 @@
     });
   });
 
-  unittest.group('resource-LayersAnnotationDataResourceApi', () {
+  unittest.group('resource-LayersAnnotationDataResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.BooksApi(mock).layers.annotationData;
@@ -5523,7 +5523,7 @@
     });
   });
 
-  unittest.group('resource-LayersVolumeAnnotationsResourceApi', () {
+  unittest.group('resource-LayersVolumeAnnotationsResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.BooksApi(mock).layers.volumeAnnotations;
@@ -5711,7 +5711,7 @@
     });
   });
 
-  unittest.group('resource-MyconfigResourceApi', () {
+  unittest.group('resource-MyconfigResource', () {
     unittest.test('method--getUserSettings', () {
       var mock = HttpServerMock();
       var res = api.BooksApi(mock).myconfig;
@@ -6015,7 +6015,7 @@
     });
   });
 
-  unittest.group('resource-MylibraryAnnotationsResourceApi', () {
+  unittest.group('resource-MylibraryAnnotationsResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.BooksApi(mock).mylibrary.annotations;
@@ -6333,7 +6333,7 @@
     });
   });
 
-  unittest.group('resource-MylibraryBookshelvesResourceApi', () {
+  unittest.group('resource-MylibraryBookshelvesResource', () {
     unittest.test('method--addVolume', () {
       var mock = HttpServerMock();
       var res = api.BooksApi(mock).mylibrary.bookshelves;
@@ -6695,7 +6695,7 @@
     });
   });
 
-  unittest.group('resource-MylibraryBookshelvesVolumesResourceApi', () {
+  unittest.group('resource-MylibraryBookshelvesVolumesResource', () {
     unittest.test('method--list', () {
       var mock = HttpServerMock();
       var res = api.BooksApi(mock).mylibrary.bookshelves.volumes;
@@ -6780,7 +6780,7 @@
     });
   });
 
-  unittest.group('resource-MylibraryReadingpositionsResourceApi', () {
+  unittest.group('resource-MylibraryReadingpositionsResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.BooksApi(mock).mylibrary.readingpositions;
@@ -6919,7 +6919,7 @@
     });
   });
 
-  unittest.group('resource-NotificationResourceApi', () {
+  unittest.group('resource-NotificationResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.BooksApi(mock).notification;
@@ -6978,7 +6978,7 @@
     });
   });
 
-  unittest.group('resource-OnboardingResourceApi', () {
+  unittest.group('resource-OnboardingResource', () {
     unittest.test('method--listCategories', () {
       var mock = HttpServerMock();
       var res = api.BooksApi(mock).onboarding;
@@ -7094,7 +7094,7 @@
     });
   });
 
-  unittest.group('resource-PersonalizedstreamResourceApi', () {
+  unittest.group('resource-PersonalizedstreamResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.BooksApi(mock).personalizedstream;
@@ -7153,7 +7153,7 @@
     });
   });
 
-  unittest.group('resource-PromoofferResourceApi', () {
+  unittest.group('resource-PromoofferResource', () {
     unittest.test('method--accept', () {
       var mock = HttpServerMock();
       var res = api.BooksApi(mock).promooffer;
@@ -7371,7 +7371,7 @@
     });
   });
 
-  unittest.group('resource-SeriesResourceApi', () {
+  unittest.group('resource-SeriesResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.BooksApi(mock).series;
@@ -7421,7 +7421,7 @@
     });
   });
 
-  unittest.group('resource-SeriesMembershipResourceApi', () {
+  unittest.group('resource-SeriesMembershipResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.BooksApi(mock).series.membership;
@@ -7482,7 +7482,7 @@
     });
   });
 
-  unittest.group('resource-VolumesResourceApi', () {
+  unittest.group('resource-VolumesResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.BooksApi(mock).volumes;
@@ -7658,7 +7658,7 @@
     });
   });
 
-  unittest.group('resource-VolumesAssociatedResourceApi', () {
+  unittest.group('resource-VolumesAssociatedResource', () {
     unittest.test('method--list', () {
       var mock = HttpServerMock();
       var res = api.BooksApi(mock).volumes.associated;
@@ -7731,7 +7731,7 @@
     });
   });
 
-  unittest.group('resource-VolumesMybooksResourceApi', () {
+  unittest.group('resource-VolumesMybooksResource', () {
     unittest.test('method--list', () {
       var mock = HttpServerMock();
       var res = api.BooksApi(mock).volumes.mybooks;
@@ -7806,7 +7806,7 @@
     });
   });
 
-  unittest.group('resource-VolumesRecommendedResourceApi', () {
+  unittest.group('resource-VolumesRecommendedResource', () {
     unittest.test('method--list', () {
       var mock = HttpServerMock();
       var res = api.BooksApi(mock).volumes.recommended;
@@ -7927,7 +7927,7 @@
     });
   });
 
-  unittest.group('resource-VolumesUseruploadedResourceApi', () {
+  unittest.group('resource-VolumesUseruploadedResource', () {
     unittest.test('method--list', () {
       var mock = HttpServerMock();
       var res = api.BooksApi(mock).volumes.useruploaded;
diff --git a/generated/googleapis/test/calendar/v3_test.dart b/generated/googleapis/test/calendar/v3_test.dart
index 673d66f..f0373a4 100644
--- a/generated/googleapis/test/calendar/v3_test.dart
+++ b/generated/googleapis/test/calendar/v3_test.dart
@@ -1916,7 +1916,7 @@
     });
   });
 
-  unittest.group('resource-AclResourceApi', () {
+  unittest.group('resource-AclResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.CalendarApi(mock).acl;
@@ -2411,7 +2411,7 @@
     });
   });
 
-  unittest.group('resource-CalendarListResourceApi', () {
+  unittest.group('resource-CalendarListResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.CalendarApi(mock).calendarList;
@@ -2852,7 +2852,7 @@
     });
   });
 
-  unittest.group('resource-CalendarsResourceApi', () {
+  unittest.group('resource-CalendarsResource', () {
     unittest.test('method--clear', () {
       var mock = HttpServerMock();
       var res = api.CalendarApi(mock).calendars;
@@ -3185,7 +3185,7 @@
     });
   });
 
-  unittest.group('resource-ChannelsResourceApi', () {
+  unittest.group('resource-ChannelsResource', () {
     unittest.test('method--stop', () {
       var mock = HttpServerMock();
       var res = api.CalendarApi(mock).channels;
@@ -3239,7 +3239,7 @@
     });
   });
 
-  unittest.group('resource-ColorsResourceApi', () {
+  unittest.group('resource-ColorsResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.CalendarApi(mock).colors;
@@ -3288,7 +3288,7 @@
     });
   });
 
-  unittest.group('resource-EventsResourceApi', () {
+  unittest.group('resource-EventsResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.CalendarApi(mock).events;
@@ -4296,7 +4296,7 @@
     });
   });
 
-  unittest.group('resource-FreebusyResourceApi', () {
+  unittest.group('resource-FreebusyResource', () {
     unittest.test('method--query', () {
       var mock = HttpServerMock();
       var res = api.CalendarApi(mock).freebusy;
@@ -4352,7 +4352,7 @@
     });
   });
 
-  unittest.group('resource-SettingsResourceApi', () {
+  unittest.group('resource-SettingsResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.CalendarApi(mock).settings;
diff --git a/generated/googleapis/test/chat/v1_test.dart b/generated/googleapis/test/chat/v1_test.dart
index be62e60..b5a9ded 100644
--- a/generated/googleapis/test/chat/v1_test.dart
+++ b/generated/googleapis/test/chat/v1_test.dart
@@ -1201,7 +1201,7 @@
     });
   });
 
-  unittest.group('resource-MediaResourceApi', () {
+  unittest.group('resource-MediaResource', () {
     unittest.test('method--download', () {
       // TODO: Implement tests for media upload;
       // TODO: Implement tests for media download;
@@ -1254,7 +1254,7 @@
     });
   });
 
-  unittest.group('resource-SpacesResourceApi', () {
+  unittest.group('resource-SpacesResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.HangoutsChatApi(mock).spaces;
@@ -1359,7 +1359,7 @@
     });
   });
 
-  unittest.group('resource-SpacesMembersResourceApi', () {
+  unittest.group('resource-SpacesMembersResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.HangoutsChatApi(mock).spaces.members;
@@ -1466,7 +1466,7 @@
     });
   });
 
-  unittest.group('resource-SpacesMessagesResourceApi', () {
+  unittest.group('resource-SpacesMessagesResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.HangoutsChatApi(mock).spaces.messages;
@@ -1678,7 +1678,7 @@
     });
   });
 
-  unittest.group('resource-SpacesMessagesAttachmentsResourceApi', () {
+  unittest.group('resource-SpacesMessagesAttachmentsResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.HangoutsChatApi(mock).spaces.messages.attachments;
diff --git a/generated/googleapis/test/civicinfo/v2_test.dart b/generated/googleapis/test/civicinfo/v2_test.dart
index cd419a5..a9ad123 100644
--- a/generated/googleapis/test/civicinfo/v2_test.dart
+++ b/generated/googleapis/test/civicinfo/v2_test.dart
@@ -1325,7 +1325,7 @@
     });
   });
 
-  unittest.group('resource-DivisionsResourceApi', () {
+  unittest.group('resource-DivisionsResource', () {
     unittest.test('method--search', () {
       var mock = HttpServerMock();
       var res = api.CivicInfoApi(mock).divisions;
@@ -1375,7 +1375,7 @@
     });
   });
 
-  unittest.group('resource-ElectionsResourceApi', () {
+  unittest.group('resource-ElectionsResource', () {
     unittest.test('method--electionQuery', () {
       var mock = HttpServerMock();
       var res = api.CivicInfoApi(mock).elections;
@@ -1485,7 +1485,7 @@
     });
   });
 
-  unittest.group('resource-RepresentativesResourceApi', () {
+  unittest.group('resource-RepresentativesResource', () {
     unittest.test('method--representativeInfoByAddress', () {
       var mock = HttpServerMock();
       var res = api.CivicInfoApi(mock).representatives;
diff --git a/generated/googleapis/test/classroom/v1_test.dart b/generated/googleapis/test/classroom/v1_test.dart
index cae4ede..45b9bc3 100644
--- a/generated/googleapis/test/classroom/v1_test.dart
+++ b/generated/googleapis/test/classroom/v1_test.dart
@@ -2406,7 +2406,7 @@
     });
   });
 
-  unittest.group('resource-CoursesResourceApi', () {
+  unittest.group('resource-CoursesResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.ClassroomApi(mock).courses;
@@ -2740,7 +2740,7 @@
     });
   });
 
-  unittest.group('resource-CoursesAliasesResourceApi', () {
+  unittest.group('resource-CoursesAliasesResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.ClassroomApi(mock).courses.aliases;
@@ -2929,7 +2929,7 @@
     });
   });
 
-  unittest.group('resource-CoursesAnnouncementsResourceApi', () {
+  unittest.group('resource-CoursesAnnouncementsResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.ClassroomApi(mock).courses.announcements;
@@ -3328,7 +3328,7 @@
     });
   });
 
-  unittest.group('resource-CoursesCourseWorkResourceApi', () {
+  unittest.group('resource-CoursesCourseWorkResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.ClassroomApi(mock).courses.courseWork;
@@ -3726,7 +3726,7 @@
     });
   });
 
-  unittest.group('resource-CoursesCourseWorkStudentSubmissionsResourceApi', () {
+  unittest.group('resource-CoursesCourseWorkStudentSubmissionsResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.ClassroomApi(mock).courses.courseWork.studentSubmissions;
@@ -4294,7 +4294,7 @@
     });
   });
 
-  unittest.group('resource-CoursesCourseWorkMaterialsResourceApi', () {
+  unittest.group('resource-CoursesCourseWorkMaterialsResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.ClassroomApi(mock).courses.courseWorkMaterials;
@@ -4628,7 +4628,7 @@
     });
   });
 
-  unittest.group('resource-CoursesStudentsResourceApi', () {
+  unittest.group('resource-CoursesStudentsResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.ClassroomApi(mock).courses.students;
@@ -4880,7 +4880,7 @@
     });
   });
 
-  unittest.group('resource-CoursesTeachersResourceApi', () {
+  unittest.group('resource-CoursesTeachersResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.ClassroomApi(mock).courses.teachers;
@@ -5128,7 +5128,7 @@
     });
   });
 
-  unittest.group('resource-CoursesTopicsResourceApi', () {
+  unittest.group('resource-CoursesTopicsResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.ClassroomApi(mock).courses.topics;
@@ -5445,7 +5445,7 @@
     });
   });
 
-  unittest.group('resource-InvitationsResourceApi', () {
+  unittest.group('resource-InvitationsResource', () {
     unittest.test('method--accept', () {
       var mock = HttpServerMock();
       var res = api.ClassroomApi(mock).invitations;
@@ -5716,7 +5716,7 @@
     });
   });
 
-  unittest.group('resource-RegistrationsResourceApi', () {
+  unittest.group('resource-RegistrationsResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.ClassroomApi(mock).registrations;
@@ -5819,7 +5819,7 @@
     });
   });
 
-  unittest.group('resource-UserProfilesResourceApi', () {
+  unittest.group('resource-UserProfilesResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.ClassroomApi(mock).userProfiles;
@@ -5871,7 +5871,7 @@
     });
   });
 
-  unittest.group('resource-UserProfilesGuardianInvitationsResourceApi', () {
+  unittest.group('resource-UserProfilesGuardianInvitationsResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.ClassroomApi(mock).userProfiles.guardianInvitations;
@@ -6136,7 +6136,7 @@
     });
   });
 
-  unittest.group('resource-UserProfilesGuardiansResourceApi', () {
+  unittest.group('resource-UserProfilesGuardiansResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.ClassroomApi(mock).userProfiles.guardians;
diff --git a/generated/googleapis/test/cloudasset/v1_test.dart b/generated/googleapis/test/cloudasset/v1_test.dart
index 57fdeff..9a7f2d9 100644
--- a/generated/googleapis/test/cloudasset/v1_test.dart
+++ b/generated/googleapis/test/cloudasset/v1_test.dart
@@ -2110,7 +2110,7 @@
     });
   });
 
-  unittest.group('resource-FeedsResourceApi', () {
+  unittest.group('resource-FeedsResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.CloudAssetApi(mock).feeds;
@@ -2362,7 +2362,7 @@
     });
   });
 
-  unittest.group('resource-OperationsResourceApi', () {
+  unittest.group('resource-OperationsResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.CloudAssetApi(mock).operations;
@@ -2412,7 +2412,7 @@
     });
   });
 
-  unittest.group('resource-V1ResourceApi', () {
+  unittest.group('resource-V1Resource', () {
     unittest.test('method--batchGetAssetsHistory', () {
       var mock = HttpServerMock();
       var res = api.CloudAssetApi(mock).v1;
diff --git a/generated/googleapis/test/cloudbilling/v1_test.dart b/generated/googleapis/test/cloudbilling/v1_test.dart
index 0e47369..2f4fd99 100644
--- a/generated/googleapis/test/cloudbilling/v1_test.dart
+++ b/generated/googleapis/test/cloudbilling/v1_test.dart
@@ -945,7 +945,7 @@
     });
   });
 
-  unittest.group('resource-BillingAccountsResourceApi', () {
+  unittest.group('resource-BillingAccountsResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.CloudbillingApi(mock).billingAccounts;
@@ -1324,7 +1324,7 @@
     });
   });
 
-  unittest.group('resource-BillingAccountsProjectsResourceApi', () {
+  unittest.group('resource-BillingAccountsProjectsResource', () {
     unittest.test('method--list', () {
       var mock = HttpServerMock();
       var res = api.CloudbillingApi(mock).billingAccounts.projects;
@@ -1384,7 +1384,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsResourceApi', () {
+  unittest.group('resource-ProjectsResource', () {
     unittest.test('method--getBillingInfo', () {
       var mock = HttpServerMock();
       var res = api.CloudbillingApi(mock).projects;
@@ -1487,7 +1487,7 @@
     });
   });
 
-  unittest.group('resource-ServicesResourceApi', () {
+  unittest.group('resource-ServicesResource', () {
     unittest.test('method--list', () {
       var mock = HttpServerMock();
       var res = api.CloudbillingApi(mock).services;
@@ -1544,7 +1544,7 @@
     });
   });
 
-  unittest.group('resource-ServicesSkusResourceApi', () {
+  unittest.group('resource-ServicesSkusResource', () {
     unittest.test('method--list', () {
       var mock = HttpServerMock();
       var res = api.CloudbillingApi(mock).services.skus;
diff --git a/generated/googleapis/test/cloudbuild/v1_test.dart b/generated/googleapis/test/cloudbuild/v1_test.dart
index abbd13e..88d035c 100644
--- a/generated/googleapis/test/cloudbuild/v1_test.dart
+++ b/generated/googleapis/test/cloudbuild/v1_test.dart
@@ -1873,7 +1873,7 @@
     });
   });
 
-  unittest.group('resource-OperationsResourceApi', () {
+  unittest.group('resource-OperationsResource', () {
     unittest.test('method--cancel', () {
       var mock = HttpServerMock();
       var res = api.CloudBuildApi(mock).operations;
@@ -1976,7 +1976,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsBuildsResourceApi', () {
+  unittest.group('resource-ProjectsBuildsResource', () {
     unittest.test('method--cancel', () {
       var mock = HttpServerMock();
       var res = api.CloudBuildApi(mock).projects.builds;
@@ -2317,7 +2317,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsLocationsBuildsResourceApi', () {
+  unittest.group('resource-ProjectsLocationsBuildsResource', () {
     unittest.test('method--cancel', () {
       var mock = HttpServerMock();
       var res = api.CloudBuildApi(mock).projects.locations.builds;
@@ -2600,7 +2600,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsLocationsOperationsResourceApi', () {
+  unittest.group('resource-ProjectsLocationsOperationsResource', () {
     unittest.test('method--cancel', () {
       var mock = HttpServerMock();
       var res = api.CloudBuildApi(mock).projects.locations.operations;
@@ -2703,7 +2703,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsTriggersResourceApi', () {
+  unittest.group('resource-ProjectsTriggersResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.CloudBuildApi(mock).projects.triggers;
diff --git a/generated/googleapis/test/clouddebugger/v2_test.dart b/generated/googleapis/test/clouddebugger/v2_test.dart
index 77cacef..32e8984 100644
--- a/generated/googleapis/test/clouddebugger/v2_test.dart
+++ b/generated/googleapis/test/clouddebugger/v2_test.dart
@@ -1085,7 +1085,7 @@
     });
   });
 
-  unittest.group('resource-ControllerDebuggeesResourceApi', () {
+  unittest.group('resource-ControllerDebuggeesResource', () {
     unittest.test('method--register', () {
       var mock = HttpServerMock();
       var res = api.CloudDebuggerApi(mock).controller.debuggees;
@@ -1138,7 +1138,7 @@
     });
   });
 
-  unittest.group('resource-ControllerDebuggeesBreakpointsResourceApi', () {
+  unittest.group('resource-ControllerDebuggeesBreakpointsResource', () {
     unittest.test('method--list', () {
       var mock = HttpServerMock();
       var res = api.CloudDebuggerApi(mock).controller.debuggees.breakpoints;
@@ -1277,7 +1277,7 @@
     });
   });
 
-  unittest.group('resource-DebuggerDebuggeesResourceApi', () {
+  unittest.group('resource-DebuggerDebuggeesResource', () {
     unittest.test('method--list', () {
       var mock = HttpServerMock();
       var res = api.CloudDebuggerApi(mock).debugger.debuggees;
@@ -1338,7 +1338,7 @@
     });
   });
 
-  unittest.group('resource-DebuggerDebuggeesBreakpointsResourceApi', () {
+  unittest.group('resource-DebuggerDebuggeesBreakpointsResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.CloudDebuggerApi(mock).debugger.debuggees.breakpoints;
diff --git a/generated/googleapis/test/cloudfunctions/v1_test.dart b/generated/googleapis/test/cloudfunctions/v1_test.dart
index 73cfc79..c0f6a17 100644
--- a/generated/googleapis/test/cloudfunctions/v1_test.dart
+++ b/generated/googleapis/test/cloudfunctions/v1_test.dart
@@ -1220,7 +1220,7 @@
     });
   });
 
-  unittest.group('resource-OperationsResourceApi', () {
+  unittest.group('resource-OperationsResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.CloudFunctionsApi(mock).operations;
@@ -1331,7 +1331,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsLocationsResourceApi', () {
+  unittest.group('resource-ProjectsLocationsResource', () {
     unittest.test('method--list', () {
       var mock = HttpServerMock();
       var res = api.CloudFunctionsApi(mock).projects.locations;
@@ -1393,7 +1393,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsLocationsFunctionsResourceApi', () {
+  unittest.group('resource-ProjectsLocationsFunctionsResource', () {
     unittest.test('method--call', () {
       var mock = HttpServerMock();
       var res = api.CloudFunctionsApi(mock).projects.locations.functions;
diff --git a/generated/googleapis/test/cloudidentity/v1_test.dart b/generated/googleapis/test/cloudidentity/v1_test.dart
index 1120e07..d491034 100644
--- a/generated/googleapis/test/cloudidentity/v1_test.dart
+++ b/generated/googleapis/test/cloudidentity/v1_test.dart
@@ -1573,7 +1573,7 @@
     });
   });
 
-  unittest.group('resource-DevicesResourceApi', () {
+  unittest.group('resource-DevicesResource', () {
     unittest.test('method--cancelWipe', () {
       var mock = HttpServerMock();
       var res = api.CloudIdentityApi(mock).devices;
@@ -1916,7 +1916,7 @@
     });
   });
 
-  unittest.group('resource-DevicesDeviceUsersResourceApi', () {
+  unittest.group('resource-DevicesDeviceUsersResource', () {
     unittest.test('method--approve', () {
       var mock = HttpServerMock();
       var res = api.CloudIdentityApi(mock).devices.deviceUsers;
@@ -2386,7 +2386,7 @@
     });
   });
 
-  unittest.group('resource-DevicesDeviceUsersClientStatesResourceApi', () {
+  unittest.group('resource-DevicesDeviceUsersClientStatesResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.CloudIdentityApi(mock).devices.deviceUsers.clientStates;
@@ -2570,7 +2570,7 @@
     });
   });
 
-  unittest.group('resource-GroupsResourceApi', () {
+  unittest.group('resource-GroupsResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.CloudIdentityApi(mock).groups;
@@ -2957,7 +2957,7 @@
     });
   });
 
-  unittest.group('resource-GroupsMembershipsResourceApi', () {
+  unittest.group('resource-GroupsMembershipsResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.CloudIdentityApi(mock).groups.memberships;
diff --git a/generated/googleapis/test/cloudiot/v1_test.dart b/generated/googleapis/test/cloudiot/v1_test.dart
index a110fb3..8e10236 100644
--- a/generated/googleapis/test/cloudiot/v1_test.dart
+++ b/generated/googleapis/test/cloudiot/v1_test.dart
@@ -1328,7 +1328,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsLocationsRegistriesResourceApi', () {
+  unittest.group('resource-ProjectsLocationsRegistriesResource', () {
     unittest.test('method--bindDeviceToGateway', () {
       var mock = HttpServerMock();
       var res = api.CloudIotApi(mock).projects.locations.registries;
@@ -1864,7 +1864,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsLocationsRegistriesDevicesResourceApi', () {
+  unittest.group('resource-ProjectsLocationsRegistriesDevicesResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.CloudIotApi(mock).projects.locations.registries.devices;
@@ -2270,8 +2270,7 @@
   });
 
   unittest.group(
-      'resource-ProjectsLocationsRegistriesDevicesConfigVersionsResourceApi',
-      () {
+      'resource-ProjectsLocationsRegistriesDevicesConfigVersionsResource', () {
     unittest.test('method--list', () {
       var mock = HttpServerMock();
       var res = api.CloudIotApi(mock)
@@ -2330,7 +2329,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsLocationsRegistriesDevicesStatesResourceApi',
+  unittest.group('resource-ProjectsLocationsRegistriesDevicesStatesResource',
       () {
     unittest.test('method--list', () {
       var mock = HttpServerMock();
@@ -2385,7 +2384,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsLocationsRegistriesGroupsResourceApi', () {
+  unittest.group('resource-ProjectsLocationsRegistriesGroupsResource', () {
     unittest.test('method--getIamPolicy', () {
       var mock = HttpServerMock();
       var res = api.CloudIotApi(mock).projects.locations.registries.groups;
@@ -2547,7 +2546,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsLocationsRegistriesGroupsDevicesResourceApi',
+  unittest.group('resource-ProjectsLocationsRegistriesGroupsDevicesResource',
       () {
     unittest.test('method--list', () {
       var mock = HttpServerMock();
diff --git a/generated/googleapis/test/cloudkms/v1_test.dart b/generated/googleapis/test/cloudkms/v1_test.dart
index 28b38ce..4697fef 100644
--- a/generated/googleapis/test/cloudkms/v1_test.dart
+++ b/generated/googleapis/test/cloudkms/v1_test.dart
@@ -1479,7 +1479,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsLocationsResourceApi', () {
+  unittest.group('resource-ProjectsLocationsResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.CloudKMSApi(mock).projects.locations;
@@ -1589,7 +1589,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsLocationsKeyRingsResourceApi', () {
+  unittest.group('resource-ProjectsLocationsKeyRingsResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.CloudKMSApi(mock).projects.locations.keyRings;
@@ -1922,7 +1922,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsLocationsKeyRingsCryptoKeysResourceApi', () {
+  unittest.group('resource-ProjectsLocationsKeyRingsCryptoKeysResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.CloudKMSApi(mock).projects.locations.keyRings.cryptoKeys;
@@ -2482,7 +2482,7 @@
   });
 
   unittest.group(
-      'resource-ProjectsLocationsKeyRingsCryptoKeysCryptoKeyVersionsResourceApi',
+      'resource-ProjectsLocationsKeyRingsCryptoKeysCryptoKeyVersionsResource',
       () {
     unittest.test('method--asymmetricDecrypt', () {
       var mock = HttpServerMock();
@@ -3078,7 +3078,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsLocationsKeyRingsImportJobsResourceApi', () {
+  unittest.group('resource-ProjectsLocationsKeyRingsImportJobsResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.CloudKMSApi(mock).projects.locations.keyRings.importJobs;
diff --git a/generated/googleapis/test/cloudprofiler/v2_test.dart b/generated/googleapis/test/cloudprofiler/v2_test.dart
index 55feee7..2a2da16 100644
--- a/generated/googleapis/test/cloudprofiler/v2_test.dart
+++ b/generated/googleapis/test/cloudprofiler/v2_test.dart
@@ -164,7 +164,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsProfilesResourceApi', () {
+  unittest.group('resource-ProjectsProfilesResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.CloudProfilerApi(mock).projects.profiles;
diff --git a/generated/googleapis/test/cloudresourcemanager/v1_test.dart b/generated/googleapis/test/cloudresourcemanager/v1_test.dart
index 4aa963c..24bbd80 100644
--- a/generated/googleapis/test/cloudresourcemanager/v1_test.dart
+++ b/generated/googleapis/test/cloudresourcemanager/v1_test.dart
@@ -1657,7 +1657,7 @@
     });
   });
 
-  unittest.group('resource-FoldersResourceApi', () {
+  unittest.group('resource-FoldersResource', () {
     unittest.test('method--clearOrgPolicy', () {
       var mock = HttpServerMock();
       var res = api.CloudResourceManagerApi(mock).folders;
@@ -1983,7 +1983,7 @@
     });
   });
 
-  unittest.group('resource-LiensResourceApi', () {
+  unittest.group('resource-LiensResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.CloudResourceManagerApi(mock).liens;
@@ -2190,7 +2190,7 @@
     });
   });
 
-  unittest.group('resource-OperationsResourceApi', () {
+  unittest.group('resource-OperationsResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.CloudResourceManagerApi(mock).operations;
@@ -2240,7 +2240,7 @@
     });
   });
 
-  unittest.group('resource-OrganizationsResourceApi', () {
+  unittest.group('resource-OrganizationsResource', () {
     unittest.test('method--clearOrgPolicy', () {
       var mock = HttpServerMock();
       var res = api.CloudResourceManagerApi(mock).organizations;
@@ -2826,7 +2826,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsResourceApi', () {
+  unittest.group('resource-ProjectsResource', () {
     unittest.test('method--clearOrgPolicy', () {
       var mock = HttpServerMock();
       var res = api.CloudResourceManagerApi(mock).projects;
diff --git a/generated/googleapis/test/cloudresourcemanager/v2_test.dart b/generated/googleapis/test/cloudresourcemanager/v2_test.dart
index c05cb2f..2dce2e4 100644
--- a/generated/googleapis/test/cloudresourcemanager/v2_test.dart
+++ b/generated/googleapis/test/cloudresourcemanager/v2_test.dart
@@ -870,7 +870,7 @@
     });
   });
 
-  unittest.group('resource-FoldersResourceApi', () {
+  unittest.group('resource-FoldersResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.CloudResourceManagerApi(mock).folders;
@@ -1457,7 +1457,7 @@
     });
   });
 
-  unittest.group('resource-OperationsResourceApi', () {
+  unittest.group('resource-OperationsResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.CloudResourceManagerApi(mock).operations;
diff --git a/generated/googleapis/test/cloudscheduler/v1_test.dart b/generated/googleapis/test/cloudscheduler/v1_test.dart
index b7d6ebf..4e4aec8 100644
--- a/generated/googleapis/test/cloudscheduler/v1_test.dart
+++ b/generated/googleapis/test/cloudscheduler/v1_test.dart
@@ -723,7 +723,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsLocationsResourceApi', () {
+  unittest.group('resource-ProjectsLocationsResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.CloudSchedulerApi(mock).projects.locations;
@@ -833,7 +833,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsLocationsJobsResourceApi', () {
+  unittest.group('resource-ProjectsLocationsJobsResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.CloudSchedulerApi(mock).projects.locations.jobs;
diff --git a/generated/googleapis/test/cloudsearch/v1_test.dart b/generated/googleapis/test/cloudsearch/v1_test.dart
index 72017f5..fbf108f 100644
--- a/generated/googleapis/test/cloudsearch/v1_test.dart
+++ b/generated/googleapis/test/cloudsearch/v1_test.dart
@@ -5760,7 +5760,7 @@
     });
   });
 
-  unittest.group('resource-DebugDatasourcesItemsResourceApi', () {
+  unittest.group('resource-DebugDatasourcesItemsResource', () {
     unittest.test('method--checkAccess', () {
       var mock = HttpServerMock();
       var res = api.CloudSearchApi(mock).debug.datasources.items;
@@ -5875,7 +5875,7 @@
     });
   });
 
-  unittest.group('resource-DebugDatasourcesItemsUnmappedidsResourceApi', () {
+  unittest.group('resource-DebugDatasourcesItemsUnmappedidsResource', () {
     unittest.test('method--list', () {
       var mock = HttpServerMock();
       var res = api.CloudSearchApi(mock).debug.datasources.items.unmappedids;
@@ -5939,7 +5939,7 @@
     });
   });
 
-  unittest.group('resource-DebugIdentitysourcesItemsResourceApi', () {
+  unittest.group('resource-DebugIdentitysourcesItemsResource', () {
     unittest.test('method--listForunmappedidentity', () {
       var mock = HttpServerMock();
       var res = api.CloudSearchApi(mock).debug.identitysources.items;
@@ -6012,7 +6012,7 @@
     });
   });
 
-  unittest.group('resource-DebugIdentitysourcesUnmappedidsResourceApi', () {
+  unittest.group('resource-DebugIdentitysourcesUnmappedidsResource', () {
     unittest.test('method--list', () {
       var mock = HttpServerMock();
       var res = api.CloudSearchApi(mock).debug.identitysources.unmappedids;
@@ -6080,7 +6080,7 @@
     });
   });
 
-  unittest.group('resource-IndexingDatasourcesResourceApi', () {
+  unittest.group('resource-IndexingDatasourcesResource', () {
     unittest.test('method--deleteSchema', () {
       var mock = HttpServerMock();
       var res = api.CloudSearchApi(mock).indexing.datasources;
@@ -6241,7 +6241,7 @@
     });
   });
 
-  unittest.group('resource-IndexingDatasourcesItemsResourceApi', () {
+  unittest.group('resource-IndexingDatasourcesItemsResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.CloudSearchApi(mock).indexing.datasources.items;
@@ -6750,7 +6750,7 @@
     });
   });
 
-  unittest.group('resource-MediaResourceApi', () {
+  unittest.group('resource-MediaResource', () {
     unittest.test('method--upload', () {
       // TODO: Implement tests for media upload;
       // TODO: Implement tests for media download;
@@ -6808,7 +6808,7 @@
     });
   });
 
-  unittest.group('resource-OperationsResourceApi', () {
+  unittest.group('resource-OperationsResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.CloudSearchApi(mock).operations;
@@ -6858,7 +6858,7 @@
     });
   });
 
-  unittest.group('resource-OperationsLroResourceApi', () {
+  unittest.group('resource-OperationsLroResource', () {
     unittest.test('method--list', () {
       var mock = HttpServerMock();
       var res = api.CloudSearchApi(mock).operations.lro;
@@ -6920,7 +6920,7 @@
     });
   });
 
-  unittest.group('resource-QueryResourceApi', () {
+  unittest.group('resource-QueryResource', () {
     unittest.test('method--search', () {
       var mock = HttpServerMock();
       var res = api.CloudSearchApi(mock).query;
@@ -7024,7 +7024,7 @@
     });
   });
 
-  unittest.group('resource-QuerySourcesResourceApi', () {
+  unittest.group('resource-QuerySourcesResource', () {
     unittest.test('method--list', () {
       var mock = HttpServerMock();
       var res = api.CloudSearchApi(mock).query.sources;
@@ -7097,7 +7097,7 @@
     });
   });
 
-  unittest.group('resource-SettingsDatasourcesResourceApi', () {
+  unittest.group('resource-SettingsDatasourcesResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.CloudSearchApi(mock).settings.datasources;
@@ -7368,7 +7368,7 @@
     });
   });
 
-  unittest.group('resource-SettingsSearchapplicationsResourceApi', () {
+  unittest.group('resource-SettingsSearchapplicationsResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.CloudSearchApi(mock).settings.searchapplications;
@@ -7694,7 +7694,7 @@
     });
   });
 
-  unittest.group('resource-StatsResourceApi', () {
+  unittest.group('resource-StatsResource', () {
     unittest.test('method--getIndex', () {
       var mock = HttpServerMock();
       var res = api.CloudSearchApi(mock).stats;
@@ -7984,7 +7984,7 @@
     });
   });
 
-  unittest.group('resource-StatsIndexDatasourcesResourceApi', () {
+  unittest.group('resource-StatsIndexDatasourcesResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.CloudSearchApi(mock).stats.index.datasources;
@@ -8060,7 +8060,7 @@
     });
   });
 
-  unittest.group('resource-StatsQuerySearchapplicationsResourceApi', () {
+  unittest.group('resource-StatsQuerySearchapplicationsResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.CloudSearchApi(mock).stats.query.searchapplications;
@@ -8137,7 +8137,7 @@
     });
   });
 
-  unittest.group('resource-StatsSessionSearchapplicationsResourceApi', () {
+  unittest.group('resource-StatsSessionSearchapplicationsResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.CloudSearchApi(mock).stats.session.searchapplications;
@@ -8214,7 +8214,7 @@
     });
   });
 
-  unittest.group('resource-StatsUserSearchapplicationsResourceApi', () {
+  unittest.group('resource-StatsUserSearchapplicationsResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.CloudSearchApi(mock).stats.user.searchapplications;
diff --git a/generated/googleapis/test/cloudshell/v1_test.dart b/generated/googleapis/test/cloudshell/v1_test.dart
index 88b2105..1ea9f10 100644
--- a/generated/googleapis/test/cloudshell/v1_test.dart
+++ b/generated/googleapis/test/cloudshell/v1_test.dart
@@ -707,7 +707,7 @@
     });
   });
 
-  unittest.group('resource-OperationsResourceApi', () {
+  unittest.group('resource-OperationsResource', () {
     unittest.test('method--cancel', () {
       var mock = HttpServerMock();
       var res = api.CloudShellApi(mock).operations;
@@ -918,7 +918,7 @@
     });
   });
 
-  unittest.group('resource-UsersEnvironmentsResourceApi', () {
+  unittest.group('resource-UsersEnvironmentsResource', () {
     unittest.test('method--addPublicKey', () {
       var mock = HttpServerMock();
       var res = api.CloudShellApi(mock).users.environments;
diff --git a/generated/googleapis/test/cloudtasks/v2_test.dart b/generated/googleapis/test/cloudtasks/v2_test.dart
index ae553d0..4dd40fa 100644
--- a/generated/googleapis/test/cloudtasks/v2_test.dart
+++ b/generated/googleapis/test/cloudtasks/v2_test.dart
@@ -1139,7 +1139,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsLocationsResourceApi', () {
+  unittest.group('resource-ProjectsLocationsResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.CloudTasksApi(mock).projects.locations;
@@ -1249,7 +1249,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsLocationsQueuesResourceApi', () {
+  unittest.group('resource-ProjectsLocationsQueuesResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.CloudTasksApi(mock).projects.locations.queues;
@@ -1836,7 +1836,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsLocationsQueuesTasksResourceApi', () {
+  unittest.group('resource-ProjectsLocationsQueuesTasksResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.CloudTasksApi(mock).projects.locations.queues.tasks;
diff --git a/generated/googleapis/test/cloudtrace/v2_test.dart b/generated/googleapis/test/cloudtrace/v2_test.dart
index 281390a..e192b2c 100644
--- a/generated/googleapis/test/cloudtrace/v2_test.dart
+++ b/generated/googleapis/test/cloudtrace/v2_test.dart
@@ -670,7 +670,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsTracesResourceApi', () {
+  unittest.group('resource-ProjectsTracesResource', () {
     unittest.test('method--batchWrite', () {
       var mock = HttpServerMock();
       var res = api.CloudTraceApi(mock).projects.traces;
@@ -725,7 +725,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsTracesSpansResourceApi', () {
+  unittest.group('resource-ProjectsTracesSpansResource', () {
     unittest.test('method--createSpan', () {
       var mock = HttpServerMock();
       var res = api.CloudTraceApi(mock).projects.traces.spans;
diff --git a/generated/googleapis/test/composer/v1_test.dart b/generated/googleapis/test/composer/v1_test.dart
index d344d18..56cd47f 100644
--- a/generated/googleapis/test/composer/v1_test.dart
+++ b/generated/googleapis/test/composer/v1_test.dart
@@ -761,7 +761,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsLocationsEnvironmentsResourceApi', () {
+  unittest.group('resource-ProjectsLocationsEnvironmentsResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.CloudComposerApi(mock).projects.locations.environments;
@@ -1026,7 +1026,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsLocationsImageVersionsResourceApi', () {
+  unittest.group('resource-ProjectsLocationsImageVersionsResource', () {
     unittest.test('method--list', () {
       var mock = HttpServerMock();
       var res = api.CloudComposerApi(mock).projects.locations.imageVersions;
@@ -1086,7 +1086,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsLocationsOperationsResourceApi', () {
+  unittest.group('resource-ProjectsLocationsOperationsResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.CloudComposerApi(mock).projects.locations.operations;
diff --git a/generated/googleapis/test/compute/v1_test.dart b/generated/googleapis/test/compute/v1_test.dart
index 67a320b..30512dd 100644
--- a/generated/googleapis/test/compute/v1_test.dart
+++ b/generated/googleapis/test/compute/v1_test.dart
@@ -35050,7 +35050,7 @@
     });
   });
 
-  unittest.group('resource-AcceleratorTypesResourceApi', () {
+  unittest.group('resource-AcceleratorTypesResource', () {
     unittest.test('method--aggregatedList', () {
       var mock = HttpServerMock();
       var res = api.ComputeApi(mock).acceleratorTypes;
@@ -35232,7 +35232,7 @@
     });
   });
 
-  unittest.group('resource-AddressesResourceApi', () {
+  unittest.group('resource-AddressesResource', () {
     unittest.test('method--aggregatedList', () {
       var mock = HttpServerMock();
       var res = api.ComputeApi(mock).addresses;
@@ -35517,7 +35517,7 @@
     });
   });
 
-  unittest.group('resource-AutoscalersResourceApi', () {
+  unittest.group('resource-AutoscalersResource', () {
     unittest.test('method--aggregatedList', () {
       var mock = HttpServerMock();
       var res = api.ComputeApi(mock).autoscalers;
@@ -35920,7 +35920,7 @@
     });
   });
 
-  unittest.group('resource-BackendBucketsResourceApi', () {
+  unittest.group('resource-BackendBucketsResource', () {
     unittest.test('method--addSignedUrlKey', () {
       var mock = HttpServerMock();
       var res = api.ComputeApi(mock).backendBuckets;
@@ -36347,7 +36347,7 @@
     });
   });
 
-  unittest.group('resource-BackendServicesResourceApi', () {
+  unittest.group('resource-BackendServicesResource', () {
     unittest.test('method--addSignedUrlKey', () {
       var mock = HttpServerMock();
       var res = api.ComputeApi(mock).backendServices;
@@ -36949,7 +36949,7 @@
     });
   });
 
-  unittest.group('resource-DiskTypesResourceApi', () {
+  unittest.group('resource-DiskTypesResource', () {
     unittest.test('method--aggregatedList', () {
       var mock = HttpServerMock();
       var res = api.ComputeApi(mock).diskTypes;
@@ -37130,7 +37130,7 @@
     });
   });
 
-  unittest.group('resource-DisksResourceApi', () {
+  unittest.group('resource-DisksResource', () {
     unittest.test('method--addResourcePolicies', () {
       var mock = HttpServerMock();
       var res = api.ComputeApi(mock).disks;
@@ -37858,7 +37858,7 @@
     });
   });
 
-  unittest.group('resource-ExternalVpnGatewaysResourceApi', () {
+  unittest.group('resource-ExternalVpnGatewaysResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.ComputeApi(mock).externalVpnGateways;
@@ -38173,7 +38173,7 @@
     });
   });
 
-  unittest.group('resource-FirewallsResourceApi', () {
+  unittest.group('resource-FirewallsResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.ComputeApi(mock).firewalls;
@@ -38494,7 +38494,7 @@
     });
   });
 
-  unittest.group('resource-ForwardingRulesResourceApi', () {
+  unittest.group('resource-ForwardingRulesResource', () {
     unittest.test('method--aggregatedList', () {
       var mock = HttpServerMock();
       var res = api.ComputeApi(mock).forwardingRules;
@@ -38891,7 +38891,7 @@
     });
   });
 
-  unittest.group('resource-GlobalAddressesResourceApi', () {
+  unittest.group('resource-GlobalAddressesResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.ComputeApi(mock).globalAddresses;
@@ -39104,7 +39104,7 @@
     });
   });
 
-  unittest.group('resource-GlobalForwardingRulesResourceApi', () {
+  unittest.group('resource-GlobalForwardingRulesResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.ComputeApi(mock).globalForwardingRules;
@@ -39425,7 +39425,7 @@
     });
   });
 
-  unittest.group('resource-GlobalNetworkEndpointGroupsResourceApi', () {
+  unittest.group('resource-GlobalNetworkEndpointGroupsResource', () {
     unittest.test('method--attachNetworkEndpoints', () {
       var mock = HttpServerMock();
       var res = api.ComputeApi(mock).globalNetworkEndpointGroups;
@@ -39821,7 +39821,7 @@
     });
   });
 
-  unittest.group('resource-GlobalOperationsResourceApi', () {
+  unittest.group('resource-GlobalOperationsResource', () {
     unittest.test('method--aggregatedList', () {
       var mock = HttpServerMock();
       var res = api.ComputeApi(mock).globalOperations;
@@ -40088,7 +40088,7 @@
     });
   });
 
-  unittest.group('resource-HealthChecksResourceApi', () {
+  unittest.group('resource-HealthChecksResource', () {
     unittest.test('method--aggregatedList', () {
       var mock = HttpServerMock();
       var res = api.ComputeApi(mock).healthChecks;
@@ -40478,7 +40478,7 @@
     });
   });
 
-  unittest.group('resource-HttpHealthChecksResourceApi', () {
+  unittest.group('resource-HttpHealthChecksResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.ComputeApi(mock).httpHealthChecks;
@@ -40799,7 +40799,7 @@
     });
   });
 
-  unittest.group('resource-HttpsHealthChecksResourceApi', () {
+  unittest.group('resource-HttpsHealthChecksResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.ComputeApi(mock).httpsHealthChecks;
@@ -41120,7 +41120,7 @@
     });
   });
 
-  unittest.group('resource-ImagesResourceApi', () {
+  unittest.group('resource-ImagesResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.ComputeApi(mock).images;
@@ -41695,7 +41695,7 @@
     });
   });
 
-  unittest.group('resource-InstanceGroupManagersResourceApi', () {
+  unittest.group('resource-InstanceGroupManagersResource', () {
     unittest.test('method--abandonInstances', () {
       var mock = HttpServerMock();
       var res = api.ComputeApi(mock).instanceGroupManagers;
@@ -42860,7 +42860,7 @@
     });
   });
 
-  unittest.group('resource-InstanceGroupsResourceApi', () {
+  unittest.group('resource-InstanceGroupsResource', () {
     unittest.test('method--addInstances', () {
       var mock = HttpServerMock();
       var res = api.ComputeApi(mock).instanceGroups;
@@ -43388,7 +43388,7 @@
     });
   });
 
-  unittest.group('resource-InstanceTemplatesResourceApi', () {
+  unittest.group('resource-InstanceTemplatesResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.ComputeApi(mock).instanceTemplates;
@@ -43754,7 +43754,7 @@
     });
   });
 
-  unittest.group('resource-InstancesResourceApi', () {
+  unittest.group('resource-InstancesResource', () {
     unittest.test('method--addAccessConfig', () {
       var mock = HttpServerMock();
       var res = api.ComputeApi(mock).instances;
@@ -45969,7 +45969,7 @@
     });
   });
 
-  unittest.group('resource-InterconnectAttachmentsResourceApi', () {
+  unittest.group('resource-InterconnectAttachmentsResource', () {
     unittest.test('method--aggregatedList', () {
       var mock = HttpServerMock();
       var res = api.ComputeApi(mock).interconnectAttachments;
@@ -46319,7 +46319,7 @@
     });
   });
 
-  unittest.group('resource-InterconnectLocationsResourceApi', () {
+  unittest.group('resource-InterconnectLocationsResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.ComputeApi(mock).interconnectLocations;
@@ -46430,7 +46430,7 @@
     });
   });
 
-  unittest.group('resource-InterconnectsResourceApi', () {
+  unittest.group('resource-InterconnectsResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.ComputeApi(mock).interconnects;
@@ -46744,7 +46744,7 @@
     });
   });
 
-  unittest.group('resource-LicenseCodesResourceApi', () {
+  unittest.group('resource-LicenseCodesResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.ComputeApi(mock).licenseCodes;
@@ -46842,7 +46842,7 @@
     });
   });
 
-  unittest.group('resource-LicensesResourceApi', () {
+  unittest.group('resource-LicensesResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.ComputeApi(mock).licenses;
@@ -47208,7 +47208,7 @@
     });
   });
 
-  unittest.group('resource-MachineTypesResourceApi', () {
+  unittest.group('resource-MachineTypesResource', () {
     unittest.test('method--aggregatedList', () {
       var mock = HttpServerMock();
       var res = api.ComputeApi(mock).machineTypes;
@@ -47390,7 +47390,7 @@
     });
   });
 
-  unittest.group('resource-NetworkEndpointGroupsResourceApi', () {
+  unittest.group('resource-NetworkEndpointGroupsResource', () {
     unittest.test('method--aggregatedList', () {
       var mock = HttpServerMock();
       var res = api.ComputeApi(mock).networkEndpointGroups;
@@ -47919,7 +47919,7 @@
     });
   });
 
-  unittest.group('resource-NetworksResourceApi', () {
+  unittest.group('resource-NetworksResource', () {
     unittest.test('method--addPeering', () {
       var mock = HttpServerMock();
       var res = api.ComputeApi(mock).networks;
@@ -48476,7 +48476,7 @@
     });
   });
 
-  unittest.group('resource-NodeGroupsResourceApi', () {
+  unittest.group('resource-NodeGroupsResource', () {
     unittest.test('method--addNodes', () {
       var mock = HttpServerMock();
       var res = api.ComputeApi(mock).nodeGroups;
@@ -49208,7 +49208,7 @@
     });
   });
 
-  unittest.group('resource-NodeTemplatesResourceApi', () {
+  unittest.group('resource-NodeTemplatesResource', () {
     unittest.test('method--aggregatedList', () {
       var mock = HttpServerMock();
       var res = api.ComputeApi(mock).nodeTemplates;
@@ -49651,7 +49651,7 @@
     });
   });
 
-  unittest.group('resource-NodeTypesResourceApi', () {
+  unittest.group('resource-NodeTypesResource', () {
     unittest.test('method--aggregatedList', () {
       var mock = HttpServerMock();
       var res = api.ComputeApi(mock).nodeTypes;
@@ -49832,7 +49832,7 @@
     });
   });
 
-  unittest.group('resource-PacketMirroringsResourceApi', () {
+  unittest.group('resource-PacketMirroringsResource', () {
     unittest.test('method--aggregatedList', () {
       var mock = HttpServerMock();
       var res = api.ComputeApi(mock).packetMirrorings;
@@ -50227,7 +50227,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsResourceApi', () {
+  unittest.group('resource-ProjectsResource', () {
     unittest.test('method--disableXpnHost', () {
       var mock = HttpServerMock();
       var res = api.ComputeApi(mock).projects;
@@ -50921,7 +50921,7 @@
     });
   });
 
-  unittest.group('resource-RegionAutoscalersResourceApi', () {
+  unittest.group('resource-RegionAutoscalersResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.ComputeApi(mock).regionAutoscalers;
@@ -51256,7 +51256,7 @@
     });
   });
 
-  unittest.group('resource-RegionBackendServicesResourceApi', () {
+  unittest.group('resource-RegionBackendServicesResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.ComputeApi(mock).regionBackendServices;
@@ -51637,7 +51637,7 @@
     });
   });
 
-  unittest.group('resource-RegionCommitmentsResourceApi', () {
+  unittest.group('resource-RegionCommitmentsResource', () {
     unittest.test('method--aggregatedList', () {
       var mock = HttpServerMock();
       var res = api.ComputeApi(mock).regionCommitments;
@@ -51872,7 +51872,7 @@
     });
   });
 
-  unittest.group('resource-RegionDiskTypesResourceApi', () {
+  unittest.group('resource-RegionDiskTypesResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.ComputeApi(mock).regionDiskTypes;
@@ -51985,7 +51985,7 @@
     });
   });
 
-  unittest.group('resource-RegionDisksResourceApi', () {
+  unittest.group('resource-RegionDisksResource', () {
     unittest.test('method--addResourcePolicies', () {
       var mock = HttpServerMock();
       var res = api.ComputeApi(mock).regionDisks;
@@ -52642,7 +52642,7 @@
     });
   });
 
-  unittest.group('resource-RegionHealthCheckServicesResourceApi', () {
+  unittest.group('resource-RegionHealthCheckServicesResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.ComputeApi(mock).regionHealthCheckServices;
@@ -52915,7 +52915,7 @@
     });
   });
 
-  unittest.group('resource-RegionHealthChecksResourceApi', () {
+  unittest.group('resource-RegionHealthChecksResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.ComputeApi(mock).regionHealthChecks;
@@ -53242,7 +53242,7 @@
     });
   });
 
-  unittest.group('resource-RegionInstanceGroupManagersResourceApi', () {
+  unittest.group('resource-RegionInstanceGroupManagersResource', () {
     unittest.test('method--abandonInstances', () {
       var mock = HttpServerMock();
       var res = api.ComputeApi(mock).regionInstanceGroupManagers;
@@ -54349,7 +54349,7 @@
     });
   });
 
-  unittest.group('resource-RegionInstanceGroupsResourceApi', () {
+  unittest.group('resource-RegionInstanceGroupsResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.ComputeApi(mock).regionInstanceGroups;
@@ -54594,7 +54594,7 @@
     });
   });
 
-  unittest.group('resource-RegionNetworkEndpointGroupsResourceApi', () {
+  unittest.group('resource-RegionNetworkEndpointGroupsResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.ComputeApi(mock).regionNetworkEndpointGroups;
@@ -54812,7 +54812,7 @@
     });
   });
 
-  unittest.group('resource-RegionNotificationEndpointsResourceApi', () {
+  unittest.group('resource-RegionNotificationEndpointsResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.ComputeApi(mock).regionNotificationEndpoints;
@@ -55030,7 +55030,7 @@
     });
   });
 
-  unittest.group('resource-RegionOperationsResourceApi', () {
+  unittest.group('resource-RegionOperationsResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.ComputeApi(mock).regionOperations;
@@ -55233,7 +55233,7 @@
     });
   });
 
-  unittest.group('resource-RegionSslCertificatesResourceApi', () {
+  unittest.group('resource-RegionSslCertificatesResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.ComputeApi(mock).regionSslCertificates;
@@ -55451,7 +55451,7 @@
     });
   });
 
-  unittest.group('resource-RegionTargetHttpProxiesResourceApi', () {
+  unittest.group('resource-RegionTargetHttpProxiesResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.ComputeApi(mock).regionTargetHttpProxies;
@@ -55724,7 +55724,7 @@
     });
   });
 
-  unittest.group('resource-RegionTargetHttpsProxiesResourceApi', () {
+  unittest.group('resource-RegionTargetHttpsProxiesResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.ComputeApi(mock).regionTargetHttpsProxies;
@@ -56056,7 +56056,7 @@
     });
   });
 
-  unittest.group('resource-RegionUrlMapsResourceApi', () {
+  unittest.group('resource-RegionUrlMapsResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.ComputeApi(mock).regionUrlMaps;
@@ -56436,7 +56436,7 @@
     });
   });
 
-  unittest.group('resource-RegionsResourceApi', () {
+  unittest.group('resource-RegionsResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.ComputeApi(mock).regions;
@@ -56547,7 +56547,7 @@
     });
   });
 
-  unittest.group('resource-ReservationsResourceApi', () {
+  unittest.group('resource-ReservationsResource', () {
     unittest.test('method--aggregatedList', () {
       var mock = HttpServerMock();
       var res = api.ComputeApi(mock).reservations;
@@ -57044,7 +57044,7 @@
     });
   });
 
-  unittest.group('resource-ResourcePoliciesResourceApi', () {
+  unittest.group('resource-ResourcePoliciesResource', () {
     unittest.test('method--aggregatedList', () {
       var mock = HttpServerMock();
       var res = api.ComputeApi(mock).resourcePolicies;
@@ -57488,7 +57488,7 @@
     });
   });
 
-  unittest.group('resource-RoutersResourceApi', () {
+  unittest.group('resource-RoutersResource', () {
     unittest.test('method--aggregatedList', () {
       var mock = HttpServerMock();
       var res = api.ComputeApi(mock).routers;
@@ -58049,7 +58049,7 @@
     });
   });
 
-  unittest.group('resource-RoutesResourceApi', () {
+  unittest.group('resource-RoutesResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.ComputeApi(mock).routes;
@@ -58262,7 +58262,7 @@
     });
   });
 
-  unittest.group('resource-SecurityPoliciesResourceApi', () {
+  unittest.group('resource-SecurityPoliciesResource', () {
     unittest.test('method--addRule', () {
       var mock = HttpServerMock();
       var res = api.ComputeApi(mock).securityPolicies;
@@ -58798,7 +58798,7 @@
     });
   });
 
-  unittest.group('resource-SnapshotsResourceApi', () {
+  unittest.group('resource-SnapshotsResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.ComputeApi(mock).snapshots;
@@ -59162,7 +59162,7 @@
     });
   });
 
-  unittest.group('resource-SslCertificatesResourceApi', () {
+  unittest.group('resource-SslCertificatesResource', () {
     unittest.test('method--aggregatedList', () {
       var mock = HttpServerMock();
       var res = api.ComputeApi(mock).sslCertificates;
@@ -59444,7 +59444,7 @@
     });
   });
 
-  unittest.group('resource-SslPoliciesResourceApi', () {
+  unittest.group('resource-SslPoliciesResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.ComputeApi(mock).sslPolicies;
@@ -59777,7 +59777,7 @@
     });
   });
 
-  unittest.group('resource-SubnetworksResourceApi', () {
+  unittest.group('resource-SubnetworksResource', () {
     unittest.test('method--aggregatedList', () {
       var mock = HttpServerMock();
       var res = api.ComputeApi(mock).subnetworks;
@@ -60458,7 +60458,7 @@
     });
   });
 
-  unittest.group('resource-TargetGrpcProxiesResourceApi', () {
+  unittest.group('resource-TargetGrpcProxiesResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.ComputeApi(mock).targetGrpcProxies;
@@ -60725,7 +60725,7 @@
     });
   });
 
-  unittest.group('resource-TargetHttpProxiesResourceApi', () {
+  unittest.group('resource-TargetHttpProxiesResource', () {
     unittest.test('method--aggregatedList', () {
       var mock = HttpServerMock();
       var res = api.ComputeApi(mock).targetHttpProxies;
@@ -61115,7 +61115,7 @@
     });
   });
 
-  unittest.group('resource-TargetHttpsProxiesResourceApi', () {
+  unittest.group('resource-TargetHttpsProxiesResource', () {
     unittest.test('method--aggregatedList', () {
       var mock = HttpServerMock();
       var res = api.ComputeApi(mock).targetHttpsProxies;
@@ -61615,7 +61615,7 @@
     });
   });
 
-  unittest.group('resource-TargetInstancesResourceApi', () {
+  unittest.group('resource-TargetInstancesResource', () {
     unittest.test('method--aggregatedList', () {
       var mock = HttpServerMock();
       var res = api.ComputeApi(mock).targetInstances;
@@ -61901,7 +61901,7 @@
     });
   });
 
-  unittest.group('resource-TargetPoolsResourceApi', () {
+  unittest.group('resource-TargetPoolsResource', () {
     unittest.test('method--addHealthCheck', () {
       var mock = HttpServerMock();
       var res = api.ComputeApi(mock).targetPools;
@@ -62523,7 +62523,7 @@
     });
   });
 
-  unittest.group('resource-TargetSslProxiesResourceApi', () {
+  unittest.group('resource-TargetSslProxiesResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.ComputeApi(mock).targetSslProxies;
@@ -62955,7 +62955,7 @@
     });
   });
 
-  unittest.group('resource-TargetTcpProxiesResourceApi', () {
+  unittest.group('resource-TargetTcpProxiesResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.ComputeApi(mock).targetTcpProxies;
@@ -63278,7 +63278,7 @@
     });
   });
 
-  unittest.group('resource-TargetVpnGatewaysResourceApi', () {
+  unittest.group('resource-TargetVpnGatewaysResource', () {
     unittest.test('method--aggregatedList', () {
       var mock = HttpServerMock();
       var res = api.ComputeApi(mock).targetVpnGateways;
@@ -63565,7 +63565,7 @@
     });
   });
 
-  unittest.group('resource-UrlMapsResourceApi', () {
+  unittest.group('resource-UrlMapsResource', () {
     unittest.test('method--aggregatedList', () {
       var mock = HttpServerMock();
       var res = api.ComputeApi(mock).urlMaps;
@@ -64058,7 +64058,7 @@
     });
   });
 
-  unittest.group('resource-VpnGatewaysResourceApi', () {
+  unittest.group('resource-VpnGatewaysResource', () {
     unittest.test('method--aggregatedList', () {
       var mock = HttpServerMock();
       var res = api.ComputeApi(mock).vpnGateways;
@@ -64499,7 +64499,7 @@
     });
   });
 
-  unittest.group('resource-VpnTunnelsResourceApi', () {
+  unittest.group('resource-VpnTunnelsResource', () {
     unittest.test('method--aggregatedList', () {
       var mock = HttpServerMock();
       var res = api.ComputeApi(mock).vpnTunnels;
@@ -64784,7 +64784,7 @@
     });
   });
 
-  unittest.group('resource-ZoneOperationsResourceApi', () {
+  unittest.group('resource-ZoneOperationsResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.ComputeApi(mock).zoneOperations;
@@ -64987,7 +64987,7 @@
     });
   });
 
-  unittest.group('resource-ZonesResourceApi', () {
+  unittest.group('resource-ZonesResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.ComputeApi(mock).zones;
diff --git a/generated/googleapis/test/container/v1_test.dart b/generated/googleapis/test/container/v1_test.dart
index 327fb98..f89440e 100644
--- a/generated/googleapis/test/container/v1_test.dart
+++ b/generated/googleapis/test/container/v1_test.dart
@@ -3800,7 +3800,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsAggregatedUsableSubnetworksResourceApi', () {
+  unittest.group('resource-ProjectsAggregatedUsableSubnetworksResource', () {
     unittest.test('method--list', () {
       var mock = HttpServerMock();
       var res = api.ContainerApi(mock).projects.aggregated.usableSubnetworks;
@@ -3863,7 +3863,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsLocationsResourceApi', () {
+  unittest.group('resource-ProjectsLocationsResource', () {
     unittest.test('method--getServerConfig', () {
       var mock = HttpServerMock();
       var res = api.ContainerApi(mock).projects.locations;
@@ -3919,7 +3919,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsLocationsClustersResourceApi', () {
+  unittest.group('resource-ProjectsLocationsClustersResource', () {
     unittest.test('method--completeIpRotation', () {
       var mock = HttpServerMock();
       var res = api.ContainerApi(mock).projects.locations.clusters;
@@ -4887,7 +4887,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsLocationsClustersNodePoolsResourceApi', () {
+  unittest.group('resource-ProjectsLocationsClustersNodePoolsResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.ContainerApi(mock).projects.locations.clusters.nodePools;
@@ -5398,7 +5398,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsLocationsClustersWellKnownResourceApi', () {
+  unittest.group('resource-ProjectsLocationsClustersWellKnownResource', () {
     unittest.test('method--getOpenidConfiguration', () {
       var mock = HttpServerMock();
       var res = api.ContainerApi(mock).projects.locations.clusters.wellKnown;
@@ -5448,7 +5448,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsLocationsOperationsResourceApi', () {
+  unittest.group('resource-ProjectsLocationsOperationsResource', () {
     unittest.test('method--cancel', () {
       var mock = HttpServerMock();
       var res = api.ContainerApi(mock).projects.locations.operations;
@@ -5617,7 +5617,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsZonesResourceApi', () {
+  unittest.group('resource-ProjectsZonesResource', () {
     unittest.test('method--getServerconfig', () {
       var mock = HttpServerMock();
       var res = api.ContainerApi(mock).projects.zones;
@@ -5688,7 +5688,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsZonesClustersResourceApi', () {
+  unittest.group('resource-ProjectsZonesClustersResource', () {
     unittest.test('method--addons', () {
       var mock = HttpServerMock();
       var res = api.ContainerApi(mock).projects.zones.clusters;
@@ -7040,7 +7040,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsZonesClustersNodePoolsResourceApi', () {
+  unittest.group('resource-ProjectsZonesClustersNodePoolsResource', () {
     unittest.test('method--autoscaling', () {
       var mock = HttpServerMock();
       var res = api.ContainerApi(mock).projects.zones.clusters.nodePools;
@@ -7837,7 +7837,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsZonesOperationsResourceApi', () {
+  unittest.group('resource-ProjectsZonesOperationsResource', () {
     unittest.test('method--cancel', () {
       var mock = HttpServerMock();
       var res = api.ContainerApi(mock).projects.zones.operations;
diff --git a/generated/googleapis/test/content/v2_1_test.dart b/generated/googleapis/test/content/v2_1_test.dart
index cbd1891..a940cd4 100644
--- a/generated/googleapis/test/content/v2_1_test.dart
+++ b/generated/googleapis/test/content/v2_1_test.dart
@@ -12845,7 +12845,7 @@
     });
   });
 
-  unittest.group('resource-AccountsResourceApi', () {
+  unittest.group('resource-AccountsResource', () {
     unittest.test('method--authinfo', () {
       var mock = HttpServerMock();
       var res = api.ShoppingContentApi(mock).accounts;
@@ -13413,7 +13413,7 @@
     });
   });
 
-  unittest.group('resource-AccountstatusesResourceApi', () {
+  unittest.group('resource-AccountstatusesResource', () {
     unittest.test('method--custombatch', () {
       var mock = HttpServerMock();
       var res = api.ShoppingContentApi(mock).accountstatuses;
@@ -13579,7 +13579,7 @@
     });
   });
 
-  unittest.group('resource-AccounttaxResourceApi', () {
+  unittest.group('resource-AccounttaxResource', () {
     unittest.test('method--custombatch', () {
       var mock = HttpServerMock();
       var res = api.ShoppingContentApi(mock).accounttax;
@@ -13786,7 +13786,7 @@
     });
   });
 
-  unittest.group('resource-DatafeedsResourceApi', () {
+  unittest.group('resource-DatafeedsResource', () {
     unittest.test('method--custombatch', () {
       var mock = HttpServerMock();
       var res = api.ShoppingContentApi(mock).datafeeds;
@@ -14131,7 +14131,7 @@
     });
   });
 
-  unittest.group('resource-DatafeedstatusesResourceApi', () {
+  unittest.group('resource-DatafeedstatusesResource', () {
     unittest.test('method--custombatch', () {
       var mock = HttpServerMock();
       var res = api.ShoppingContentApi(mock).datafeedstatuses;
@@ -14298,7 +14298,7 @@
     });
   });
 
-  unittest.group('resource-LiasettingsResourceApi', () {
+  unittest.group('resource-LiasettingsResource', () {
     unittest.test('method--custombatch', () {
       var mock = HttpServerMock();
       var res = api.ShoppingContentApi(mock).liasettings;
@@ -14825,7 +14825,7 @@
     });
   });
 
-  unittest.group('resource-LocalinventoryResourceApi', () {
+  unittest.group('resource-LocalinventoryResource', () {
     unittest.test('method--custombatch', () {
       var mock = HttpServerMock();
       var res = api.ShoppingContentApi(mock).localinventory;
@@ -14935,7 +14935,7 @@
     });
   });
 
-  unittest.group('resource-OrderinvoicesResourceApi', () {
+  unittest.group('resource-OrderinvoicesResource', () {
     unittest.test('method--createchargeinvoice', () {
       var mock = HttpServerMock();
       var res = api.ShoppingContentApi(mock).orderinvoices;
@@ -15045,7 +15045,7 @@
     });
   });
 
-  unittest.group('resource-OrderreportsResourceApi', () {
+  unittest.group('resource-OrderreportsResource', () {
     unittest.test('method--listdisbursements', () {
       var mock = HttpServerMock();
       var res = api.ShoppingContentApi(mock).orderreports;
@@ -15173,7 +15173,7 @@
     });
   });
 
-  unittest.group('resource-OrderreturnsResourceApi', () {
+  unittest.group('resource-OrderreturnsResource', () {
     unittest.test('method--acknowledge', () {
       var mock = HttpServerMock();
       var res = api.ShoppingContentApi(mock).orderreturns;
@@ -15466,7 +15466,7 @@
     });
   });
 
-  unittest.group('resource-OrdersResourceApi', () {
+  unittest.group('resource-OrdersResource', () {
     unittest.test('method--acknowledge', () {
       var mock = HttpServerMock();
       var res = api.ShoppingContentApi(mock).orders;
@@ -16577,7 +16577,7 @@
     });
   });
 
-  unittest.group('resource-PosResourceApi', () {
+  unittest.group('resource-PosResource', () {
     unittest.test('method--custombatch', () {
       var mock = HttpServerMock();
       var res = api.ShoppingContentApi(mock).pos;
@@ -16923,7 +16923,7 @@
     });
   });
 
-  unittest.group('resource-ProductsResourceApi', () {
+  unittest.group('resource-ProductsResource', () {
     unittest.test('method--custombatch', () {
       var mock = HttpServerMock();
       var res = api.ShoppingContentApi(mock).products;
@@ -17176,7 +17176,7 @@
     });
   });
 
-  unittest.group('resource-ProductstatusesResourceApi', () {
+  unittest.group('resource-ProductstatusesResource', () {
     unittest.test('method--custombatch', () {
       var mock = HttpServerMock();
       var res = api.ShoppingContentApi(mock).productstatuses;
@@ -17342,7 +17342,7 @@
     });
   });
 
-  unittest.group('resource-PubsubnotificationsettingsResourceApi', () {
+  unittest.group('resource-PubsubnotificationsettingsResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.ShoppingContentApi(mock).pubsubnotificationsettings;
@@ -17439,7 +17439,7 @@
     });
   });
 
-  unittest.group('resource-RegionalinventoryResourceApi', () {
+  unittest.group('resource-RegionalinventoryResource', () {
     unittest.test('method--custombatch', () {
       var mock = HttpServerMock();
       var res = api.ShoppingContentApi(mock).regionalinventory;
@@ -17549,7 +17549,7 @@
     });
   });
 
-  unittest.group('resource-ReturnaddressResourceApi', () {
+  unittest.group('resource-ReturnaddressResource', () {
     unittest.test('method--custombatch', () {
       var mock = HttpServerMock();
       var res = api.ShoppingContentApi(mock).returnaddress;
@@ -17802,7 +17802,7 @@
     });
   });
 
-  unittest.group('resource-ReturnpolicyResourceApi', () {
+  unittest.group('resource-ReturnpolicyResource', () {
     unittest.test('method--custombatch', () {
       var mock = HttpServerMock();
       var res = api.ShoppingContentApi(mock).returnpolicy;
@@ -18041,7 +18041,7 @@
     });
   });
 
-  unittest.group('resource-SettlementreportsResourceApi', () {
+  unittest.group('resource-SettlementreportsResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.ShoppingContentApi(mock).settlementreports;
@@ -18150,7 +18150,7 @@
     });
   });
 
-  unittest.group('resource-SettlementtransactionsResourceApi', () {
+  unittest.group('resource-SettlementtransactionsResource', () {
     unittest.test('method--list', () {
       var mock = HttpServerMock();
       var res = api.ShoppingContentApi(mock).settlementtransactions;
@@ -18212,7 +18212,7 @@
     });
   });
 
-  unittest.group('resource-ShippingsettingsResourceApi', () {
+  unittest.group('resource-ShippingsettingsResource', () {
     unittest.test('method--custombatch', () {
       var mock = HttpServerMock();
       var res = api.ShoppingContentApi(mock).shippingsettings;
diff --git a/generated/googleapis/test/customsearch/v1_test.dart b/generated/googleapis/test/customsearch/v1_test.dart
index 9a6ac3e..75c8336 100644
--- a/generated/googleapis/test/customsearch/v1_test.dart
+++ b/generated/googleapis/test/customsearch/v1_test.dart
@@ -858,7 +858,7 @@
     });
   });
 
-  unittest.group('resource-CseResourceApi', () {
+  unittest.group('resource-CseResource', () {
     unittest.test('method--list', () {
       var mock = HttpServerMock();
       var res = api.CustomSearchApi(mock).cse;
@@ -1019,7 +1019,7 @@
     });
   });
 
-  unittest.group('resource-CseSiterestrictResourceApi', () {
+  unittest.group('resource-CseSiterestrictResource', () {
     unittest.test('method--list', () {
       var mock = HttpServerMock();
       var res = api.CustomSearchApi(mock).cse.siterestrict;
diff --git a/generated/googleapis/test/dataproc/v1_test.dart b/generated/googleapis/test/dataproc/v1_test.dart
index 303f338..363a468 100644
--- a/generated/googleapis/test/dataproc/v1_test.dart
+++ b/generated/googleapis/test/dataproc/v1_test.dart
@@ -3679,8 +3679,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsLocationsAutoscalingPoliciesResourceApi',
-      () {
+  unittest.group('resource-ProjectsLocationsAutoscalingPoliciesResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.DataprocApi(mock).projects.locations.autoscalingPolicies;
@@ -4102,7 +4101,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsLocationsWorkflowTemplatesResourceApi', () {
+  unittest.group('resource-ProjectsLocationsWorkflowTemplatesResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.DataprocApi(mock).projects.locations.workflowTemplates;
@@ -4641,7 +4640,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsRegionsAutoscalingPoliciesResourceApi', () {
+  unittest.group('resource-ProjectsRegionsAutoscalingPoliciesResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.DataprocApi(mock).projects.regions.autoscalingPolicies;
@@ -5063,7 +5062,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsRegionsClustersResourceApi', () {
+  unittest.group('resource-ProjectsRegionsClustersResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.DataprocApi(mock).projects.regions.clusters;
@@ -5697,7 +5696,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsRegionsJobsResourceApi', () {
+  unittest.group('resource-ProjectsRegionsJobsResource', () {
     unittest.test('method--cancel', () {
       var mock = HttpServerMock();
       var res = api.DataprocApi(mock).projects.regions.jobs;
@@ -6388,7 +6387,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsRegionsOperationsResourceApi', () {
+  unittest.group('resource-ProjectsRegionsOperationsResource', () {
     unittest.test('method--cancel', () {
       var mock = HttpServerMock();
       var res = api.DataprocApi(mock).projects.regions.operations;
@@ -6754,7 +6753,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsRegionsWorkflowTemplatesResourceApi', () {
+  unittest.group('resource-ProjectsRegionsWorkflowTemplatesResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.DataprocApi(mock).projects.regions.workflowTemplates;
diff --git a/generated/googleapis/test/datastore/v1_test.dart b/generated/googleapis/test/datastore/v1_test.dart
index eaa228e..367ec20 100644
--- a/generated/googleapis/test/datastore/v1_test.dart
+++ b/generated/googleapis/test/datastore/v1_test.dart
@@ -2470,7 +2470,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsResourceApi', () {
+  unittest.group('resource-ProjectsResource', () {
     unittest.test('method--allocateIds', () {
       var mock = HttpServerMock();
       var res = api.DatastoreApi(mock).projects;
@@ -3025,7 +3025,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsIndexesResourceApi', () {
+  unittest.group('resource-ProjectsIndexesResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.DatastoreApi(mock).projects.indexes;
@@ -3282,7 +3282,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsOperationsResourceApi', () {
+  unittest.group('resource-ProjectsOperationsResource', () {
     unittest.test('method--cancel', () {
       var mock = HttpServerMock();
       var res = api.DatastoreApi(mock).projects.operations;
diff --git a/generated/googleapis/test/deploymentmanager/v2_test.dart b/generated/googleapis/test/deploymentmanager/v2_test.dart
index 78b9dbd..e1d7fcd 100644
--- a/generated/googleapis/test/deploymentmanager/v2_test.dart
+++ b/generated/googleapis/test/deploymentmanager/v2_test.dart
@@ -1958,7 +1958,7 @@
     });
   });
 
-  unittest.group('resource-DeploymentsResourceApi', () {
+  unittest.group('resource-DeploymentsResource', () {
     unittest.test('method--cancelPreview', () {
       var mock = HttpServerMock();
       var res = api.DeploymentManagerApi(mock).deployments;
@@ -2547,7 +2547,7 @@
     });
   });
 
-  unittest.group('resource-ManifestsResourceApi', () {
+  unittest.group('resource-ManifestsResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.DeploymentManagerApi(mock).manifests;
@@ -2656,7 +2656,7 @@
     });
   });
 
-  unittest.group('resource-OperationsResourceApi', () {
+  unittest.group('resource-OperationsResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.DeploymentManagerApi(mock).operations;
@@ -2763,7 +2763,7 @@
     });
   });
 
-  unittest.group('resource-ResourcesResourceApi', () {
+  unittest.group('resource-ResourcesResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.DeploymentManagerApi(mock).resources;
@@ -2872,7 +2872,7 @@
     });
   });
 
-  unittest.group('resource-TypesResourceApi', () {
+  unittest.group('resource-TypesResource', () {
     unittest.test('method--list', () {
       var mock = HttpServerMock();
       var res = api.DeploymentManagerApi(mock).types;
diff --git a/generated/googleapis/test/dfareporting/v3_4_test.dart b/generated/googleapis/test/dfareporting/v3_4_test.dart
index 3990889..d17343a 100644
--- a/generated/googleapis/test/dfareporting/v3_4_test.dart
+++ b/generated/googleapis/test/dfareporting/v3_4_test.dart
@@ -13332,7 +13332,7 @@
     });
   });
 
-  unittest.group('resource-AccountActiveAdSummariesResourceApi', () {
+  unittest.group('resource-AccountActiveAdSummariesResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.DfareportingApi(mock).accountActiveAdSummaries;
@@ -13397,7 +13397,7 @@
     });
   });
 
-  unittest.group('resource-AccountPermissionGroupsResourceApi', () {
+  unittest.group('resource-AccountPermissionGroupsResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.DfareportingApi(mock).accountPermissionGroups;
@@ -13523,7 +13523,7 @@
     });
   });
 
-  unittest.group('resource-AccountPermissionsResourceApi', () {
+  unittest.group('resource-AccountPermissionsResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.DfareportingApi(mock).accountPermissions;
@@ -13648,7 +13648,7 @@
     });
   });
 
-  unittest.group('resource-AccountUserProfilesResourceApi', () {
+  unittest.group('resource-AccountUserProfilesResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.DfareportingApi(mock).accountUserProfiles;
@@ -14003,7 +14003,7 @@
     });
   });
 
-  unittest.group('resource-AccountsResourceApi', () {
+  unittest.group('resource-AccountsResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.DfareportingApi(mock).accounts;
@@ -14285,7 +14285,7 @@
     });
   });
 
-  unittest.group('resource-AdsResourceApi', () {
+  unittest.group('resource-AdsResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.DfareportingApi(mock).ads;
@@ -14691,7 +14691,7 @@
     });
   });
 
-  unittest.group('resource-AdvertiserGroupsResourceApi', () {
+  unittest.group('resource-AdvertiserGroupsResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.DfareportingApi(mock).advertiserGroups;
@@ -15095,7 +15095,7 @@
     });
   });
 
-  unittest.group('resource-AdvertiserLandingPagesResourceApi', () {
+  unittest.group('resource-AdvertiserLandingPagesResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.DfareportingApi(mock).advertiserLandingPages;
@@ -15455,7 +15455,7 @@
     });
   });
 
-  unittest.group('resource-AdvertisersResourceApi', () {
+  unittest.group('resource-AdvertisersResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.DfareportingApi(mock).advertisers;
@@ -15821,7 +15821,7 @@
     });
   });
 
-  unittest.group('resource-BrowsersResourceApi', () {
+  unittest.group('resource-BrowsersResource', () {
     unittest.test('method--list', () {
       var mock = HttpServerMock();
       var res = api.DfareportingApi(mock).browsers;
@@ -15882,7 +15882,7 @@
     });
   });
 
-  unittest.group('resource-CampaignCreativeAssociationsResourceApi', () {
+  unittest.group('resource-CampaignCreativeAssociationsResource', () {
     unittest.test('method--insert', () {
       var mock = HttpServerMock();
       var res = api.DfareportingApi(mock).campaignCreativeAssociations;
@@ -16045,7 +16045,7 @@
     });
   });
 
-  unittest.group('resource-CampaignsResourceApi', () {
+  unittest.group('resource-CampaignsResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.DfareportingApi(mock).campaigns;
@@ -16416,7 +16416,7 @@
     });
   });
 
-  unittest.group('resource-ChangeLogsResourceApi', () {
+  unittest.group('resource-ChangeLogsResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.DfareportingApi(mock).changeLogs;
@@ -16578,7 +16578,7 @@
     });
   });
 
-  unittest.group('resource-CitiesResourceApi', () {
+  unittest.group('resource-CitiesResource', () {
     unittest.test('method--list', () {
       var mock = HttpServerMock();
       var res = api.DfareportingApi(mock).cities;
@@ -16655,7 +16655,7 @@
     });
   });
 
-  unittest.group('resource-ConnectionTypesResourceApi', () {
+  unittest.group('resource-ConnectionTypesResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.DfareportingApi(mock).connectionTypes;
@@ -16780,7 +16780,7 @@
     });
   });
 
-  unittest.group('resource-ContentCategoriesResourceApi', () {
+  unittest.group('resource-ContentCategoriesResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.DfareportingApi(mock).contentCategories;
@@ -17184,7 +17184,7 @@
     });
   });
 
-  unittest.group('resource-ConversionsResourceApi', () {
+  unittest.group('resource-ConversionsResource', () {
     unittest.test('method--batchinsert', () {
       var mock = HttpServerMock();
       var res = api.DfareportingApi(mock).conversions;
@@ -17318,7 +17318,7 @@
     });
   });
 
-  unittest.group('resource-CountriesResourceApi', () {
+  unittest.group('resource-CountriesResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.DfareportingApi(mock).countries;
@@ -17442,7 +17442,7 @@
     });
   });
 
-  unittest.group('resource-CreativeAssetsResourceApi', () {
+  unittest.group('resource-CreativeAssetsResource', () {
     unittest.test('method--insert', () {
       // TODO: Implement tests for media upload;
       // TODO: Implement tests for media download;
@@ -17522,7 +17522,7 @@
     });
   });
 
-  unittest.group('resource-CreativeFieldValuesResourceApi', () {
+  unittest.group('resource-CreativeFieldValuesResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.DfareportingApi(mock).creativeFieldValues;
@@ -17990,7 +17990,7 @@
     });
   });
 
-  unittest.group('resource-CreativeFieldsResourceApi', () {
+  unittest.group('resource-CreativeFieldsResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.DfareportingApi(mock).creativeFields;
@@ -18398,7 +18398,7 @@
     });
   });
 
-  unittest.group('resource-CreativeGroupsResourceApi', () {
+  unittest.group('resource-CreativeGroupsResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.DfareportingApi(mock).creativeGroups;
@@ -18749,7 +18749,7 @@
     });
   });
 
-  unittest.group('resource-CreativesResourceApi', () {
+  unittest.group('resource-CreativesResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.DfareportingApi(mock).creatives;
@@ -19129,7 +19129,7 @@
     });
   });
 
-  unittest.group('resource-CustomEventsResourceApi', () {
+  unittest.group('resource-CustomEventsResource', () {
     unittest.test('method--batchinsert', () {
       var mock = HttpServerMock();
       var res = api.DfareportingApi(mock).customEvents;
@@ -19197,7 +19197,7 @@
     });
   });
 
-  unittest.group('resource-DimensionValuesResourceApi', () {
+  unittest.group('resource-DimensionValuesResource', () {
     unittest.test('method--query', () {
       var mock = HttpServerMock();
       var res = api.DfareportingApi(mock).dimensionValues;
@@ -19272,7 +19272,7 @@
     });
   });
 
-  unittest.group('resource-DirectorySitesResourceApi', () {
+  unittest.group('resource-DirectorySitesResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.DfareportingApi(mock).directorySites;
@@ -19507,7 +19507,7 @@
     });
   });
 
-  unittest.group('resource-DynamicTargetingKeysResourceApi', () {
+  unittest.group('resource-DynamicTargetingKeysResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.DfareportingApi(mock).dynamicTargetingKeys;
@@ -19716,7 +19716,7 @@
     });
   });
 
-  unittest.group('resource-EventTagsResourceApi', () {
+  unittest.group('resource-EventTagsResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.DfareportingApi(mock).eventTags;
@@ -20134,7 +20134,7 @@
     });
   });
 
-  unittest.group('resource-FilesResourceApi', () {
+  unittest.group('resource-FilesResource', () {
     unittest.test('method--get', () {
       // TODO: Implement tests for media upload;
       // TODO: Implement tests for media download;
@@ -20281,7 +20281,7 @@
     });
   });
 
-  unittest.group('resource-FloodlightActivitiesResourceApi', () {
+  unittest.group('resource-FloodlightActivitiesResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.DfareportingApi(mock).floodlightActivities;
@@ -20780,7 +20780,7 @@
     });
   });
 
-  unittest.group('resource-FloodlightActivityGroupsResourceApi', () {
+  unittest.group('resource-FloodlightActivityGroupsResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.DfareportingApi(mock).floodlightActivityGroups;
@@ -21135,7 +21135,7 @@
     });
   });
 
-  unittest.group('resource-FloodlightConfigurationsResourceApi', () {
+  unittest.group('resource-FloodlightConfigurationsResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.DfareportingApi(mock).floodlightConfigurations;
@@ -21393,7 +21393,7 @@
     });
   });
 
-  unittest.group('resource-InventoryItemsResourceApi', () {
+  unittest.group('resource-InventoryItemsResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.DfareportingApi(mock).inventoryItems;
@@ -21571,7 +21571,7 @@
     });
   });
 
-  unittest.group('resource-LanguagesResourceApi', () {
+  unittest.group('resource-LanguagesResource', () {
     unittest.test('method--list', () {
       var mock = HttpServerMock();
       var res = api.DfareportingApi(mock).languages;
@@ -21632,7 +21632,7 @@
     });
   });
 
-  unittest.group('resource-MetrosResourceApi', () {
+  unittest.group('resource-MetrosResource', () {
     unittest.test('method--list', () {
       var mock = HttpServerMock();
       var res = api.DfareportingApi(mock).metros;
@@ -21693,7 +21693,7 @@
     });
   });
 
-  unittest.group('resource-MobileAppsResourceApi', () {
+  unittest.group('resource-MobileAppsResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.DfareportingApi(mock).mobileApps;
@@ -21837,7 +21837,7 @@
     });
   });
 
-  unittest.group('resource-MobileCarriersResourceApi', () {
+  unittest.group('resource-MobileCarriersResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.DfareportingApi(mock).mobileCarriers;
@@ -21962,7 +21962,7 @@
     });
   });
 
-  unittest.group('resource-OperatingSystemVersionsResourceApi', () {
+  unittest.group('resource-OperatingSystemVersionsResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.DfareportingApi(mock).operatingSystemVersions;
@@ -22088,7 +22088,7 @@
     });
   });
 
-  unittest.group('resource-OperatingSystemsResourceApi', () {
+  unittest.group('resource-OperatingSystemsResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.DfareportingApi(mock).operatingSystems;
@@ -22213,7 +22213,7 @@
     });
   });
 
-  unittest.group('resource-OrderDocumentsResourceApi', () {
+  unittest.group('resource-OrderDocumentsResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.DfareportingApi(mock).orderDocuments;
@@ -22392,7 +22392,7 @@
     });
   });
 
-  unittest.group('resource-OrdersResourceApi', () {
+  unittest.group('resource-OrdersResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.DfareportingApi(mock).orders;
@@ -22563,7 +22563,7 @@
     });
   });
 
-  unittest.group('resource-PlacementGroupsResourceApi', () {
+  unittest.group('resource-PlacementGroupsResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.DfareportingApi(mock).placementGroups;
@@ -22957,7 +22957,7 @@
     });
   });
 
-  unittest.group('resource-PlacementStrategiesResourceApi', () {
+  unittest.group('resource-PlacementStrategiesResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.DfareportingApi(mock).placementStrategies;
@@ -23361,7 +23361,7 @@
     });
   });
 
-  unittest.group('resource-PlacementsResourceApi', () {
+  unittest.group('resource-PlacementsResource', () {
     unittest.test('method--generatetags', () {
       var mock = HttpServerMock();
       var res = api.DfareportingApi(mock).placements;
@@ -23837,7 +23837,7 @@
     });
   });
 
-  unittest.group('resource-PlatformTypesResourceApi', () {
+  unittest.group('resource-PlatformTypesResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.DfareportingApi(mock).platformTypes;
@@ -23962,7 +23962,7 @@
     });
   });
 
-  unittest.group('resource-PostalCodesResourceApi', () {
+  unittest.group('resource-PostalCodesResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.DfareportingApi(mock).postalCodes;
@@ -24086,7 +24086,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsResourceApi', () {
+  unittest.group('resource-ProjectsResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.DfareportingApi(mock).projects;
@@ -24238,7 +24238,7 @@
     });
   });
 
-  unittest.group('resource-RegionsResourceApi', () {
+  unittest.group('resource-RegionsResource', () {
     unittest.test('method--list', () {
       var mock = HttpServerMock();
       var res = api.DfareportingApi(mock).regions;
@@ -24299,7 +24299,7 @@
     });
   });
 
-  unittest.group('resource-RemarketingListSharesResourceApi', () {
+  unittest.group('resource-RemarketingListSharesResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.DfareportingApi(mock).remarketingListShares;
@@ -24494,7 +24494,7 @@
     });
   });
 
-  unittest.group('resource-RemarketingListsResourceApi', () {
+  unittest.group('resource-RemarketingListsResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.DfareportingApi(mock).remarketingLists;
@@ -24844,7 +24844,7 @@
     });
   });
 
-  unittest.group('resource-ReportsResourceApi', () {
+  unittest.group('resource-ReportsResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.DfareportingApi(mock).reports;
@@ -25323,7 +25323,7 @@
     });
   });
 
-  unittest.group('resource-ReportsCompatibleFieldsResourceApi', () {
+  unittest.group('resource-ReportsCompatibleFieldsResource', () {
     unittest.test('method--query', () {
       var mock = HttpServerMock();
       var res = api.DfareportingApi(mock).reports.compatibleFields;
@@ -25389,7 +25389,7 @@
     });
   });
 
-  unittest.group('resource-ReportsFilesResourceApi', () {
+  unittest.group('resource-ReportsFilesResource', () {
     unittest.test('method--get', () {
       // TODO: Implement tests for media upload;
       // TODO: Implement tests for media download;
@@ -25553,7 +25553,7 @@
     });
   });
 
-  unittest.group('resource-SitesResourceApi', () {
+  unittest.group('resource-SitesResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.DfareportingApi(mock).sites;
@@ -25933,7 +25933,7 @@
     });
   });
 
-  unittest.group('resource-SizesResourceApi', () {
+  unittest.group('resource-SizesResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.DfareportingApi(mock).sizes;
@@ -26137,7 +26137,7 @@
     });
   });
 
-  unittest.group('resource-SubaccountsResourceApi', () {
+  unittest.group('resource-SubaccountsResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.DfareportingApi(mock).subaccounts;
@@ -26479,7 +26479,7 @@
     });
   });
 
-  unittest.group('resource-TargetableRemarketingListsResourceApi', () {
+  unittest.group('resource-TargetableRemarketingListsResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.DfareportingApi(mock).targetableRemarketingLists;
@@ -26633,7 +26633,7 @@
     });
   });
 
-  unittest.group('resource-TargetingTemplatesResourceApi', () {
+  unittest.group('resource-TargetingTemplatesResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.DfareportingApi(mock).targetingTemplates;
@@ -26980,7 +26980,7 @@
     });
   });
 
-  unittest.group('resource-UserProfilesResourceApi', () {
+  unittest.group('resource-UserProfilesResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.DfareportingApi(mock).userProfiles;
@@ -27082,7 +27082,7 @@
     });
   });
 
-  unittest.group('resource-UserRolePermissionGroupsResourceApi', () {
+  unittest.group('resource-UserRolePermissionGroupsResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.DfareportingApi(mock).userRolePermissionGroups;
@@ -27208,7 +27208,7 @@
     });
   });
 
-  unittest.group('resource-UserRolePermissionsResourceApi', () {
+  unittest.group('resource-UserRolePermissionsResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.DfareportingApi(mock).userRolePermissions;
@@ -27335,7 +27335,7 @@
     });
   });
 
-  unittest.group('resource-UserRolesResourceApi', () {
+  unittest.group('resource-UserRolesResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.DfareportingApi(mock).userRoles;
@@ -27746,7 +27746,7 @@
     });
   });
 
-  unittest.group('resource-VideoFormatsResourceApi', () {
+  unittest.group('resource-VideoFormatsResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.DfareportingApi(mock).videoFormats;
diff --git a/generated/googleapis/test/dialogflow/v2_test.dart b/generated/googleapis/test/dialogflow/v2_test.dart
index 7fb6b7d..0c2acde 100644
--- a/generated/googleapis/test/dialogflow/v2_test.dart
+++ b/generated/googleapis/test/dialogflow/v2_test.dart
@@ -9936,7 +9936,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsResourceApi', () {
+  unittest.group('resource-ProjectsResource', () {
     unittest.test('method--deleteAgent', () {
       var mock = HttpServerMock();
       var res = api.DialogflowApi(mock).projects;
@@ -10094,7 +10094,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsAgentResourceApi', () {
+  unittest.group('resource-ProjectsAgentResource', () {
     unittest.test('method--export', () {
       var mock = HttpServerMock();
       var res = api.DialogflowApi(mock).projects.agent;
@@ -10539,7 +10539,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsAgentEntityTypesResourceApi', () {
+  unittest.group('resource-ProjectsAgentEntityTypesResource', () {
     unittest.test('method--batchDelete', () {
       var mock = HttpServerMock();
       var res = api.DialogflowApi(mock).projects.agent.entityTypes;
@@ -10944,7 +10944,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsAgentEntityTypesEntitiesResourceApi', () {
+  unittest.group('resource-ProjectsAgentEntityTypesEntitiesResource', () {
     unittest.test('method--batchCreate', () {
       var mock = HttpServerMock();
       var res = api.DialogflowApi(mock).projects.agent.entityTypes.entities;
@@ -11117,7 +11117,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsAgentEnvironmentsResourceApi', () {
+  unittest.group('resource-ProjectsAgentEnvironmentsResource', () {
     unittest.test('method--list', () {
       var mock = HttpServerMock();
       var res = api.DialogflowApi(mock).projects.agent.environments;
@@ -11178,8 +11178,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsAgentEnvironmentsUsersSessionsResourceApi',
-      () {
+  unittest.group('resource-ProjectsAgentEnvironmentsUsersSessionsResource', () {
     unittest.test('method--deleteContexts', () {
       var mock = HttpServerMock();
       var res =
@@ -11288,7 +11287,7 @@
   });
 
   unittest.group(
-      'resource-ProjectsAgentEnvironmentsUsersSessionsContextsResourceApi', () {
+      'resource-ProjectsAgentEnvironmentsUsersSessionsContextsResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.DialogflowApi(mock)
@@ -11591,8 +11590,7 @@
   });
 
   unittest.group(
-      'resource-ProjectsAgentEnvironmentsUsersSessionsEntityTypesResourceApi',
-      () {
+      'resource-ProjectsAgentEnvironmentsUsersSessionsEntityTypesResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.DialogflowApi(mock)
@@ -11897,7 +11895,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsAgentIntentsResourceApi', () {
+  unittest.group('resource-ProjectsAgentIntentsResource', () {
     unittest.test('method--batchDelete', () {
       var mock = HttpServerMock();
       var res = api.DialogflowApi(mock).projects.agent.intents;
@@ -12314,7 +12312,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsAgentSessionsResourceApi', () {
+  unittest.group('resource-ProjectsAgentSessionsResource', () {
     unittest.test('method--deleteContexts', () {
       var mock = HttpServerMock();
       var res = api.DialogflowApi(mock).projects.agent.sessions;
@@ -12420,7 +12418,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsAgentSessionsContextsResourceApi', () {
+  unittest.group('resource-ProjectsAgentSessionsContextsResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.DialogflowApi(mock).projects.agent.sessions.contexts;
@@ -12692,7 +12690,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsAgentSessionsEntityTypesResourceApi', () {
+  unittest.group('resource-ProjectsAgentSessionsEntityTypesResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.DialogflowApi(mock).projects.agent.sessions.entityTypes;
@@ -12967,7 +12965,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsLocationsOperationsResourceApi', () {
+  unittest.group('resource-ProjectsLocationsOperationsResource', () {
     unittest.test('method--cancel', () {
       var mock = HttpServerMock();
       var res = api.DialogflowApi(mock).projects.locations.operations;
@@ -13128,7 +13126,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsOperationsResourceApi', () {
+  unittest.group('resource-ProjectsOperationsResource', () {
     unittest.test('method--cancel', () {
       var mock = HttpServerMock();
       var res = api.DialogflowApi(mock).projects.operations;
diff --git a/generated/googleapis/test/digitalassetlinks/v1_test.dart b/generated/googleapis/test/digitalassetlinks/v1_test.dart
index eed8ed0..b50b0f6 100644
--- a/generated/googleapis/test/digitalassetlinks/v1_test.dart
+++ b/generated/googleapis/test/digitalassetlinks/v1_test.dart
@@ -276,7 +276,7 @@
     });
   });
 
-  unittest.group('resource-AssetlinksResourceApi', () {
+  unittest.group('resource-AssetlinksResource', () {
     unittest.test('method--check', () {
       var mock = HttpServerMock();
       var res = api.DigitalassetlinksApi(mock).assetlinks;
@@ -359,7 +359,7 @@
     });
   });
 
-  unittest.group('resource-StatementsResourceApi', () {
+  unittest.group('resource-StatementsResource', () {
     unittest.test('method--list', () {
       var mock = HttpServerMock();
       var res = api.DigitalassetlinksApi(mock).statements;
diff --git a/generated/googleapis/test/discovery/v1_test.dart b/generated/googleapis/test/discovery/v1_test.dart
index 2ff58a4..e53c621 100644
--- a/generated/googleapis/test/discovery/v1_test.dart
+++ b/generated/googleapis/test/discovery/v1_test.dart
@@ -1017,7 +1017,7 @@
     });
   });
 
-  unittest.group('resource-ApisResourceApi', () {
+  unittest.group('resource-ApisResource', () {
     unittest.test('method--getRest', () {
       var mock = HttpServerMock();
       var res = api.DiscoveryApi(mock).apis;
diff --git a/generated/googleapis/test/displayvideo/v1_test.dart b/generated/googleapis/test/displayvideo/v1_test.dart
index dea7025..e79eec7 100644
--- a/generated/googleapis/test/displayvideo/v1_test.dart
+++ b/generated/googleapis/test/displayvideo/v1_test.dart
@@ -8802,7 +8802,7 @@
     });
   });
 
-  unittest.group('resource-AdvertisersResourceApi', () {
+  unittest.group('resource-AdvertisersResource', () {
     unittest.test('method--audit', () {
       var mock = HttpServerMock();
       var res = api.DisplayVideoApi(mock).advertisers;
@@ -9251,7 +9251,7 @@
     });
   });
 
-  unittest.group('resource-AdvertisersAssetsResourceApi', () {
+  unittest.group('resource-AdvertisersAssetsResource', () {
     unittest.test('method--upload', () {
       // TODO: Implement tests for media upload;
       // TODO: Implement tests for media download;
@@ -9309,7 +9309,7 @@
     });
   });
 
-  unittest.group('resource-AdvertisersCampaignsResourceApi', () {
+  unittest.group('resource-AdvertisersCampaignsResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.DisplayVideoApi(mock).advertisers.campaigns;
@@ -9584,7 +9584,7 @@
     });
   });
 
-  unittest.group('resource-AdvertisersChannelsResourceApi', () {
+  unittest.group('resource-AdvertisersChannelsResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.DisplayVideoApi(mock).advertisers.channels;
@@ -9827,7 +9827,7 @@
     });
   });
 
-  unittest.group('resource-AdvertisersChannelsSitesResourceApi', () {
+  unittest.group('resource-AdvertisersChannelsSitesResource', () {
     unittest.test('method--bulkEdit', () {
       var mock = HttpServerMock();
       var res = api.DisplayVideoApi(mock).advertisers.channels.sites;
@@ -10092,7 +10092,7 @@
     });
   });
 
-  unittest.group('resource-AdvertisersCreativesResourceApi', () {
+  unittest.group('resource-AdvertisersCreativesResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.DisplayVideoApi(mock).advertisers.creatives;
@@ -10367,7 +10367,7 @@
     });
   });
 
-  unittest.group('resource-AdvertisersInsertionOrdersResourceApi', () {
+  unittest.group('resource-AdvertisersInsertionOrdersResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.DisplayVideoApi(mock).advertisers.insertionOrders;
@@ -10643,7 +10643,7 @@
     });
   });
 
-  unittest.group('resource-AdvertisersLineItemsResourceApi', () {
+  unittest.group('resource-AdvertisersLineItemsResource', () {
     unittest.test('method--bulkEditLineItemAssignedTargetingOptions', () {
       var mock = HttpServerMock();
       var res = api.DisplayVideoApi(mock).advertisers.lineItems;
@@ -11046,7 +11046,7 @@
   });
 
   unittest.group(
-      'resource-AdvertisersLineItemsTargetingTypesAssignedTargetingOptionsResourceApi',
+      'resource-AdvertisersLineItemsTargetingTypesAssignedTargetingOptionsResource',
       () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
@@ -11296,7 +11296,7 @@
     });
   });
 
-  unittest.group('resource-AdvertisersLocationListsResourceApi', () {
+  unittest.group('resource-AdvertisersLocationListsResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.DisplayVideoApi(mock).advertisers.locationLists;
@@ -11523,8 +11523,8 @@
     });
   });
 
-  unittest.group(
-      'resource-AdvertisersLocationListsAssignedLocationsResourceApi', () {
+  unittest.group('resource-AdvertisersLocationListsAssignedLocationsResource',
+      () {
     unittest.test('method--bulkEdit', () {
       var mock = HttpServerMock();
       var res =
@@ -11821,7 +11821,7 @@
     });
   });
 
-  unittest.group('resource-AdvertisersNegativeKeywordListsResourceApi', () {
+  unittest.group('resource-AdvertisersNegativeKeywordListsResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.DisplayVideoApi(mock).advertisers.negativeKeywordLists;
@@ -12093,8 +12093,7 @@
   });
 
   unittest.group(
-      'resource-AdvertisersNegativeKeywordListsNegativeKeywordsResourceApi',
-      () {
+      'resource-AdvertisersNegativeKeywordListsNegativeKeywordsResource', () {
     unittest.test('method--bulkEdit', () {
       var mock = HttpServerMock();
       var res = api.DisplayVideoApi(mock)
@@ -12365,8 +12364,7 @@
   });
 
   unittest.group(
-      'resource-AdvertisersTargetingTypesAssignedTargetingOptionsResourceApi',
-      () {
+      'resource-AdvertisersTargetingTypesAssignedTargetingOptionsResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.DisplayVideoApi(mock)
@@ -12606,7 +12604,7 @@
     });
   });
 
-  unittest.group('resource-CombinedAudiencesResourceApi', () {
+  unittest.group('resource-CombinedAudiencesResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.DisplayVideoApi(mock).combinedAudiences;
@@ -12736,7 +12734,7 @@
     });
   });
 
-  unittest.group('resource-CustomBiddingAlgorithmsResourceApi', () {
+  unittest.group('resource-CustomBiddingAlgorithmsResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.DisplayVideoApi(mock).customBiddingAlgorithms;
@@ -12867,7 +12865,7 @@
     });
   });
 
-  unittest.group('resource-CustomListsResourceApi', () {
+  unittest.group('resource-CustomListsResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.DisplayVideoApi(mock).customLists;
@@ -12987,7 +12985,7 @@
     });
   });
 
-  unittest.group('resource-FirstAndThirdPartyAudiencesResourceApi', () {
+  unittest.group('resource-FirstAndThirdPartyAudiencesResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.DisplayVideoApi(mock).firstAndThirdPartyAudiences;
@@ -13119,7 +13117,7 @@
     });
   });
 
-  unittest.group('resource-FloodlightGroupsResourceApi', () {
+  unittest.group('resource-FloodlightGroupsResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.DisplayVideoApi(mock).floodlightGroups;
@@ -13237,7 +13235,7 @@
     });
   });
 
-  unittest.group('resource-GoogleAudiencesResourceApi', () {
+  unittest.group('resource-GoogleAudiencesResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.DisplayVideoApi(mock).googleAudiences;
@@ -13367,7 +13365,7 @@
     });
   });
 
-  unittest.group('resource-InventorySourceGroupsResourceApi', () {
+  unittest.group('resource-InventorySourceGroupsResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.DisplayVideoApi(mock).inventorySourceGroups;
@@ -13685,7 +13683,7 @@
   });
 
   unittest.group(
-      'resource-InventorySourceGroupsAssignedInventorySourcesResourceApi', () {
+      'resource-InventorySourceGroupsAssignedInventorySourcesResource', () {
     unittest.test('method--bulkEdit', () {
       var mock = HttpServerMock();
       var res = api.DisplayVideoApi(mock)
@@ -13946,7 +13944,7 @@
     });
   });
 
-  unittest.group('resource-InventorySourcesResourceApi', () {
+  unittest.group('resource-InventorySourcesResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.DisplayVideoApi(mock).inventorySources;
@@ -14071,7 +14069,7 @@
     });
   });
 
-  unittest.group('resource-MediaResourceApi', () {
+  unittest.group('resource-MediaResource', () {
     unittest.test('method--download', () {
       // TODO: Implement tests for media upload;
       // TODO: Implement tests for media download;
@@ -14124,7 +14122,7 @@
     });
   });
 
-  unittest.group('resource-PartnersResourceApi', () {
+  unittest.group('resource-PartnersResource', () {
     unittest.test('method--bulkEditPartnerAssignedTargetingOptions', () {
       var mock = HttpServerMock();
       var res = api.DisplayVideoApi(mock).partners;
@@ -14293,7 +14291,7 @@
     });
   });
 
-  unittest.group('resource-PartnersChannelsResourceApi', () {
+  unittest.group('resource-PartnersChannelsResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.DisplayVideoApi(mock).partners.channels;
@@ -14536,7 +14534,7 @@
     });
   });
 
-  unittest.group('resource-PartnersChannelsSitesResourceApi', () {
+  unittest.group('resource-PartnersChannelsSitesResource', () {
     unittest.test('method--bulkEdit', () {
       var mock = HttpServerMock();
       var res = api.DisplayVideoApi(mock).partners.channels.sites;
@@ -14802,7 +14800,7 @@
   });
 
   unittest.group(
-      'resource-PartnersTargetingTypesAssignedTargetingOptionsResourceApi', () {
+      'resource-PartnersTargetingTypesAssignedTargetingOptionsResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.DisplayVideoApi(mock)
@@ -15041,7 +15039,7 @@
     });
   });
 
-  unittest.group('resource-SdfdownloadtasksResourceApi', () {
+  unittest.group('resource-SdfdownloadtasksResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.DisplayVideoApi(mock).sdfdownloadtasks;
@@ -15095,7 +15093,7 @@
     });
   });
 
-  unittest.group('resource-SdfdownloadtasksOperationsResourceApi', () {
+  unittest.group('resource-SdfdownloadtasksOperationsResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.DisplayVideoApi(mock).sdfdownloadtasks.operations;
@@ -15145,7 +15143,7 @@
     });
   });
 
-  unittest.group('resource-TargetingTypesTargetingOptionsResourceApi', () {
+  unittest.group('resource-TargetingTypesTargetingOptionsResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.DisplayVideoApi(mock).targetingTypes.targetingOptions;
@@ -15269,7 +15267,7 @@
     });
   });
 
-  unittest.group('resource-UsersResourceApi', () {
+  unittest.group('resource-UsersResource', () {
     unittest.test('method--bulkEditAssignedUserRoles', () {
       var mock = HttpServerMock();
       var res = api.DisplayVideoApi(mock).users;
diff --git a/generated/googleapis/test/dlp/v2_test.dart b/generated/googleapis/test/dlp/v2_test.dart
index 16e1b3d..5f4ec41 100644
--- a/generated/googleapis/test/dlp/v2_test.dart
+++ b/generated/googleapis/test/dlp/v2_test.dart
@@ -7716,7 +7716,7 @@
     });
   });
 
-  unittest.group('resource-InfoTypesResourceApi', () {
+  unittest.group('resource-InfoTypesResource', () {
     unittest.test('method--list', () {
       var mock = HttpServerMock();
       var res = api.DLPApi(mock).infoTypes;
@@ -7781,7 +7781,7 @@
     });
   });
 
-  unittest.group('resource-LocationsInfoTypesResourceApi', () {
+  unittest.group('resource-LocationsInfoTypesResource', () {
     unittest.test('method--list', () {
       var mock = HttpServerMock();
       var res = api.DLPApi(mock).locations.infoTypes;
@@ -7845,7 +7845,7 @@
     });
   });
 
-  unittest.group('resource-OrganizationsDeidentifyTemplatesResourceApi', () {
+  unittest.group('resource-OrganizationsDeidentifyTemplatesResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.DLPApi(mock).organizations.deidentifyTemplates;
@@ -8128,7 +8128,7 @@
     });
   });
 
-  unittest.group('resource-OrganizationsInspectTemplatesResourceApi', () {
+  unittest.group('resource-OrganizationsInspectTemplatesResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.DLPApi(mock).organizations.inspectTemplates;
@@ -8407,8 +8407,8 @@
     });
   });
 
-  unittest.group(
-      'resource-OrganizationsLocationsDeidentifyTemplatesResourceApi', () {
+  unittest.group('resource-OrganizationsLocationsDeidentifyTemplatesResource',
+      () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.DLPApi(mock).organizations.locations.deidentifyTemplates;
@@ -8691,8 +8691,7 @@
     });
   });
 
-  unittest.group('resource-OrganizationsLocationsInspectTemplatesResourceApi',
-      () {
+  unittest.group('resource-OrganizationsLocationsInspectTemplatesResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.DLPApi(mock).organizations.locations.inspectTemplates;
@@ -8971,8 +8970,7 @@
     });
   });
 
-  unittest.group('resource-OrganizationsLocationsStoredInfoTypesResourceApi',
-      () {
+  unittest.group('resource-OrganizationsLocationsStoredInfoTypesResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.DLPApi(mock).organizations.locations.storedInfoTypes;
@@ -9248,7 +9246,7 @@
     });
   });
 
-  unittest.group('resource-OrganizationsStoredInfoTypesResourceApi', () {
+  unittest.group('resource-OrganizationsStoredInfoTypesResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.DLPApi(mock).organizations.storedInfoTypes;
@@ -9524,7 +9522,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsContentResourceApi', () {
+  unittest.group('resource-ProjectsContentResource', () {
     unittest.test('method--deidentify', () {
       var mock = HttpServerMock();
       var res = api.DLPApi(mock).projects.content;
@@ -9694,7 +9692,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsDeidentifyTemplatesResourceApi', () {
+  unittest.group('resource-ProjectsDeidentifyTemplatesResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.DLPApi(mock).projects.deidentifyTemplates;
@@ -9977,7 +9975,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsDlpJobsResourceApi', () {
+  unittest.group('resource-ProjectsDlpJobsResource', () {
     unittest.test('method--cancel', () {
       var mock = HttpServerMock();
       var res = api.DLPApi(mock).projects.dlpJobs;
@@ -10256,7 +10254,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsImageResourceApi', () {
+  unittest.group('resource-ProjectsImageResource', () {
     unittest.test('method--redact', () {
       var mock = HttpServerMock();
       var res = api.DLPApi(mock).projects.image;
@@ -10314,7 +10312,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsInspectTemplatesResourceApi', () {
+  unittest.group('resource-ProjectsInspectTemplatesResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.DLPApi(mock).projects.inspectTemplates;
@@ -10593,7 +10591,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsJobTriggersResourceApi', () {
+  unittest.group('resource-ProjectsJobTriggersResource', () {
     unittest.test('method--activate', () {
       var mock = HttpServerMock();
       var res = api.DLPApi(mock).projects.jobTriggers;
@@ -10926,7 +10924,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsLocationsContentResourceApi', () {
+  unittest.group('resource-ProjectsLocationsContentResource', () {
     unittest.test('method--deidentify', () {
       var mock = HttpServerMock();
       var res = api.DLPApi(mock).projects.locations.content;
@@ -11096,8 +11094,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsLocationsDeidentifyTemplatesResourceApi',
-      () {
+  unittest.group('resource-ProjectsLocationsDeidentifyTemplatesResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.DLPApi(mock).projects.locations.deidentifyTemplates;
@@ -11380,7 +11377,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsLocationsDlpJobsResourceApi', () {
+  unittest.group('resource-ProjectsLocationsDlpJobsResource', () {
     unittest.test('method--cancel', () {
       var mock = HttpServerMock();
       var res = api.DLPApi(mock).projects.locations.dlpJobs;
@@ -11769,7 +11766,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsLocationsImageResourceApi', () {
+  unittest.group('resource-ProjectsLocationsImageResource', () {
     unittest.test('method--redact', () {
       var mock = HttpServerMock();
       var res = api.DLPApi(mock).projects.locations.image;
@@ -11827,7 +11824,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsLocationsInspectTemplatesResourceApi', () {
+  unittest.group('resource-ProjectsLocationsInspectTemplatesResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.DLPApi(mock).projects.locations.inspectTemplates;
@@ -12106,7 +12103,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsLocationsJobTriggersResourceApi', () {
+  unittest.group('resource-ProjectsLocationsJobTriggersResource', () {
     unittest.test('method--activate', () {
       var mock = HttpServerMock();
       var res = api.DLPApi(mock).projects.locations.jobTriggers;
@@ -12495,7 +12492,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsLocationsStoredInfoTypesResourceApi', () {
+  unittest.group('resource-ProjectsLocationsStoredInfoTypesResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.DLPApi(mock).projects.locations.storedInfoTypes;
@@ -12771,7 +12768,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsStoredInfoTypesResourceApi', () {
+  unittest.group('resource-ProjectsStoredInfoTypesResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.DLPApi(mock).projects.storedInfoTypes;
diff --git a/generated/googleapis/test/dns/v1_test.dart b/generated/googleapis/test/dns/v1_test.dart
index 7881ce5..456370c 100644
--- a/generated/googleapis/test/dns/v1_test.dart
+++ b/generated/googleapis/test/dns/v1_test.dart
@@ -1395,7 +1395,7 @@
     });
   });
 
-  unittest.group('resource-ChangesResourceApi', () {
+  unittest.group('resource-ChangesResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.DnsApi(mock).changes;
@@ -1628,7 +1628,7 @@
     });
   });
 
-  unittest.group('resource-DnsKeysResourceApi', () {
+  unittest.group('resource-DnsKeysResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.DnsApi(mock).dnsKeys;
@@ -1788,7 +1788,7 @@
     });
   });
 
-  unittest.group('resource-ManagedZoneOperationsResourceApi', () {
+  unittest.group('resource-ManagedZoneOperationsResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.DnsApi(mock).managedZoneOperations;
@@ -1944,7 +1944,7 @@
     });
   });
 
-  unittest.group('resource-ManagedZonesResourceApi', () {
+  unittest.group('resource-ManagedZonesResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.DnsApi(mock).managedZones;
@@ -2344,7 +2344,7 @@
     });
   });
 
-  unittest.group('resource-PoliciesResourceApi', () {
+  unittest.group('resource-PoliciesResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.DnsApi(mock).policies;
@@ -2740,7 +2740,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsResourceApi', () {
+  unittest.group('resource-ProjectsResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.DnsApi(mock).projects;
@@ -2796,7 +2796,7 @@
     });
   });
 
-  unittest.group('resource-ResourceRecordSetsResourceApi', () {
+  unittest.group('resource-ResourceRecordSetsResource', () {
     unittest.test('method--list', () {
       var mock = HttpServerMock();
       var res = api.DnsApi(mock).resourceRecordSets;
diff --git a/generated/googleapis/test/docs/v1_test.dart b/generated/googleapis/test/docs/v1_test.dart
index 869938f..cf84972 100644
--- a/generated/googleapis/test/docs/v1_test.dart
+++ b/generated/googleapis/test/docs/v1_test.dart
@@ -5940,7 +5940,7 @@
     });
   });
 
-  unittest.group('resource-DocumentsResourceApi', () {
+  unittest.group('resource-DocumentsResource', () {
     unittest.test('method--batchUpdate', () {
       var mock = HttpServerMock();
       var res = api.DocsApi(mock).documents;
diff --git a/generated/googleapis/test/domainsrdap/v1_test.dart b/generated/googleapis/test/domainsrdap/v1_test.dart
index bfdb249..1304ab7 100644
--- a/generated/googleapis/test/domainsrdap/v1_test.dart
+++ b/generated/googleapis/test/domainsrdap/v1_test.dart
@@ -277,7 +277,7 @@
     });
   });
 
-  unittest.group('resource-AutnumResourceApi', () {
+  unittest.group('resource-AutnumResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.DomainsRDAPApi(mock).autnum;
@@ -329,7 +329,7 @@
     });
   });
 
-  unittest.group('resource-DomainResourceApi', () {
+  unittest.group('resource-DomainResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.DomainsRDAPApi(mock).domain;
@@ -379,7 +379,7 @@
     });
   });
 
-  unittest.group('resource-EntityResourceApi', () {
+  unittest.group('resource-EntityResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.DomainsRDAPApi(mock).entity;
@@ -431,7 +431,7 @@
     });
   });
 
-  unittest.group('resource-IpResourceApi', () {
+  unittest.group('resource-IpResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.DomainsRDAPApi(mock).ip;
@@ -493,7 +493,7 @@
     });
   });
 
-  unittest.group('resource-NameserverResourceApi', () {
+  unittest.group('resource-NameserverResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.DomainsRDAPApi(mock).nameserver;
@@ -545,7 +545,7 @@
     });
   });
 
-  unittest.group('resource-V1ResourceApi', () {
+  unittest.group('resource-V1Resource', () {
     unittest.test('method--getDomains', () {
       var mock = HttpServerMock();
       var res = api.DomainsRDAPApi(mock).v1;
diff --git a/generated/googleapis/test/doubleclickbidmanager/v1_1_test.dart b/generated/googleapis/test/doubleclickbidmanager/v1_1_test.dart
index 8b24270..0b87b35 100644
--- a/generated/googleapis/test/doubleclickbidmanager/v1_1_test.dart
+++ b/generated/googleapis/test/doubleclickbidmanager/v1_1_test.dart
@@ -1187,7 +1187,7 @@
     });
   });
 
-  unittest.group('resource-LineitemsResourceApi', () {
+  unittest.group('resource-LineitemsResource', () {
     unittest.test('method--downloadlineitems', () {
       var mock = HttpServerMock();
       var res = api.DoubleClickBidManagerApi(mock).lineitems;
@@ -1298,7 +1298,7 @@
     });
   });
 
-  unittest.group('resource-QueriesResourceApi', () {
+  unittest.group('resource-QueriesResource', () {
     unittest.test('method--createquery', () {
       var mock = HttpServerMock();
       var res = api.DoubleClickBidManagerApi(mock).queries;
@@ -1580,7 +1580,7 @@
     });
   });
 
-  unittest.group('resource-ReportsResourceApi', () {
+  unittest.group('resource-ReportsResource', () {
     unittest.test('method--listreports', () {
       var mock = HttpServerMock();
       var res = api.DoubleClickBidManagerApi(mock).reports;
@@ -1650,7 +1650,7 @@
     });
   });
 
-  unittest.group('resource-SdfResourceApi', () {
+  unittest.group('resource-SdfResource', () {
     unittest.test('method--download', () {
       var mock = HttpServerMock();
       var res = api.DoubleClickBidManagerApi(mock).sdf;
diff --git a/generated/googleapis/test/doubleclicksearch/v2_test.dart b/generated/googleapis/test/doubleclicksearch/v2_test.dart
index 8c33153..83f1210 100644
--- a/generated/googleapis/test/doubleclicksearch/v2_test.dart
+++ b/generated/googleapis/test/doubleclicksearch/v2_test.dart
@@ -869,7 +869,7 @@
     });
   });
 
-  unittest.group('resource-ConversionResourceApi', () {
+  unittest.group('resource-ConversionResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.DoubleclicksearchApi(mock).conversion;
@@ -1132,7 +1132,7 @@
     });
   });
 
-  unittest.group('resource-ReportsResourceApi', () {
+  unittest.group('resource-ReportsResource', () {
     unittest.test('method--generate', () {
       var mock = HttpServerMock();
       var res = api.DoubleclicksearchApi(mock).reports;
@@ -1347,7 +1347,7 @@
     });
   });
 
-  unittest.group('resource-SavedColumnsResourceApi', () {
+  unittest.group('resource-SavedColumnsResource', () {
     unittest.test('method--list', () {
       var mock = HttpServerMock();
       var res = api.DoubleclicksearchApi(mock).savedColumns;
diff --git a/generated/googleapis/test/drive/v2_test.dart b/generated/googleapis/test/drive/v2_test.dart
index ec27660..b1be889 100644
--- a/generated/googleapis/test/drive/v2_test.dart
+++ b/generated/googleapis/test/drive/v2_test.dart
@@ -3149,7 +3149,7 @@
     });
   });
 
-  unittest.group('resource-AboutResourceApi', () {
+  unittest.group('resource-AboutResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.DriveApi(mock).about;
@@ -3213,7 +3213,7 @@
     });
   });
 
-  unittest.group('resource-AppsResourceApi', () {
+  unittest.group('resource-AppsResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.DriveApi(mock).apps;
@@ -3330,7 +3330,7 @@
     });
   });
 
-  unittest.group('resource-ChangesResourceApi', () {
+  unittest.group('resource-ChangesResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.DriveApi(mock).changes;
@@ -3683,7 +3683,7 @@
     });
   });
 
-  unittest.group('resource-ChannelsResourceApi', () {
+  unittest.group('resource-ChannelsResource', () {
     unittest.test('method--stop', () {
       var mock = HttpServerMock();
       var res = api.DriveApi(mock).channels;
@@ -3737,7 +3737,7 @@
     });
   });
 
-  unittest.group('resource-ChildrenResourceApi', () {
+  unittest.group('resource-ChildrenResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.DriveApi(mock).children;
@@ -4020,7 +4020,7 @@
     });
   });
 
-  unittest.group('resource-CommentsResourceApi', () {
+  unittest.group('resource-CommentsResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.DriveApi(mock).comments;
@@ -4426,7 +4426,7 @@
     });
   });
 
-  unittest.group('resource-DrivesResourceApi', () {
+  unittest.group('resource-DrivesResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.DriveApi(mock).drives;
@@ -4840,7 +4840,7 @@
     });
   });
 
-  unittest.group('resource-FilesResourceApi', () {
+  unittest.group('resource-FilesResource', () {
     unittest.test('method--copy', () {
       var mock = HttpServerMock();
       var res = api.DriveApi(mock).files;
@@ -6050,7 +6050,7 @@
     });
   });
 
-  unittest.group('resource-ParentsResourceApi', () {
+  unittest.group('resource-ParentsResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.DriveApi(mock).parents;
@@ -6317,7 +6317,7 @@
     });
   });
 
-  unittest.group('resource-PermissionsResourceApi', () {
+  unittest.group('resource-PermissionsResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.DriveApi(mock).permissions;
@@ -6877,7 +6877,7 @@
     });
   });
 
-  unittest.group('resource-PropertiesResourceApi', () {
+  unittest.group('resource-PropertiesResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.DriveApi(mock).properties;
@@ -7278,7 +7278,7 @@
     });
   });
 
-  unittest.group('resource-RepliesResourceApi', () {
+  unittest.group('resource-RepliesResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.DriveApi(mock).replies;
@@ -7742,7 +7742,7 @@
     });
   });
 
-  unittest.group('resource-RevisionsResourceApi', () {
+  unittest.group('resource-RevisionsResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.DriveApi(mock).revisions;
@@ -8072,7 +8072,7 @@
     });
   });
 
-  unittest.group('resource-TeamdrivesResourceApi', () {
+  unittest.group('resource-TeamdrivesResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.DriveApi(mock).teamdrives;
diff --git a/generated/googleapis/test/drive/v3_test.dart b/generated/googleapis/test/drive/v3_test.dart
index 0f85fb0..c51ec8a 100644
--- a/generated/googleapis/test/drive/v3_test.dart
+++ b/generated/googleapis/test/drive/v3_test.dart
@@ -2173,7 +2173,7 @@
     });
   });
 
-  unittest.group('resource-AboutResourceApi', () {
+  unittest.group('resource-AboutResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.DriveApi(mock).about;
@@ -2222,7 +2222,7 @@
     });
   });
 
-  unittest.group('resource-ChangesResourceApi', () {
+  unittest.group('resource-ChangesResource', () {
     unittest.test('method--getStartPageToken', () {
       var mock = HttpServerMock();
       var res = api.DriveApi(mock).changes;
@@ -2495,7 +2495,7 @@
     });
   });
 
-  unittest.group('resource-ChannelsResourceApi', () {
+  unittest.group('resource-ChannelsResource', () {
     unittest.test('method--stop', () {
       var mock = HttpServerMock();
       var res = api.DriveApi(mock).channels;
@@ -2549,7 +2549,7 @@
     });
   });
 
-  unittest.group('resource-CommentsResourceApi', () {
+  unittest.group('resource-CommentsResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.DriveApi(mock).comments;
@@ -2887,7 +2887,7 @@
     });
   });
 
-  unittest.group('resource-DrivesResourceApi', () {
+  unittest.group('resource-DrivesResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.DriveApi(mock).drives;
@@ -3301,7 +3301,7 @@
     });
   });
 
-  unittest.group('resource-FilesResourceApi', () {
+  unittest.group('resource-FilesResource', () {
     unittest.test('method--copy', () {
       var mock = HttpServerMock();
       var res = api.DriveApi(mock).files;
@@ -4077,7 +4077,7 @@
     });
   });
 
-  unittest.group('resource-PermissionsResourceApi', () {
+  unittest.group('resource-PermissionsResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.DriveApi(mock).permissions;
@@ -4499,7 +4499,7 @@
     });
   });
 
-  unittest.group('resource-RepliesResourceApi', () {
+  unittest.group('resource-RepliesResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.DriveApi(mock).replies;
@@ -4884,7 +4884,7 @@
     });
   });
 
-  unittest.group('resource-RevisionsResourceApi', () {
+  unittest.group('resource-RevisionsResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.DriveApi(mock).revisions;
@@ -5153,7 +5153,7 @@
     });
   });
 
-  unittest.group('resource-TeamdrivesResourceApi', () {
+  unittest.group('resource-TeamdrivesResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.DriveApi(mock).teamdrives;
diff --git a/generated/googleapis/test/driveactivity/v2_test.dart b/generated/googleapis/test/driveactivity/v2_test.dart
index b2809e3..54e837e 100644
--- a/generated/googleapis/test/driveactivity/v2_test.dart
+++ b/generated/googleapis/test/driveactivity/v2_test.dart
@@ -1729,7 +1729,7 @@
     });
   });
 
-  unittest.group('resource-ActivityResourceApi', () {
+  unittest.group('resource-ActivityResource', () {
     unittest.test('method--query', () {
       var mock = HttpServerMock();
       var res = api.DriveActivityApi(mock).activity;
diff --git a/generated/googleapis/test/fcm/v1_test.dart b/generated/googleapis/test/fcm/v1_test.dart
index 15d5ffb..cc5cf5d 100644
--- a/generated/googleapis/test/fcm/v1_test.dart
+++ b/generated/googleapis/test/fcm/v1_test.dart
@@ -651,7 +651,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsMessagesResourceApi', () {
+  unittest.group('resource-ProjectsMessagesResource', () {
     unittest.test('method--send', () {
       var mock = HttpServerMock();
       var res = api.FirebaseCloudMessagingApi(mock).projects.messages;
diff --git a/generated/googleapis/test/file/v1_test.dart b/generated/googleapis/test/file/v1_test.dart
index d8f4a1f..2d22ed5 100644
--- a/generated/googleapis/test/file/v1_test.dart
+++ b/generated/googleapis/test/file/v1_test.dart
@@ -1198,7 +1198,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsLocationsResourceApi', () {
+  unittest.group('resource-ProjectsLocationsResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.CloudFilestoreApi(mock).projects.locations;
@@ -1312,7 +1312,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsLocationsInstancesResourceApi', () {
+  unittest.group('resource-ProjectsLocationsInstancesResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.CloudFilestoreApi(mock).projects.locations.instances;
@@ -1588,7 +1588,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsLocationsOperationsResourceApi', () {
+  unittest.group('resource-ProjectsLocationsOperationsResource', () {
     unittest.test('method--cancel', () {
       var mock = HttpServerMock();
       var res = api.CloudFilestoreApi(mock).projects.locations.operations;
diff --git a/generated/googleapis/test/firebasedynamiclinks/v1_test.dart b/generated/googleapis/test/firebasedynamiclinks/v1_test.dart
index 763a893..6d60fb3 100644
--- a/generated/googleapis/test/firebasedynamiclinks/v1_test.dart
+++ b/generated/googleapis/test/firebasedynamiclinks/v1_test.dart
@@ -889,7 +889,7 @@
     });
   });
 
-  unittest.group('resource-ManagedShortLinksResourceApi', () {
+  unittest.group('resource-ManagedShortLinksResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.FirebaseDynamicLinksApi(mock).managedShortLinks;
@@ -944,7 +944,7 @@
     });
   });
 
-  unittest.group('resource-ShortLinksResourceApi', () {
+  unittest.group('resource-ShortLinksResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.FirebaseDynamicLinksApi(mock).shortLinks;
@@ -999,7 +999,7 @@
     });
   });
 
-  unittest.group('resource-V1ResourceApi', () {
+  unittest.group('resource-V1Resource', () {
     unittest.test('method--getLinkStats', () {
       var mock = HttpServerMock();
       var res = api.FirebaseDynamicLinksApi(mock).v1;
diff --git a/generated/googleapis/test/firebaserules/v1_test.dart b/generated/googleapis/test/firebaserules/v1_test.dart
index a6377e2..6bdfa37 100644
--- a/generated/googleapis/test/firebaserules/v1_test.dart
+++ b/generated/googleapis/test/firebaserules/v1_test.dart
@@ -1030,7 +1030,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsResourceApi', () {
+  unittest.group('resource-ProjectsResource', () {
     unittest.test('method--test', () {
       var mock = HttpServerMock();
       var res = api.FirebaseRulesApi(mock).projects;
@@ -1085,7 +1085,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsReleasesResourceApi', () {
+  unittest.group('resource-ProjectsReleasesResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.FirebaseRulesApi(mock).projects.releases;
@@ -1402,7 +1402,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsRulesetsResourceApi', () {
+  unittest.group('resource-ProjectsRulesetsResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.FirebaseRulesApi(mock).projects.rulesets;
diff --git a/generated/googleapis/test/firestore/v1_test.dart b/generated/googleapis/test/firestore/v1_test.dart
index 7ac493b..3f5bd7b 100644
--- a/generated/googleapis/test/firestore/v1_test.dart
+++ b/generated/googleapis/test/firestore/v1_test.dart
@@ -3173,7 +3173,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsDatabasesResourceApi', () {
+  unittest.group('resource-ProjectsDatabasesResource', () {
     unittest.test('method--exportDocuments', () {
       var mock = HttpServerMock();
       var res = api.FirestoreApi(mock).projects.databases;
@@ -3285,7 +3285,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsDatabasesCollectionGroupsFieldsResourceApi',
+  unittest.group('resource-ProjectsDatabasesCollectionGroupsFieldsResource',
       () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
@@ -3461,7 +3461,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsDatabasesCollectionGroupsIndexesResourceApi',
+  unittest.group('resource-ProjectsDatabasesCollectionGroupsIndexesResource',
       () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
@@ -3682,7 +3682,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsDatabasesDocumentsResourceApi', () {
+  unittest.group('resource-ProjectsDatabasesDocumentsResource', () {
     unittest.test('method--batchGet', () {
       var mock = HttpServerMock();
       var res = api.FirestoreApi(mock).projects.databases.documents;
@@ -4545,7 +4545,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsDatabasesOperationsResourceApi', () {
+  unittest.group('resource-ProjectsDatabasesOperationsResource', () {
     unittest.test('method--cancel', () {
       var mock = HttpServerMock();
       var res = api.FirestoreApi(mock).projects.databases.operations;
@@ -4760,7 +4760,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsLocationsResourceApi', () {
+  unittest.group('resource-ProjectsLocationsResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.FirestoreApi(mock).projects.locations;
diff --git a/generated/googleapis/test/fitness/v1_test.dart b/generated/googleapis/test/fitness/v1_test.dart
index 3574b03..6949b5b 100644
--- a/generated/googleapis/test/fitness/v1_test.dart
+++ b/generated/googleapis/test/fitness/v1_test.dart
@@ -956,7 +956,7 @@
     });
   });
 
-  unittest.group('resource-UsersDataSourcesResourceApi', () {
+  unittest.group('resource-UsersDataSourcesResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.FitnessApi(mock).users.dataSources;
@@ -1196,7 +1196,7 @@
     });
   });
 
-  unittest.group('resource-UsersDataSourcesDataPointChangesResourceApi', () {
+  unittest.group('resource-UsersDataSourcesDataPointChangesResource', () {
     unittest.test('method--list', () {
       var mock = HttpServerMock();
       var res = api.FitnessApi(mock).users.dataSources.dataPointChanges;
@@ -1251,7 +1251,7 @@
     });
   });
 
-  unittest.group('resource-UsersDataSourcesDatasetsResourceApi', () {
+  unittest.group('resource-UsersDataSourcesDatasetsResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.FitnessApi(mock).users.dataSources.datasets;
@@ -1414,7 +1414,7 @@
     });
   });
 
-  unittest.group('resource-UsersDatasetResourceApi', () {
+  unittest.group('resource-UsersDatasetResource', () {
     unittest.test('method--aggregate', () {
       var mock = HttpServerMock();
       var res = api.FitnessApi(mock).users.dataset;
@@ -1465,7 +1465,7 @@
     });
   });
 
-  unittest.group('resource-UsersSessionsResourceApi', () {
+  unittest.group('resource-UsersSessionsResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.FitnessApi(mock).users.sessions;
diff --git a/generated/googleapis/test/games/v1_test.dart b/generated/googleapis/test/games/v1_test.dart
index 1505fd3..afe8d56 100644
--- a/generated/googleapis/test/games/v1_test.dart
+++ b/generated/googleapis/test/games/v1_test.dart
@@ -2447,7 +2447,7 @@
     });
   });
 
-  unittest.group('resource-AchievementDefinitionsResourceApi', () {
+  unittest.group('resource-AchievementDefinitionsResource', () {
     unittest.test('method--list', () {
       var mock = HttpServerMock();
       var res = api.GamesApi(mock).achievementDefinitions;
@@ -2510,7 +2510,7 @@
     });
   });
 
-  unittest.group('resource-AchievementsResourceApi', () {
+  unittest.group('resource-AchievementsResource', () {
     unittest.test('method--increment', () {
       var mock = HttpServerMock();
       var res = api.GamesApi(mock).achievements;
@@ -2878,7 +2878,7 @@
     });
   });
 
-  unittest.group('resource-ApplicationsResourceApi', () {
+  unittest.group('resource-ApplicationsResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.GamesApi(mock).applications;
@@ -3038,7 +3038,7 @@
     });
   });
 
-  unittest.group('resource-EventsResourceApi', () {
+  unittest.group('resource-EventsResource', () {
     unittest.test('method--listByPlayer', () {
       var mock = HttpServerMock();
       var res = api.GamesApi(mock).events;
@@ -3213,7 +3213,7 @@
     });
   });
 
-  unittest.group('resource-LeaderboardsResourceApi', () {
+  unittest.group('resource-LeaderboardsResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.GamesApi(mock).leaderboards;
@@ -3327,7 +3327,7 @@
     });
   });
 
-  unittest.group('resource-MetagameResourceApi', () {
+  unittest.group('resource-MetagameResource', () {
     unittest.test('method--getMetagameConfig', () {
       var mock = HttpServerMock();
       var res = api.GamesApi(mock).metagame;
@@ -3448,7 +3448,7 @@
     });
   });
 
-  unittest.group('resource-PlayersResourceApi', () {
+  unittest.group('resource-PlayersResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.GamesApi(mock).players;
@@ -3566,7 +3566,7 @@
     });
   });
 
-  unittest.group('resource-RevisionsResourceApi', () {
+  unittest.group('resource-RevisionsResource', () {
     unittest.test('method--check', () {
       var mock = HttpServerMock();
       var res = api.GamesApi(mock).revisions;
@@ -3617,7 +3617,7 @@
     });
   });
 
-  unittest.group('resource-ScoresResourceApi', () {
+  unittest.group('resource-ScoresResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.GamesApi(mock).scores;
@@ -3990,7 +3990,7 @@
     });
   });
 
-  unittest.group('resource-SnapshotsResourceApi', () {
+  unittest.group('resource-SnapshotsResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.GamesApi(mock).snapshots;
@@ -4114,7 +4114,7 @@
     });
   });
 
-  unittest.group('resource-StatsResourceApi', () {
+  unittest.group('resource-StatsResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.GamesApi(mock).stats;
diff --git a/generated/googleapis/test/gamesconfiguration/v1configuration_test.dart b/generated/googleapis/test/gamesconfiguration/v1configuration_test.dart
index 4146d26..3a1b10e 100644
--- a/generated/googleapis/test/gamesconfiguration/v1configuration_test.dart
+++ b/generated/googleapis/test/gamesconfiguration/v1configuration_test.dart
@@ -462,7 +462,7 @@
     });
   });
 
-  unittest.group('resource-AchievementConfigurationsResourceApi', () {
+  unittest.group('resource-AchievementConfigurationsResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.GamesConfigurationApi(mock).achievementConfigurations;
@@ -745,7 +745,7 @@
     });
   });
 
-  unittest.group('resource-ImageConfigurationsResourceApi', () {
+  unittest.group('resource-ImageConfigurationsResource', () {
     unittest.test('method--upload', () {
       // TODO: Implement tests for media upload;
       // TODO: Implement tests for media download;
@@ -810,7 +810,7 @@
     });
   });
 
-  unittest.group('resource-LeaderboardConfigurationsResourceApi', () {
+  unittest.group('resource-LeaderboardConfigurationsResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.GamesConfigurationApi(mock).leaderboardConfigurations;
diff --git a/generated/googleapis/test/gamesmanagement/v1management_test.dart b/generated/googleapis/test/gamesmanagement/v1management_test.dart
index 014a65f..1ff0eab 100644
--- a/generated/googleapis/test/gamesmanagement/v1management_test.dart
+++ b/generated/googleapis/test/gamesmanagement/v1management_test.dart
@@ -570,7 +570,7 @@
     });
   });
 
-  unittest.group('resource-AchievementsResourceApi', () {
+  unittest.group('resource-AchievementsResource', () {
     unittest.test('method--reset', () {
       var mock = HttpServerMock();
       var res = api.GamesManagementApi(mock).achievements;
@@ -827,7 +827,7 @@
     });
   });
 
-  unittest.group('resource-ApplicationsResourceApi', () {
+  unittest.group('resource-ApplicationsResource', () {
     unittest.test('method--listHidden', () {
       var mock = HttpServerMock();
       var res = api.GamesManagementApi(mock).applications;
@@ -894,7 +894,7 @@
     });
   });
 
-  unittest.group('resource-EventsResourceApi', () {
+  unittest.group('resource-EventsResource', () {
     unittest.test('method--reset', () {
       var mock = HttpServerMock();
       var res = api.GamesManagementApi(mock).events;
@@ -1142,7 +1142,7 @@
     });
   });
 
-  unittest.group('resource-PlayersResourceApi', () {
+  unittest.group('resource-PlayersResource', () {
     unittest.test('method--hide', () {
       var mock = HttpServerMock();
       var res = api.GamesManagementApi(mock).players;
@@ -1260,7 +1260,7 @@
     });
   });
 
-  unittest.group('resource-ScoresResourceApi', () {
+  unittest.group('resource-ScoresResource', () {
     unittest.test('method--reset', () {
       var mock = HttpServerMock();
       var res = api.GamesManagementApi(mock).scores;
diff --git a/generated/googleapis/test/genomics/v1_test.dart b/generated/googleapis/test/genomics/v1_test.dart
index ea971a3..b5a7b94 100644
--- a/generated/googleapis/test/genomics/v1_test.dart
+++ b/generated/googleapis/test/genomics/v1_test.dart
@@ -912,7 +912,7 @@
     });
   });
 
-  unittest.group('resource-OperationsResourceApi', () {
+  unittest.group('resource-OperationsResource', () {
     unittest.test('method--cancel', () {
       var mock = HttpServerMock();
       var res = api.GenomicsApi(mock).operations;
diff --git a/generated/googleapis/test/gmail/v1_test.dart b/generated/googleapis/test/gmail/v1_test.dart
index a5dc9b2..4709a1f 100644
--- a/generated/googleapis/test/gmail/v1_test.dart
+++ b/generated/googleapis/test/gmail/v1_test.dart
@@ -1872,7 +1872,7 @@
     });
   });
 
-  unittest.group('resource-UsersResourceApi', () {
+  unittest.group('resource-UsersResource', () {
     unittest.test('method--getProfile', () {
       var mock = HttpServerMock();
       var res = api.GmailApi(mock).users;
@@ -2045,7 +2045,7 @@
     });
   });
 
-  unittest.group('resource-UsersDraftsResourceApi', () {
+  unittest.group('resource-UsersDraftsResource', () {
     unittest.test('method--create', () {
       // TODO: Implement tests for media upload;
       // TODO: Implement tests for media download;
@@ -2435,7 +2435,7 @@
     });
   });
 
-  unittest.group('resource-UsersHistoryResourceApi', () {
+  unittest.group('resource-UsersHistoryResource', () {
     unittest.test('method--list', () {
       var mock = HttpServerMock();
       var res = api.GmailApi(mock).users.history;
@@ -2514,7 +2514,7 @@
     });
   });
 
-  unittest.group('resource-UsersLabelsResourceApi', () {
+  unittest.group('resource-UsersLabelsResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.GmailApi(mock).users.labels;
@@ -2881,7 +2881,7 @@
     });
   });
 
-  unittest.group('resource-UsersMessagesResourceApi', () {
+  unittest.group('resource-UsersMessagesResource', () {
     unittest.test('method--batchDelete', () {
       var mock = HttpServerMock();
       var res = api.GmailApi(mock).users.messages;
@@ -3623,7 +3623,7 @@
     });
   });
 
-  unittest.group('resource-UsersMessagesAttachmentsResourceApi', () {
+  unittest.group('resource-UsersMessagesAttachmentsResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.GmailApi(mock).users.messages.attachments;
@@ -3695,7 +3695,7 @@
     });
   });
 
-  unittest.group('resource-UsersSettingsResourceApi', () {
+  unittest.group('resource-UsersSettingsResource', () {
     unittest.test('method--getAutoForwarding', () {
       var mock = HttpServerMock();
       var res = api.GmailApi(mock).users.settings;
@@ -4282,7 +4282,7 @@
     });
   });
 
-  unittest.group('resource-UsersSettingsDelegatesResourceApi', () {
+  unittest.group('resource-UsersSettingsDelegatesResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.GmailApi(mock).users.settings.delegates;
@@ -4519,7 +4519,7 @@
     });
   });
 
-  unittest.group('resource-UsersSettingsFiltersResourceApi', () {
+  unittest.group('resource-UsersSettingsFiltersResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.GmailApi(mock).users.settings.filters;
@@ -4756,7 +4756,7 @@
     });
   });
 
-  unittest.group('resource-UsersSettingsForwardingAddressesResourceApi', () {
+  unittest.group('resource-UsersSettingsForwardingAddressesResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.GmailApi(mock).users.settings.forwardingAddresses;
@@ -4994,7 +4994,7 @@
     });
   });
 
-  unittest.group('resource-UsersSettingsSendAsResourceApi', () {
+  unittest.group('resource-UsersSettingsSendAsResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.GmailApi(mock).users.settings.sendAs;
@@ -5426,7 +5426,7 @@
     });
   });
 
-  unittest.group('resource-UsersSettingsSendAsSmimeInfoResourceApi', () {
+  unittest.group('resource-UsersSettingsSendAsSmimeInfoResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.GmailApi(mock).users.settings.sendAs.smimeInfo;
@@ -5778,7 +5778,7 @@
     });
   });
 
-  unittest.group('resource-UsersThreadsResourceApi', () {
+  unittest.group('resource-UsersThreadsResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.GmailApi(mock).users.threads;
diff --git a/generated/googleapis/test/groupsmigration/v1_test.dart b/generated/googleapis/test/groupsmigration/v1_test.dart
index ba1820b..767f8c3 100644
--- a/generated/googleapis/test/groupsmigration/v1_test.dart
+++ b/generated/googleapis/test/groupsmigration/v1_test.dart
@@ -57,7 +57,7 @@
     });
   });
 
-  unittest.group('resource-ArchiveResourceApi', () {
+  unittest.group('resource-ArchiveResource', () {
     unittest.test('method--insert', () {
       // TODO: Implement tests for media upload;
       // TODO: Implement tests for media download;
diff --git a/generated/googleapis/test/groupssettings/v1_test.dart b/generated/googleapis/test/groupssettings/v1_test.dart
index e9e521e..b377323 100644
--- a/generated/googleapis/test/groupssettings/v1_test.dart
+++ b/generated/googleapis/test/groupssettings/v1_test.dart
@@ -180,7 +180,7 @@
     });
   });
 
-  unittest.group('resource-GroupsResourceApi', () {
+  unittest.group('resource-GroupsResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.GroupssettingsApi(mock).groups;
diff --git a/generated/googleapis/test/healthcare/v1_test.dart b/generated/googleapis/test/healthcare/v1_test.dart
index 29bde99..d9f86be 100644
--- a/generated/googleapis/test/healthcare/v1_test.dart
+++ b/generated/googleapis/test/healthcare/v1_test.dart
@@ -2848,7 +2848,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsLocationsResourceApi', () {
+  unittest.group('resource-ProjectsLocationsResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.CloudHealthcareApi(mock).projects.locations;
@@ -2958,7 +2958,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsLocationsDatasetsResourceApi', () {
+  unittest.group('resource-ProjectsLocationsDatasetsResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.CloudHealthcareApi(mock).projects.locations.datasets;
@@ -3442,8 +3442,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsLocationsDatasetsDicomStoresResourceApi',
-      () {
+  unittest.group('resource-ProjectsLocationsDatasetsDicomStoresResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res =
@@ -4255,8 +4254,8 @@
     });
   });
 
-  unittest.group(
-      'resource-ProjectsLocationsDatasetsDicomStoresStudiesResourceApi', () {
+  unittest.group('resource-ProjectsLocationsDatasetsDicomStoresStudiesResource',
+      () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.CloudHealthcareApi(mock)
@@ -4590,8 +4589,7 @@
   });
 
   unittest.group(
-      'resource-ProjectsLocationsDatasetsDicomStoresStudiesSeriesResourceApi',
-      () {
+      'resource-ProjectsLocationsDatasetsDicomStoresStudiesSeriesResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.CloudHealthcareApi(mock)
@@ -4815,7 +4813,7 @@
   });
 
   unittest.group(
-      'resource-ProjectsLocationsDatasetsDicomStoresStudiesSeriesInstancesResourceApi',
+      'resource-ProjectsLocationsDatasetsDicomStoresStudiesSeriesInstancesResource',
       () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
@@ -5043,7 +5041,7 @@
   });
 
   unittest.group(
-      'resource-ProjectsLocationsDatasetsDicomStoresStudiesSeriesInstancesFramesResourceApi',
+      'resource-ProjectsLocationsDatasetsDicomStoresStudiesSeriesInstancesFramesResource',
       () {
     unittest.test('method--retrieveFrames', () {
       var mock = HttpServerMock();
@@ -5160,7 +5158,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsLocationsDatasetsFhirStoresResourceApi', () {
+  unittest.group('resource-ProjectsLocationsDatasetsFhirStoresResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res =
@@ -5764,7 +5762,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsLocationsDatasetsFhirStoresFhirResourceApi',
+  unittest.group('resource-ProjectsLocationsDatasetsFhirStoresFhirResource',
       () {
     unittest.test('method--PatientEverything', () {
       var mock = HttpServerMock();
@@ -6463,8 +6461,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsLocationsDatasetsHl7V2StoresResourceApi',
-      () {
+  unittest.group('resource-ProjectsLocationsDatasetsHl7V2StoresResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res =
@@ -6907,7 +6904,7 @@
   });
 
   unittest.group(
-      'resource-ProjectsLocationsDatasetsHl7V2StoresMessagesResourceApi', () {
+      'resource-ProjectsLocationsDatasetsHl7V2StoresMessagesResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.CloudHealthcareApi(mock)
@@ -7267,7 +7264,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsLocationsDatasetsOperationsResourceApi', () {
+  unittest.group('resource-ProjectsLocationsDatasetsOperationsResource', () {
     unittest.test('method--cancel', () {
       var mock = HttpServerMock();
       var res =
diff --git a/generated/googleapis/test/homegraph/v1_test.dart b/generated/googleapis/test/homegraph/v1_test.dart
index a82e679..6187a61 100644
--- a/generated/googleapis/test/homegraph/v1_test.dart
+++ b/generated/googleapis/test/homegraph/v1_test.dart
@@ -877,7 +877,7 @@
     });
   });
 
-  unittest.group('resource-AgentUsersResourceApi', () {
+  unittest.group('resource-AgentUsersResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.HomeGraphServiceApi(mock).agentUsers;
@@ -931,7 +931,7 @@
     });
   });
 
-  unittest.group('resource-DevicesResourceApi', () {
+  unittest.group('resource-DevicesResource', () {
     unittest.test('method--query', () {
       var mock = HttpServerMock();
       var res = api.HomeGraphServiceApi(mock).devices;
diff --git a/generated/googleapis/test/iam/v1_test.dart b/generated/googleapis/test/iam/v1_test.dart
index 1233684..2656f13 100644
--- a/generated/googleapis/test/iam/v1_test.dart
+++ b/generated/googleapis/test/iam/v1_test.dart
@@ -1617,7 +1617,7 @@
     });
   });
 
-  unittest.group('resource-IamPoliciesResourceApi', () {
+  unittest.group('resource-IamPoliciesResource', () {
     unittest.test('method--lintPolicy', () {
       var mock = HttpServerMock();
       var res = api.IamApi(mock).iamPolicies;
@@ -1723,7 +1723,7 @@
     });
   });
 
-  unittest.group('resource-OrganizationsRolesResourceApi', () {
+  unittest.group('resource-OrganizationsRolesResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.IamApi(mock).organizations.roles;
@@ -2050,7 +2050,7 @@
     });
   });
 
-  unittest.group('resource-PermissionsResourceApi', () {
+  unittest.group('resource-PermissionsResource', () {
     unittest.test('method--queryTestablePermissions', () {
       var mock = HttpServerMock();
       var res = api.IamApi(mock).permissions;
@@ -2105,7 +2105,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsRolesResourceApi', () {
+  unittest.group('resource-ProjectsRolesResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.IamApi(mock).projects.roles;
@@ -2432,7 +2432,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsServiceAccountsResourceApi', () {
+  unittest.group('resource-ProjectsServiceAccountsResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.IamApi(mock).projects.serviceAccounts;
@@ -3179,7 +3179,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsServiceAccountsKeysResourceApi', () {
+  unittest.group('resource-ProjectsServiceAccountsKeysResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.IamApi(mock).projects.serviceAccounts.keys;
@@ -3439,7 +3439,7 @@
     });
   });
 
-  unittest.group('resource-RolesResourceApi', () {
+  unittest.group('resource-RolesResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.IamApi(mock).roles;
diff --git a/generated/googleapis/test/iamcredentials/v1_test.dart b/generated/googleapis/test/iamcredentials/v1_test.dart
index 4a6a4ec..e75f15b 100644
--- a/generated/googleapis/test/iamcredentials/v1_test.dart
+++ b/generated/googleapis/test/iamcredentials/v1_test.dart
@@ -327,7 +327,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsServiceAccountsResourceApi', () {
+  unittest.group('resource-ProjectsServiceAccountsResource', () {
     unittest.test('method--generateAccessToken', () {
       var mock = HttpServerMock();
       var res = api.IAMCredentialsApi(mock).projects.serviceAccounts;
diff --git a/generated/googleapis/test/iap/v1_test.dart b/generated/googleapis/test/iap/v1_test.dart
index 008da42..bf5e986 100644
--- a/generated/googleapis/test/iap/v1_test.dart
+++ b/generated/googleapis/test/iap/v1_test.dart
@@ -870,7 +870,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsBrandsResourceApi', () {
+  unittest.group('resource-ProjectsBrandsResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.CloudIAPApi(mock).projects.brands;
@@ -1021,7 +1021,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsBrandsIdentityAwareProxyClientsResourceApi',
+  unittest.group('resource-ProjectsBrandsIdentityAwareProxyClientsResource',
       () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
@@ -1286,7 +1286,7 @@
     });
   });
 
-  unittest.group('resource-V1ResourceApi', () {
+  unittest.group('resource-V1Resource', () {
     unittest.test('method--getIamPolicy', () {
       var mock = HttpServerMock();
       var res = api.CloudIAPApi(mock).v1;
diff --git a/generated/googleapis/test/identitytoolkit/v3_test.dart b/generated/googleapis/test/identitytoolkit/v3_test.dart
index da45718..773c5a3 100644
--- a/generated/googleapis/test/identitytoolkit/v3_test.dart
+++ b/generated/googleapis/test/identitytoolkit/v3_test.dart
@@ -2156,7 +2156,7 @@
     });
   });
 
-  unittest.group('resource-RelyingpartyResourceApi', () {
+  unittest.group('resource-RelyingpartyResource', () {
     unittest.test('method--createAuthUri', () {
       var mock = HttpServerMock();
       var res = api.IdentityToolkitApi(mock).relyingparty;
diff --git a/generated/googleapis/test/indexing/v3_test.dart b/generated/googleapis/test/indexing/v3_test.dart
index f852d74..32a7f6e 100644
--- a/generated/googleapis/test/indexing/v3_test.dart
+++ b/generated/googleapis/test/indexing/v3_test.dart
@@ -119,7 +119,7 @@
     });
   });
 
-  unittest.group('resource-UrlNotificationsResourceApi', () {
+  unittest.group('resource-UrlNotificationsResource', () {
     unittest.test('method--getMetadata', () {
       var mock = HttpServerMock();
       var res = api.IndexingApi(mock).urlNotifications;
diff --git a/generated/googleapis/test/jobs/v2_test.dart b/generated/googleapis/test/jobs/v2_test.dart
index b640d47..d9cda00 100644
--- a/generated/googleapis/test/jobs/v2_test.dart
+++ b/generated/googleapis/test/jobs/v2_test.dart
@@ -3820,7 +3820,7 @@
     });
   });
 
-  unittest.group('resource-CompaniesResourceApi', () {
+  unittest.group('resource-CompaniesResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.CloudTalentSolutionApi(mock).companies;
@@ -4086,7 +4086,7 @@
     });
   });
 
-  unittest.group('resource-CompaniesJobsResourceApi', () {
+  unittest.group('resource-CompaniesJobsResource', () {
     unittest.test('method--list', () {
       var mock = HttpServerMock();
       var res = api.CloudTalentSolutionApi(mock).companies.jobs;
@@ -4157,7 +4157,7 @@
     });
   });
 
-  unittest.group('resource-JobsResourceApi', () {
+  unittest.group('resource-JobsResource', () {
     unittest.test('method--batchDelete', () {
       var mock = HttpServerMock();
       var res = api.CloudTalentSolutionApi(mock).jobs;
@@ -4680,7 +4680,7 @@
     });
   });
 
-  unittest.group('resource-V2ResourceApi', () {
+  unittest.group('resource-V2Resource', () {
     unittest.test('method--complete', () {
       var mock = HttpServerMock();
       var res = api.CloudTalentSolutionApi(mock).v2;
diff --git a/generated/googleapis/test/jobs/v3_test.dart b/generated/googleapis/test/jobs/v3_test.dart
index 7b938ec..6c69ea6 100644
--- a/generated/googleapis/test/jobs/v3_test.dart
+++ b/generated/googleapis/test/jobs/v3_test.dart
@@ -3334,7 +3334,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsResourceApi', () {
+  unittest.group('resource-ProjectsResource', () {
     unittest.test('method--complete', () {
       var mock = HttpServerMock();
       var res = api.CloudTalentSolutionApi(mock).projects;
@@ -3410,7 +3410,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsClientEventsResourceApi', () {
+  unittest.group('resource-ProjectsClientEventsResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.CloudTalentSolutionApi(mock).projects.clientEvents;
@@ -3465,7 +3465,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsCompaniesResourceApi', () {
+  unittest.group('resource-ProjectsCompaniesResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.CloudTalentSolutionApi(mock).projects.companies;
@@ -3730,7 +3730,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsJobsResourceApi', () {
+  unittest.group('resource-ProjectsJobsResource', () {
     unittest.test('method--batchDelete', () {
       var mock = HttpServerMock();
       var res = api.CloudTalentSolutionApi(mock).projects.jobs;
diff --git a/generated/googleapis/test/kgsearch/v1_test.dart b/generated/googleapis/test/kgsearch/v1_test.dart
index 8b48f35..aa2849f 100644
--- a/generated/googleapis/test/kgsearch/v1_test.dart
+++ b/generated/googleapis/test/kgsearch/v1_test.dart
@@ -143,7 +143,7 @@
     });
   });
 
-  unittest.group('resource-EntitiesResourceApi', () {
+  unittest.group('resource-EntitiesResource', () {
     unittest.test('method--search', () {
       var mock = HttpServerMock();
       var res = api.KgsearchApi(mock).entities;
diff --git a/generated/googleapis/test/language/v1_test.dart b/generated/googleapis/test/language/v1_test.dart
index d0b2319..964d45a 100644
--- a/generated/googleapis/test/language/v1_test.dart
+++ b/generated/googleapis/test/language/v1_test.dart
@@ -980,7 +980,7 @@
     });
   });
 
-  unittest.group('resource-DocumentsResourceApi', () {
+  unittest.group('resource-DocumentsResource', () {
     unittest.test('method--analyzeEntities', () {
       var mock = HttpServerMock();
       var res = api.CloudNaturalLanguageApi(mock).documents;
diff --git a/generated/googleapis/test/libraryagent/v1_test.dart b/generated/googleapis/test/libraryagent/v1_test.dart
index fb94592..89bb723 100644
--- a/generated/googleapis/test/libraryagent/v1_test.dart
+++ b/generated/googleapis/test/libraryagent/v1_test.dart
@@ -191,7 +191,7 @@
     });
   });
 
-  unittest.group('resource-ShelvesResourceApi', () {
+  unittest.group('resource-ShelvesResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.LibraryagentApi(mock).shelves;
@@ -299,7 +299,7 @@
     });
   });
 
-  unittest.group('resource-ShelvesBooksResourceApi', () {
+  unittest.group('resource-ShelvesBooksResource', () {
     unittest.test('method--borrow', () {
       var mock = HttpServerMock();
       var res = api.LibraryagentApi(mock).shelves.books;
diff --git a/generated/googleapis/test/licensing/v1_test.dart b/generated/googleapis/test/licensing/v1_test.dart
index cfd146b..34337ca 100644
--- a/generated/googleapis/test/licensing/v1_test.dart
+++ b/generated/googleapis/test/licensing/v1_test.dart
@@ -142,7 +142,7 @@
     });
   });
 
-  unittest.group('resource-LicenseAssignmentsResourceApi', () {
+  unittest.group('resource-LicenseAssignmentsResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.LicensingApi(mock).licenseAssignments;
diff --git a/generated/googleapis/test/logging/v2_test.dart b/generated/googleapis/test/logging/v2_test.dart
index 4cacc7e..749bf42 100644
--- a/generated/googleapis/test/logging/v2_test.dart
+++ b/generated/googleapis/test/logging/v2_test.dart
@@ -1667,7 +1667,7 @@
     });
   });
 
-  unittest.group('resource-BillingAccountsBucketsResourceApi', () {
+  unittest.group('resource-BillingAccountsBucketsResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.LoggingApi(mock).billingAccounts.buckets;
@@ -1717,7 +1717,7 @@
     });
   });
 
-  unittest.group('resource-BillingAccountsExclusionsResourceApi', () {
+  unittest.group('resource-BillingAccountsExclusionsResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.LoggingApi(mock).billingAccounts.exclusions;
@@ -1982,7 +1982,7 @@
     });
   });
 
-  unittest.group('resource-BillingAccountsLocationsBucketsResourceApi', () {
+  unittest.group('resource-BillingAccountsLocationsBucketsResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.LoggingApi(mock).billingAccounts.locations.buckets;
@@ -2256,7 +2256,7 @@
     });
   });
 
-  unittest.group('resource-BillingAccountsLogsResourceApi', () {
+  unittest.group('resource-BillingAccountsLogsResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.LoggingApi(mock).billingAccounts.logs;
@@ -2363,7 +2363,7 @@
     });
   });
 
-  unittest.group('resource-BillingAccountsSinksResourceApi', () {
+  unittest.group('resource-BillingAccountsSinksResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.LoggingApi(mock).billingAccounts.sinks;
@@ -2700,7 +2700,7 @@
     });
   });
 
-  unittest.group('resource-EntriesResourceApi', () {
+  unittest.group('resource-EntriesResource', () {
     unittest.test('method--list', () {
       var mock = HttpServerMock();
       var res = api.LoggingApi(mock).entries;
@@ -2804,7 +2804,7 @@
     });
   });
 
-  unittest.group('resource-ExclusionsResourceApi', () {
+  unittest.group('resource-ExclusionsResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.LoggingApi(mock).exclusions;
@@ -3069,7 +3069,7 @@
     });
   });
 
-  unittest.group('resource-FoldersExclusionsResourceApi', () {
+  unittest.group('resource-FoldersExclusionsResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.LoggingApi(mock).folders.exclusions;
@@ -3334,7 +3334,7 @@
     });
   });
 
-  unittest.group('resource-FoldersLocationsBucketsResourceApi', () {
+  unittest.group('resource-FoldersLocationsBucketsResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.LoggingApi(mock).folders.locations.buckets;
@@ -3656,7 +3656,7 @@
     });
   });
 
-  unittest.group('resource-FoldersLogsResourceApi', () {
+  unittest.group('resource-FoldersLogsResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.LoggingApi(mock).folders.logs;
@@ -3763,7 +3763,7 @@
     });
   });
 
-  unittest.group('resource-FoldersSinksResourceApi', () {
+  unittest.group('resource-FoldersSinksResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.LoggingApi(mock).folders.sinks;
@@ -4100,7 +4100,7 @@
     });
   });
 
-  unittest.group('resource-LocationsBucketsResourceApi', () {
+  unittest.group('resource-LocationsBucketsResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.LoggingApi(mock).locations.buckets;
@@ -4422,7 +4422,7 @@
     });
   });
 
-  unittest.group('resource-LogsResourceApi', () {
+  unittest.group('resource-LogsResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.LoggingApi(mock).logs;
@@ -4529,7 +4529,7 @@
     });
   });
 
-  unittest.group('resource-MonitoredResourceDescriptorsResourceApi', () {
+  unittest.group('resource-MonitoredResourceDescriptorsResource', () {
     unittest.test('method--list', () {
       var mock = HttpServerMock();
       var res = api.LoggingApi(mock).monitoredResourceDescriptors;
@@ -4588,7 +4588,7 @@
     });
   });
 
-  unittest.group('resource-OrganizationsResourceApi', () {
+  unittest.group('resource-OrganizationsResource', () {
     unittest.test('method--getCmekSettings', () {
       var mock = HttpServerMock();
       var res = api.LoggingApi(mock).organizations;
@@ -4695,7 +4695,7 @@
     });
   });
 
-  unittest.group('resource-OrganizationsExclusionsResourceApi', () {
+  unittest.group('resource-OrganizationsExclusionsResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.LoggingApi(mock).organizations.exclusions;
@@ -4960,7 +4960,7 @@
     });
   });
 
-  unittest.group('resource-OrganizationsLocationsBucketsResourceApi', () {
+  unittest.group('resource-OrganizationsLocationsBucketsResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.LoggingApi(mock).organizations.locations.buckets;
@@ -5282,7 +5282,7 @@
     });
   });
 
-  unittest.group('resource-OrganizationsLogsResourceApi', () {
+  unittest.group('resource-OrganizationsLogsResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.LoggingApi(mock).organizations.logs;
@@ -5389,7 +5389,7 @@
     });
   });
 
-  unittest.group('resource-OrganizationsSinksResourceApi', () {
+  unittest.group('resource-OrganizationsSinksResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.LoggingApi(mock).organizations.sinks;
@@ -5726,7 +5726,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsExclusionsResourceApi', () {
+  unittest.group('resource-ProjectsExclusionsResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.LoggingApi(mock).projects.exclusions;
@@ -5991,7 +5991,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsLocationsBucketsResourceApi', () {
+  unittest.group('resource-ProjectsLocationsBucketsResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.LoggingApi(mock).projects.locations.buckets;
@@ -6313,7 +6313,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsLogsResourceApi', () {
+  unittest.group('resource-ProjectsLogsResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.LoggingApi(mock).projects.logs;
@@ -6420,7 +6420,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsMetricsResourceApi', () {
+  unittest.group('resource-ProjectsMetricsResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.LoggingApi(mock).projects.metrics;
@@ -6681,7 +6681,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsSinksResourceApi', () {
+  unittest.group('resource-ProjectsSinksResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.LoggingApi(mock).projects.sinks;
@@ -7018,7 +7018,7 @@
     });
   });
 
-  unittest.group('resource-SinksResourceApi', () {
+  unittest.group('resource-SinksResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.LoggingApi(mock).sinks;
@@ -7293,7 +7293,7 @@
     });
   });
 
-  unittest.group('resource-V2ResourceApi', () {
+  unittest.group('resource-V2Resource', () {
     unittest.test('method--getCmekSettings', () {
       var mock = HttpServerMock();
       var res = api.LoggingApi(mock).v2;
diff --git a/generated/googleapis/test/managedidentities/v1_test.dart b/generated/googleapis/test/managedidentities/v1_test.dart
index b02f489..8fae888 100644
--- a/generated/googleapis/test/managedidentities/v1_test.dart
+++ b/generated/googleapis/test/managedidentities/v1_test.dart
@@ -1715,7 +1715,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsLocationsResourceApi', () {
+  unittest.group('resource-ProjectsLocationsResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.ManagedServiceForMicrosoftActiveDirectoryConsumerApi(mock)
@@ -1833,7 +1833,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsLocationsGlobalDomainsResourceApi', () {
+  unittest.group('resource-ProjectsLocationsGlobalDomainsResource', () {
     unittest.test('method--attachTrust', () {
       var mock = HttpServerMock();
       var res = api.ManagedServiceForMicrosoftActiveDirectoryConsumerApi(mock)
@@ -2589,7 +2589,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsLocationsGlobalOperationsResourceApi', () {
+  unittest.group('resource-ProjectsLocationsGlobalOperationsResource', () {
     unittest.test('method--cancel', () {
       var mock = HttpServerMock();
       var res = api.ManagedServiceForMicrosoftActiveDirectoryConsumerApi(mock)
diff --git a/generated/googleapis/test/manufacturers/v1_test.dart b/generated/googleapis/test/manufacturers/v1_test.dart
index 74f44db..20c7884 100644
--- a/generated/googleapis/test/manufacturers/v1_test.dart
+++ b/generated/googleapis/test/manufacturers/v1_test.dart
@@ -650,7 +650,7 @@
     });
   });
 
-  unittest.group('resource-AccountsProductsResourceApi', () {
+  unittest.group('resource-AccountsProductsResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.ManufacturerCenterApi(mock).accounts.products;
diff --git a/generated/googleapis/test/ml/v1_test.dart b/generated/googleapis/test/ml/v1_test.dart
index ee8676a..425de13 100644
--- a/generated/googleapis/test/ml/v1_test.dart
+++ b/generated/googleapis/test/ml/v1_test.dart
@@ -3727,7 +3727,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsResourceApi', () {
+  unittest.group('resource-ProjectsResource', () {
     unittest.test('method--explain', () {
       var mock = HttpServerMock();
       var res = api.CloudMachineLearningEngineApi(mock).projects;
@@ -3886,7 +3886,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsJobsResourceApi', () {
+  unittest.group('resource-ProjectsJobsResource', () {
     unittest.test('method--cancel', () {
       var mock = HttpServerMock();
       var res = api.CloudMachineLearningEngineApi(mock).projects.jobs;
@@ -4326,7 +4326,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsLocationsResourceApi', () {
+  unittest.group('resource-ProjectsLocationsResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.CloudMachineLearningEngineApi(mock).projects.locations;
@@ -4435,7 +4435,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsLocationsOperationsResourceApi', () {
+  unittest.group('resource-ProjectsLocationsOperationsResource', () {
     unittest.test('method--cancel', () {
       var mock = HttpServerMock();
       var res =
@@ -4536,7 +4536,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsLocationsStudiesResourceApi', () {
+  unittest.group('resource-ProjectsLocationsStudiesResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res =
@@ -4745,7 +4745,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsLocationsStudiesTrialsResourceApi', () {
+  unittest.group('resource-ProjectsLocationsStudiesTrialsResource', () {
     unittest.test('method--addMeasurement', () {
       var mock = HttpServerMock();
       var res = api.CloudMachineLearningEngineApi(mock)
@@ -5256,7 +5256,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsModelsResourceApi', () {
+  unittest.group('resource-ProjectsModelsResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.CloudMachineLearningEngineApi(mock).projects.models;
@@ -5693,7 +5693,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsModelsVersionsResourceApi', () {
+  unittest.group('resource-ProjectsModelsVersionsResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res =
@@ -6026,7 +6026,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsOperationsResourceApi', () {
+  unittest.group('resource-ProjectsOperationsResource', () {
     unittest.test('method--cancel', () {
       var mock = HttpServerMock();
       var res = api.CloudMachineLearningEngineApi(mock).projects.operations;
diff --git a/generated/googleapis/test/monitoring/v3_test.dart b/generated/googleapis/test/monitoring/v3_test.dart
index 5a8a68c..04a8e7f 100644
--- a/generated/googleapis/test/monitoring/v3_test.dart
+++ b/generated/googleapis/test/monitoring/v3_test.dart
@@ -4055,7 +4055,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsAlertPoliciesResourceApi', () {
+  unittest.group('resource-ProjectsAlertPoliciesResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.MonitoringApi(mock).projects.alertPolicies;
@@ -4328,7 +4328,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsCollectdTimeSeriesResourceApi', () {
+  unittest.group('resource-ProjectsCollectdTimeSeriesResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.MonitoringApi(mock).projects.collectdTimeSeries;
@@ -4385,7 +4385,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsGroupsResourceApi', () {
+  unittest.group('resource-ProjectsGroupsResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.MonitoringApi(mock).projects.groups;
@@ -4669,7 +4669,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsGroupsMembersResourceApi', () {
+  unittest.group('resource-ProjectsGroupsMembersResource', () {
     unittest.test('method--list', () {
       var mock = HttpServerMock();
       var res = api.MonitoringApi(mock).projects.groups.members;
@@ -4739,7 +4739,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsMetricDescriptorsResourceApi', () {
+  unittest.group('resource-ProjectsMetricDescriptorsResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.MonitoringApi(mock).projects.metricDescriptors;
@@ -4951,8 +4951,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsMonitoredResourceDescriptorsResourceApi',
-      () {
+  unittest.group('resource-ProjectsMonitoredResourceDescriptorsResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.MonitoringApi(mock).projects.monitoredResourceDescriptors;
@@ -5065,8 +5064,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsNotificationChannelDescriptorsResourceApi',
-      () {
+  unittest.group('resource-ProjectsNotificationChannelDescriptorsResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.MonitoringApi(mock).projects.notificationChannelDescriptors;
@@ -5176,7 +5174,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsNotificationChannelsResourceApi', () {
+  unittest.group('resource-ProjectsNotificationChannelsResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.MonitoringApi(mock).projects.notificationChannels;
@@ -5615,7 +5613,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsTimeSeriesResourceApi', () {
+  unittest.group('resource-ProjectsTimeSeriesResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.MonitoringApi(mock).projects.timeSeries;
@@ -5815,7 +5813,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsUptimeCheckConfigsResourceApi', () {
+  unittest.group('resource-ProjectsUptimeCheckConfigsResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.MonitoringApi(mock).projects.uptimeCheckConfigs;
@@ -6081,7 +6079,7 @@
     });
   });
 
-  unittest.group('resource-ServicesResourceApi', () {
+  unittest.group('resource-ServicesResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.MonitoringApi(mock).services;
@@ -6353,7 +6351,7 @@
     });
   });
 
-  unittest.group('resource-ServicesServiceLevelObjectivesResourceApi', () {
+  unittest.group('resource-ServicesServiceLevelObjectivesResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.MonitoringApi(mock).services.serviceLevelObjectives;
@@ -6633,7 +6631,7 @@
     });
   });
 
-  unittest.group('resource-UptimeCheckIpsResourceApi', () {
+  unittest.group('resource-UptimeCheckIpsResource', () {
     unittest.test('method--list', () {
       var mock = HttpServerMock();
       var res = api.MonitoringApi(mock).uptimeCheckIps;
diff --git a/generated/googleapis/test/networkmanagement/v1_test.dart b/generated/googleapis/test/networkmanagement/v1_test.dart
index 003f39f..352d9b0 100644
--- a/generated/googleapis/test/networkmanagement/v1_test.dart
+++ b/generated/googleapis/test/networkmanagement/v1_test.dart
@@ -1698,7 +1698,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsLocationsResourceApi', () {
+  unittest.group('resource-ProjectsLocationsResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.NetworkManagementApi(mock).projects.locations;
@@ -1808,7 +1808,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsLocationsGlobalConnectivityTestsResourceApi',
+  unittest.group('resource-ProjectsLocationsGlobalConnectivityTestsResource',
       () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
@@ -2337,7 +2337,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsLocationsGlobalOperationsResourceApi', () {
+  unittest.group('resource-ProjectsLocationsGlobalOperationsResource', () {
     unittest.test('method--cancel', () {
       var mock = HttpServerMock();
       var res =
diff --git a/generated/googleapis/test/oauth2/v2_test.dart b/generated/googleapis/test/oauth2/v2_test.dart
index f02f425..1cbffee 100644
--- a/generated/googleapis/test/oauth2/v2_test.dart
+++ b/generated/googleapis/test/oauth2/v2_test.dart
@@ -171,7 +171,7 @@
     });
   });
 
-  unittest.group('resource-UserinfoResourceApi', () {
+  unittest.group('resource-UserinfoResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.Oauth2Api(mock).userinfo;
@@ -217,7 +217,7 @@
     });
   });
 
-  unittest.group('resource-UserinfoV2MeResourceApi', () {
+  unittest.group('resource-UserinfoV2MeResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.Oauth2Api(mock).userinfo.v2.me;
diff --git a/generated/googleapis/test/osconfig/v1_test.dart b/generated/googleapis/test/osconfig/v1_test.dart
index 41f603a..0f09119 100644
--- a/generated/googleapis/test/osconfig/v1_test.dart
+++ b/generated/googleapis/test/osconfig/v1_test.dart
@@ -1285,7 +1285,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsPatchDeploymentsResourceApi', () {
+  unittest.group('resource-ProjectsPatchDeploymentsResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.OSConfigApi(mock).projects.patchDeployments;
@@ -1498,7 +1498,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsPatchJobsResourceApi', () {
+  unittest.group('resource-ProjectsPatchJobsResource', () {
     unittest.test('method--cancel', () {
       var mock = HttpServerMock();
       var res = api.OSConfigApi(mock).projects.patchJobs;
@@ -1714,7 +1714,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsPatchJobsInstanceDetailsResourceApi', () {
+  unittest.group('resource-ProjectsPatchJobsInstanceDetailsResource', () {
     unittest.test('method--list', () {
       var mock = HttpServerMock();
       var res = api.OSConfigApi(mock).projects.patchJobs.instanceDetails;
diff --git a/generated/googleapis/test/oslogin/v1_test.dart b/generated/googleapis/test/oslogin/v1_test.dart
index 0fc1388..7f84898 100644
--- a/generated/googleapis/test/oslogin/v1_test.dart
+++ b/generated/googleapis/test/oslogin/v1_test.dart
@@ -217,7 +217,7 @@
     });
   });
 
-  unittest.group('resource-UsersResourceApi', () {
+  unittest.group('resource-UsersResource', () {
     unittest.test('method--getLoginProfile', () {
       var mock = HttpServerMock();
       var res = api.CloudOSLoginApi(mock).users;
@@ -334,7 +334,7 @@
     });
   });
 
-  unittest.group('resource-UsersProjectsResourceApi', () {
+  unittest.group('resource-UsersProjectsResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.CloudOSLoginApi(mock).users.projects;
@@ -384,7 +384,7 @@
     });
   });
 
-  unittest.group('resource-UsersSshPublicKeysResourceApi', () {
+  unittest.group('resource-UsersSshPublicKeysResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.CloudOSLoginApi(mock).users.sshPublicKeys;
diff --git a/generated/googleapis/test/pagespeedonline/v5_test.dart b/generated/googleapis/test/pagespeedonline/v5_test.dart
index db14548..2c8c92a 100644
--- a/generated/googleapis/test/pagespeedonline/v5_test.dart
+++ b/generated/googleapis/test/pagespeedonline/v5_test.dart
@@ -873,7 +873,7 @@
     });
   });
 
-  unittest.group('resource-PagespeedapiResourceApi', () {
+  unittest.group('resource-PagespeedapiResource', () {
     unittest.test('method--runpagespeed', () {
       var mock = HttpServerMock();
       var res = api.PagespeedInsightsApi(mock).pagespeedapi;
diff --git a/generated/googleapis/test/people/v1_test.dart b/generated/googleapis/test/people/v1_test.dart
index dbda7d5..b4d5070 100644
--- a/generated/googleapis/test/people/v1_test.dart
+++ b/generated/googleapis/test/people/v1_test.dart
@@ -3004,7 +3004,7 @@
     });
   });
 
-  unittest.group('resource-ContactGroupsResourceApi', () {
+  unittest.group('resource-ContactGroupsResource', () {
     unittest.test('method--batchGet', () {
       var mock = HttpServerMock();
       var res = api.PeopleServiceApi(mock).contactGroups;
@@ -3330,7 +3330,7 @@
     });
   });
 
-  unittest.group('resource-ContactGroupsMembersResourceApi', () {
+  unittest.group('resource-ContactGroupsMembersResource', () {
     unittest.test('method--modify', () {
       var mock = HttpServerMock();
       var res = api.PeopleServiceApi(mock).contactGroups.members;
@@ -3388,7 +3388,7 @@
     });
   });
 
-  unittest.group('resource-OtherContactsResourceApi', () {
+  unittest.group('resource-OtherContactsResource', () {
     unittest.test('method--copyOtherContactToMyContactsGroup', () {
       var mock = HttpServerMock();
       var res = api.PeopleServiceApi(mock).otherContacts;
@@ -3513,7 +3513,7 @@
     });
   });
 
-  unittest.group('resource-PeopleResourceApi', () {
+  unittest.group('resource-PeopleResource', () {
     unittest.test('method--createContact', () {
       var mock = HttpServerMock();
       var res = api.PeopleServiceApi(mock).people;
@@ -4066,7 +4066,7 @@
     });
   });
 
-  unittest.group('resource-PeopleConnectionsResourceApi', () {
+  unittest.group('resource-PeopleConnectionsResource', () {
     unittest.test('method--list', () {
       var mock = HttpServerMock();
       var res = api.PeopleServiceApi(mock).people.connections;
diff --git a/generated/googleapis/test/playcustomapp/v1_test.dart b/generated/googleapis/test/playcustomapp/v1_test.dart
index 1039e9e..771c2eb 100644
--- a/generated/googleapis/test/playcustomapp/v1_test.dart
+++ b/generated/googleapis/test/playcustomapp/v1_test.dart
@@ -59,7 +59,7 @@
     });
   });
 
-  unittest.group('resource-AccountsCustomAppsResourceApi', () {
+  unittest.group('resource-AccountsCustomAppsResource', () {
     unittest.test('method--create', () {
       // TODO: Implement tests for media upload;
       // TODO: Implement tests for media download;
diff --git a/generated/googleapis/test/policytroubleshooter/v1_test.dart b/generated/googleapis/test/policytroubleshooter/v1_test.dart
index 7e3c325..3f2a5d5 100644
--- a/generated/googleapis/test/policytroubleshooter/v1_test.dart
+++ b/generated/googleapis/test/policytroubleshooter/v1_test.dart
@@ -551,7 +551,7 @@
     });
   });
 
-  unittest.group('resource-IamResourceApi', () {
+  unittest.group('resource-IamResource', () {
     unittest.test('method--troubleshoot', () {
       var mock = HttpServerMock();
       var res = api.PolicyTroubleshooterApi(mock).iam;
diff --git a/generated/googleapis/test/poly/v1_test.dart b/generated/googleapis/test/poly/v1_test.dart
index 11ef48e..3bedad1 100644
--- a/generated/googleapis/test/poly/v1_test.dart
+++ b/generated/googleapis/test/poly/v1_test.dart
@@ -608,7 +608,7 @@
     });
   });
 
-  unittest.group('resource-AssetsResourceApi', () {
+  unittest.group('resource-AssetsResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.PolyServiceApi(mock).assets;
@@ -736,7 +736,7 @@
     });
   });
 
-  unittest.group('resource-UsersAssetsResourceApi', () {
+  unittest.group('resource-UsersAssetsResource', () {
     unittest.test('method--list', () {
       var mock = HttpServerMock();
       var res = api.PolyServiceApi(mock).users.assets;
@@ -806,7 +806,7 @@
     });
   });
 
-  unittest.group('resource-UsersLikedassetsResourceApi', () {
+  unittest.group('resource-UsersLikedassetsResource', () {
     unittest.test('method--list', () {
       var mock = HttpServerMock();
       var res = api.PolyServiceApi(mock).users.likedassets;
diff --git a/generated/googleapis/test/pubsub/v1_test.dart b/generated/googleapis/test/pubsub/v1_test.dart
index dceebc2..57d8fda 100644
--- a/generated/googleapis/test/pubsub/v1_test.dart
+++ b/generated/googleapis/test/pubsub/v1_test.dart
@@ -1388,7 +1388,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsSnapshotsResourceApi', () {
+  unittest.group('resource-ProjectsSnapshotsResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.PubsubApi(mock).projects.snapshots;
@@ -1811,7 +1811,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsSubscriptionsResourceApi', () {
+  unittest.group('resource-ProjectsSubscriptionsResource', () {
     unittest.test('method--acknowledge', () {
       var mock = HttpServerMock();
       var res = api.PubsubApi(mock).projects.subscriptions;
@@ -2550,7 +2550,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsTopicsResourceApi', () {
+  unittest.group('resource-ProjectsTopicsResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.PubsubApi(mock).projects.topics;
@@ -3026,7 +3026,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsTopicsSnapshotsResourceApi', () {
+  unittest.group('resource-ProjectsTopicsSnapshotsResource', () {
     unittest.test('method--list', () {
       var mock = HttpServerMock();
       var res = api.PubsubApi(mock).projects.topics.snapshots;
@@ -3086,7 +3086,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsTopicsSubscriptionsResourceApi', () {
+  unittest.group('resource-ProjectsTopicsSubscriptionsResource', () {
     unittest.test('method--list', () {
       var mock = HttpServerMock();
       var res = api.PubsubApi(mock).projects.topics.subscriptions;
diff --git a/generated/googleapis/test/recommender/v1_test.dart b/generated/googleapis/test/recommender/v1_test.dart
index f0d06ab..b45cf1c 100644
--- a/generated/googleapis/test/recommender/v1_test.dart
+++ b/generated/googleapis/test/recommender/v1_test.dart
@@ -993,8 +993,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsLocationsInsightTypesInsightsResourceApi',
-      () {
+  unittest.group('resource-ProjectsLocationsInsightTypesInsightsResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res =
@@ -1168,7 +1167,7 @@
   });
 
   unittest.group(
-      'resource-ProjectsLocationsRecommendersRecommendationsResourceApi', () {
+      'resource-ProjectsLocationsRecommendersRecommendationsResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.RecommenderApi(mock)
diff --git a/generated/googleapis/test/redis/v1_test.dart b/generated/googleapis/test/redis/v1_test.dart
index ad05549..6772c6d 100644
--- a/generated/googleapis/test/redis/v1_test.dart
+++ b/generated/googleapis/test/redis/v1_test.dart
@@ -852,7 +852,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsLocationsResourceApi', () {
+  unittest.group('resource-ProjectsLocationsResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.CloudRedisApi(mock).projects.locations;
@@ -962,7 +962,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsLocationsInstancesResourceApi', () {
+  unittest.group('resource-ProjectsLocationsInstancesResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.CloudRedisApi(mock).projects.locations.instances;
@@ -1443,7 +1443,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsLocationsOperationsResourceApi', () {
+  unittest.group('resource-ProjectsLocationsOperationsResource', () {
     unittest.test('method--cancel', () {
       var mock = HttpServerMock();
       var res = api.CloudRedisApi(mock).projects.locations.operations;
diff --git a/generated/googleapis/test/remotebuildexecution/v2_test.dart b/generated/googleapis/test/remotebuildexecution/v2_test.dart
index db83661..30261d3 100644
--- a/generated/googleapis/test/remotebuildexecution/v2_test.dart
+++ b/generated/googleapis/test/remotebuildexecution/v2_test.dart
@@ -4121,7 +4121,7 @@
     });
   });
 
-  unittest.group('resource-ActionResultsResourceApi', () {
+  unittest.group('resource-ActionResultsResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.RemoteBuildExecutionApi(mock).actionResults;
@@ -4252,7 +4252,7 @@
     });
   });
 
-  unittest.group('resource-ActionsResourceApi', () {
+  unittest.group('resource-ActionsResource', () {
     unittest.test('method--execute', () {
       var mock = HttpServerMock();
       var res = api.RemoteBuildExecutionApi(mock).actions;
@@ -4309,7 +4309,7 @@
     });
   });
 
-  unittest.group('resource-BlobsResourceApi', () {
+  unittest.group('resource-BlobsResource', () {
     unittest.test('method--batchRead', () {
       var mock = HttpServerMock();
       var res = api.RemoteBuildExecutionApi(mock).blobs;
@@ -4544,7 +4544,7 @@
     });
   });
 
-  unittest.group('resource-OperationsResourceApi', () {
+  unittest.group('resource-OperationsResource', () {
     unittest.test('method--waitExecution', () {
       var mock = HttpServerMock();
       var res = api.RemoteBuildExecutionApi(mock).operations;
@@ -4601,7 +4601,7 @@
     });
   });
 
-  unittest.group('resource-V2ResourceApi', () {
+  unittest.group('resource-V2Resource', () {
     unittest.test('method--getCapabilities', () {
       var mock = HttpServerMock();
       var res = api.RemoteBuildExecutionApi(mock).v2;
diff --git a/generated/googleapis/test/reseller/v1_test.dart b/generated/googleapis/test/reseller/v1_test.dart
index f042140..2d9342d 100644
--- a/generated/googleapis/test/reseller/v1_test.dart
+++ b/generated/googleapis/test/reseller/v1_test.dart
@@ -525,7 +525,7 @@
     });
   });
 
-  unittest.group('resource-CustomersResourceApi', () {
+  unittest.group('resource-CustomersResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.ResellerApi(mock).customers;
@@ -754,7 +754,7 @@
     });
   });
 
-  unittest.group('resource-ResellernotifyResourceApi', () {
+  unittest.group('resource-ResellernotifyResource_1', () {
     unittest.test('method--getwatchdetails', () {
       var mock = HttpServerMock();
       var res = api.ResellerApi(mock).resellernotify;
@@ -915,7 +915,7 @@
     });
   });
 
-  unittest.group('resource-SubscriptionsResourceApi', () {
+  unittest.group('resource-SubscriptionsResource', () {
     unittest.test('method--activate', () {
       var mock = HttpServerMock();
       var res = api.ResellerApi(mock).subscriptions;
diff --git a/generated/googleapis/test/run/v1_test.dart b/generated/googleapis/test/run/v1_test.dart
index c714ab2..d32d76d 100644
--- a/generated/googleapis/test/run/v1_test.dart
+++ b/generated/googleapis/test/run/v1_test.dart
@@ -2834,7 +2834,7 @@
     });
   });
 
-  unittest.group('resource-NamespacesAuthorizeddomainsResourceApi', () {
+  unittest.group('resource-NamespacesAuthorizeddomainsResource', () {
     unittest.test('method--list', () {
       var mock = HttpServerMock();
       var res = api.CloudRunApi(mock).namespaces.authorizeddomains;
@@ -2894,7 +2894,7 @@
     });
   });
 
-  unittest.group('resource-NamespacesConfigurationsResourceApi', () {
+  unittest.group('resource-NamespacesConfigurationsResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.CloudRunApi(mock).namespaces.configurations;
@@ -3021,7 +3021,7 @@
     });
   });
 
-  unittest.group('resource-NamespacesDomainmappingsResourceApi', () {
+  unittest.group('resource-NamespacesDomainmappingsResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.CloudRunApi(mock).namespaces.domainmappings;
@@ -3261,7 +3261,7 @@
     });
   });
 
-  unittest.group('resource-NamespacesRevisionsResourceApi', () {
+  unittest.group('resource-NamespacesRevisionsResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.CloudRunApi(mock).namespaces.revisions;
@@ -3447,7 +3447,7 @@
     });
   });
 
-  unittest.group('resource-NamespacesRoutesResourceApi', () {
+  unittest.group('resource-NamespacesRoutesResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.CloudRunApi(mock).namespaces.routes;
@@ -3573,7 +3573,7 @@
     });
   });
 
-  unittest.group('resource-NamespacesServicesResourceApi', () {
+  unittest.group('resource-NamespacesServicesResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.CloudRunApi(mock).namespaces.services;
@@ -3865,7 +3865,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsAuthorizeddomainsResourceApi', () {
+  unittest.group('resource-ProjectsAuthorizeddomainsResource', () {
     unittest.test('method--list', () {
       var mock = HttpServerMock();
       var res = api.CloudRunApi(mock).projects.authorizeddomains;
@@ -3925,7 +3925,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsLocationsResourceApi', () {
+  unittest.group('resource-ProjectsLocationsResource', () {
     unittest.test('method--list', () {
       var mock = HttpServerMock();
       var res = api.CloudRunApi(mock).projects.locations;
@@ -3987,7 +3987,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsLocationsAuthorizeddomainsResourceApi', () {
+  unittest.group('resource-ProjectsLocationsAuthorizeddomainsResource', () {
     unittest.test('method--list', () {
       var mock = HttpServerMock();
       var res = api.CloudRunApi(mock).projects.locations.authorizeddomains;
@@ -4047,7 +4047,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsLocationsConfigurationsResourceApi', () {
+  unittest.group('resource-ProjectsLocationsConfigurationsResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.CloudRunApi(mock).projects.locations.configurations;
@@ -4174,7 +4174,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsLocationsDomainmappingsResourceApi', () {
+  unittest.group('resource-ProjectsLocationsDomainmappingsResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.CloudRunApi(mock).projects.locations.domainmappings;
@@ -4414,7 +4414,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsLocationsRevisionsResourceApi', () {
+  unittest.group('resource-ProjectsLocationsRevisionsResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.CloudRunApi(mock).projects.locations.revisions;
@@ -4600,7 +4600,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsLocationsRoutesResourceApi', () {
+  unittest.group('resource-ProjectsLocationsRoutesResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.CloudRunApi(mock).projects.locations.routes;
@@ -4726,7 +4726,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsLocationsServicesResourceApi', () {
+  unittest.group('resource-ProjectsLocationsServicesResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.CloudRunApi(mock).projects.locations.services;
diff --git a/generated/googleapis/test/runtimeconfig/v1_test.dart b/generated/googleapis/test/runtimeconfig/v1_test.dart
index fc35110..014e654 100644
--- a/generated/googleapis/test/runtimeconfig/v1_test.dart
+++ b/generated/googleapis/test/runtimeconfig/v1_test.dart
@@ -282,7 +282,7 @@
     });
   });
 
-  unittest.group('resource-OperationsResourceApi', () {
+  unittest.group('resource-OperationsResource', () {
     unittest.test('method--cancel', () {
       var mock = HttpServerMock();
       var res = api.CloudRuntimeConfigApi(mock).operations;
diff --git a/generated/googleapis/test/safebrowsing/v4_test.dart b/generated/googleapis/test/safebrowsing/v4_test.dart
index 34b046d..e0d3ad2 100644
--- a/generated/googleapis/test/safebrowsing/v4_test.dart
+++ b/generated/googleapis/test/safebrowsing/v4_test.dart
@@ -1046,7 +1046,7 @@
     });
   });
 
-  unittest.group('resource-EncodedFullHashesResourceApi', () {
+  unittest.group('resource-EncodedFullHashesResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.SafebrowsingApi(mock).encodedFullHashes;
@@ -1107,7 +1107,7 @@
     });
   });
 
-  unittest.group('resource-EncodedUpdatesResourceApi', () {
+  unittest.group('resource-EncodedUpdatesResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.SafebrowsingApi(mock).encodedUpdates;
@@ -1169,7 +1169,7 @@
     });
   });
 
-  unittest.group('resource-FullHashesResourceApi', () {
+  unittest.group('resource-FullHashesResource', () {
     unittest.test('method--find', () {
       var mock = HttpServerMock();
       var res = api.SafebrowsingApi(mock).fullHashes;
@@ -1222,7 +1222,7 @@
     });
   });
 
-  unittest.group('resource-ThreatHitsResourceApi', () {
+  unittest.group('resource-ThreatHitsResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.SafebrowsingApi(mock).threatHits;
@@ -1275,7 +1275,7 @@
     });
   });
 
-  unittest.group('resource-ThreatListUpdatesResourceApi', () {
+  unittest.group('resource-ThreatListUpdatesResource', () {
     unittest.test('method--fetch', () {
       var mock = HttpServerMock();
       var res = api.SafebrowsingApi(mock).threatListUpdates;
@@ -1330,7 +1330,7 @@
     });
   });
 
-  unittest.group('resource-ThreatListsResourceApi', () {
+  unittest.group('resource-ThreatListsResource', () {
     unittest.test('method--list', () {
       var mock = HttpServerMock();
       var res = api.SafebrowsingApi(mock).threatLists;
@@ -1376,7 +1376,7 @@
     });
   });
 
-  unittest.group('resource-ThreatMatchesResourceApi', () {
+  unittest.group('resource-ThreatMatchesResource', () {
     unittest.test('method--find', () {
       var mock = HttpServerMock();
       var res = api.SafebrowsingApi(mock).threatMatches;
diff --git a/generated/googleapis/test/script/v1_test.dart b/generated/googleapis/test/script/v1_test.dart
index 5c1c793..d8a7bc3 100644
--- a/generated/googleapis/test/script/v1_test.dart
+++ b/generated/googleapis/test/script/v1_test.dart
@@ -1541,7 +1541,7 @@
     });
   });
 
-  unittest.group('resource-ProcessesResourceApi', () {
+  unittest.group('resource-ProcessesResource', () {
     unittest.test('method--list', () {
       var mock = HttpServerMock();
       var res = api.ScriptApi(mock).processes;
@@ -1729,7 +1729,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsResourceApi', () {
+  unittest.group('resource-ProjectsResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.ScriptApi(mock).projects;
@@ -2018,7 +2018,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsDeploymentsResourceApi', () {
+  unittest.group('resource-ProjectsDeploymentsResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.ScriptApi(mock).projects.deployments;
@@ -2332,7 +2332,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsVersionsResourceApi', () {
+  unittest.group('resource-ProjectsVersionsResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.ScriptApi(mock).projects.versions;
@@ -2520,7 +2520,7 @@
     });
   });
 
-  unittest.group('resource-ScriptsResourceApi', () {
+  unittest.group('resource-ScriptsResource', () {
     unittest.test('method--run', () {
       var mock = HttpServerMock();
       var res = api.ScriptApi(mock).scripts;
diff --git a/generated/googleapis/test/searchconsole/v1_test.dart b/generated/googleapis/test/searchconsole/v1_test.dart
index 69cdc2d..919018d 100644
--- a/generated/googleapis/test/searchconsole/v1_test.dart
+++ b/generated/googleapis/test/searchconsole/v1_test.dart
@@ -684,7 +684,7 @@
     });
   });
 
-  unittest.group('resource-SearchanalyticsResourceApi', () {
+  unittest.group('resource-SearchanalyticsResource', () {
     unittest.test('method--query', () {
       var mock = HttpServerMock();
       var res = api.SearchConsoleApi(mock).searchanalytics;
@@ -749,7 +749,7 @@
     });
   });
 
-  unittest.group('resource-SitemapsResourceApi', () {
+  unittest.group('resource-SitemapsResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.SearchConsoleApi(mock).sitemaps;
@@ -987,7 +987,7 @@
     });
   });
 
-  unittest.group('resource-SitesResourceApi', () {
+  unittest.group('resource-SitesResource', () {
     unittest.test('method--add', () {
       var mock = HttpServerMock();
       var res = api.SearchConsoleApi(mock).sites;
@@ -1179,7 +1179,7 @@
     });
   });
 
-  unittest.group('resource-UrlTestingToolsMobileFriendlyTestResourceApi', () {
+  unittest.group('resource-UrlTestingToolsMobileFriendlyTestResource', () {
     unittest.test('method--run', () {
       var mock = HttpServerMock();
       var res = api.SearchConsoleApi(mock).urlTestingTools.mobileFriendlyTest;
diff --git a/generated/googleapis/test/secretmanager/v1_test.dart b/generated/googleapis/test/secretmanager/v1_test.dart
index 714e5ba..25b7a4c 100644
--- a/generated/googleapis/test/secretmanager/v1_test.dart
+++ b/generated/googleapis/test/secretmanager/v1_test.dart
@@ -1132,7 +1132,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsLocationsResourceApi', () {
+  unittest.group('resource-ProjectsLocationsResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.SecretManagerApi(mock).projects.locations;
@@ -1242,7 +1242,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsSecretsResourceApi', () {
+  unittest.group('resource-ProjectsSecretsResource', () {
     unittest.test('method--addVersion', () {
       var mock = HttpServerMock();
       var res = api.SecretManagerApi(mock).projects.secrets;
@@ -1726,7 +1726,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsSecretsVersionsResourceApi', () {
+  unittest.group('resource-ProjectsSecretsVersionsResource', () {
     unittest.test('method--access', () {
       var mock = HttpServerMock();
       var res = api.SecretManagerApi(mock).projects.secrets.versions;
diff --git a/generated/googleapis/test/securitycenter/v1_test.dart b/generated/googleapis/test/securitycenter/v1_test.dart
index 965850f..009af19 100644
--- a/generated/googleapis/test/securitycenter/v1_test.dart
+++ b/generated/googleapis/test/securitycenter/v1_test.dart
@@ -2017,7 +2017,7 @@
     });
   });
 
-  unittest.group('resource-OrganizationsResourceApi', () {
+  unittest.group('resource-OrganizationsResource', () {
     unittest.test('method--getOrganizationSettings', () {
       var mock = HttpServerMock();
       var res = api.SecurityCommandCenterApi(mock).organizations;
@@ -2124,7 +2124,7 @@
     });
   });
 
-  unittest.group('resource-OrganizationsAssetsResourceApi', () {
+  unittest.group('resource-OrganizationsAssetsResource', () {
     unittest.test('method--group', () {
       var mock = HttpServerMock();
       var res = api.SecurityCommandCenterApi(mock).organizations.assets;
@@ -2370,7 +2370,7 @@
     });
   });
 
-  unittest.group('resource-OrganizationsNotificationConfigsResourceApi', () {
+  unittest.group('resource-OrganizationsNotificationConfigsResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res =
@@ -2645,7 +2645,7 @@
     });
   });
 
-  unittest.group('resource-OrganizationsOperationsResourceApi', () {
+  unittest.group('resource-OrganizationsOperationsResource', () {
     unittest.test('method--cancel', () {
       var mock = HttpServerMock();
       var res = api.SecurityCommandCenterApi(mock).organizations.operations;
@@ -2851,7 +2851,7 @@
     });
   });
 
-  unittest.group('resource-OrganizationsSourcesResourceApi', () {
+  unittest.group('resource-OrganizationsSourcesResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.SecurityCommandCenterApi(mock).organizations.sources;
@@ -3228,7 +3228,7 @@
     });
   });
 
-  unittest.group('resource-OrganizationsSourcesFindingsResourceApi', () {
+  unittest.group('resource-OrganizationsSourcesFindingsResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res =
diff --git a/generated/googleapis/test/serviceconsumermanagement/v1_test.dart b/generated/googleapis/test/serviceconsumermanagement/v1_test.dart
index 4e104fc..3554a8c 100644
--- a/generated/googleapis/test/serviceconsumermanagement/v1_test.dart
+++ b/generated/googleapis/test/serviceconsumermanagement/v1_test.dart
@@ -4010,7 +4010,7 @@
     });
   });
 
-  unittest.group('resource-OperationsResourceApi', () {
+  unittest.group('resource-OperationsResource', () {
     unittest.test('method--cancel', () {
       var mock = HttpServerMock();
       var res = api.ServiceConsumerManagementApi(mock).operations;
@@ -4221,7 +4221,7 @@
     });
   });
 
-  unittest.group('resource-ServicesResourceApi', () {
+  unittest.group('resource-ServicesResource', () {
     unittest.test('method--search', () {
       var mock = HttpServerMock();
       var res = api.ServiceConsumerManagementApi(mock).services;
@@ -4284,7 +4284,7 @@
     });
   });
 
-  unittest.group('resource-ServicesTenancyUnitsResourceApi', () {
+  unittest.group('resource-ServicesTenancyUnitsResource', () {
     unittest.test('method--addProject', () {
       var mock = HttpServerMock();
       var res = api.ServiceConsumerManagementApi(mock).services.tenancyUnits;
diff --git a/generated/googleapis/test/servicecontrol/v1_test.dart b/generated/googleapis/test/servicecontrol/v1_test.dart
index d36b092..bf5ceaa 100644
--- a/generated/googleapis/test/servicecontrol/v1_test.dart
+++ b/generated/googleapis/test/servicecontrol/v1_test.dart
@@ -2566,7 +2566,7 @@
     });
   });
 
-  unittest.group('resource-ServicesResourceApi', () {
+  unittest.group('resource-ServicesResource', () {
     unittest.test('method--allocateQuota', () {
       var mock = HttpServerMock();
       var res = api.ServiceControlApi(mock).services;
diff --git a/generated/googleapis/test/servicemanagement/v1_test.dart b/generated/googleapis/test/servicemanagement/v1_test.dart
index 2508d8e..cf47863 100644
--- a/generated/googleapis/test/servicemanagement/v1_test.dart
+++ b/generated/googleapis/test/servicemanagement/v1_test.dart
@@ -4077,7 +4077,7 @@
     });
   });
 
-  unittest.group('resource-OperationsResourceApi', () {
+  unittest.group('resource-OperationsResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.ServiceManagementApi(mock).operations;
@@ -4188,7 +4188,7 @@
     });
   });
 
-  unittest.group('resource-ServicesResourceApi', () {
+  unittest.group('resource-ServicesResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.ServiceManagementApi(mock).services;
@@ -4796,7 +4796,7 @@
     });
   });
 
-  unittest.group('resource-ServicesConfigsResourceApi', () {
+  unittest.group('resource-ServicesConfigsResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.ServiceManagementApi(mock).services.configs;
@@ -5049,7 +5049,7 @@
     });
   });
 
-  unittest.group('resource-ServicesConsumersResourceApi', () {
+  unittest.group('resource-ServicesConsumersResource', () {
     unittest.test('method--getIamPolicy', () {
       var mock = HttpServerMock();
       var res = api.ServiceManagementApi(mock).services.consumers;
@@ -5211,7 +5211,7 @@
     });
   });
 
-  unittest.group('resource-ServicesRolloutsResourceApi', () {
+  unittest.group('resource-ServicesRolloutsResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.ServiceManagementApi(mock).services.rollouts;
diff --git a/generated/googleapis/test/servicenetworking/v1_test.dart b/generated/googleapis/test/servicenetworking/v1_test.dart
index 4403036..9581265 100644
--- a/generated/googleapis/test/servicenetworking/v1_test.dart
+++ b/generated/googleapis/test/servicenetworking/v1_test.dart
@@ -3949,7 +3949,7 @@
     });
   });
 
-  unittest.group('resource-OperationsResourceApi', () {
+  unittest.group('resource-OperationsResource', () {
     unittest.test('method--cancel', () {
       var mock = HttpServerMock();
       var res = api.ServiceNetworkingApi(mock).operations;
@@ -4160,7 +4160,7 @@
     });
   });
 
-  unittest.group('resource-ServicesResourceApi', () {
+  unittest.group('resource-ServicesResource', () {
     unittest.test('method--addSubnetwork', () {
       var mock = HttpServerMock();
       var res = api.ServiceNetworkingApi(mock).services;
@@ -4433,7 +4433,7 @@
     });
   });
 
-  unittest.group('resource-ServicesConnectionsResourceApi', () {
+  unittest.group('resource-ServicesConnectionsResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.ServiceNetworkingApi(mock).services.connections;
@@ -4600,7 +4600,7 @@
     });
   });
 
-  unittest.group('resource-ServicesDnsRecordSetsResourceApi', () {
+  unittest.group('resource-ServicesDnsRecordSetsResource', () {
     unittest.test('method--add', () {
       var mock = HttpServerMock();
       var res = api.ServiceNetworkingApi(mock).services.dnsRecordSets;
@@ -4761,7 +4761,7 @@
     });
   });
 
-  unittest.group('resource-ServicesDnsZonesResourceApi', () {
+  unittest.group('resource-ServicesDnsZonesResource', () {
     unittest.test('method--add', () {
       var mock = HttpServerMock();
       var res = api.ServiceNetworkingApi(mock).services.dnsZones;
@@ -4870,7 +4870,7 @@
   });
 
   unittest.group(
-      'resource-ServicesProjectsGlobalNetworksPeeredDnsDomainsResourceApi', () {
+      'resource-ServicesProjectsGlobalNetworksPeeredDnsDomainsResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.ServiceNetworkingApi(mock)
@@ -5037,7 +5037,7 @@
     });
   });
 
-  unittest.group('resource-ServicesRolesResourceApi', () {
+  unittest.group('resource-ServicesRolesResource', () {
     unittest.test('method--add', () {
       var mock = HttpServerMock();
       var res = api.ServiceNetworkingApi(mock).services.roles;
diff --git a/generated/googleapis/test/serviceusage/v1_test.dart b/generated/googleapis/test/serviceusage/v1_test.dart
index 1d6765a..1224809 100644
--- a/generated/googleapis/test/serviceusage/v1_test.dart
+++ b/generated/googleapis/test/serviceusage/v1_test.dart
@@ -3763,7 +3763,7 @@
     });
   });
 
-  unittest.group('resource-OperationsResourceApi', () {
+  unittest.group('resource-OperationsResource', () {
     unittest.test('method--cancel', () {
       var mock = HttpServerMock();
       var res = api.ServiceUsageApi(mock).operations;
@@ -3975,7 +3975,7 @@
     });
   });
 
-  unittest.group('resource-ServicesResourceApi', () {
+  unittest.group('resource-ServicesResource', () {
     unittest.test('method--batchEnable', () {
       var mock = HttpServerMock();
       var res = api.ServiceUsageApi(mock).services;
diff --git a/generated/googleapis/test/sheets/v4_test.dart b/generated/googleapis/test/sheets/v4_test.dart
index 399ab9d..b09400d 100644
--- a/generated/googleapis/test/sheets/v4_test.dart
+++ b/generated/googleapis/test/sheets/v4_test.dart
@@ -9219,7 +9219,7 @@
     });
   });
 
-  unittest.group('resource-SpreadsheetsResourceApi', () {
+  unittest.group('resource-SpreadsheetsResource', () {
     unittest.test('method--batchUpdate', () {
       var mock = HttpServerMock();
       var res = api.SheetsApi(mock).spreadsheets;
@@ -9455,7 +9455,7 @@
     });
   });
 
-  unittest.group('resource-SpreadsheetsDeveloperMetadataResourceApi', () {
+  unittest.group('resource-SpreadsheetsDeveloperMetadataResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.SheetsApi(mock).spreadsheets.developerMetadata;
@@ -9580,7 +9580,7 @@
     });
   });
 
-  unittest.group('resource-SpreadsheetsSheetsResourceApi', () {
+  unittest.group('resource-SpreadsheetsSheetsResource', () {
     unittest.test('method--copyTo', () {
       var mock = HttpServerMock();
       var res = api.SheetsApi(mock).spreadsheets.sheets;
@@ -9655,7 +9655,7 @@
     });
   });
 
-  unittest.group('resource-SpreadsheetsValuesResourceApi', () {
+  unittest.group('resource-SpreadsheetsValuesResource', () {
     unittest.test('method--append', () {
       var mock = HttpServerMock();
       var res = api.SheetsApi(mock).spreadsheets.values;
diff --git a/generated/googleapis/test/siteverification/v1_test.dart b/generated/googleapis/test/siteverification/v1_test.dart
index 035a89b..99a0484 100644
--- a/generated/googleapis/test/siteverification/v1_test.dart
+++ b/generated/googleapis/test/siteverification/v1_test.dart
@@ -254,7 +254,7 @@
     });
   });
 
-  unittest.group('resource-WebResourceResourceApi', () {
+  unittest.group('resource-WebResourceResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.SiteVerificationApi(mock).webResource;
diff --git a/generated/googleapis/test/slides/v1_test.dart b/generated/googleapis/test/slides/v1_test.dart
index 44f7f77..bb30a52 100644
--- a/generated/googleapis/test/slides/v1_test.dart
+++ b/generated/googleapis/test/slides/v1_test.dart
@@ -4684,7 +4684,7 @@
     });
   });
 
-  unittest.group('resource-PresentationsResourceApi', () {
+  unittest.group('resource-PresentationsResource', () {
     unittest.test('method--batchUpdate', () {
       var mock = HttpServerMock();
       var res = api.SlidesApi(mock).presentations;
@@ -4848,7 +4848,7 @@
     });
   });
 
-  unittest.group('resource-PresentationsPagesResourceApi', () {
+  unittest.group('resource-PresentationsPagesResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.SlidesApi(mock).presentations.pages;
diff --git a/generated/googleapis/test/sourcerepo/v1_test.dart b/generated/googleapis/test/sourcerepo/v1_test.dart
index a806ff9..7eb5f7b 100644
--- a/generated/googleapis/test/sourcerepo/v1_test.dart
+++ b/generated/googleapis/test/sourcerepo/v1_test.dart
@@ -856,7 +856,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsResourceApi', () {
+  unittest.group('resource-ProjectsResource', () {
     unittest.test('method--getConfig', () {
       var mock = HttpServerMock();
       var res = api.CloudSourceRepositoriesApi(mock).projects;
@@ -959,7 +959,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsReposResourceApi', () {
+  unittest.group('resource-ProjectsReposResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.CloudSourceRepositoriesApi(mock).projects.repos;
diff --git a/generated/googleapis/test/spanner/v1_test.dart b/generated/googleapis/test/spanner/v1_test.dart
index f22f08f..9f684e8 100644
--- a/generated/googleapis/test/spanner/v1_test.dart
+++ b/generated/googleapis/test/spanner/v1_test.dart
@@ -3543,7 +3543,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsInstanceConfigsResourceApi', () {
+  unittest.group('resource-ProjectsInstanceConfigsResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.SpannerApi(mock).projects.instanceConfigs;
@@ -3651,7 +3651,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsInstancesResourceApi', () {
+  unittest.group('resource-ProjectsInstancesResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.SpannerApi(mock).projects.instances;
@@ -4078,7 +4078,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsInstancesBackupOperationsResourceApi', () {
+  unittest.group('resource-ProjectsInstancesBackupOperationsResource', () {
     unittest.test('method--list', () {
       var mock = HttpServerMock();
       var res = api.SpannerApi(mock).projects.instances.backupOperations;
@@ -4141,7 +4141,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsInstancesBackupsResourceApi', () {
+  unittest.group('resource-ProjectsInstancesBackupsResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.SpannerApi(mock).projects.instances.backups;
@@ -4573,7 +4573,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsInstancesBackupsOperationsResourceApi', () {
+  unittest.group('resource-ProjectsInstancesBackupsOperationsResource', () {
     unittest.test('method--cancel', () {
       var mock = HttpServerMock();
       var res = api.SpannerApi(mock).projects.instances.backups.operations;
@@ -4779,7 +4779,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsInstancesDatabaseOperationsResourceApi', () {
+  unittest.group('resource-ProjectsInstancesDatabaseOperationsResource', () {
     unittest.test('method--list', () {
       var mock = HttpServerMock();
       var res = api.SpannerApi(mock).projects.instances.databaseOperations;
@@ -4842,7 +4842,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsInstancesDatabasesResourceApi', () {
+  unittest.group('resource-ProjectsInstancesDatabasesResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.SpannerApi(mock).projects.instances.databases;
@@ -5364,8 +5364,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsInstancesDatabasesOperationsResourceApi',
-      () {
+  unittest.group('resource-ProjectsInstancesDatabasesOperationsResource', () {
     unittest.test('method--cancel', () {
       var mock = HttpServerMock();
       var res = api.SpannerApi(mock).projects.instances.databases.operations;
@@ -5571,7 +5570,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsInstancesDatabasesSessionsResourceApi', () {
+  unittest.group('resource-ProjectsInstancesDatabasesSessionsResource', () {
     unittest.test('method--batchCreate', () {
       var mock = HttpServerMock();
       var res = api.SpannerApi(mock).projects.instances.databases.sessions;
@@ -6366,7 +6365,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsInstancesOperationsResourceApi', () {
+  unittest.group('resource-ProjectsInstancesOperationsResource', () {
     unittest.test('method--cancel', () {
       var mock = HttpServerMock();
       var res = api.SpannerApi(mock).projects.instances.operations;
diff --git a/generated/googleapis/test/speech/v1_test.dart b/generated/googleapis/test/speech/v1_test.dart
index 12cf5a1..ee924b4 100644
--- a/generated/googleapis/test/speech/v1_test.dart
+++ b/generated/googleapis/test/speech/v1_test.dart
@@ -736,7 +736,7 @@
     });
   });
 
-  unittest.group('resource-OperationsResourceApi', () {
+  unittest.group('resource-OperationsResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.SpeechApi(mock).operations;
@@ -847,7 +847,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsLocationsOperationsResourceApi', () {
+  unittest.group('resource-ProjectsLocationsOperationsResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.SpeechApi(mock).projects.locations.operations;
@@ -957,7 +957,7 @@
     });
   });
 
-  unittest.group('resource-SpeechResourceApi', () {
+  unittest.group('resource-SpeechResource', () {
     unittest.test('method--longrunningrecognize', () {
       var mock = HttpServerMock();
       var res = api.SpeechApi(mock).speech;
diff --git a/generated/googleapis/test/storage/v1_test.dart b/generated/googleapis/test/storage/v1_test.dart
index 8cb13d5..0726885 100644
--- a/generated/googleapis/test/storage/v1_test.dart
+++ b/generated/googleapis/test/storage/v1_test.dart
@@ -1894,7 +1894,7 @@
     });
   });
 
-  unittest.group('resource-BucketAccessControlsResourceApi', () {
+  unittest.group('resource-BucketAccessControlsResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.StorageApi(mock).bucketAccessControls;
@@ -2333,7 +2333,7 @@
     });
   });
 
-  unittest.group('resource-BucketsResourceApi', () {
+  unittest.group('resource-BucketsResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.StorageApi(mock).buckets;
@@ -3094,7 +3094,7 @@
     });
   });
 
-  unittest.group('resource-ChannelsResourceApi', () {
+  unittest.group('resource-ChannelsResource', () {
     unittest.test('method--stop', () {
       var mock = HttpServerMock();
       var res = api.StorageApi(mock).channels;
@@ -3148,7 +3148,7 @@
     });
   });
 
-  unittest.group('resource-DefaultObjectAccessControlsResourceApi', () {
+  unittest.group('resource-DefaultObjectAccessControlsResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.StorageApi(mock).defaultObjectAccessControls;
@@ -3595,7 +3595,7 @@
     });
   });
 
-  unittest.group('resource-NotificationsResourceApi', () {
+  unittest.group('resource-NotificationsResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.StorageApi(mock).notifications;
@@ -3880,7 +3880,7 @@
     });
   });
 
-  unittest.group('resource-ObjectAccessControlsResourceApi', () {
+  unittest.group('resource-ObjectAccessControlsResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.StorageApi(mock).objectAccessControls;
@@ -4403,7 +4403,7 @@
     });
   });
 
-  unittest.group('resource-ObjectsResourceApi', () {
+  unittest.group('resource-ObjectsResource', () {
     unittest.test('method--compose', () {
       var mock = HttpServerMock();
       var res = api.StorageApi(mock).objects;
@@ -5782,7 +5782,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsHmacKeysResourceApi', () {
+  unittest.group('resource-ProjectsHmacKeysResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.StorageApi(mock).projects.hmacKeys;
@@ -6134,7 +6134,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsServiceAccountResourceApi', () {
+  unittest.group('resource-ProjectsServiceAccountResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.StorageApi(mock).projects.serviceAccount;
diff --git a/generated/googleapis/test/storagetransfer/v1_test.dart b/generated/googleapis/test/storagetransfer/v1_test.dart
index 71c72ec..0e9439a 100644
--- a/generated/googleapis/test/storagetransfer/v1_test.dart
+++ b/generated/googleapis/test/storagetransfer/v1_test.dart
@@ -1121,7 +1121,7 @@
     });
   });
 
-  unittest.group('resource-GoogleServiceAccountsResourceApi', () {
+  unittest.group('resource-GoogleServiceAccountsResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.StoragetransferApi(mock).googleServiceAccounts;
@@ -1173,7 +1173,7 @@
     });
   });
 
-  unittest.group('resource-TransferJobsResourceApi', () {
+  unittest.group('resource-TransferJobsResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.StoragetransferApi(mock).transferJobs;
@@ -1388,7 +1388,7 @@
     });
   });
 
-  unittest.group('resource-TransferOperationsResourceApi', () {
+  unittest.group('resource-TransferOperationsResource', () {
     unittest.test('method--cancel', () {
       var mock = HttpServerMock();
       var res = api.StoragetransferApi(mock).transferOperations;
diff --git a/generated/googleapis/test/streetviewpublish/v1_test.dart b/generated/googleapis/test/streetviewpublish/v1_test.dart
index fe28bf4..3cd39a2 100644
--- a/generated/googleapis/test/streetviewpublish/v1_test.dart
+++ b/generated/googleapis/test/streetviewpublish/v1_test.dart
@@ -814,7 +814,7 @@
     });
   });
 
-  unittest.group('resource-PhotoResourceApi', () {
+  unittest.group('resource-PhotoResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.StreetViewPublishApi(mock).photo;
@@ -1085,7 +1085,7 @@
     });
   });
 
-  unittest.group('resource-PhotosResourceApi', () {
+  unittest.group('resource-PhotosResource', () {
     unittest.test('method--batchDelete', () {
       var mock = HttpServerMock();
       var res = api.StreetViewPublishApi(mock).photos;
diff --git a/generated/googleapis/test/tagmanager/v1_test.dart b/generated/googleapis/test/tagmanager/v1_test.dart
index 8cadae8..7b5bd1f 100644
--- a/generated/googleapis/test/tagmanager/v1_test.dart
+++ b/generated/googleapis/test/tagmanager/v1_test.dart
@@ -1802,7 +1802,7 @@
     });
   });
 
-  unittest.group('resource-AccountsResourceApi', () {
+  unittest.group('resource-AccountsResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.TagManagerApi(mock).accounts;
@@ -1957,7 +1957,7 @@
     });
   });
 
-  unittest.group('resource-AccountsContainersResourceApi', () {
+  unittest.group('resource-AccountsContainersResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.TagManagerApi(mock).accounts.containers;
@@ -2263,7 +2263,7 @@
     });
   });
 
-  unittest.group('resource-AccountsContainersEnvironmentsResourceApi', () {
+  unittest.group('resource-AccountsContainersEnvironmentsResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.TagManagerApi(mock).accounts.containers.environments;
@@ -2623,7 +2623,7 @@
     });
   });
 
-  unittest.group('resource-AccountsContainersFoldersResourceApi', () {
+  unittest.group('resource-AccountsContainersFoldersResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.TagManagerApi(mock).accounts.containers.folders;
@@ -2982,7 +2982,7 @@
     });
   });
 
-  unittest.group('resource-AccountsContainersFoldersEntitiesResourceApi', () {
+  unittest.group('resource-AccountsContainersFoldersEntitiesResource', () {
     unittest.test('method--list', () {
       var mock = HttpServerMock();
       var res = api.TagManagerApi(mock).accounts.containers.folders.entities;
@@ -3061,7 +3061,7 @@
     });
   });
 
-  unittest.group('resource-AccountsContainersMoveFoldersResourceApi', () {
+  unittest.group('resource-AccountsContainersMoveFoldersResource', () {
     unittest.test('method--update', () {
       var mock = HttpServerMock();
       var res = api.TagManagerApi(mock).accounts.containers.moveFolders;
@@ -3147,8 +3147,8 @@
     });
   });
 
-  unittest.group(
-      'resource-AccountsContainersReauthorizeEnvironmentsResourceApi', () {
+  unittest.group('resource-AccountsContainersReauthorizeEnvironmentsResource',
+      () {
     unittest.test('method--update', () {
       var mock = HttpServerMock();
       var res =
@@ -3228,7 +3228,7 @@
     });
   });
 
-  unittest.group('resource-AccountsContainersTagsResourceApi', () {
+  unittest.group('resource-AccountsContainersTagsResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.TagManagerApi(mock).accounts.containers.tags;
@@ -3584,7 +3584,7 @@
     });
   });
 
-  unittest.group('resource-AccountsContainersTriggersResourceApi', () {
+  unittest.group('resource-AccountsContainersTriggersResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.TagManagerApi(mock).accounts.containers.triggers;
@@ -3943,7 +3943,7 @@
     });
   });
 
-  unittest.group('resource-AccountsContainersVariablesResourceApi', () {
+  unittest.group('resource-AccountsContainersVariablesResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.TagManagerApi(mock).accounts.containers.variables;
@@ -4302,7 +4302,7 @@
     });
   });
 
-  unittest.group('resource-AccountsContainersVersionsResourceApi', () {
+  unittest.group('resource-AccountsContainersVersionsResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.TagManagerApi(mock).accounts.containers.versions;
@@ -4909,7 +4909,7 @@
     });
   });
 
-  unittest.group('resource-AccountsPermissionsResourceApi', () {
+  unittest.group('resource-AccountsPermissionsResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.TagManagerApi(mock).accounts.permissions;
diff --git a/generated/googleapis/test/tagmanager/v2_test.dart b/generated/googleapis/test/tagmanager/v2_test.dart
index 6a75027..3d49f15 100644
--- a/generated/googleapis/test/tagmanager/v2_test.dart
+++ b/generated/googleapis/test/tagmanager/v2_test.dart
@@ -2804,7 +2804,7 @@
     });
   });
 
-  unittest.group('resource-AccountsResourceApi', () {
+  unittest.group('resource-AccountsResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.TagManagerApi(mock).accounts;
@@ -2960,7 +2960,7 @@
     });
   });
 
-  unittest.group('resource-AccountsContainersResourceApi', () {
+  unittest.group('resource-AccountsContainersResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.TagManagerApi(mock).accounts.containers;
@@ -3217,7 +3217,7 @@
     });
   });
 
-  unittest.group('resource-AccountsContainersEnvironmentsResourceApi', () {
+  unittest.group('resource-AccountsContainersEnvironmentsResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.TagManagerApi(mock).accounts.containers.environments;
@@ -3527,7 +3527,7 @@
     });
   });
 
-  unittest.group('resource-AccountsContainersVersionHeadersResourceApi', () {
+  unittest.group('resource-AccountsContainersVersionHeadersResource', () {
     unittest.test('method--latest', () {
       var mock = HttpServerMock();
       var res = api.TagManagerApi(mock).accounts.containers.versionHeaders;
@@ -3635,7 +3635,7 @@
     });
   });
 
-  unittest.group('resource-AccountsContainersVersionsResourceApi', () {
+  unittest.group('resource-AccountsContainersVersionsResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.TagManagerApi(mock).accounts.containers.versions;
@@ -3988,7 +3988,7 @@
     });
   });
 
-  unittest.group('resource-AccountsContainersWorkspacesResourceApi', () {
+  unittest.group('resource-AccountsContainersWorkspacesResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.TagManagerApi(mock).accounts.containers.workspaces;
@@ -4501,7 +4501,7 @@
   });
 
   unittest.group(
-      'resource-AccountsContainersWorkspacesBuiltInVariablesResourceApi', () {
+      'resource-AccountsContainersWorkspacesBuiltInVariablesResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.TagManagerApi(mock)
@@ -4722,7 +4722,7 @@
     });
   });
 
-  unittest.group('resource-AccountsContainersWorkspacesFoldersResourceApi', () {
+  unittest.group('resource-AccountsContainersWorkspacesFoldersResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.TagManagerApi(mock).accounts.containers.workspaces.folders;
@@ -5143,7 +5143,7 @@
     });
   });
 
-  unittest.group('resource-AccountsContainersWorkspacesTagsResourceApi', () {
+  unittest.group('resource-AccountsContainersWorkspacesTagsResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.TagManagerApi(mock).accounts.containers.workspaces.tags;
@@ -5449,8 +5449,7 @@
     });
   });
 
-  unittest.group('resource-AccountsContainersWorkspacesTemplatesResourceApi',
-      () {
+  unittest.group('resource-AccountsContainersWorkspacesTemplatesResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res =
@@ -5764,8 +5763,7 @@
     });
   });
 
-  unittest.group('resource-AccountsContainersWorkspacesTriggersResourceApi',
-      () {
+  unittest.group('resource-AccountsContainersWorkspacesTriggersResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.TagManagerApi(mock).accounts.containers.workspaces.triggers;
@@ -6073,8 +6071,7 @@
     });
   });
 
-  unittest.group('resource-AccountsContainersWorkspacesVariablesResourceApi',
-      () {
+  unittest.group('resource-AccountsContainersWorkspacesVariablesResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res =
@@ -6388,7 +6385,7 @@
     });
   });
 
-  unittest.group('resource-AccountsContainersWorkspacesZonesResourceApi', () {
+  unittest.group('resource-AccountsContainersWorkspacesZonesResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.TagManagerApi(mock).accounts.containers.workspaces.zones;
@@ -6696,7 +6693,7 @@
     });
   });
 
-  unittest.group('resource-AccountsUserPermissionsResourceApi', () {
+  unittest.group('resource-AccountsUserPermissionsResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.TagManagerApi(mock).accounts.userPermissions;
diff --git a/generated/googleapis/test/tasks/v1_test.dart b/generated/googleapis/test/tasks/v1_test.dart
index 0b29372..213cf53 100644
--- a/generated/googleapis/test/tasks/v1_test.dart
+++ b/generated/googleapis/test/tasks/v1_test.dart
@@ -256,7 +256,7 @@
     });
   });
 
-  unittest.group('resource-TasklistsResourceApi', () {
+  unittest.group('resource-TasklistsResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.TasksApi(mock).tasklists;
@@ -572,7 +572,7 @@
     });
   });
 
-  unittest.group('resource-TasksResourceApi', () {
+  unittest.group('resource-TasksResource', () {
     unittest.test('method--clear', () {
       var mock = HttpServerMock();
       var res = api.TasksApi(mock).tasks;
diff --git a/generated/googleapis/test/testing/v1_test.dart b/generated/googleapis/test/testing/v1_test.dart
index 70a37aa..201c449 100644
--- a/generated/googleapis/test/testing/v1_test.dart
+++ b/generated/googleapis/test/testing/v1_test.dart
@@ -2926,7 +2926,7 @@
     });
   });
 
-  unittest.group('resource-ApplicationDetailServiceResourceApi', () {
+  unittest.group('resource-ApplicationDetailServiceResource', () {
     unittest.test('method--getApkDetails', () {
       var mock = HttpServerMock();
       var res = api.TestingApi(mock).applicationDetailService;
@@ -2979,7 +2979,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsTestMatricesResourceApi', () {
+  unittest.group('resource-ProjectsTestMatricesResource', () {
     unittest.test('method--cancel', () {
       var mock = HttpServerMock();
       var res = api.TestingApi(mock).projects.testMatrices;
@@ -3172,7 +3172,7 @@
     });
   });
 
-  unittest.group('resource-TestEnvironmentCatalogResourceApi', () {
+  unittest.group('resource-TestEnvironmentCatalogResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.TestingApi(mock).testEnvironmentCatalog;
diff --git a/generated/googleapis/test/texttospeech/v1_test.dart b/generated/googleapis/test/texttospeech/v1_test.dart
index 6cf8b49..f2ef80e 100644
--- a/generated/googleapis/test/texttospeech/v1_test.dart
+++ b/generated/googleapis/test/texttospeech/v1_test.dart
@@ -282,7 +282,7 @@
     });
   });
 
-  unittest.group('resource-TextResourceApi', () {
+  unittest.group('resource-TextResource', () {
     unittest.test('method--synthesize', () {
       var mock = HttpServerMock();
       var res = api.TexttospeechApi(mock).text;
@@ -335,7 +335,7 @@
     });
   });
 
-  unittest.group('resource-VoicesResourceApi', () {
+  unittest.group('resource-VoicesResource', () {
     unittest.test('method--list', () {
       var mock = HttpServerMock();
       var res = api.TexttospeechApi(mock).voices;
diff --git a/generated/googleapis/test/tpu/v1_test.dart b/generated/googleapis/test/tpu/v1_test.dart
index 5a8d7ff..4dcc32c 100644
--- a/generated/googleapis/test/tpu/v1_test.dart
+++ b/generated/googleapis/test/tpu/v1_test.dart
@@ -911,7 +911,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsLocationsResourceApi', () {
+  unittest.group('resource-ProjectsLocationsResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.TPUApi(mock).projects.locations;
@@ -1021,7 +1021,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsLocationsAcceleratorTypesResourceApi', () {
+  unittest.group('resource-ProjectsLocationsAcceleratorTypesResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.TPUApi(mock).projects.locations.acceleratorTypes;
@@ -1136,7 +1136,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsLocationsNodesResourceApi', () {
+  unittest.group('resource-ProjectsLocationsNodesResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.TPUApi(mock).projects.locations.nodes;
@@ -1506,7 +1506,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsLocationsOperationsResourceApi', () {
+  unittest.group('resource-ProjectsLocationsOperationsResource', () {
     unittest.test('method--cancel', () {
       var mock = HttpServerMock();
       var res = api.TPUApi(mock).projects.locations.operations;
@@ -1712,7 +1712,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsLocationsTensorflowVersionsResourceApi', () {
+  unittest.group('resource-ProjectsLocationsTensorflowVersionsResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.TPUApi(mock).projects.locations.tensorflowVersions;
diff --git a/generated/googleapis/test/translate/v3_test.dart b/generated/googleapis/test/translate/v3_test.dart
index 006a140..9d87362 100644
--- a/generated/googleapis/test/translate/v3_test.dart
+++ b/generated/googleapis/test/translate/v3_test.dart
@@ -1192,7 +1192,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsResourceApi', () {
+  unittest.group('resource-ProjectsResource', () {
     unittest.test('method--detectLanguage', () {
       var mock = HttpServerMock();
       var res = api.TranslateApi(mock).projects;
@@ -1356,7 +1356,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsLocationsResourceApi', () {
+  unittest.group('resource-ProjectsLocationsResource', () {
     unittest.test('method--batchTranslateText', () {
       var mock = HttpServerMock();
       var res = api.TranslateApi(mock).projects.locations;
@@ -1681,7 +1681,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsLocationsGlossariesResourceApi', () {
+  unittest.group('resource-ProjectsLocationsGlossariesResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.TranslateApi(mock).projects.locations.glossaries;
@@ -1892,7 +1892,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsLocationsOperationsResourceApi', () {
+  unittest.group('resource-ProjectsLocationsOperationsResource', () {
     unittest.test('method--cancel', () {
       var mock = HttpServerMock();
       var res = api.TranslateApi(mock).projects.locations.operations;
diff --git a/generated/googleapis/test/vault/v1_test.dart b/generated/googleapis/test/vault/v1_test.dart
index 353902d..fda9acc 100644
--- a/generated/googleapis/test/vault/v1_test.dart
+++ b/generated/googleapis/test/vault/v1_test.dart
@@ -1751,7 +1751,7 @@
     });
   });
 
-  unittest.group('resource-MattersResourceApi', () {
+  unittest.group('resource-MattersResource', () {
     unittest.test('method--addPermissions', () {
       var mock = HttpServerMock();
       var res = api.VaultApi(mock).matters;
@@ -2329,7 +2329,7 @@
     });
   });
 
-  unittest.group('resource-MattersExportsResourceApi', () {
+  unittest.group('resource-MattersExportsResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.VaultApi(mock).matters.exports;
@@ -2577,7 +2577,7 @@
     });
   });
 
-  unittest.group('resource-MattersHoldsResourceApi', () {
+  unittest.group('resource-MattersHoldsResource', () {
     unittest.test('method--addHeldAccounts', () {
       var mock = HttpServerMock();
       var res = api.VaultApi(mock).matters.holds;
@@ -3040,7 +3040,7 @@
     });
   });
 
-  unittest.group('resource-MattersHoldsAccountsResourceApi', () {
+  unittest.group('resource-MattersHoldsAccountsResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.VaultApi(mock).matters.holds.accounts;
@@ -3249,7 +3249,7 @@
     });
   });
 
-  unittest.group('resource-MattersSavedQueriesResourceApi', () {
+  unittest.group('resource-MattersSavedQueriesResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.VaultApi(mock).matters.savedQueries;
@@ -3497,7 +3497,7 @@
     });
   });
 
-  unittest.group('resource-OperationsResourceApi', () {
+  unittest.group('resource-OperationsResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.VaultApi(mock).operations;
diff --git a/generated/googleapis/test/verifiedaccess/v1_test.dart b/generated/googleapis/test/verifiedaccess/v1_test.dart
index 9caedb3..586936f 100644
--- a/generated/googleapis/test/verifiedaccess/v1_test.dart
+++ b/generated/googleapis/test/verifiedaccess/v1_test.dart
@@ -173,7 +173,7 @@
     });
   });
 
-  unittest.group('resource-ChallengeResourceApi', () {
+  unittest.group('resource-ChallengeResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.VerifiedaccessApi(mock).challenge;
diff --git a/generated/googleapis/test/videointelligence/v1_test.dart b/generated/googleapis/test/videointelligence/v1_test.dart
index cf33220..88c8460 100644
--- a/generated/googleapis/test/videointelligence/v1_test.dart
+++ b/generated/googleapis/test/videointelligence/v1_test.dart
@@ -8968,8 +8968,7 @@
     });
   });
 
-  unittest.group('resource-OperationsProjectsLocationsOperationsResourceApi',
-      () {
+  unittest.group('resource-OperationsProjectsLocationsOperationsResource', () {
     unittest.test('method--cancel', () {
       var mock = HttpServerMock();
       var res = api.CloudVideoIntelligenceApi(mock)
@@ -9128,7 +9127,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsLocationsCorporaOperationsResourceApi', () {
+  unittest.group('resource-ProjectsLocationsCorporaOperationsResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.CloudVideoIntelligenceApi(mock)
@@ -9183,7 +9182,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsLocationsCorpuraOperationsResourceApi', () {
+  unittest.group('resource-ProjectsLocationsCorpuraOperationsResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.CloudVideoIntelligenceApi(mock)
@@ -9238,7 +9237,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsLocationsOperationsResourceApi', () {
+  unittest.group('resource-ProjectsLocationsOperationsResource', () {
     unittest.test('method--cancel', () {
       var mock = HttpServerMock();
       var res =
@@ -9457,7 +9456,7 @@
     });
   });
 
-  unittest.group('resource-VideosResourceApi', () {
+  unittest.group('resource-VideosResource', () {
     unittest.test('method--annotate', () {
       var mock = HttpServerMock();
       var res = api.CloudVideoIntelligenceApi(mock).videos;
diff --git a/generated/googleapis/test/vision/v1_test.dart b/generated/googleapis/test/vision/v1_test.dart
index b716bcc..70f0d99 100644
--- a/generated/googleapis/test/vision/v1_test.dart
+++ b/generated/googleapis/test/vision/v1_test.dart
@@ -13023,7 +13023,7 @@
     });
   });
 
-  unittest.group('resource-FilesResourceApi', () {
+  unittest.group('resource-FilesResource', () {
     unittest.test('method--annotate', () {
       var mock = HttpServerMock();
       var res = api.VisionApi(mock).files;
@@ -13129,7 +13129,7 @@
     });
   });
 
-  unittest.group('resource-ImagesResourceApi', () {
+  unittest.group('resource-ImagesResource', () {
     unittest.test('method--annotate', () {
       var mock = HttpServerMock();
       var res = api.VisionApi(mock).images;
@@ -13235,7 +13235,7 @@
     });
   });
 
-  unittest.group('resource-LocationsOperationsResourceApi', () {
+  unittest.group('resource-LocationsOperationsResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.VisionApi(mock).locations.operations;
@@ -13285,7 +13285,7 @@
     });
   });
 
-  unittest.group('resource-OperationsResourceApi', () {
+  unittest.group('resource-OperationsResource', () {
     unittest.test('method--cancel', () {
       var mock = HttpServerMock();
       var res = api.VisionApi(mock).operations;
@@ -13496,7 +13496,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsFilesResourceApi', () {
+  unittest.group('resource-ProjectsFilesResource', () {
     unittest.test('method--annotate', () {
       var mock = HttpServerMock();
       var res = api.VisionApi(mock).projects.files;
@@ -13606,7 +13606,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsImagesResourceApi', () {
+  unittest.group('resource-ProjectsImagesResource', () {
     unittest.test('method--annotate', () {
       var mock = HttpServerMock();
       var res = api.VisionApi(mock).projects.images;
@@ -13716,7 +13716,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsLocationsFilesResourceApi', () {
+  unittest.group('resource-ProjectsLocationsFilesResource', () {
     unittest.test('method--annotate', () {
       var mock = HttpServerMock();
       var res = api.VisionApi(mock).projects.locations.files;
@@ -13826,7 +13826,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsLocationsImagesResourceApi', () {
+  unittest.group('resource-ProjectsLocationsImagesResource', () {
     unittest.test('method--annotate', () {
       var mock = HttpServerMock();
       var res = api.VisionApi(mock).projects.locations.images;
@@ -13936,7 +13936,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsLocationsOperationsResourceApi', () {
+  unittest.group('resource-ProjectsLocationsOperationsResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.VisionApi(mock).projects.locations.operations;
@@ -13986,7 +13986,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsLocationsProductSetsResourceApi', () {
+  unittest.group('resource-ProjectsLocationsProductSetsResource', () {
     unittest.test('method--addProduct', () {
       var mock = HttpServerMock();
       var res = api.VisionApi(mock).projects.locations.productSets;
@@ -14416,8 +14416,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsLocationsProductSetsProductsResourceApi',
-      () {
+  unittest.group('resource-ProjectsLocationsProductSetsProductsResource', () {
     unittest.test('method--list', () {
       var mock = HttpServerMock();
       var res = api.VisionApi(mock).projects.locations.productSets.products;
@@ -14477,7 +14476,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsLocationsProductsResourceApi', () {
+  unittest.group('resource-ProjectsLocationsProductsResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.VisionApi(mock).projects.locations.products;
@@ -14799,7 +14798,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsLocationsProductsReferenceImagesResourceApi',
+  unittest.group('resource-ProjectsLocationsProductsReferenceImagesResource',
       () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
@@ -15013,7 +15012,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsOperationsResourceApi', () {
+  unittest.group('resource-ProjectsOperationsResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.VisionApi(mock).projects.operations;
diff --git a/generated/googleapis/test/webfonts/v1_test.dart b/generated/googleapis/test/webfonts/v1_test.dart
index 27420d6..ca31f4a 100644
--- a/generated/googleapis/test/webfonts/v1_test.dart
+++ b/generated/googleapis/test/webfonts/v1_test.dart
@@ -150,7 +150,7 @@
     });
   });
 
-  unittest.group('resource-WebfontsResourceApi', () {
+  unittest.group('resource-WebfontsResource', () {
     unittest.test('method--list', () {
       var mock = HttpServerMock();
       var res = api.WebfontsApi(mock).webfonts;
diff --git a/generated/googleapis/test/webmasters/v3_test.dart b/generated/googleapis/test/webmasters/v3_test.dart
index ef4c344..86414b4 100644
--- a/generated/googleapis/test/webmasters/v3_test.dart
+++ b/generated/googleapis/test/webmasters/v3_test.dart
@@ -456,7 +456,7 @@
     });
   });
 
-  unittest.group('resource-SearchanalyticsResourceApi', () {
+  unittest.group('resource-SearchanalyticsResource', () {
     unittest.test('method--query', () {
       var mock = HttpServerMock();
       var res = api.WebmastersApi(mock).searchanalytics;
@@ -524,7 +524,7 @@
     });
   });
 
-  unittest.group('resource-SitemapsResourceApi', () {
+  unittest.group('resource-SitemapsResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.WebmastersApi(mock).sitemaps;
@@ -774,7 +774,7 @@
     });
   });
 
-  unittest.group('resource-SitesResourceApi', () {
+  unittest.group('resource-SitesResource', () {
     unittest.test('method--add', () {
       var mock = HttpServerMock();
       var res = api.WebmastersApi(mock).sites;
diff --git a/generated/googleapis/test/websecurityscanner/v1_test.dart b/generated/googleapis/test/websecurityscanner/v1_test.dart
index 33cf82a..8142499 100644
--- a/generated/googleapis/test/websecurityscanner/v1_test.dart
+++ b/generated/googleapis/test/websecurityscanner/v1_test.dart
@@ -1107,7 +1107,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsScanConfigsResourceApi', () {
+  unittest.group('resource-ProjectsScanConfigsResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.WebSecurityScannerApi(mock).projects.scanConfigs;
@@ -1425,7 +1425,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsScanConfigsScanRunsResourceApi', () {
+  unittest.group('resource-ProjectsScanConfigsScanRunsResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.WebSecurityScannerApi(mock).projects.scanConfigs.scanRuns;
@@ -1585,8 +1585,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsScanConfigsScanRunsCrawledUrlsResourceApi',
-      () {
+  unittest.group('resource-ProjectsScanConfigsScanRunsCrawledUrlsResource', () {
     unittest.test('method--list', () {
       var mock = HttpServerMock();
       var res = api.WebSecurityScannerApi(mock)
@@ -1649,8 +1648,8 @@
     });
   });
 
-  unittest.group(
-      'resource-ProjectsScanConfigsScanRunsFindingTypeStatsResourceApi', () {
+  unittest.group('resource-ProjectsScanConfigsScanRunsFindingTypeStatsResource',
+      () {
     unittest.test('method--list', () {
       var mock = HttpServerMock();
       var res = api.WebSecurityScannerApi(mock)
@@ -1705,7 +1704,7 @@
     });
   });
 
-  unittest.group('resource-ProjectsScanConfigsScanRunsFindingsResourceApi', () {
+  unittest.group('resource-ProjectsScanConfigsScanRunsFindingsResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.WebSecurityScannerApi(mock)
diff --git a/generated/googleapis/test/youtube/v3_test.dart b/generated/googleapis/test/youtube/v3_test.dart
index 4fc67d1..6339571 100644
--- a/generated/googleapis/test/youtube/v3_test.dart
+++ b/generated/googleapis/test/youtube/v3_test.dart
@@ -8422,7 +8422,7 @@
     });
   });
 
-  unittest.group('resource-AbuseReportsResourceApi', () {
+  unittest.group('resource-AbuseReportsResource', () {
     unittest.test('method--insert', () {
       var mock = HttpServerMock();
       var res = api.YouTubeApi(mock).abuseReports;
@@ -8477,7 +8477,7 @@
     });
   });
 
-  unittest.group('resource-ActivitiesResourceApi', () {
+  unittest.group('resource-ActivitiesResource', () {
     unittest.test('method--list', () {
       var mock = HttpServerMock();
       var res = api.YouTubeApi(mock).activities;
@@ -8558,7 +8558,7 @@
     });
   });
 
-  unittest.group('resource-CaptionsResourceApi', () {
+  unittest.group('resource-CaptionsResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.YouTubeApi(mock).captions;
@@ -8880,7 +8880,7 @@
     });
   });
 
-  unittest.group('resource-ChannelBannersResourceApi', () {
+  unittest.group('resource-ChannelBannersResource', () {
     unittest.test('method--insert', () {
       // TODO: Implement tests for media upload;
       // TODO: Implement tests for media download;
@@ -8949,7 +8949,7 @@
     });
   });
 
-  unittest.group('resource-ChannelSectionsResourceApi', () {
+  unittest.group('resource-ChannelSectionsResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.YouTubeApi(mock).channelSections;
@@ -9189,7 +9189,7 @@
     });
   });
 
-  unittest.group('resource-ChannelsResourceApi', () {
+  unittest.group('resource-ChannelsResource', () {
     unittest.test('method--list', () {
       var mock = HttpServerMock();
       var res = api.YouTubeApi(mock).channels;
@@ -9335,7 +9335,7 @@
     });
   });
 
-  unittest.group('resource-CommentThreadsResourceApi', () {
+  unittest.group('resource-CommentThreadsResource', () {
     unittest.test('method--insert', () {
       var mock = HttpServerMock();
       var res = api.YouTubeApi(mock).commentThreads;
@@ -9531,7 +9531,7 @@
     });
   });
 
-  unittest.group('resource-CommentsResourceApi', () {
+  unittest.group('resource-CommentsResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.YouTubeApi(mock).comments;
@@ -9852,7 +9852,7 @@
     });
   });
 
-  unittest.group('resource-I18nLanguagesResourceApi', () {
+  unittest.group('resource-I18nLanguagesResource', () {
     unittest.test('method--list', () {
       var mock = HttpServerMock();
       var res = api.YouTubeApi(mock).i18nLanguages;
@@ -9904,7 +9904,7 @@
     });
   });
 
-  unittest.group('resource-I18nRegionsResourceApi', () {
+  unittest.group('resource-I18nRegionsResource', () {
     unittest.test('method--list', () {
       var mock = HttpServerMock();
       var res = api.YouTubeApi(mock).i18nRegions;
@@ -9956,7 +9956,7 @@
     });
   });
 
-  unittest.group('resource-LiveBroadcastsResourceApi', () {
+  unittest.group('resource-LiveBroadcastsResource', () {
     unittest.test('method--bind', () {
       var mock = HttpServerMock();
       var res = api.YouTubeApi(mock).liveBroadcasts;
@@ -10413,7 +10413,7 @@
     });
   });
 
-  unittest.group('resource-LiveChatBansResourceApi', () {
+  unittest.group('resource-LiveChatBansResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.YouTubeApi(mock).liveChatBans;
@@ -10514,7 +10514,7 @@
     });
   });
 
-  unittest.group('resource-LiveChatMessagesResourceApi', () {
+  unittest.group('resource-LiveChatMessagesResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.YouTubeApi(mock).liveChatMessages;
@@ -10683,7 +10683,7 @@
     });
   });
 
-  unittest.group('resource-LiveChatModeratorsResourceApi', () {
+  unittest.group('resource-LiveChatModeratorsResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.YouTubeApi(mock).liveChatModerators;
@@ -10845,7 +10845,7 @@
     });
   });
 
-  unittest.group('resource-LiveStreamsResourceApi', () {
+  unittest.group('resource-LiveStreamsResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.YouTubeApi(mock).liveStreams;
@@ -11097,7 +11097,7 @@
     });
   });
 
-  unittest.group('resource-MembersResourceApi', () {
+  unittest.group('resource-MembersResource', () {
     unittest.test('method--list', () {
       var mock = HttpServerMock();
       var res = api.YouTubeApi(mock).members;
@@ -11167,7 +11167,7 @@
     });
   });
 
-  unittest.group('resource-MembershipsLevelsResourceApi', () {
+  unittest.group('resource-MembershipsLevelsResource', () {
     unittest.test('method--list', () {
       var mock = HttpServerMock();
       var res = api.YouTubeApi(mock).membershipsLevels;
@@ -11218,7 +11218,7 @@
     });
   });
 
-  unittest.group('resource-PlaylistItemsResourceApi', () {
+  unittest.group('resource-PlaylistItemsResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.YouTubeApi(mock).playlistItems;
@@ -11459,7 +11459,7 @@
     });
   });
 
-  unittest.group('resource-PlaylistsResourceApi', () {
+  unittest.group('resource-PlaylistsResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.YouTubeApi(mock).playlists;
@@ -11710,7 +11710,7 @@
     });
   });
 
-  unittest.group('resource-SearchResourceApi', () {
+  unittest.group('resource-SearchResource', () {
     unittest.test('method--list', () {
       var mock = HttpServerMock();
       var res = api.YouTubeApi(mock).search;
@@ -11878,7 +11878,7 @@
     });
   });
 
-  unittest.group('resource-SponsorsResourceApi', () {
+  unittest.group('resource-SponsorsResource', () {
     unittest.test('method--list', () {
       var mock = HttpServerMock();
       var res = api.YouTubeApi(mock).sponsors;
@@ -11940,7 +11940,7 @@
     });
   });
 
-  unittest.group('resource-SubscriptionsResourceApi', () {
+  unittest.group('resource-SubscriptionsResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.YouTubeApi(mock).subscriptions;
@@ -12131,7 +12131,7 @@
     });
   });
 
-  unittest.group('resource-SuperChatEventsResourceApi', () {
+  unittest.group('resource-SuperChatEventsResource', () {
     unittest.test('method--list', () {
       var mock = HttpServerMock();
       var res = api.YouTubeApi(mock).superChatEvents;
@@ -12194,7 +12194,7 @@
     });
   });
 
-  unittest.group('resource-TestsResourceApi', () {
+  unittest.group('resource-TestsResource', () {
     unittest.test('method--insert', () {
       var mock = HttpServerMock();
       var res = api.YouTubeApi(mock).tests;
@@ -12249,7 +12249,7 @@
     });
   });
 
-  unittest.group('resource-ThirdPartyLinksResourceApi', () {
+  unittest.group('resource-ThirdPartyLinksResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.YouTubeApi(mock).thirdPartyLinks;
@@ -12465,7 +12465,7 @@
     });
   });
 
-  unittest.group('resource-ThumbnailsResourceApi', () {
+  unittest.group('resource-ThumbnailsResource', () {
     unittest.test('method--set', () {
       // TODO: Implement tests for media upload;
       // TODO: Implement tests for media download;
@@ -12524,7 +12524,7 @@
     });
   });
 
-  unittest.group('resource-VideoAbuseReportReasonsResourceApi', () {
+  unittest.group('resource-VideoAbuseReportReasonsResource', () {
     unittest.test('method--list', () {
       var mock = HttpServerMock();
       var res = api.YouTubeApi(mock).videoAbuseReportReasons;
@@ -12578,7 +12578,7 @@
     });
   });
 
-  unittest.group('resource-VideoCategoriesResourceApi', () {
+  unittest.group('resource-VideoCategoriesResource', () {
     unittest.test('method--list', () {
       var mock = HttpServerMock();
       var res = api.YouTubeApi(mock).videoCategories;
@@ -12640,7 +12640,7 @@
     });
   });
 
-  unittest.group('resource-VideosResourceApi', () {
+  unittest.group('resource-VideosResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.YouTubeApi(mock).videos;
@@ -13076,7 +13076,7 @@
     });
   });
 
-  unittest.group('resource-WatermarksResourceApi', () {
+  unittest.group('resource-WatermarksResource', () {
     unittest.test('method--set', () {
       // TODO: Implement tests for media upload;
       // TODO: Implement tests for media download;
diff --git a/generated/googleapis/test/youtubeanalytics/v2_test.dart b/generated/googleapis/test/youtubeanalytics/v2_test.dart
index e57161d..b05be8b 100644
--- a/generated/googleapis/test/youtubeanalytics/v2_test.dart
+++ b/generated/googleapis/test/youtubeanalytics/v2_test.dart
@@ -525,7 +525,7 @@
     });
   });
 
-  unittest.group('resource-GroupItemsResourceApi', () {
+  unittest.group('resource-GroupItemsResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.YouTubeAnalyticsApi(mock).groupItems;
@@ -692,7 +692,7 @@
     });
   });
 
-  unittest.group('resource-GroupsResourceApi', () {
+  unittest.group('resource-GroupsResource', () {
     unittest.test('method--delete', () {
       var mock = HttpServerMock();
       var res = api.YouTubeAnalyticsApi(mock).groups;
@@ -921,7 +921,7 @@
     });
   });
 
-  unittest.group('resource-ReportsResourceApi', () {
+  unittest.group('resource-ReportsResource', () {
     unittest.test('method--query', () {
       var mock = HttpServerMock();
       var res = api.YouTubeAnalyticsApi(mock).reports;
diff --git a/generated/googleapis/test/youtubereporting/v1_test.dart b/generated/googleapis/test/youtubereporting/v1_test.dart
index 392ff1f..eb52908 100644
--- a/generated/googleapis/test/youtubereporting/v1_test.dart
+++ b/generated/googleapis/test/youtubereporting/v1_test.dart
@@ -718,7 +718,7 @@
     });
   });
 
-  unittest.group('resource-JobsResourceApi', () {
+  unittest.group('resource-JobsResource', () {
     unittest.test('method--create', () {
       var mock = HttpServerMock();
       var res = api.YouTubeReportingApi(mock).jobs;
@@ -948,7 +948,7 @@
     });
   });
 
-  unittest.group('resource-JobsReportsResourceApi', () {
+  unittest.group('resource-JobsReportsResource', () {
     unittest.test('method--get', () {
       var mock = HttpServerMock();
       var res = api.YouTubeReportingApi(mock).jobs.reports;
@@ -1096,7 +1096,7 @@
     });
   });
 
-  unittest.group('resource-MediaResourceApi', () {
+  unittest.group('resource-MediaResource', () {
     unittest.test('method--download', () {
       // TODO: Implement tests for media upload;
       // TODO: Implement tests for media download;
@@ -1149,7 +1149,7 @@
     });
   });
 
-  unittest.group('resource-ReportTypesResourceApi', () {
+  unittest.group('resource-ReportTypesResource', () {
     unittest.test('method--list', () {
       var mock = HttpServerMock();
       var res = api.YouTubeReportingApi(mock).reportTypes;