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

It's cleaner.
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;